added ptperr.h to dist. up'd version to beta4

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3063 67ed7778-7388-44ab-90cf-0a291f65f57c
2001-11-16 21:02:42 +00:00
parent 7b5e017fd3
commit 12e95b926d
5 changed files with 604 additions and 70 deletions
--- a/camlibs/ptp/Makefile
+++ b/camlibs/ptp/Makefile
@@ -1,20 +1,371 @@
+# Generated automatically from Makefile.in by configure.
+# Makefile.in generated automatically by automake 1.5 from Makefile.am.

-OBJECTS	= dx3500 libptp.so
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.

-CFLAGS	= -g -DDEBUG
-LDFLAGS = -lusb ptp.o
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.

-CC	= gcc

-all: ${OBJECTS}

-dx3500: main.o libptp.so
-	${CC} -o dx3500 main.o ${LDFLAGS} -g
+SHELL = /bin/sh

-ptp.o:	ptp.c ptp.h
+srcdir = .
+top_srcdir = ../..
+prefix = /usr/local
+exec_prefix = ${prefix}

-libptp.so: ptp.o
-	${CC} -shared -o libptp.so ptp.o
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/gphoto
+pkglibdir = $(libdir)/gphoto
+pkgincludedir = $(includedir)/gphoto
+top_builddir = ../..

-clean:
-	rm -f *.o *.so
+ACLOCAL = ${SHELL} /home/scottf/Desktop/projects/sourceforge/gphoto2/missing --run aclocal
+AUTOCONF = ${SHELL} /home/scottf/Desktop/projects/sourceforge/gphoto2/missing --run autoconf
+AUTOMAKE = ${SHELL} /home/scottf/Desktop/projects/sourceforge/gphoto2/missing --run automake
+AUTOHEADER = ${SHELL} /home/scottf/Desktop/projects/sourceforge/gphoto2/missing --run autoheader
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+AA_CFLAGS = -I/usr/include
+AA_LIBS = -L/usr/lib -Wl,-rpath,/usr/lib -laa -lm -L/usr/X11R6/lib -lX11 -lgpm -lslang
+AMTAR = ${SHELL} /home/scottf/Desktop/projects/sourceforge/gphoto2/missing --run tar
+AS = @AS@
+AWK = mawk
+BUILD_INCLUDED_LIBINTL = no
+CATALOGS =  de.gmo
+CATOBJEXT = .gmo
+CC = gcc
+CDK_LIBS = 
+CFLAGS = -g -O2 -g -Wall -Wmissing-declarations -Wmissing-prototypes -I/home/scottf/Desktop/projects/sourceforge/gphoto2 -I/home/scottf/Desktop/projects/sourceforge/gphoto2/libgphoto2_port/libgphoto2_port
+CPP = gcc -E
+DATADIRNAME = share
+DEPDIR = .deps
+DLLTOOL = @DLLTOOL@
+DOC_DIR = ${prefix}/share/doc/gphoto-2.0beta3
+ECHO = echo
+EXEEXT = 
+GENCAT = gencat
+GLIBC21 = yes
+GMOFILES =  de.gmo
+GMSGFMT = /usr/bin/msgfmt
+GTKDOC = false
+HAVE_GTK_DOC = 
+HTML_DIR = ${prefix}/share/doc/gphoto-2.0beta3/html
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+INSTOBJEXT = .mo
+INTLBISON = bison
+INTLLIBS = 
+INTLOBJS = 
+INTL_LIBTOOL_SUFFIX_PREFIX = 
+JPEG_LIBS = -ljpeg
+LIBGPHOTO2_INCLUDEDIR = -I${includedir}
+LIBGPHOTO2_LIBDIR = -L${libdir}
+LIBGPHOTO2_LIBS = -lgphoto2 -lm
+LIBGPHOTO2_PORT_DIR = libgphoto2_port
+LIBGPHOTO2_VERSION = 2.0beta3
+LIBICONV = 
+LIBS = -ldl  -L/home/scottf/Desktop/projects/sourceforge/gphoto2/libgphoto2_port/libgphoto2_port/ -lgphoto2_port
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+MAINT = #
+MKINSTALLDIRS = ./mkinstalldirs
+MSGFMT = /usr/bin/msgfmt
+OBJDUMP = @OBJDUMP@
+OBJEXT = o
+PACKAGE = gphoto
+POFILES =  de.po
+POSUB = po
+RANLIB = ranlib
+STRIP = strip
+SUBDIRS_CAMLIBS =  agfa barbie canon casio digita dimera directory jamcam jd11 kodak konica minolta panasonic polaroid ptp samsung sierra stv0680 sonydscf1 sonydscf55
+USE_INCLUDED_LIBINTL = no
+USE_NLS = yes
+VERSION = 2.0beta3
+am__include = include
+am__quote = 
+dotlibs = 
+install_sh = /home/scottf/Desktop/projects/sourceforge/gphoto2/install-sh
+
+camlibdir = $(prefix)/lib/gphoto2
+camlib_LTLIBRARIES = libgphoto2_ptp.la
+
+INCLUDES = -I$(top_srcdir)/libgphoto2
+
+libgphoto2_ptp_la_SOURCES = ptp.c ptp.h ptperr.h library.c
+
+libgphoto2_ptp_la_LDFLAGS = \
+ -module -avoid-version\
+ -L$(shell pwd)/$(top_builddir)/libgphoto2/
+
+
+libgphoto2_ptp_la_LIBADD = -lgphoto2
+subdir = camlibs/ptp
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/libgphoto2/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(camlib_LTLIBRARIES)
+
+libgphoto2_ptp_la_DEPENDENCIES =
+am_libgphoto2_ptp_la_OBJECTS = ptp.lo library.lo
+libgphoto2_ptp_la_OBJECTS = $(am_libgphoto2_ptp_la_OBJECTS)
+
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/libgphoto2
+CPPFLAGS = 
+LDFLAGS =  -g -Wall
+LIBS = -ldl  -L/home/scottf/Desktop/projects/sourceforge/gphoto2/libgphoto2_port/libgphoto2_port/ -lgphoto2_port
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+#DEP_FILES = $(DEPDIR)/library.Plo $(DEPDIR)/ptp.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(libgphoto2_ptp_la_SOURCES)
+DIST_COMMON = README Makefile.am Makefile.in
+SOURCES = $(libgphoto2_ptp_la_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+$(srcdir)/Makefile.in: # Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  camlibs/ptp/Makefile
+Makefile: # $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && \
+	  CONFIG_HEADERS= CONFIG_LINKS= \
+	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+install-camlibLTLIBRARIES: $(camlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(camlibdir)
+	@list='$(camlib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(camlibdir)/$$p"; \
+	    $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(camlibdir)/$$p; \
+	  else :; fi; \
+	done
+
+uninstall-camlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(camlib_LTLIBRARIES)'; for p in $$list; do \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(camlibdir)/$$p"; \
+	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(camlibdir)/$$p; \
+	done
+
+clean-camlibLTLIBRARIES:
+	-test -z "$(camlib_LTLIBRARIES)" || rm -f $(camlib_LTLIBRARIES)
+libgphoto2_ptp.la: $(libgphoto2_ptp_la_OBJECTS) $(libgphoto2_ptp_la_DEPENDENCIES) 
+	$(LINK) -rpath $(camlibdir) $(libgphoto2_ptp_la_LDFLAGS) $(libgphoto2_ptp_la_OBJECTS) $(libgphoto2_ptp_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+#include $(DEPDIR)/library.Plo
+#include $(DEPDIR)/ptp.Plo
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+.c.o:
+#	source='$<' object='$@' libtool=no 
+#	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' 
+#	$(CCDEPMODE) $(depcomp) 
+	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+
+.c.obj:
+#	source='$<' object='$@' libtool=no 
+#	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' 
+#	$(CCDEPMODE) $(depcomp) 
+	$(COMPILE) -c `cygpath -w $<`
+
+.c.lo:
+#	source='$<' object='$@' libtool=yes 
+#	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' 
+#	$(CCDEPMODE) $(depcomp) 
+	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+CCDEPMODE = depmode=none
+uninstall-info-am:
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
+
+GTAGS:
+	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    cp -pR $$d/$$file $(distdir) \
+	    || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(camlibdir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-camlibLTLIBRARIES clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-camlibLTLIBRARIES
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+uninstall-am: uninstall-camlibLTLIBRARIES uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-camlibLTLIBRARIES \
+	clean-generic clean-libtool distclean distclean-compile \
+	distclean-depend distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am info info-am install \
+	install-am install-camlibLTLIBRARIES install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool tags uninstall \
+	uninstall-am uninstall-camlibLTLIBRARIES uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
--- a/camlibs/ptp/Makefile.am
+++ b/camlibs/ptp/Makefile.am
@@ -3,7 +3,7 @@ camlib_LTLIBRARIES = libgphoto2_ptp.la

 INCLUDES = -I$(top_srcdir)/libgphoto2

-libgphoto2_ptp_la_SOURCES = ptp.c ptp.h library.c
+libgphoto2_ptp_la_SOURCES = ptp.c ptp.h ptperr.h library.c

 libgphoto2_ptp_la_LDFLAGS =\
 -module -avoid-version\
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.

 AC_INIT(libgphoto2/gphoto2.h)
 AM_CONFIG_HEADER(libgphoto2/config.h)
-AM_INIT_AUTOMAKE(gphoto, 2.0beta3)
+AM_INIT_AUTOMAKE(gphoto, 2.0beta4)
 AM_MAINTAINER_MODE

 dnl Checks for programs.
--- a/libgphoto2_port/po/libgphoto2_port.pot
+++ b/libgphoto2_port/po/libgphoto2_port.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-16 17:25+0200\n"
+"POT-Creation-Date: 2001-11-16 04:08-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,180 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: libgphoto2_port/gphoto2-port-core.c:78
+#: libgphoto2_port/gphoto2-port.c:52
+#, c-format
+msgid "The operation '%s' is not supported by this device"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:53
+msgid "The port has not yet been initialized"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:240
+msgid "open"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:263
+msgid "close"
+msgstr ""
+
+#. Check if we wrote all bytes
+#: libgphoto2_port/gphoto2-port.c:333
+msgid "write"
+msgstr ""
+
+#. Check if we read as many bytes as expected
+#: libgphoto2_port/gphoto2-port.c:365
+msgid "read"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:464
+msgid "update"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:510
+msgid "get_pin"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:528
+msgid "set_pin"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:543
+msgid "send_break"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:556
+msgid "flush"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:572
+msgid "find_device"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:586
+msgid "clear_halt"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:606
+msgid "msg_write"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:626
+msgid "msg_read"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port.c:686
+msgid "No error description available"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port-info-list.c:169
 #, c-format
 msgid "Could not load any io-library because '%s' could not be opened (%m)"
 msgstr ""
+
+#: libgphoto2_port/gphoto2-port-result.c:54
+#: libgphoto2_port/gphoto2-port-result.c:91
+msgid "Unknown error"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port-result.c:58
+msgid "I/O problem"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port-result.c:59
+msgid "Bad parameters"
+msgstr ""
+
+#: libgphoto2_port/gphoto2-port-result.c:60
+msgid "Unsupported operation"
+msgstr ""
+
+#: usb/libusb.c:125
+msgid "Could not open USB device"
+msgstr ""
+
+#: usb/libusb.c:132
+#, c-format
+msgid ""
+"Could not claim interface %d (%m). Make sure no other program or kernel "
+"module (i.e. dcxxx) is using the device and you have read/write access to "
+"the device."
+msgstr ""
+
+#: usb/libusb.c:151
+#, c-format
+msgid "Could not release interface %d (%m)"
+msgstr ""
+
+#: usb/libusb.c:158
+#, c-format
+msgid "Could not close USB port (%m)"
+msgstr ""
+
+#: usb/libusb.c:274
+#, c-format
+msgid "Could not set config %d/%d (%m)"
+msgstr ""
+
+#: usb/libusb.c:296
+#, c-format
+msgid "Could not set interface %d/%d (%m)"
+msgstr ""
+
+#: usb/libusb.c:347
+#, c-format
+msgid ""
+"Could not find USB device (vendor 0x%x, product 0x%x). Make sure this device "
+"is connected to the computer."
+msgstr ""
+
+#: serial/unix.c:180
+#, c-format
+msgid "Could not lock device '%s'"
+msgstr ""
+
+#: serial/unix.c:200
+#, c-format
+msgid "Device '%s' is locked by pid %d"
+msgstr ""
+
+#: serial/unix.c:203
+#, c-format
+msgid "Device '%s' could not be locked (dev_lock returned %d)"
+msgstr ""
+
+#: serial/unix.c:231
+#, c-format
+msgid "Device '%s' could not be unlocked."
+msgstr ""
+
+#: serial/unix.c:248
+#, c-format
+msgid "Device '%s' could not be unlocked as it is locked by pid %d."
+msgstr ""
+
+#: serial/unix.c:251
+#, c-format
+msgid "Device '%s' could not be unlocked (dev_unlock returned %d)"
+msgstr ""
+
+#: serial/unix.c:386
+#, c-format
+msgid "Failed to open '%s' (%m)"
+msgstr ""
+
+#: serial/unix.c:404
+#, c-format
+msgid "Could not close device (%s)"
+msgstr ""
+
+#: serial/unix.c:439
+#, c-format
+msgid "Could not write to port (%m)"
+msgstr ""
+
+#: serial/unix.c:688
+#, c-format
+msgid "Could not set the baudrate to %d"
+msgstr ""
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gphoto2\n"
-"POT-Creation-Date: 2001-11-15 22:35+0100\n"
+"POT-Creation-Date: 2001-11-16 04:18-0800\n"
 "PO-Revision-Date: 2001-11-15 22:42+0100\n"
 "Last-Translator: Colin Marquardt <colin@marquardt-home.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -313,7 +313,7 @@ msgid "Communication error 1"
 msgstr "Kommunikationsfehler 1"

 #: camlibs/canon/psa50.c:1592 camlibs/canon/psa50.c:1596
-#: camlibs/dimera/dimera3500.c:1056
+#: camlibs/dimera/dimera3500.c:1059
 msgid "No response from camera"
 msgstr "Keine Antwort von Kamera"

@@ -380,32 +380,32 @@ msgstr ""
 "Digita\n"
 "Johannes Erdfelt <johannes@erdfelt.com>"

-#: camlibs/dimera/dimera3500.c:407
+#: camlibs/dimera/dimera3500.c:410
 msgid "Only root directory is supported"
 msgstr "Nur das Wurzelverzeichnis (»/«) ist unterstützt"

-#: camlibs/dimera/dimera3500.c:414 camlibs/dimera/dimera3500.c:601
+#: camlibs/dimera/dimera3500.c:417 camlibs/dimera/dimera3500.c:604
 msgid "Problem getting number of images"
 msgstr "Problem beim Holen der Anzahl der Bilder"

-#: camlibs/dimera/dimera3500.c:455
+#: camlibs/dimera/dimera3500.c:458
 msgid "Image type is not supported"
 msgstr "Bildtyp nicht unterstützt"

-#: camlibs/dimera/dimera3500.c:510 camlibs/dimera/dimera3500.c:750
+#: camlibs/dimera/dimera3500.c:513 camlibs/dimera/dimera3500.c:753
 msgid "Problem getting image information"
 msgstr "Problem beim Holen der Bildinformation"

-#: camlibs/dimera/dimera3500.c:541
+#: camlibs/dimera/dimera3500.c:544
 msgid "Capture type is not supported"
 msgstr "Aufnahmetyp nicht unterstützt"

-#: camlibs/dimera/dimera3500.c:621
+#: camlibs/dimera/dimera3500.c:624
 #, c-format
 msgid " (battery is %d%% full)"
 msgstr " (Batterie ist zu %d%% voll)"

-#: camlibs/dimera/dimera3500.c:625
+#: camlibs/dimera/dimera3500.c:628
 #, c-format
 msgid ""
 "Dimera 3500 ver. %s %d/%d %d:%d\n"
@@ -423,76 +423,76 @@ msgstr ""
 "Kamera wird %s-betrieben%s\n"

 #. Flash
-#: camlibs/dimera/dimera3500.c:636 camlibs/konica/library.c:782
+#: camlibs/dimera/dimera3500.c:639 camlibs/konica/library.c:782
 #: camlibs/konica/library.c:1022
 msgid "Flash"
 msgstr "Blitz"

-#: camlibs/dimera/dimera3500.c:636
+#: camlibs/dimera/dimera3500.c:639
 msgid "NO Flash"
 msgstr "Kein Blitz"

-#: camlibs/dimera/dimera3500.c:638
+#: camlibs/dimera/dimera3500.c:641
 msgid "Dual Iris"
 msgstr "Dual-Iris"

-#: camlibs/dimera/dimera3500.c:638
+#: camlibs/dimera/dimera3500.c:641
 msgid "NO Dual Iris"
 msgstr "Keine Dual-Iris"

-#: camlibs/dimera/dimera3500.c:640
+#: camlibs/dimera/dimera3500.c:643
 msgid "Resolution Switch"
 msgstr "Auflösungsumschaltung"

-#: camlibs/dimera/dimera3500.c:640
+#: camlibs/dimera/dimera3500.c:643
 msgid "NO Resolution Switch"
 msgstr "Keine Auflösungsumschaltung"

-#: camlibs/dimera/dimera3500.c:642
+#: camlibs/dimera/dimera3500.c:645
 msgid "NO Power Light"
 msgstr "Keine Powerlampe"

-#: camlibs/dimera/dimera3500.c:644
+#: camlibs/dimera/dimera3500.c:647
 msgid "ON"
 msgstr "An"

-#: camlibs/dimera/dimera3500.c:644
+#: camlibs/dimera/dimera3500.c:647
 msgid "OFF"
 msgstr "Aus"

-#: camlibs/dimera/dimera3500.c:646
+#: camlibs/dimera/dimera3500.c:649
 msgid "ready"
 msgstr "Bereit"

-#: camlibs/dimera/dimera3500.c:646
+#: camlibs/dimera/dimera3500.c:649
 msgid "NOT ready"
 msgstr "Nicht bereit"

-#: camlibs/dimera/dimera3500.c:648
+#: camlibs/dimera/dimera3500.c:651
 msgid "in fill mode"
 msgstr "Im Füllmodus"

-#: camlibs/dimera/dimera3500.c:648
+#: camlibs/dimera/dimera3500.c:651
 msgid "NOT in fill mode"
 msgstr "Nicht im Füllmodus"

-#: camlibs/dimera/dimera3500.c:650
+#: camlibs/dimera/dimera3500.c:653
 msgid "low (320x240)"
 msgstr "niedrig (320x240)"

-#: camlibs/dimera/dimera3500.c:650
+#: camlibs/dimera/dimera3500.c:653
 msgid "high (640x480)"
 msgstr "hoch (640x480)"

-#: camlibs/dimera/dimera3500.c:652
+#: camlibs/dimera/dimera3500.c:655
 msgid "externally"
 msgstr "extern"

-#: camlibs/dimera/dimera3500.c:652
+#: camlibs/dimera/dimera3500.c:655
 msgid "internally"
 msgstr "intern"

-#: camlibs/dimera/dimera3500.c:662
+#: camlibs/dimera/dimera3500.c:665
 msgid ""
 "  Image glitches or problems communicating are\n"
 "often caused by a low battery.\n"
@@ -510,7 +510,7 @@ msgstr ""
 "von der Aufnahmevorschau-Funktion gesetzt.\n"
 "  Die Bildqualität ist im Moment geringer als sie sein könnte.\n"

-#: camlibs/dimera/dimera3500.c:676
+#: camlibs/dimera/dimera3500.c:679
 msgid ""
 "gPhoto2 Mustek VDC-3500/Relisys Dimera 3500\n"
 "This software was created with the\n"
@@ -540,57 +540,66 @@ msgstr ""
 "     Informationen über Protokoll und Rohbildformat,\n"
 "     gphoto2-Portierung\n"

-#: camlibs/dimera/dimera3500.c:746
+#: camlibs/dimera/dimera3500.c:749
 msgid "Getting Image Info"
 msgstr "Lade Bild-Informationen"

-#: camlibs/dimera/dimera3500.c:764
+#: camlibs/dimera/dimera3500.c:767
 msgid "Loading Image"
 msgstr "Lade Bild"

-#: camlibs/dimera/dimera3500.c:768
+#: camlibs/dimera/dimera3500.c:771
 msgid "Problem reading image from flash"
 msgstr "Problem beim Lesen des Bildes vom Speicher"

 #. 8 bits per pixel in raw CCD format
-#: camlibs/dimera/dimera3500.c:781 camlibs/dimera/dimera3500.c:805
-#: camlibs/dimera/dimera3500.c:833
+#: camlibs/dimera/dimera3500.c:784 camlibs/dimera/dimera3500.c:808
+#: camlibs/dimera/dimera3500.c:836
 msgid "Downloading Image"
 msgstr "Lade Bild herunter"

-#: camlibs/dimera/dimera3500.c:786 camlibs/dimera/dimera3500.c:936
-#: camlibs/dimera/dimera3500.c:1004
+#: camlibs/dimera/dimera3500.c:789 camlibs/dimera/dimera3500.c:939
+#: camlibs/dimera/dimera3500.c:1007
 msgid "Out of memory"
 msgstr "Kein Speicherplatz vorhanden"

-#: camlibs/dimera/dimera3500.c:815 camlibs/dimera/dimera3500.c:843
+#: camlibs/dimera/dimera3500.c:818 camlibs/dimera/dimera3500.c:846
 msgid "Retransmitting"
 msgstr "Übertrage erneut"

-#: camlibs/dimera/dimera3500.c:824 camlibs/dimera/dimera3500.c:852
+#: camlibs/dimera/dimera3500.c:827 camlibs/dimera/dimera3500.c:855
 msgid "Problem downloading image"
 msgstr "Problem beim Herunterladen des Bildes"

-#: camlibs/dimera/dimera3500.c:951
+#: camlibs/dimera/dimera3500.c:954
 msgid "Problem taking live image"
 msgstr "Problem bei der Aufnahme eines Live-Bildes"

-#: camlibs/dimera/dimera3500.c:1023
+#: camlibs/dimera/dimera3500.c:1026
 msgid "Problem opening port"
 msgstr "Problem beim Öffnen des Ports"

-#: camlibs/dimera/dimera3500.c:1033
+#: camlibs/dimera/dimera3500.c:1036
 msgid "Problem resetting camera"
 msgstr "Problem beim Kamera-Reset"

-#: camlibs/dimera/dimera3500.c:1043
+#: camlibs/dimera/dimera3500.c:1046
 msgid "Problem setting camera communication speed"
 msgstr "Problem beim Setzen der Kameradatenrate"

-#: camlibs/dimera/dimera3500.c:1062
+#: camlibs/dimera/dimera3500.c:1065
 msgid "Looks like a modem, not a camera"
 msgstr "Sieht wie ein Modem aus, nicht wie eine Kamera"

+#: camlibs/directory/directory.c:311
+#, fuzzy
+msgid "Directory Browse"
+msgstr "Verzeichnis existiert bereits"
+
+#: camlibs/directory/directory.c:312 camlibs/directory/directory.c:343
+msgid "View hidden directories"
+msgstr ""
+
 #: camlibs/kodak/dc120/dc120.c:25
 msgid "Internal Memory"
 msgstr "Interner Speicher"
@@ -829,7 +838,7 @@ msgstr "Dauerhafte Einstellungen"

 #. Date
 #: camlibs/konica/library.c:671 camlibs/konica/library.c:883
-#: camlibs/polaroid/pdc700.c:892 camlibs/polaroid/pdc700.c:958
+#: camlibs/polaroid/pdc700.c:896 camlibs/polaroid/pdc700.c:962
 msgid "Date and Time"
 msgstr "Datum und Zeit"

@@ -1373,16 +1382,16 @@ msgstr "Unerwarteten Header erhalten (%i)"
 msgid "Received unexpected response"
 msgstr "Unerwartete Antwort erhalten"

-#: camlibs/polaroid/pdc700.c:239
+#: camlibs/polaroid/pdc700.c:243
 msgid "Checksum error"
 msgstr "Prüfsummenfehler"

-#: camlibs/polaroid/pdc700.c:283
+#: camlibs/polaroid/pdc700.c:289
 #, c-format
 msgid "The camera sent more bytes than expected (%i)"
 msgstr "Die Kamera sendete mehr Bytes als erwartet (%i)"

-#: camlibs/polaroid/pdc700.c:367
+#: camlibs/polaroid/pdc700.c:373
 #, c-format
 msgid ""
 "Requested information about picture %i (= 0x%x), but got information about "
@@ -1391,7 +1400,7 @@ msgstr ""
 "Forderte Informationen über Bild %i (= 0x%x) an, erhielt jedoch "
 "Informationen über Bild %i"

-#: camlibs/polaroid/pdc700.c:799
+#: camlibs/polaroid/pdc700.c:803
 #, c-format
 msgid ""
 "%i bytes of an unknown image format have been received. Please write <gphoto-"
@@ -1400,19 +1409,19 @@ msgstr ""
 "%i Bytes eines unbekannten Bildformates erhalten. Bitte schreiben Sie an "
 "<gphoto-devel@gphoto.org> (auf Englisch) für Unterstützung."

-#: camlibs/polaroid/pdc700.c:864 camlibs/sierra/sierra.c:700
+#: camlibs/polaroid/pdc700.c:868 camlibs/sierra/sierra.c:700
 msgid "Camera Configuration"
 msgstr "Kamera-Konfiguration"

-#: camlibs/polaroid/pdc700.c:865
+#: camlibs/polaroid/pdc700.c:869
 msgid "Settings"
 msgstr "Einstellungen"

-#: camlibs/polaroid/pdc700.c:880
+#: camlibs/polaroid/pdc700.c:884
 msgid "How long will it take until the camera powers off?"
 msgstr "Wie lange soll es dauern, bis die Kamera abschaltet?"

-#: camlibs/polaroid/pdc700.c:975
+#: camlibs/polaroid/pdc700.c:979
 #, c-format
 msgid ""
 "Date: %i/%02i/%02i %02i:%02i:%02i\n"
@@ -1445,10 +1454,11 @@ msgstr ""
 "Automat. Ausschalten: %i Minuten\n"
 "Stromquelle: %s"

-#: camlibs/polaroid/pdc700.c:1099
+#: camlibs/polaroid/pdc700.c:1103
 #, c-format
 msgid "The requested port type (%i) is not supported by this driver."
-msgstr "Der angeforderte Port-Typ (%i) wird von diesem Treiber nicht unterstützt."
+msgstr ""
+"Der angeforderte Port-Typ (%i) wird von diesem Treiber nicht unterstützt."

 #: camlibs/sierra/sierra.c:560
 msgid "The file to be uploaded has a null length"
@@ -2068,7 +2078,7 @@ msgstr ""
 msgid "Please specify a port."
 msgstr "Bitte geben Sie einen Port an."

-#: frontends/command-line/main.c:1290
+#: frontends/command-line/main.c:1289
 msgid "For debugging messages, please use the --debug option.\n"
 msgstr "Für Debug-Meldungen verwenden Sie bitte die Option »--debug«.\n"