diff options
| author | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-04-05 14:10:38 +0000 |
|---|---|---|
| committer | Jorg Schuler <jcsjcs@users.sourceforge.net> | 2006-04-05 14:10:38 +0000 |
| commit | 5605e446abae537bac1d5f8f90056cebbdb1c26f (patch) | |
| tree | 10b41469d88eb359c88c26d348699cbbea803c30 | |
| parent | 7b3e3b26fb63b542bc6225807009ec88e4b6233b (diff) | |
| download | libgpod-5605e446abae537bac1d5f8f90056cebbdb1c26f.tar.gz libgpod-5605e446abae537bac1d5f8f90056cebbdb1c26f.tar.xz libgpod-5605e446abae537bac1d5f8f90056cebbdb1c26f.zip | |
2006-04-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
* itdb.h: flag1 -> has_artwork
* itdb_track.c: (itdb_track_set_thumbnails,
itdb_remove_thumbnails) set has_artwork flag correctly.
2006-04-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
* itdb.h: unk178 -> mark_unplayed
* itdb_itunesdb.c: reset the mark_unplayed flag when playcount is
detected.
2006-03-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
* po/es.po: replaced with version from Alejandro Lamas who
maintains the gtkpod translation as well.
2006-03-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
* itunesdb.c: set filetype identifier when transfering track to
the iPod.
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1227 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 29 | ||||
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | bindings/Makefile.am | 1 | ||||
| -rw-r--r-- | bindings/python/Makefile | 422 | ||||
| -rw-r--r-- | bindings/python/Makefile.am | 40 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | m4/Makefile.am | 1 | ||||
| -rw-r--r-- | m4/python.m4 | 79 | ||||
| -rw-r--r-- | m4/swig.m4 | 156 | ||||
| -rw-r--r-- | po/de.po | 243 | ||||
| -rw-r--r-- | po/es.po | 343 | ||||
| -rw-r--r-- | po/fr.po | 239 | ||||
| -rw-r--r-- | po/he.po | 221 | ||||
| -rw-r--r-- | po/it.po | 237 | ||||
| -rw-r--r-- | po/ja.po | 123 | ||||
| -rw-r--r-- | po/sv.po | 227 | ||||
| -rw-r--r-- | src/itdb.h | 11 | ||||
| -rw-r--r-- | src/itdb_device.c | 21 | ||||
| -rw-r--r-- | src/itdb_itunesdb.c | 15 | ||||
| -rw-r--r-- | src/itdb_track.c | 16 |
20 files changed, 1835 insertions, 611 deletions
@@ -1,9 +1,28 @@ -2006-02-29 Jorg Schuler <jcsjcs at users.sourceforge.net> +2006-04-03 Jorg Schuler <jcsjcs at users.sourceforge.net> + + * itdb.h: flag1 -> has_artwork + + * itdb_track.c: (itdb_track_set_thumbnails, + itdb_remove_thumbnails) set has_artwork flag correctly. + +2006-04-01 Jorg Schuler <jcsjcs at users.sourceforge.net> + + * itdb.h: unk178 -> mark_unplayed + + * itdb_itunesdb.c: reset the mark_unplayed flag when playcount is + detected. + +2006-03-31 Jorg Schuler <jcsjcs at users.sourceforge.net> + + * po/es.po: replaced with version from Alejandro Lamas who + maintains the gtkpod translation as well. + +2006-03-29 Jorg Schuler <jcsjcs at users.sourceforge.net> * itunesdb.c: set filetype identifier when transfering track to the iPod. -2006-02-24 Jorg Schuler <jcsjcs at users.sourceforge.net> +2006-03-24 Jorg Schuler <jcsjcs at users.sourceforge.net> Alpha version of reversed-endian Artwork writing. Status: iTunesDB can be written and is accepted on mobile phones, ArtworkDB can be @@ -13,14 +32,14 @@ * itdb.h: adjusted a couple of field lengths (4 byte -> 2 byte or even 1 byte) to address endian issues. -2006-02-18 Jorg Schuler <jcsjcs at users.sourceforge.net> +2006-03-18 Jorg Schuler <jcsjcs at users.sourceforge.net> * itdb_itunesdb.c (mk_mhod): fixed bug when writing podcast urls. * itdb_itunesdb.c (itdb_write_file): move endianess autodetection to a place before calling ipod_write_artwork_db(). -2006-02-17 Jorg Schuler <jcsjcs at users.sourceforge.net> +2006-03-17 Jorg Schuler <jcsjcs at users.sourceforge.net> * itdb_device.[ch]: rewrote ipod-device.c, removed all hal-code, removed all code irrelevant to writing the iTunesDB and @@ -40,7 +59,7 @@ * itdb_itunesdb.c (itdb_get_path): fixed bug. -2006-02-12 Jorg Schuler <jcsjcs at users.sourceforge.net> +2006-03-12 Jorg Schuler <jcsjcs at users.sourceforge.net> * itdb.h, itdb_itunesdb.c: added functions for autodetection of iControl directory (currently either <mp>/iPod_Control or diff --git a/Makefile.am b/Makefile.am index cdee804..7af1838 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,18 +1,13 @@ -SUBDIRS=src tests po +SUBDIRS=src tests po bindings m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgpod-1.0.pc -# the bindings/ below are just a hack until a better way is found EXTRA_DIST = \ intltool-merge.in \ intltool-update.in \ intltool-extract.in \ - libgpod-1.0.pc.in \ - bindings/python/examples/play.py \ - bindings/python/examples/tag-genre-from-audioscrobber.py \ - bindings/python/Makefile \ - bindings/python/gpod.i + libgpod-1.0.pc.in DISTCLEANFILES = \ diff --git a/bindings/Makefile.am b/bindings/Makefile.am new file mode 100644 index 0000000..c2ddf78 --- /dev/null +++ b/bindings/Makefile.am @@ -0,0 +1 @@ +SUBDIRS=python diff --git a/bindings/python/Makefile b/bindings/python/Makefile index 573cc8d..fd3a200 100644 --- a/bindings/python/Makefile +++ b/bindings/python/Makefile @@ -1,20 +1,416 @@ -all: _gpod.so +# Makefile.in generated by automake 1.7.9 from Makefile.am. +# bindings/python/Makefile. Generated from Makefile.in by configure. -gpod_wrap.c: gpod.i - swig -python gpod.i +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# 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. -gpod.py: gpod.i - swig -python gpod.i +# 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. -gpod_wrap.o: gpod_wrap.c - gcc -c -fpic gpod_wrap.c -I /usr/include/python2.3/ `pkg-config glib-2.0 --cflags` -_gpod.so: gpod_wrap.o - gcc -shared gpod_wrap.o -o _gpod.so -L../../src/.libs -lgpod `pkg-config glib-2.0 --libs` +srcdir = . +top_srcdir = ../.. -clean: - rm gpod.py gpod.pyc _gpod.so gpod_wrap.c gpod_wrap.o +pkgdatadir = $(datadir)/libgpod +pkglibdir = $(libdir)/libgpod +pkgincludedir = $(includedir)/libgpod +top_builddir = ../.. -test: _gpod.so play.py - LD_LIBRARY_PATH=../../src/.libs ./play.py +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = /usr/bin/install -c +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_triplet = i686-pc-linux-gnu +ACLOCAL = ${SHELL} /home/jcs/source/gtkpod/libgpod-test/missing --run aclocal-1.7 +ACLOCAL_AMFLAGS = +AMDEP_FALSE = # +AMDEP_TRUE = +AMTAR = ${SHELL} /home/jcs/source/gtkpod/libgpod-test/missing --run tar +AR = ar +AUTOCONF = ${SHELL} /home/jcs/source/gtkpod/libgpod-test/missing --run autoconf +AUTOHEADER = ${SHELL} /home/jcs/source/gtkpod/libgpod-test/missing --run autoheader +AUTOMAKE = ${SHELL} /home/jcs/source/gtkpod/libgpod-test/missing --run automake-1.7 +AWK = gawk +CATALOGS = de.gmo es.gmo fr.gmo he.gmo it.gmo ja.gmo sv.gmo +CATOBJEXT = .gmo +CC = gcc +CCDEPMODE = depmode=gcc3 +CFLAGS = -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Werror -std=c89 -g -O2 -Wno-strict-aliasing -Wno-sign-compare +CPP = gcc -E +CPPFLAGS = +CXX = g++ +CXXCPP = g++ -E +CXXDEPMODE = depmode=gcc3 +CXXFLAGS = -g -O2 +CYGPATH_W = echo +DATADIRNAME = share +DEFS = -DHAVE_CONFIG_H +DEPDIR = .deps +ECHO = echo +ECHO_C = +ECHO_N = -n +ECHO_T = +EGREP = grep -E +EXEEXT = +F77 = +FFLAGS = +GDKPIXBUF_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +GDKPIXBUF_LIBS = -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 +GETTEXT_PACKAGE = libgpod +GMOFILES = de.gmo es.gmo fr.gmo he.gmo it.gmo ja.gmo sv.gmo +GMSGFMT = /usr/bin/msgfmt +HAVE_GDKPIXBUF_FALSE = # +HAVE_GDKPIXBUF_TRUE = +HAVE_PYTHON_FALSE = +HAVE_PYTHON_TRUE = # +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +INSTOBJEXT = .mo +INTLLIBS = +INTLTOOL_CAVES_RULE = %.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_DESKTOP_RULE = %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_DIRECTORY_RULE = %.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_EXTRACT = $(top_builddir)/intltool-extract +INTLTOOL_ICONV = /usr/bin/iconv +INTLTOOL_KBD_RULE = %.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_KEYS_RULE = %.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_MERGE = $(top_builddir)/intltool-merge +INTLTOOL_MSGFMT = /usr/bin/msgfmt +INTLTOOL_MSGMERGE = /usr/bin/msgmerge +INTLTOOL_OAF_RULE = %.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@ +INTLTOOL_PERL = /usr/bin/perl +INTLTOOL_PONG_RULE = %.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_PROP_RULE = %.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_SCHEMAS_RULE = %.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_SERVER_RULE = %.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_SHEET_RULE = %.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_SOUNDLIST_RULE = %.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_THEME_RULE = %.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_UI_RULE = %.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_UPDATE = $(top_builddir)/intltool-update +INTLTOOL_XAM_RULE = %.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +INTLTOOL_XGETTEXT = /usr/bin/xgettext +INTLTOOL_XML_NOMERGE_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ +INTLTOOL_XML_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +LDFLAGS = +LIBGPOD_AGE = 303 +LIBGPOD_CFLAGS = -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -I/usr/include/gtk-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include +LIBGPOD_CURRENT = 303 +LIBGPOD_LIBS = -lgobject-2.0 -lglib-2.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 +LIBGPOD_REVISION = 0 +LIBGPOD_VERSION = 0.3.3 +LIBOBJS = +LIBS = +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +LTLIBOBJS = +MAINT = +MAINTAINER_MODE_FALSE = # +MAINTAINER_MODE_TRUE = +MAKEINFO = ${SHELL} /home/jcs/source/gtkpod/libgpod-test/missing --run makeinfo +MKINSTALLDIRS = ./mkinstalldirs +MSGFMT = /usr/bin/msgfmt +OBJEXT = o +PACKAGE = libgpod +PACKAGE_BUGREPORT = +PACKAGE_NAME = +PACKAGE_STRING = +PACKAGE_TARNAME = +PACKAGE_VERSION = +PATH_SEPARATOR = : +PKG_CONFIG = /usr/bin/pkg-config +POFILES = de.po es.po fr.po he.po it.po ja.po sv.po +POSUB = po +PO_IN_DATADIR_FALSE = +PO_IN_DATADIR_TRUE = +PYTHON = +PYTHON_EXEC_PREFIX = +PYTHON_INCLUDES = +PYTHON_LDFLAGS = +PYTHON_PLATFORM = +PYTHON_PREFIX = +PYTHON_VERSION = +RANLIB = ranlib +SET_MAKE = +SHELL = /bin/sh +STRIP = strip +SWIG = +SWIG_LIB = +USE_NLS = yes +VERSION = 0.3.3 +XGETTEXT = /usr/bin/xgettext +ac_ct_AR = ar +ac_ct_CC = gcc +ac_ct_CXX = g++ +ac_ct_F77 = +ac_ct_RANLIB = ranlib +ac_ct_STRIP = strip +ac_pt_PKG_CONFIG = /usr/bin/pkg-config +am__fastdepCC_FALSE = # +am__fastdepCC_TRUE = +am__fastdepCXX_FALSE = # +am__fastdepCXX_TRUE = +am__include = include +am__leading_dot = . +am__quote = +bindir = ${exec_prefix}/bin +build = i686-pc-linux-gnu +build_alias = +build_cpu = i686 +build_os = linux-gnu +build_vendor = pc +datadir = ${prefix}/share +exec_prefix = ${prefix} +host = i686-pc-linux-gnu +host_alias = +host_cpu = i686 +host_os = linux-gnu +host_vendor = pc +includedir = ${prefix}/include +infodir = ${prefix}/info +install_sh = /home/jcs/source/gtkpod/libgpod-test/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localstatedir = ${prefix}/var +mandir = ${prefix}/man +mkdir_p = mkdir -p -- . +oldincludedir = /usr/include +pkgpyexecdir = +pkgpythondir = +prefix = /usr/local +program_transform_name = s,x,x, +pyexecdir = +pythondir = +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +sysconfdir = ${prefix}/etc +target_alias = +EXTRA_DIST = \ + gpod.i \ + examples/coverart_fetch.py \ + examples/play.py \ + examples/tag-genre-from-audioscrobber.py + + +CLEANFILES = \ + *.py* \ + _gpod.so \ + gpod.py \ + gpod_wrap.c \ + gpod_wrap.o + + +#MODULE_CFLAGS = `$(PKG_CONFIG) --cflags $(top_srcdir)/libgpod-1.0.pc` $(PYTHON_INCLUDES) +#MODULE_LIBS = `$(PKG_CONFIG) --libs $(top_srcdir)/libgpod-1.0.pc` -L$(top_srcdir)/src/.libs +#python_DATA = gpod.py _gpod.so +subdir = bindings/python +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = +DATA = $(python_DATA) + +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu bindings/python/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +pythonDATA_INSTALL = $(INSTALL_DATA) +install-pythonDATA: $(python_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pythondir) + @list='$(python_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(pythonDATA_INSTALL) $$d$$p $(DESTDIR)$(pythondir)/$$f"; \ + $(pythonDATA_INSTALL) $$d$$p $(DESTDIR)$(pythondir)/$$f; \ + done + +uninstall-pythonDATA: + @$(NORMAL_UNINSTALL) + @list='$(python_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f $(DESTDIR)$(pythondir)/$$f"; \ + rm -f $(DESTDIR)$(pythondir)/$$f; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + $(mkinstalldirs) $(distdir)/examples + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || 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 $(DATA) + +installdirs: + $(mkinstalldirs) $(DESTDIR)$(pythondir) +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)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -rm -f $(CONFIG_CLEAN_FILES) + +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-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +info: info-am + +info-am: + +install-data-am: install-pythonDATA + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-pythonDATA + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-pythonDATA install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-pythonDATA + + +#gpod_wrap.c: gpod.i +# $(SWIG) -python gpod.i + +#gpod.py: gpod.i +# $(SWIG) -python gpod.i + +#gpod_wrap.o: gpod_wrap.c +# $(CC) $(MODULE_CFLAGS) -c -fpic gpod_wrap.c + +#_gpod.so: gpod_wrap.o +# $(CC) $(MODULE_LIBS) gpod_wrap.o -o $@ + +#install-pythonDATA: $(python_DATA) +# $(mkinstalldirs) $(DESTDIR)$(pythondir) +# $(INSTALL_PROGRAM) _gpod.so $(DESTDIR)$(pythondir)/_gpod.so +# $(INSTALL_DATA) gpod.py $(DESTDIR)$(pythondir)/gpod.py +# $(PYTHON) -c 'from py_compile import compile; compile("$(DESTDIR)$(pythondir)/gpod.py")' +# $(PYTHON) -O -c 'from py_compile import compile; compile("$(DESTDIR)$(pythondir)/gpod.py")' + +#uninstall-pythonDATA: $(python_DATA) +# rm -f $(DESTDIR)$(pythondir)/_gpod.so $(DESTDIR)$(pythondir)/gpod.py +# 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: diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am new file mode 100644 index 0000000..059836a --- /dev/null +++ b/bindings/python/Makefile.am @@ -0,0 +1,40 @@ +EXTRA_DIST = \ + gpod.i \ + examples/coverart_fetch.py \ + examples/play.py \ + examples/tag-genre-from-audioscrobber.py + +CLEANFILES = \ + *.py* \ + _gpod.so \ + gpod.py \ + gpod_wrap.c \ + gpod_wrap.o + +if HAVE_PYTHON +MODULE_CFLAGS = `$(PKG_CONFIG) --cflags $(top_srcdir)/libgpod-1.0.pc` $(PYTHON_INCLUDES) +MODULE_LIBS = `$(PKG_CONFIG) --libs $(top_srcdir)/libgpod-1.0.pc` -L$(top_srcdir)/src/.libs +python_DATA = gpod.py _gpod.so + +gpod_wrap.c: gpod.i + $(SWIG) -python gpod.i + +gpod.py: gpod.i + $(SWIG) -python gpod.i + +gpod_wrap.o: gpod_wrap.c + $(CC) $(MODULE_CFLAGS) -c -fpic gpod_wrap.c + +_gpod.so: gpod_wrap.o + $(CC) $(MODULE_LIBS) @PYTHON_LDFLAGS@ gpod_wrap.o -o $@ + +install-pythonDATA: $(python_DATA) + $(mkinstalldirs) $(DESTDIR)$(pythondir) + $(INSTALL_PROGRAM) _gpod.so $(DESTDIR)$(pythondir)/_gpod.so + $(INSTALL_DATA) gpod.py $(DESTDIR)$(pythondir)/gpod.py + $(PYTHON) -c 'from py_compile import compile; compile("$(DESTDIR)$(pythondir)/gpod.py")' + $(PYTHON) -O -c 'from py_compile import compile; compile("$(DESTDIR)$(pythondir)/gpod.py")' + +uninstall-pythonDATA: $(python_DATA) + rm -f $(DESTDIR)$(pythondir)/_gpod.so $(DESTDIR)$(pythondir)/gpod.py +endif diff --git a/configure.ac b/configure.ac index 42bb297..02e3520 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_PREREQ(2.52) AC_INIT(src) AC_CONFIG_SRCDIR(configure.ac) +AC_CONFIG_MACRO_DIR(m4) AM_CONFIG_HEADER(config.h) @@ -85,6 +86,15 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) AM_GLIB_GNU_GETTEXT +dnl ************************************************** +dnl * optional python bindings +dnl ************************************************** + +PYTHON_MIN_VERSION=2.1.1 +SWIG_MIN_VERSION=1.3.24 +LIBGPOD_CHECK_PYTHON($PYTHON_MIN_VERSION) + + dnl warnings bits, copied from gnome-keyring configure.in dnl Turn on the additional warnings last, so -Werror doesn't affect other tests. @@ -135,6 +145,9 @@ AC_SUBST(LIBGPOD_LIBS) AC_OUTPUT([ Makefile +bindings/Makefile +bindings/python/Makefile +m4/Makefile po/Makefile.in src/Makefile tests/Makefile diff --git a/m4/Makefile.am b/m4/Makefile.am new file mode 100644 index 0000000..9b23752 --- /dev/null +++ b/m4/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = python.m4 swig.m4 diff --git a/m4/python.m4 b/m4/python.m4 new file mode 100644 index 0000000..032334b --- /dev/null +++ b/m4/python.m4 @@ -0,0 +1,79 @@ +dnl copied from pygtk +dnl +dnl a macro to check for ability to create python extensions +dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) +dnl function also defines PYTHON_INCLUDES +AC_DEFUN([AM_CHECK_PYTHON_HEADERS], +[AC_REQUIRE([AM_PATH_PYTHON]) +AC_MSG_CHECKING(for development headers) +dnl deduce PYTHON_INCLUDES +py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +fi +AC_SUBST(PYTHON_INCLUDES) +dnl check if the headers exist: +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +AC_TRY_CPP([#include <Python.h>],dnl +[AC_MSG_RESULT(found) +$1],dnl +[AC_MSG_RESULT(not found) +$2]) +CPPFLAGS="$save_CPPFLAGS" +]) + +dnl check for python +AC_DEFUN([LIBGPOD_CHECK_PYTHON], +[ + AC_ARG_WITH(python, + AC_HELP_STRING([--with-python=PATH], + [build python bindings [[default=no]]]), + [with_python=$withval],[with_python=no]) + + AC_MSG_CHECKING(whether to build python bindings) + if test "X$with_python" != Xno; then + if test "X$with_python" != Xyes; then + PYTHON=$with_python + fi + with_python=yes + fi + AC_MSG_RESULT($with_python) + + if test "X$with_python" == Xyes; then + if test -z "$PYTHON"; then + AC_PATH_PROG(PYTHON, python) + fi + + if test -n "$PYTHON"; then + AM_PATH_PYTHON($PYTHON_MIN_VERSION) + AM_CHECK_PYTHON_HEADERS(with_python="yes",with_python="no") + + if test "X$with_python" == Xyes; then + dnl test for python ldflags + dnl copied from the Redland RDF bindings, http://librdf.org/ + if test `uname` = Darwin; then + PYTHON_LDFLAGS="-Wl,-F. -Wl,-F. -bundle" + if $PYTHON -c 'import sys, string; sys.exit(string.find(sys.prefix,"Framework")+1)'; then + : + else + PYTHON_LDFLAGS="$PYTHON_LDFLAGS -framework Python" + fi + else + PYTHON_LDFLAGS="-shared" + fi + AC_SUBST(PYTHON_LDFLAGS) + + dnl check for swig + AC_PROG_SWIG($SWIG_MIN_VERSION) + with_python="$has_swig" + fi + else + AC_MSG_WARN(python not found. try --with-python=/path/to/python) + with_python="no" + fi + fi + AM_CONDITIONAL(HAVE_PYTHON, test x$with_python = xyes) +])dnl diff --git a/m4/swig.m4 b/m4/swig.m4 new file mode 100644 index 0000000..589f479 --- /dev/null +++ b/m4/swig.m4 @@ -0,0 +1,156 @@ +dnl @synopsis AC_PROG_SWIG([major.minor.micro]) +dnl +dnl This macro searches for a SWIG installation on your system. If +dnl found you should call SWIG via $(SWIG). You can use the optional +dnl first argument to check if the version of the available SWIG is +dnl greater than or equal to the value of the argument. It should have +dnl the format: N[.N[.N]] (N is a number between 0 and 999. Only the +dnl first N is mandatory.) +dnl +dnl If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks +dnl that the swig package is this version number or higher. +dnl +dnl In configure.in, use as: +dnl +dnl AC_PROG_SWIG(1.3.17) +dnl SWIG_ENABLE_CXX +dnl SWIG_MULTI_MODULE_SUPPORT +dnl SWIG_PYTHON +dnl +dnl @category InstalledPackages +dnl @author Sebastian Huber <sebastian-huber@web.de> +dnl @author Alan W. Irwin <irwin@beluga.phys.uvic.ca> +dnl @author Rafael Laboissiere <rafael@laboissiere.net> +dnl @author Andrew Collier <abcollier@yahoo.com> +dnl @version 2004-09-20 +dnl @license GPLWithACException + +AC_DEFUN([AC_PROG_SWIG],[ + AC_PATH_PROG([SWIG],[swig]) + if test -z "$SWIG" ; then + AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org]) + SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false' + elif test -n "$1" ; then + AC_MSG_CHECKING([for SWIG version]) + [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] + AC_MSG_RESULT([$swig_version]) + if test -n "$swig_version" ; then + # Calculate the required version number components + [required=$1] + [required_major=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_major" ; then + [required_major=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_minor=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_minor" ; then + [required_minor=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_patch=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_patch" ; then + [required_patch=0] + fi + # Calculate the available version number components + [available=$swig_version] + [available_major=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_major" ; then + [available_major=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_minor=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_minor" ; then + [available_minor=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_patch=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_patch" ; then + [available_patch=0] + fi + if test $available_major -ne $required_major \ + -o $available_minor -ne $required_minor \ + -o $available_patch -lt $required_patch ; then + AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org]) + SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' + has_swig="no" + else + SWIG_LIB=`$SWIG -swiglib` + has_swig="yes" + fi + else + AC_MSG_WARN([cannot determine SWIG version]) + SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false' + has_swig="no" + fi + fi + AC_SUBST([SWIG_LIB]) +]) + +# SWIG_ENABLE_CXX() +# +# Enable SWIG C++ support. This affects all invocations of $(SWIG). +AC_DEFUN([SWIG_ENABLE_CXX],[ + AC_REQUIRE([AC_PROG_SWIG]) + AC_REQUIRE([AC_PROG_CXX]) + SWIG="$SWIG -c++" +]) + +# SWIG_MULTI_MODULE_SUPPORT() +# +# Enable support for multiple modules. This effects all invocations +# of $(SWIG). You have to link all generated modules against the +# appropriate SWIG runtime library. If you want to build Python +# modules for example, use the SWIG_PYTHON() macro and link the +# modules against $(SWIG_PYTHON_LIBS). +# +AC_DEFUN([SWIG_MULTI_MODULE_SUPPORT],[ + AC_REQUIRE([AC_PROG_SWIG]) + SWIG="$SWIG -noruntime" +]) + +# SWIG_PYTHON([use-shadow-classes = {no, yes}]) +# +# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS), +# and $(SWIG_PYTHON_OPT) output variables. +# +# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate +# code for Python. Shadow classes are enabled unless the value of the +# optional first argument is exactly 'no'. If you need multi module +# support (provided by the SWIG_MULTI_MODULE_SUPPORT() macro) use +# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It +# contains the SWIG Python runtime library that is needed by the type +# check system for example. +AC_DEFUN([SWIG_PYTHON],[ + AC_REQUIRE([AC_PROG_SWIG]) + AC_REQUIRE([AC_PYTHON_DEVEL]) + test "x$1" != "xno" || swig_shadow=" -noproxy" + AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow]) + AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS]) +]) + + +dnl @synopsis AC_LIB_WAD +dnl +dnl This macro searches for installed WAD library. +dnl +AC_DEFUN([AC_LIB_WAD], +[ + AC_REQUIRE([AC_PYTHON_DEVEL]) + AC_ARG_ENABLE(wad, + AC_HELP_STRING([--enable-wad], [enable wad module]), + [ + case "${enableval}" in + no) ;; + *) if test "x${enableval}" = xyes; + then + check_wad="yes" + fi ;; + esac + ], []) + + if test -n "$check_wad"; + then + AC_CHECK_LIB(wadpy, _init, [WADPY=-lwadpy], [], $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS) + AC_SUBST(WADPY) + fi +]) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gtkpod 0.52\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-14 21:51+0900\n" +"POT-Creation-Date: 2006-03-31 23:04+0900\n" "PO-Revision-Date: 2005-09-14 22:01+0900\n" "Last-Translator: Jörg Schuler <jcsjcs at users.sourceforge.net>\n" "Language-Team: none\n" @@ -16,33 +16,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: ../src/itdb_itunesdb.c:313 +#: ../src/itdb_itunesdb.c:361 #, c-format msgid "Illegal seek to offset %ld (length %ld) in file '%s'." msgstr "Illegaler seek bei Offset %ld (Länge %ld) in Datei '%s'." -#: ../src/itdb_itunesdb.c:521 +#: ../src/itdb_itunesdb.c:815 #, c-format msgid "Not a Play Counts file: '%s' (missing mhdp header)." msgstr "Keine Play Counts Datei: '%s' (mhdp-Header fehlt)." -#: ../src/itdb_itunesdb.c:535 +#: ../src/itdb_itunesdb.c:830 #, c-format msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)." msgstr "Play Counts Datei ('%s'): Headerlänge kleiner als erwarted (%d<96)." -#: ../src/itdb_itunesdb.c:548 +#: ../src/itdb_itunesdb.c:843 #, c-format msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)." msgstr "" "Play Counts Datei ('%s'): Länge der Einträge kleiner als erwartet (%d<12)." -#: ../src/itdb_itunesdb.c:803 +#: ../src/itdb_itunesdb.c:921 +#, fuzzy, c-format +msgid "iTunesStats file ('%s'): entry length smaller than expected (%d<18)." +msgstr "" +"Play Counts Datei ('%s'): Länge der Einträge kleiner als erwartet (%d<12)." + +#: ../src/itdb_itunesdb.c:1197 #, c-format msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'." msgstr "iTunesDB beschädigt: kein MHOD bei Offset %ld in Datei '%s'." -#: ../src/itdb_itunesdb.c:923 +#: ../src/itdb_itunesdb.c:1354 #, c-format msgid "" "Length of smart playlist rule field (%d) not as expected. Trying to continue " @@ -51,13 +57,12 @@ msgstr "" "Die Länge einer Regel (%d) einer intelligenten Wiedergabeliste weicht von " "der erwarteten Länge ab. Es wird versucht fortzufahren.\n" -#: ../src/itdb_itunesdb.c:966 -msgid "Did not find SLst hunk as expected. Trying to continue.\n" -msgstr "" -"Es wurde nicht wie erwarted ein 'SLst'-Hunk gefunden. Es wird trotzdem " -"versucht, weiterzumachen.\n" +#: ../src/itdb_itunesdb.c:1386 +#, fuzzy, c-format +msgid "iTunesDB corrupt: no SLst at offset %ld in file '%s'." +msgstr "iTunesDB beschädigt: kein MHOD bei Offset %ld in Datei '%s'." -#: ../src/itdb_itunesdb.c:972 +#: ../src/itdb_itunesdb.c:1399 #, c-format msgid "" "Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n" @@ -67,49 +72,98 @@ msgstr "" "versucht fortzufahren.\n" "\n" -#: ../src/itdb_itunesdb.c:1053 ../src/itdb_itunesdb.c:1744 -#: ../src/itdb_itunesdb.c:1779 +#: ../src/itdb_itunesdb.c:1461 #, c-format msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'." msgstr "" "iTunesDB beschädigt: Hunklänge ist Null für den Hunk an Offset %ld in Datei " "'%s'." -#: ../src/itdb_itunesdb.c:1148 -msgid "Master-PL" -msgstr "Haupt-PL" +#: ../src/itdb_itunesdb.c:1474 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: no section '%s' found in section '%s' starting at %ld." +msgstr "iTunesDB beschädigt: kein MHOD bei Offset %ld in Datei '%s'." -#: ../src/itdb_itunesdb.c:1150 -msgid "Playlist" -msgstr "Wiedergabeliste" +#: ../src/itdb_itunesdb.c:1488 +#, fuzzy, c-format +msgid "" +"header length of '%s' smaller than expected (%d < %d) at offset %ld in file " +"'%s'." +msgstr "" +"iTunesDB ('%s'): Headerlänge des mhsd-Hunks is kleiner als erwartet (%" +"ld<32). Breche ab." -#: ../src/itdb_itunesdb.c:1175 +#: ../src/itdb_itunesdb.c:1573 #, c-format -msgid "iTunesDB corrupt: found mhyp at %ld in file '%s'." +msgid "Not a iTunesDB: '%s' (missing mhdb header)." +msgstr "Keine iTunesDB Datei: '%s' (kein mhdb-Header)." + +#: ../src/itdb_itunesdb.c:1590 +#, fuzzy, c-format +msgid "" +"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%d<32). " +"Aborting." +msgstr "" +"iTunesDB ('%s'): Headerlänge des mhsd-Hunks is kleiner als erwartet (%" +"ld<32). Breche ab." + +#: ../src/itdb_itunesdb.c:1611 +#, fuzzy, c-format +msgid "iTunesDB '%s' corrupt: mhsd expected at %ld." msgstr "iTunesDB beschädigt: mhyp bei Offset %ld in Datei '%s' gefunden." -#: ../src/itdb_itunesdb.c:1223 +#: ../src/itdb_itunesdb.c:1728 +#, c-format +msgid "Number of MHODs in mhip at %ld inconsistent in file '%s'." +msgstr "" + +#: ../src/itdb_itunesdb.c:1746 #, c-format msgid "Itdb_Track ID '%d' not found.\n" msgstr "Itdb_Track ID '%d' nicht gefunden.\n" -#: ../src/itdb_itunesdb.c:1487 +#: ../src/itdb_itunesdb.c:1903 +#, fuzzy, c-format +msgid "Number of MHODs in mhyp at %ld inconsistent in file '%s'." +msgstr "iTunesDB beschädigt: mhyp bei Offset %ld in Datei '%s' gefunden." + +#: ../src/itdb_itunesdb.c:1913 +msgid "Master-PL" +msgstr "Haupt-PL" + +#: ../src/itdb_itunesdb.c:1917 +msgid "Podcasts" +msgstr "" + +#: ../src/itdb_itunesdb.c:1919 +msgid "Playlist" +msgstr "Wiedergabeliste" + +#: ../src/itdb_itunesdb.c:1941 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: number of mhip sections inconsistent in mhyp starting at %" +"ld in file '%s'." +msgstr "iTunesDB beschädigt: mhyp bei Offset %ld in Datei '%s' gefunden." + +#: ../src/itdb_itunesdb.c:2222 msgid "OTG Playlist" msgstr "OTG-Wiedergabeliste" -#: ../src/itdb_itunesdb.c:1501 +#: ../src/itdb_itunesdb.c:2240 #, c-format msgid "Not a OTG playlist file: '%s' (missing mhpo header)." msgstr "Keine OTG (On-The-Go) Wiedergabelistendatei: '%s' (mhpo-Header fehlt)." -#: ../src/itdb_itunesdb.c:1515 +#: ../src/itdb_itunesdb.c:2254 #, c-format msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)." msgstr "" "OTG (On-The-Go) Wiedergabelistendatei ('%s'): Headerlänger kleiner als " "erwartet (%d<20)." -#: ../src/itdb_itunesdb.c:1527 +#: ../src/itdb_itunesdb.c:2266 #, c-format msgid "" "OTG playlist file file ('%s'): entry length smaller than expected (%d<4)." @@ -117,50 +171,30 @@ msgstr "" "OTG (On-The-Go) Wiedergabelistendatei ('%s'): Länge der Einträge kleiner als " "erwartet (%d<4)." -#: ../src/itdb_itunesdb.c:1562 +#: ../src/itdb_itunesdb.c:2301 #, c-format msgid "OTG playlist file '%s': reference to non-existent track (%d)." msgstr "" "OTG (On-The-Go) Wiedergabelistendateii '%s' bezieht sich auf ein nicht " "existierendes Stück (%d)." -#: ../src/itdb_itunesdb.c:1607 +#: ../src/itdb_itunesdb.c:2346 #, c-format msgid "OTG Playlist %d" msgstr "OTG-Wiedergabeliste %d" -#: ../src/itdb_itunesdb.c:1650 -#, c-format -msgid "Not a iTunesDB: '%s' (missing mhdb header)." -msgstr "Keine iTunesDB Datei: '%s' (kein mhdb-Header)." - -#: ../src/itdb_itunesdb.c:1666 -#, c-format -msgid "" -"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%ld<32). " -"Aborting." -msgstr "" -"iTunesDB ('%s'): Headerlänge des mhsd-Hunks is kleiner als erwartet (%" -"ld<32). Breche ab." - -#: ../src/itdb_itunesdb.c:1698 -#, c-format -msgid "iTunesDB '%s' corrupt: already found two playlist mhsds -- giving up." -msgstr "" -"iTunesDB '%s' beschädigt: bereits zwei Wiedergabelisten mhsds-Hunks " -"gefunden. Breche ab." - #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1759 +#: ../src/itdb_itunesdb.c:2414 +#, fuzzy msgid "" -"iTunesDB possibly corrupt: number of tracks (mhit hunks) inconsistent. " -"Trying to continue.\n" +"iTunesDB corrupt: number of tracks (mhit hunks) inconsistent. Trying to " +"continue.\n" msgstr "" "iTunesDB möglicherweise beschädigt: Anzahl der Stücke (mhit-Hunks) ist nicht " "konsistent. Versuche fortzufahren.\n" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1841 +#: ../src/itdb_itunesdb.c:2477 msgid "" "iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. " "Trying to continue.\n" @@ -168,85 +202,110 @@ msgstr "" "iTunesDB möglicherweise beschädigt: Anzahl der Wiedergabelisten (mhyp-Hunks) " "ist nicht konsistent. Versuche fortzufahren.\n" -#: ../src/itdb_itunesdb.c:1879 +#: ../src/itdb_itunesdb.c:2524 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find tracklist (no mhsd type 1 section " +"found)" +msgstr "" +"iTunesDB '%s' beschädigt: bereits zwei Wiedergabelisten mhsds-Hunks " +"gefunden. Breche ab." + +#: ../src/itdb_itunesdb.c:2553 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find playlists (no mhsd type 2 or type 3 " +"sections found)" +msgstr "" +"iTunesDB '%s' beschädigt: bereits zwei Wiedergabelisten mhsds-Hunks " +"gefunden. Breche ab." + +#: ../src/itdb_itunesdb.c:2575 +#, c-format +msgid "iTunes directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2592 +#, c-format +msgid "Music directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2610 +#, c-format +msgid "Control directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2677 #, c-format msgid "File not found: '%s'." msgstr "Datei nicht gefunden: '%s'." -#: ../src/itdb_itunesdb.c:2396 +#: ../src/itdb_itunesdb.c:3465 #, c-format msgid "Cannot write mhod of type %d\n" msgstr "Schreiben eines mhod-Hunks vom Typ %d ist nicht unterstützt.\n" -#: ../src/itdb_itunesdb.c:2522 ../src/itdb_itunesdb.c:2635 -msgid "Database in memory corrupt (track pointer == NULL). Aborting export." -msgstr "" -"Datenbank im Speicher beschädigt (Zeiger auf Stück == NULL). Der Export wird " -"abgebrochen." - -#: ../src/itdb_itunesdb.c:2678 -msgid "Database in memory corrupt (playlist pointer == NULL). Aborting export." -msgstr "" -"Datenbank im Speicher beschädigt (Zeiger auf Wiedergabeliste == NULL). Der " -"Export wird abgebrochen." - -#: ../src/itdb_itunesdb.c:2718 +#: ../src/itdb_itunesdb.c:4014 #, c-format msgid "Opening of '%s' for writing failed." msgstr "Öffnen der Datei '%s' zum Schreiben ist fehlgeschlagen." -#: ../src/itdb_itunesdb.c:2729 +#: ../src/itdb_itunesdb.c:4025 #, c-format msgid "Writing to '%s' failed." msgstr "Fehler beim Schreiben in die Datei '%s'." -#: ../src/itdb_itunesdb.c:2740 +#: ../src/itdb_itunesdb.c:4036 #, c-format msgid "Writing to '%s' failed (%s)." msgstr "Schreiben in die Datei '%s' ist fehlgeschlagen (%s)." -#: ../src/itdb_itunesdb.c:2881 ../src/itdb_itunesdb.c:3052 -#: ../src/itdb_itunesdb.c:3245 ../src/itdb_itunesdb.c:3451 -#, c-format -msgid "Path not found: '%s'." +#: ../src/itdb_itunesdb.c:4370 +#, fuzzy, c-format +msgid "Path not found: '%s' (or similar)." msgstr "Pfad nicht gefunden: '%s'." -#: ../src/itdb_itunesdb.c:3265 +#: ../src/itdb_itunesdb.c:4573 #, c-format msgid "Error renaming '%s' to '%s' (%s)." msgstr "Fehler beim Umbenennen von '%s' nach '%s' (%s)." -#: ../src/itdb_itunesdb.c:3282 +#: ../src/itdb_itunesdb.c:4590 ../src/itdb_itunesdb.c:4607 #, c-format msgid "Error removing '%s' (%s)." msgstr "Fehler beim Entfernen von '%s' (%s)." -#: ../src/itdb_itunesdb.c:3426 +#: ../src/itdb_itunesdb.c:4747 #, c-format msgid "No 'F..' directories found in '%s'." msgstr "No 'F..' directories were found in '%s'." -#: ../src/itdb_itunesdb.c:3589 +#: ../src/itdb_itunesdb.c:4775 +#, c-format +msgid "Path not found: '%s'." +msgstr "Pfad nicht gefunden: '%s'." + +#: ../src/itdb_itunesdb.c:4925 #, c-format msgid "Error opening '%s' for reading (%s)." msgstr "Fehler beim Öffnen von '%s' zum Lesen (%s)." -#: ../src/itdb_itunesdb.c:3600 +#: ../src/itdb_itunesdb.c:4936 #, c-format msgid "Error opening '%s' for writing (%s)." msgstr "Fehler beim Öffnen von '%s' zum Schreiben (%s)." -#: ../src/itdb_itunesdb.c:3617 +#: ../src/itdb_itunesdb.c:4953 #, c-format msgid "Error while reading from '%s' (%s)." msgstr "Fehler beim Lesen aus '%s' (%s)." -#: ../src/itdb_itunesdb.c:3633 +#: ../src/itdb_itunesdb.c:4969 #, c-format msgid "Error while writing to '%s' (%s)." msgstr "Fehler beim Schreiben in die Datei '%s' (%s)." -#: ../src/itdb_itunesdb.c:3646 ../src/itdb_itunesdb.c:3656 +#: ../src/itdb_itunesdb.c:4982 ../src/itdb_itunesdb.c:4992 #, c-format msgid "Error when closing '%s' (%s)." msgstr "Fehler beim Schließen der Datei '%s' (%s)." @@ -257,3 +316,19 @@ msgstr "Fehler beim Schließen der Datei '%s' (%s)." msgid "Unknown action (%d) in smart playlist will be ignored.\n" msgstr "" "Unbekannte Aktion (%d) in intelligenter Wiedergabeliste wird ignoriert.\n" + +#~ msgid "Did not find SLst hunk as expected. Trying to continue.\n" +#~ msgstr "" +#~ "Es wurde nicht wie erwarted ein 'SLst'-Hunk gefunden. Es wird trotzdem " +#~ "versucht, weiterzumachen.\n" + +#~ msgid "Database in memory corrupt (track pointer == NULL). Aborting export." +#~ msgstr "" +#~ "Datenbank im Speicher beschädigt (Zeiger auf Stück == NULL). Der Export " +#~ "wird abgebrochen." + +#~ msgid "" +#~ "Database in memory corrupt (playlist pointer == NULL). Aborting export." +#~ msgstr "" +#~ "Datenbank im Speicher beschädigt (Zeiger auf Wiedergabeliste == NULL). " +#~ "Der Export wird abgebrochen." @@ -1,231 +1,318 @@ -# translation of es.po to Español -# Azael Avalos <coproscefalo@gmail.com>, 2006. +# translation of gtkpod.po to Spanish +# This file is distributed under the same license as the gtkpod package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Alejandro Lamas Daviña <alejandro.lamas@ific.uv.es>, 2006. +# # msgid "" msgstr "" -"Project-Id-Version: es\n" +"Project-Id-Version: es_ES\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-14 21:51+0900\n" -"PO-Revision-Date: 2006-02-23 14:42-0700\n" -"Last-Translator: Azael Avalos\n" -"Language-Team: Español\n" +"POT-Creation-Date: 2006-03-31 23:04+0900\n" +"PO-Revision-Date: 2006-03-30 02:00+0200\n" +"Last-Translator: Alejandro Lamas Daviña <alejandro.lamas@ific.uv.es>\n" +"Language-Team: <es_ES>\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" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: KBabel 1.9.1\n" -#: ../src/itdb_itunesdb.c:313 +#: ../src/itdb_itunesdb.c:361 #, c-format msgid "Illegal seek to offset %ld (length %ld) in file '%s'." -msgstr "Busqueda ilegal en el offset %ld (tamaño %ld) en el archivo '%s'." +msgstr "Acceso ilegal al desplazamiento %ld (tamaño %ld) en el fichero '%s'." -#: ../src/itdb_itunesdb.c:521 +#: ../src/itdb_itunesdb.c:815 #, c-format msgid "Not a Play Counts file: '%s' (missing mhdp header)." -msgstr "No es un archivo de Cuentas de Reproducción: '%s' (falta el encabezado mhdp)." +msgstr "No es un fichero cuenta reproducciones: '%s' (falta cabecera mhdp)." -#: ../src/itdb_itunesdb.c:535 +#: ../src/itdb_itunesdb.c:830 #, c-format msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)." -msgstr "El archivo de Cuentas de Reproducción ('%s'): el tamaño del encabezado es mas pequeño de lo esperado (%d<96)." +msgstr "" +"Fichero cuenta reproducciones ('%s'): tamaño de la cabecera menor del " +"esperado (%d<96)." -#: ../src/itdb_itunesdb.c:548 +#: ../src/itdb_itunesdb.c:843 #, c-format msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)." -msgstr "El archivo de Cuentas de Reproducción ('%s'): el tamaño de la entrada es mas pequeña de lo esperado (%d<12)." +msgstr "" +"Fichero cuenta reproducciones ('%s'): tamaño de la entrada menor del " +"esperado (%d<12)." + +#: ../src/itdb_itunesdb.c:921 +#, fuzzy, c-format +msgid "iTunesStats file ('%s'): entry length smaller than expected (%d<18)." +msgstr "" +"Fichero cuenta reproducciones ('%s'): tamaño de la entrada menor del " +"esperado (%d<12)." -#: ../src/itdb_itunesdb.c:803 +#: ../src/itdb_itunesdb.c:1197 #, c-format msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'." -msgstr "iTunesDB corrupta: no se encontró MHOD en el offset %ld del archivo '%s'." +msgstr "" +"iTunesDB corrupta: no hay MHOD en el desplazamiento %ld del fichero '%s'." -#: ../src/itdb_itunesdb.c:923 +#: ../src/itdb_itunesdb.c:1354 #, c-format msgid "" "Length of smart playlist rule field (%d) not as expected. Trying to continue " "anyhow.\n" -msgstr "El tamaño de el campo de reglas de la lista de reproducción inteligente (%d) no es el esperado. Intentando continuar de todas formas.\n" +msgstr "" +"La longitud del campo de reglas (%d) de la lista de reproducción inteligente " +"no es la esperada. Intentando continuar.\n" -#: ../src/itdb_itunesdb.c:966 -#, fuzzy -msgid "Did not find SLst hunk as expected. Trying to continue.\n" -msgstr "No se encontró el SLst hunk como se esperaba. Intentando continuar.\n" +#: ../src/itdb_itunesdb.c:1386 +#, fuzzy, c-format +msgid "iTunesDB corrupt: no SLst at offset %ld in file '%s'." +msgstr "" +"iTunesDB corrupta: no hay MHOD en el desplazamiento %ld del fichero '%s'." -#: ../src/itdb_itunesdb.c:972 +#: ../src/itdb_itunesdb.c:1399 #, c-format msgid "" "Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n" "\n" msgstr "" -"Se encontró un tipo desconocido de MHOD (%d) al intentar análizar el iTunesDB. Ignorando.\n" +"Se ha encontrado un tipo MHOD desconocido (%d) al analizar la iTunesDB. " +"Ignorando.\n" "\n" -#: ../src/itdb_itunesdb.c:1053 ../src/itdb_itunesdb.c:1744 -#: ../src/itdb_itunesdb.c:1779 +#: ../src/itdb_itunesdb.c:1461 #, c-format -#, fuzzy msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'." -msgstr "iTunesDB corrupta: el tamaño del hunk es 0 en el hunk %ld en el archivo '%s'." +msgstr "iTunesDB corrupta: tamaño 0 para la zona %ld en el fichero '%s'." -#: ../src/itdb_itunesdb.c:1148 -msgid "Master-PL" -msgstr "Lista de Reproducción Maestra" +#: ../src/itdb_itunesdb.c:1474 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: no section '%s' found in section '%s' starting at %ld." +msgstr "" +"iTunesDB corrupta: no hay MHOD en el desplazamiento %ld del fichero '%s'." -#: ../src/itdb_itunesdb.c:1150 -msgid "Playlist" -msgstr "Lista de Reproducción" +#: ../src/itdb_itunesdb.c:1488 +#, fuzzy, c-format +msgid "" +"header length of '%s' smaller than expected (%d < %d) at offset %ld in file " +"'%s'." +msgstr "" +"iTunesDB ('%s'): tamaño de la cabecera de la zona mhsd menor del esperado (%" +"ld<32). Cancelando." -#: ../src/itdb_itunesdb.c:1175 +#: ../src/itdb_itunesdb.c:1573 #, c-format -msgid "iTunesDB corrupt: found mhyp at %ld in file '%s'." -msgstr "iTunesDB corrupta: se encontró mhyp en %ld en el archivo '%s'." +msgid "Not a iTunesDB: '%s' (missing mhdb header)." +msgstr "No es un fichero iTunesDB: '%s' (falta la cabecera mhdb)." -#: ../src/itdb_itunesdb.c:1223 +#: ../src/itdb_itunesdb.c:1590 +#, fuzzy, c-format +msgid "" +"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%d<32). " +"Aborting." +msgstr "" +"iTunesDB ('%s'): tamaño de la cabecera de la zona mhsd menor del esperado (%" +"ld<32). Cancelando." + +#: ../src/itdb_itunesdb.c:1611 +#, fuzzy, c-format +msgid "iTunesDB '%s' corrupt: mhsd expected at %ld." +msgstr "iTunesDB corrupta: se ha encontrado mhyp en %ld en el fichero '%s'." + +#: ../src/itdb_itunesdb.c:1728 +#, c-format +msgid "Number of MHODs in mhip at %ld inconsistent in file '%s'." +msgstr "" + +#: ../src/itdb_itunesdb.c:1746 #, c-format msgid "Itdb_Track ID '%d' not found.\n" -msgstr "No se encontró el ID '%d' del Itdb_Track.\n" +msgstr "Itdb_Track ID '%d' no encontrada.\n" + +#: ../src/itdb_itunesdb.c:1903 +#, fuzzy, c-format +msgid "Number of MHODs in mhyp at %ld inconsistent in file '%s'." +msgstr "iTunesDB corrupta: se ha encontrado mhyp en %ld en el fichero '%s'." + +#: ../src/itdb_itunesdb.c:1913 +msgid "Master-PL" +msgstr "Lista de reproducción principal" + +#: ../src/itdb_itunesdb.c:1917 +msgid "Podcasts" +msgstr "" -#: ../src/itdb_itunesdb.c:1487 +#: ../src/itdb_itunesdb.c:1919 +msgid "Playlist" +msgstr "Lista de reproducción" + +#: ../src/itdb_itunesdb.c:1941 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: number of mhip sections inconsistent in mhyp starting at %" +"ld in file '%s'." +msgstr "iTunesDB corrupta: se ha encontrado mhyp en %ld en el fichero '%s'." + +#: ../src/itdb_itunesdb.c:2222 msgid "OTG Playlist" -msgstr "Lista de Reproducción OTG" +msgstr "Lista de reproducción OTG" -#: ../src/itdb_itunesdb.c:1501 +#: ../src/itdb_itunesdb.c:2240 #, c-format msgid "Not a OTG playlist file: '%s' (missing mhpo header)." -msgstr "No es un archivo de la lista de reproducción OTG: '%s' (falta el encabezado mhpo)." +msgstr "No es una lista de reproducción: '%s' (falta la cabecera mhpo)." -#: ../src/itdb_itunesdb.c:1515 +#: ../src/itdb_itunesdb.c:2254 #, c-format msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)." -msgstr "El archivo de la lista de reproducción OTG ('%s'): el tamaño del encabezado es mas pequeño de lo esperado (%d<20)." +msgstr "" +"Fichero de lista de reproducción OTG ('%s'): tamaño de la cabecera menor del " +"esperado (%d<20)." -#: ../src/itdb_itunesdb.c:1527 +#: ../src/itdb_itunesdb.c:2266 #, c-format -msgid "OTG playlist file file ('%s'): entry length smaller than expected (%d<4)." -msgstr "El archivo de la lista de reproducción OTG ('%s'): el tamaño de la entrada es mas pequeño de lo esperado (%d<4)." +msgid "" +"OTG playlist file file ('%s'): entry length smaller than expected (%d<4)." +msgstr "" +"Fichero de lista de reproducción OTG ('%s'): tamaño de la entrada menor del " +"esperado (%d<4)." -#: ../src/itdb_itunesdb.c:1562 +#: ../src/itdb_itunesdb.c:2301 #, c-format msgid "OTG playlist file '%s': reference to non-existent track (%d)." -msgstr "El archivo de la lista de reproducción OTG '%s': referencia a una pista no existente (%d)." +msgstr "" +"La lista de reproducción OTG '%s': hace referencia a una pista no existente " +"(%d)." -#: ../src/itdb_itunesdb.c:1607 +#: ../src/itdb_itunesdb.c:2346 #, c-format msgid "OTG Playlist %d" -msgstr "Lista de Reproducción OTG %d" - -#: ../src/itdb_itunesdb.c:1650 -#, c-format -msgid "Not a iTunesDB: '%s' (missing mhdb header)." -msgstr "No es una iTunesDB: '%s' (falta el encabezado mhdb)." - -#: ../src/itdb_itunesdb.c:1666 -#, c-format -#, fuzzy -msgid "" -"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%ld<32). " -"Aborting." -msgstr "iTunesDB ('%s'): el tamaño del encabezado mhsd del hunk es mas pequeño del esperado (%ld<32). Abortando." - -#: ../src/itdb_itunesdb.c:1698 -#, c-format -#, fuzzy -msgid "iTunesDB '%s' corrupt: already found two playlist mhsds -- giving up." -msgstr "iTunesDB '%s' corrupta: se han encontrado dos lista de reproducción mhsds -- ." +msgstr "Lista de reproducción OTG %d" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1759 +#: ../src/itdb_itunesdb.c:2414 #, fuzzy msgid "" -"iTunesDB possibly corrupt: number of tracks (mhit hunks) inconsistent. " -"Trying to continue.\n" -msgstr "iTunesDB posiblemente corrupta: el número de pistas (mhit hunks) es inconsistente. Intentando continuar.\n" +"iTunesDB corrupt: number of tracks (mhit hunks) inconsistent. Trying to " +"continue.\n" +msgstr "" +"Es posible que iTunesDB esté corrupta: el número de pistas (zonas mhit) no " +"es consistente. Intentando continuar.\n" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1841 -#, fuzzy +#: ../src/itdb_itunesdb.c:2477 msgid "" "iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. " "Trying to continue.\n" -msgstr "iTunesDB posiblemente corrupta: el número de listas de reproducción (mhyp hunks) es inconsistente. Intentando continuar.\n" +msgstr "" +"Es posible que iTunesDB esté corrupta: el número de listas de reproducción " +"(zonas mhyp) no es consistente. Intentando continuar.\n" + +#: ../src/itdb_itunesdb.c:2524 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find tracklist (no mhsd type 1 section " +"found)" +msgstr "" +"iTunesDB '%s' corrputa: se han encontrado dos listas de reproducción mhsds " +"-- Deteniendo." + +#: ../src/itdb_itunesdb.c:2553 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find playlists (no mhsd type 2 or type 3 " +"sections found)" +msgstr "" +"iTunesDB '%s' corrputa: se han encontrado dos listas de reproducción mhsds " +"-- Deteniendo." -#: ../src/itdb_itunesdb.c:1879 +#: ../src/itdb_itunesdb.c:2575 #, c-format -msgid "File not found: '%s'." -msgstr "Archivo no encontrado: '%s'." +msgid "iTunes directory not found: '%s' (or similar)." +msgstr "" -#: ../src/itdb_itunesdb.c:2396 +#: ../src/itdb_itunesdb.c:2592 #, c-format -msgid "Cannot write mhod of type %d\n" -msgstr "No se pudo escribir mhod del tipo %d\n" +msgid "Music directory not found: '%s' (or similar)." +msgstr "" -#: ../src/itdb_itunesdb.c:2522 ../src/itdb_itunesdb.c:2635 -msgid "Database in memory corrupt (track pointer == NULL). Aborting export." -msgstr "La base de datos en la memoria esta corrupta (apuntador de la pista == NULL). Abortando la exportación." +#: ../src/itdb_itunesdb.c:2610 +#, c-format +msgid "Control directory not found: '%s' (or similar)." +msgstr "" -#: ../src/itdb_itunesdb.c:2678 -msgid "Database in memory corrupt (playlist pointer == NULL). Aborting export." -msgstr "La base de datos en la memoria esta corrupta (apuntador de la lista de reproducción == NULL). Abortando exportación." +#: ../src/itdb_itunesdb.c:2677 +#, c-format +msgid "File not found: '%s'." +msgstr "Fichero no encontrado: '%s'." -#: ../src/itdb_itunesdb.c:2718 +#: ../src/itdb_itunesdb.c:3465 +#, c-format +msgid "Cannot write mhod of type %d\n" +msgstr "No se puede escribir el mhod de tipo %d\n" + +#: ../src/itdb_itunesdb.c:4014 #, c-format msgid "Opening of '%s' for writing failed." -msgstr "Fallo al abrir '%s' para escritura." +msgstr "No se ha podido abrir '%s' para su escritura." -#: ../src/itdb_itunesdb.c:2729 +#: ../src/itdb_itunesdb.c:4025 #, c-format msgid "Writing to '%s' failed." -msgstr "Fallo al escribir a '%s'." +msgstr "No se ha podido escribir '%s'." -#: ../src/itdb_itunesdb.c:2740 +#: ../src/itdb_itunesdb.c:4036 #, c-format msgid "Writing to '%s' failed (%s)." -msgstr "Fallo al escribir a '%s' (%s)." +msgstr "No se ha podido escribir '%s' (%s)." -#: ../src/itdb_itunesdb.c:2881 ../src/itdb_itunesdb.c:3052 -#: ../src/itdb_itunesdb.c:3245 ../src/itdb_itunesdb.c:3451 -#, c-format -#, fuzzy -msgid "Path not found: '%s'." -msgstr "No se encontró: '%s'." +#: ../src/itdb_itunesdb.c:4370 +#, fuzzy, c-format +msgid "Path not found: '%s' (or similar)." +msgstr "Ruta no encontrada: '%s'." -#: ../src/itdb_itunesdb.c:3265 +#: ../src/itdb_itunesdb.c:4573 #, c-format msgid "Error renaming '%s' to '%s' (%s)." msgstr "Error al renombrar '%s' a '%s' (%s)." -#: ../src/itdb_itunesdb.c:3282 +#: ../src/itdb_itunesdb.c:4590 ../src/itdb_itunesdb.c:4607 #, c-format msgid "Error removing '%s' (%s)." -msgstr "Error al remover '%s' (%s)." +msgstr "Error al borrar '%s' (%s)." -#: ../src/itdb_itunesdb.c:3426 +#: ../src/itdb_itunesdb.c:4747 #, c-format msgid "No 'F..' directories found in '%s'." -msgstr "No se encontró ningún directorio 'F..' en '%s'." +msgstr "No se ha encontrado ningún directorio en '%s'." -#: ../src/itdb_itunesdb.c:3589 +#: ../src/itdb_itunesdb.c:4775 +#, c-format +msgid "Path not found: '%s'." +msgstr "Ruta no encontrada: '%s'." + +#: ../src/itdb_itunesdb.c:4925 #, c-format msgid "Error opening '%s' for reading (%s)." -msgstr "Error al abrir '%s' para lectura (%s)." +msgstr "Error al abrir '%s' para su lectura (%s)." -#: ../src/itdb_itunesdb.c:3600 +#: ../src/itdb_itunesdb.c:4936 #, c-format msgid "Error opening '%s' for writing (%s)." -msgstr "Error al abrir '%s' para escritura (%s)." +msgstr "Error al abrir '%s' para su escritura (%s)." -#: ../src/itdb_itunesdb.c:3617 +#: ../src/itdb_itunesdb.c:4953 #, c-format msgid "Error while reading from '%s' (%s)." -msgstr "Error leyendo de '%s' (%s)." +msgstr "Error durante la lectura de '%s' (%s)." -#: ../src/itdb_itunesdb.c:3633 +#: ../src/itdb_itunesdb.c:4969 #, c-format msgid "Error while writing to '%s' (%s)." -msgstr "Error escribiendo a '%s' (%s)." +msgstr "Error durante la escritura de '%s' (%s)." -#: ../src/itdb_itunesdb.c:3646 ../src/itdb_itunesdb.c:3656 +#: ../src/itdb_itunesdb.c:4982 ../src/itdb_itunesdb.c:4992 #, c-format msgid "Error when closing '%s' (%s)." msgstr "Error al cerrar '%s' (%s)." @@ -234,5 +321,21 @@ msgstr "Error al cerrar '%s' (%s)." #: ../src/itdb_playlist.c:71 #, c-format msgid "Unknown action (%d) in smart playlist will be ignored.\n" -msgstr "La acción desconocida (%d) en la lista de reproducción inteligente sera ignorada.\n" - +msgstr "" +"Acción desconocida (%d) en la lista de reproducción inteligente. Será " +"ignorada.\n" + +#~ msgid "Did not find SLst hunk as expected. Trying to continue.\n" +#~ msgstr "" +#~ "No se ha encontrado la zona SLst como se esperaba. Intentando continuar.\n" + +#~ msgid "Database in memory corrupt (track pointer == NULL). Aborting export." +#~ msgstr "" +#~ "La base de datos residente en memoria está corrupta (puntero a pista == " +#~ "NULL). Cancelando la exportación." + +#~ msgid "" +#~ "Database in memory corrupt (playlist pointer == NULL). Aborting export." +#~ msgstr "" +#~ "La base de datos residente en memoria está corrupta (puntero a lista de " +#~ "reproducción == NULL). Cancelando la exportación." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gtkpod 0.94\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-14 21:51+0900\n" +"POT-Creation-Date: 2006-03-31 23:04+0900\n" "PO-Revision-Date: 2005-09-14 21:46+0900\n" "Last-Translator: Éric Lassauge <lassauge@users.sf.net>\n" "Language-Team: FR\n" @@ -18,36 +18,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../src/itdb_itunesdb.c:313 +#: ../src/itdb_itunesdb.c:361 #, c-format msgid "Illegal seek to offset %ld (length %ld) in file '%s'." msgstr "Erreur de flux à l'offset %ld (longueur %ld) dans le fichier «%s»." -#: ../src/itdb_itunesdb.c:521 +#: ../src/itdb_itunesdb.c:815 #, c-format msgid "Not a Play Counts file: '%s' (missing mhdp header)." msgstr "«%s» n»est pas un fichier de compteurs (entête mhdp manquant)" -#: ../src/itdb_itunesdb.c:535 +#: ../src/itdb_itunesdb.c:830 #, c-format msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)." msgstr "" "Fichier de compteurs ('%s') : longueur de l'entête plus petite que prévue (%" "d<96)." -#: ../src/itdb_itunesdb.c:548 +#: ../src/itdb_itunesdb.c:843 #, c-format msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)." msgstr "" "Fichier de compteur ('%s') : longueur des données plus petite que prévue (%" "d<12)." -#: ../src/itdb_itunesdb.c:803 +#: ../src/itdb_itunesdb.c:921 +#, fuzzy, c-format +msgid "iTunesStats file ('%s'): entry length smaller than expected (%d<18)." +msgstr "" +"Fichier de compteur ('%s') : longueur des données plus petite que prévue (%" +"d<12)." + +#: ../src/itdb_itunesdb.c:1197 #, c-format msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'." msgstr "Corruption d'iTunesDB : pas de MHOD à l'offset %ld du fichier «%s»." -#: ../src/itdb_itunesdb.c:923 +#: ../src/itdb_itunesdb.c:1354 #, c-format msgid "" "Length of smart playlist rule field (%d) not as expected. Trying to continue " @@ -56,12 +63,12 @@ msgstr "" "Longueur du champ de la règle (%d) de la liste intelligente inattendue. " "Tentative pour continuer quand même.\n" -#: ../src/itdb_itunesdb.c:966 -msgid "Did not find SLst hunk as expected. Trying to continue.\n" -msgstr "" -"Ne peut trouver le SLst attendu. Tentative pour continuer quand même.\n" +#: ../src/itdb_itunesdb.c:1386 +#, fuzzy, c-format +msgid "iTunesDB corrupt: no SLst at offset %ld in file '%s'." +msgstr "Corruption d'iTunesDB : pas de MHOD à l'offset %ld du fichier «%s»." -#: ../src/itdb_itunesdb.c:972 +#: ../src/itdb_itunesdb.c:1399 #, c-format msgid "" "Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n" @@ -69,46 +76,95 @@ msgid "" msgstr "" "Type MHOD inconnu (%d) lors du parcours de iTunesDB. Ignorance de l'erreur.\n" -#: ../src/itdb_itunesdb.c:1053 ../src/itdb_itunesdb.c:1744 -#: ../src/itdb_itunesdb.c:1779 +#: ../src/itdb_itunesdb.c:1461 #, c-format msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'." msgstr "Corruption d'iTunesDB : longueur 0 à %ld du fichier «%s»." -#: ../src/itdb_itunesdb.c:1148 -msgid "Master-PL" -msgstr "Liste principale" +#: ../src/itdb_itunesdb.c:1474 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: no section '%s' found in section '%s' starting at %ld." +msgstr "Corruption d'iTunesDB : pas de MHOD à l'offset %ld du fichier «%s»." -#: ../src/itdb_itunesdb.c:1150 -msgid "Playlist" -msgstr "Liste de lecture" +#: ../src/itdb_itunesdb.c:1488 +#, fuzzy, c-format +msgid "" +"header length of '%s' smaller than expected (%d < %d) at offset %ld in file " +"'%s'." +msgstr "" +"iTunesDB ('%s') : longueur de l'entête mhsd plus petite que prévue (%ld<32). " +"Interruption." -#: ../src/itdb_itunesdb.c:1175 +#: ../src/itdb_itunesdb.c:1573 #, c-format -msgid "iTunesDB corrupt: found mhyp at %ld in file '%s'." +msgid "Not a iTunesDB: '%s' (missing mhdb header)." +msgstr "«%s» n»est pas un fichier iTunesDB (entête mhdb manquante)" + +#: ../src/itdb_itunesdb.c:1590 +#, fuzzy, c-format +msgid "" +"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%d<32). " +"Aborting." +msgstr "" +"iTunesDB ('%s') : longueur de l'entête mhsd plus petite que prévue (%ld<32). " +"Interruption." + +#: ../src/itdb_itunesdb.c:1611 +#, fuzzy, c-format +msgid "iTunesDB '%s' corrupt: mhsd expected at %ld." msgstr "Corruption d'iTunesDB : trouvé mhyp à %ld du fichier «%s»." -#: ../src/itdb_itunesdb.c:1223 +#: ../src/itdb_itunesdb.c:1728 +#, c-format +msgid "Number of MHODs in mhip at %ld inconsistent in file '%s'." +msgstr "" + +#: ../src/itdb_itunesdb.c:1746 #, c-format msgid "Itdb_Track ID '%d' not found.\n" msgstr "Itdb_Track ID «%d» non trouvé.\n" -#: ../src/itdb_itunesdb.c:1487 +#: ../src/itdb_itunesdb.c:1903 +#, fuzzy, c-format +msgid "Number of MHODs in mhyp at %ld inconsistent in file '%s'." +msgstr "Corruption d'iTunesDB : trouvé mhyp à %ld du fichier «%s»." + +#: ../src/itdb_itunesdb.c:1913 +msgid "Master-PL" +msgstr "Liste principale" + +#: ../src/itdb_itunesdb.c:1917 +msgid "Podcasts" +msgstr "" + +#: ../src/itdb_itunesdb.c:1919 +msgid "Playlist" +msgstr "Liste de lecture" + +#: ../src/itdb_itunesdb.c:1941 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: number of mhip sections inconsistent in mhyp starting at %" +"ld in file '%s'." +msgstr "Corruption d'iTunesDB : trouvé mhyp à %ld du fichier «%s»." + +#: ../src/itdb_itunesdb.c:2222 msgid "OTG Playlist" msgstr "Liste de lecture OTG" -#: ../src/itdb_itunesdb.c:1501 +#: ../src/itdb_itunesdb.c:2240 #, c-format msgid "Not a OTG playlist file: '%s' (missing mhpo header)." msgstr "" "Le fichier '%s' n'est pas un fichier de liste OTG (entête mhpo manquant)." -#: ../src/itdb_itunesdb.c:1515 +#: ../src/itdb_itunesdb.c:2254 #, c-format msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)." msgstr "Fichier de liste OTG («%s») : entête plus petit que prévu (%d<20)." -#: ../src/itdb_itunesdb.c:1527 +#: ../src/itdb_itunesdb.c:2266 #, c-format msgid "" "OTG playlist file file ('%s'): entry length smaller than expected (%d<4)." @@ -116,47 +172,28 @@ msgstr "" "Fichier de liste OTG ('%s') : longueur de données plus petite que prévue (%" "d<4)." -#: ../src/itdb_itunesdb.c:1562 +#: ../src/itdb_itunesdb.c:2301 #, c-format msgid "OTG playlist file '%s': reference to non-existent track (%d)." msgstr "Fichier de liste OTG «%s» : référence à un morceau inexistant (%d)." -#: ../src/itdb_itunesdb.c:1607 +#: ../src/itdb_itunesdb.c:2346 #, c-format msgid "OTG Playlist %d" msgstr "Liste de lecture OTG %d" -#: ../src/itdb_itunesdb.c:1650 -#, c-format -msgid "Not a iTunesDB: '%s' (missing mhdb header)." -msgstr "«%s» n»est pas un fichier iTunesDB (entête mhdb manquante)" - -#: ../src/itdb_itunesdb.c:1666 -#, c-format -msgid "" -"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%ld<32). " -"Aborting." -msgstr "" -"iTunesDB ('%s') : longueur de l'entête mhsd plus petite que prévue (%ld<32). " -"Interruption." - -#: ../src/itdb_itunesdb.c:1698 -#, c-format -msgid "iTunesDB '%s' corrupt: already found two playlist mhsds -- giving up." -msgstr "" -"Corruption de iTunesDB ('%s') : déjà trouvés deux listes mhsds -- abandon." - #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1759 +#: ../src/itdb_itunesdb.c:2414 +#, fuzzy msgid "" -"iTunesDB possibly corrupt: number of tracks (mhit hunks) inconsistent. " -"Trying to continue.\n" +"iTunesDB corrupt: number of tracks (mhit hunks) inconsistent. Trying to " +"continue.\n" msgstr "" "Corruption possible de iTunesDB : nombre de fichiers (mhit) incohérent. " "Tentative pour continuer quand même.\n" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1841 +#: ../src/itdb_itunesdb.c:2477 msgid "" "iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. " "Trying to continue.\n" @@ -164,85 +201,108 @@ msgstr "" "Corruption possible d'iTunesDB : nombre de listes (mhyp) incohérent. " "Tentative pour continuer quand même.\n" -#: ../src/itdb_itunesdb.c:1879 +#: ../src/itdb_itunesdb.c:2524 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find tracklist (no mhsd type 1 section " +"found)" +msgstr "" +"Corruption de iTunesDB ('%s') : déjà trouvés deux listes mhsds -- abandon." + +#: ../src/itdb_itunesdb.c:2553 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find playlists (no mhsd type 2 or type 3 " +"sections found)" +msgstr "" +"Corruption de iTunesDB ('%s') : déjà trouvés deux listes mhsds -- abandon." + +#: ../src/itdb_itunesdb.c:2575 +#, c-format +msgid "iTunes directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2592 +#, c-format +msgid "Music directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2610 +#, c-format +msgid "Control directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2677 #, c-format msgid "File not found: '%s'." msgstr "Fichier introuvable : «%s»." -#: ../src/itdb_itunesdb.c:2396 +#: ../src/itdb_itunesdb.c:3465 #, c-format msgid "Cannot write mhod of type %d\n" msgstr "Impossible d'écrire mhod du type %d\n" -#: ../src/itdb_itunesdb.c:2522 ../src/itdb_itunesdb.c:2635 -msgid "Database in memory corrupt (track pointer == NULL). Aborting export." -msgstr "" -"Base de données en mémoire corrompue (track pointer == NULL). Abandon de " -"l'export." - -#: ../src/itdb_itunesdb.c:2678 -msgid "Database in memory corrupt (playlist pointer == NULL). Aborting export." -msgstr "" -"Base de données en mémoire corrompue (playlist pointer == NULL). Abandon de " -"l'export." - -#: ../src/itdb_itunesdb.c:2718 +#: ../src/itdb_itunesdb.c:4014 #, c-format msgid "Opening of '%s' for writing failed." msgstr "Échec de l'ouverture en écriture de «%s»." -#: ../src/itdb_itunesdb.c:2729 +#: ../src/itdb_itunesdb.c:4025 #, c-format msgid "Writing to '%s' failed." msgstr "Erreur d'écriture du fichier «%s»." -#: ../src/itdb_itunesdb.c:2740 +#: ../src/itdb_itunesdb.c:4036 #, c-format msgid "Writing to '%s' failed (%s)." msgstr "Échec de l'écriture dans «%s» (%s)." -#: ../src/itdb_itunesdb.c:2881 ../src/itdb_itunesdb.c:3052 -#: ../src/itdb_itunesdb.c:3245 ../src/itdb_itunesdb.c:3451 -#, c-format -msgid "Path not found: '%s'." +#: ../src/itdb_itunesdb.c:4370 +#, fuzzy, c-format +msgid "Path not found: '%s' (or similar)." msgstr "Chemin non trouvé : «%s»." -#: ../src/itdb_itunesdb.c:3265 +#: ../src/itdb_itunesdb.c:4573 #, c-format msgid "Error renaming '%s' to '%s' (%s)." msgstr "Impossible de renommer «%s» en «%s» (%s)." -#: ../src/itdb_itunesdb.c:3282 +#: ../src/itdb_itunesdb.c:4590 ../src/itdb_itunesdb.c:4607 #, c-format msgid "Error removing '%s' (%s)." msgstr "Erreur de suppression du fichier «%s» (%s)." -#: ../src/itdb_itunesdb.c:3426 +#: ../src/itdb_itunesdb.c:4747 #, c-format msgid "No 'F..' directories found in '%s'." msgstr "" -#: ../src/itdb_itunesdb.c:3589 +#: ../src/itdb_itunesdb.c:4775 +#, c-format +msgid "Path not found: '%s'." +msgstr "Chemin non trouvé : «%s»." + +#: ../src/itdb_itunesdb.c:4925 #, c-format msgid "Error opening '%s' for reading (%s)." msgstr "Ne peut ouvrir en lecture le fichier «%s» (%s)." -#: ../src/itdb_itunesdb.c:3600 +#: ../src/itdb_itunesdb.c:4936 #, c-format msgid "Error opening '%s' for writing (%s)." msgstr "Ne peut ouvrir en écriture le fichier «%s» (%s)." -#: ../src/itdb_itunesdb.c:3617 +#: ../src/itdb_itunesdb.c:4953 #, c-format msgid "Error while reading from '%s' (%s)." msgstr "Erreur lors de la lecture à partir de : %s (%s)." -#: ../src/itdb_itunesdb.c:3633 +#: ../src/itdb_itunesdb.c:4969 #, c-format msgid "Error while writing to '%s' (%s)." msgstr "Erreur d'écriture dans «%s» (%s)." -#: ../src/itdb_itunesdb.c:3646 ../src/itdb_itunesdb.c:3656 +#: ../src/itdb_itunesdb.c:4982 ../src/itdb_itunesdb.c:4992 #, c-format msgid "Error when closing '%s' (%s)." msgstr "Erreur à la fermeture «%s» (%s)." @@ -252,3 +312,18 @@ msgstr "Erreur à la fermeture «%s» (%s)." #, c-format msgid "Unknown action (%d) in smart playlist will be ignored.\n" msgstr "L'action inconnue (%d) dans la liste intelligente sera ignorée.\n" + +#~ msgid "Did not find SLst hunk as expected. Trying to continue.\n" +#~ msgstr "" +#~ "Ne peut trouver le SLst attendu. Tentative pour continuer quand même.\n" + +#~ msgid "Database in memory corrupt (track pointer == NULL). Aborting export." +#~ msgstr "" +#~ "Base de données en mémoire corrompue (track pointer == NULL). Abandon de " +#~ "l'export." + +#~ msgid "" +#~ "Database in memory corrupt (playlist pointer == NULL). Aborting export." +#~ msgstr "" +#~ "Base de données en mémoire corrompue (playlist pointer == NULL). Abandon " +#~ "de l'export." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gtkpod\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-14 21:51+0900\n" +"POT-Creation-Date: 2006-03-31 23:04+0900\n" "PO-Revision-Date: 2005-08-02 21:19+0300\n" "Last-Translator: Assaf Gillat\n" "Language-Team: HEBREW <kde-il@yahoogroups.com>\n" @@ -17,32 +17,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.9.1\n" -#: ../src/itdb_itunesdb.c:313 +#: ../src/itdb_itunesdb.c:361 #, c-format msgid "Illegal seek to offset %ld (length %ld) in file '%s'." msgstr "חיפוש לא חוקי בהיסט %ld (אורך %ld) בקובץ '%s'." -#: ../src/itdb_itunesdb.c:521 +#: ../src/itdb_itunesdb.c:815 #, c-format msgid "Not a Play Counts file: '%s' (missing mhdp header)." msgstr "זהו לא קובץ ספירת השמעה: '%s' (חסר תחילית mhdp)" -#: ../src/itdb_itunesdb.c:535 +#: ../src/itdb_itunesdb.c:830 #, c-format msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)." msgstr "קובץ ספירת השמעה ('%s'): אורך תחילית קטן מהצפוי (%d<96)." -#: ../src/itdb_itunesdb.c:548 +#: ../src/itdb_itunesdb.c:843 #, c-format msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)." msgstr "קובץ ספירת השמעה ('%s'): אורך רשומה קטן מהצפוי (%d<12)." -#: ../src/itdb_itunesdb.c:803 +#: ../src/itdb_itunesdb.c:921 +#, fuzzy, c-format +msgid "iTunesStats file ('%s'): entry length smaller than expected (%d<18)." +msgstr "קובץ ספירת השמעה ('%s'): אורך רשומה קטן מהצפוי (%d<12)." + +#: ../src/itdb_itunesdb.c:1197 #, c-format msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'." msgstr "iTunesDB שבור: אין MHOD בהיסט %ld בקובץ '%s'." -#: ../src/itdb_itunesdb.c:923 +#: ../src/itdb_itunesdb.c:1354 #, c-format msgid "" "Length of smart playlist rule field (%d) not as expected. Trying to continue " @@ -50,11 +55,12 @@ msgid "" msgstr "" "אורך שדה של חוק (%d) רשימת השמעה חכמה הוא לא כצפוי. מנסה להמשיך בכל זאת.\n" -#: ../src/itdb_itunesdb.c:966 -msgid "Did not find SLst hunk as expected. Trying to continue.\n" -msgstr "לא נמצאה חתיכת SLst כצפוי. מנסה להמשיך.\n" +#: ../src/itdb_itunesdb.c:1386 +#, fuzzy, c-format +msgid "iTunesDB corrupt: no SLst at offset %ld in file '%s'." +msgstr "iTunesDB שבור: אין MHOD בהיסט %ld בקובץ '%s'." -#: ../src/itdb_itunesdb.c:972 +#: ../src/itdb_itunesdb.c:1399 #, c-format msgid "" "Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n" @@ -63,89 +69,119 @@ msgstr "" "נתקלנו בסוג לא ידוע של MHOD (%d) בזמן ניתוח ה-iTuneDB. מתעלם.\n" "\n" -#: ../src/itdb_itunesdb.c:1053 ../src/itdb_itunesdb.c:1744 -#: ../src/itdb_itunesdb.c:1779 +#: ../src/itdb_itunesdb.c:1461 #, c-format msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'." msgstr "iTunesDB שבור: אורך חתיכה 0 בחתיכה %ld בקובץ '%s'." -#: ../src/itdb_itunesdb.c:1148 -msgid "Master-PL" -msgstr "רשימת ראשית" +#: ../src/itdb_itunesdb.c:1474 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: no section '%s' found in section '%s' starting at %ld." +msgstr "iTunesDB שבור: אין MHOD בהיסט %ld בקובץ '%s'." -#: ../src/itdb_itunesdb.c:1150 -msgid "Playlist" -msgstr "רשימת השמעה" +#: ../src/itdb_itunesdb.c:1488 +#, fuzzy, c-format +msgid "" +"header length of '%s' smaller than expected (%d < %d) at offset %ld in file " +"'%s'." +msgstr "" +"iTunesDB ('%s'): גודל תחילית של החתיכה mhsd קטנה מהצפוי (%ld<32). מבטל." -#: ../src/itdb_itunesdb.c:1175 +#: ../src/itdb_itunesdb.c:1573 #, c-format -msgid "iTunesDB corrupt: found mhyp at %ld in file '%s'." +msgid "Not a iTunesDB: '%s' (missing mhdb header)." +msgstr "זהו לא iTunesDB: '%s' (חסרה תחילית mhdb)." + +#: ../src/itdb_itunesdb.c:1590 +#, fuzzy, c-format +msgid "" +"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%d<32). " +"Aborting." +msgstr "" +"iTunesDB ('%s'): גודל תחילית של החתיכה mhsd קטנה מהצפוי (%ld<32). מבטל." + +#: ../src/itdb_itunesdb.c:1611 +#, fuzzy, c-format +msgid "iTunesDB '%s' corrupt: mhsd expected at %ld." msgstr "iTunesDB שבור: נמצא mhyp ב %ld בקובץ '%s'." -#: ../src/itdb_itunesdb.c:1223 +#: ../src/itdb_itunesdb.c:1728 +#, c-format +msgid "Number of MHODs in mhip at %ld inconsistent in file '%s'." +msgstr "" + +#: ../src/itdb_itunesdb.c:1746 #, c-format msgid "Itdb_Track ID '%d' not found.\n" msgstr "מזהה Itdb_Track '%d' לא נמצא.\n" -#: ../src/itdb_itunesdb.c:1487 +#: ../src/itdb_itunesdb.c:1903 +#, fuzzy, c-format +msgid "Number of MHODs in mhyp at %ld inconsistent in file '%s'." +msgstr "iTunesDB שבור: נמצא mhyp ב %ld בקובץ '%s'." + +#: ../src/itdb_itunesdb.c:1913 +msgid "Master-PL" +msgstr "רשימת ראשית" + +#: ../src/itdb_itunesdb.c:1917 +msgid "Podcasts" +msgstr "" + +#: ../src/itdb_itunesdb.c:1919 +msgid "Playlist" +msgstr "רשימת השמעה" + +#: ../src/itdb_itunesdb.c:1941 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: number of mhip sections inconsistent in mhyp starting at %" +"ld in file '%s'." +msgstr "iTunesDB שבור: נמצא mhyp ב %ld בקובץ '%s'." + +#: ../src/itdb_itunesdb.c:2222 msgid "OTG Playlist" msgstr "רשימת השמעה OTG" -#: ../src/itdb_itunesdb.c:1501 +#: ../src/itdb_itunesdb.c:2240 #, c-format msgid "Not a OTG playlist file: '%s' (missing mhpo header)." msgstr "זהו לא קובץ רשימת השמעה OTG: '%s' (חסרה תחילת קובץ mhpo)." -#: ../src/itdb_itunesdb.c:1515 +#: ../src/itdb_itunesdb.c:2254 #, c-format msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)." msgstr "קובץ רשימת השמעה OTG ('%s'): גודל תחילית קטן מהצפוי (%d<20)." -#: ../src/itdb_itunesdb.c:1527 +#: ../src/itdb_itunesdb.c:2266 #, c-format msgid "" "OTG playlist file file ('%s'): entry length smaller than expected (%d<4)." msgstr "קובץ רשימת השמעה OTG ('%s'): גודל רשומה קטן מהצפוי (%d<4)." -#: ../src/itdb_itunesdb.c:1562 +#: ../src/itdb_itunesdb.c:2301 #, c-format msgid "OTG playlist file '%s': reference to non-existent track (%d)." msgstr "רשימת השמעה OTG '%s': התייחסות לרצועה לא קיימת (%d)." -#: ../src/itdb_itunesdb.c:1607 +#: ../src/itdb_itunesdb.c:2346 #, c-format msgid "OTG Playlist %d" msgstr "רשימת השמעה OTG %d" -#: ../src/itdb_itunesdb.c:1650 -#, c-format -msgid "Not a iTunesDB: '%s' (missing mhdb header)." -msgstr "זהו לא iTunesDB: '%s' (חסרה תחילית mhdb)." - -#: ../src/itdb_itunesdb.c:1666 -#, c-format -msgid "" -"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%ld<32). " -"Aborting." -msgstr "" -"iTunesDB ('%s'): גודל תחילית של החתיכה mhsd קטנה מהצפוי (%ld<32). מבטל." - -#: ../src/itdb_itunesdb.c:1698 -#, c-format -msgid "iTunesDB '%s' corrupt: already found two playlist mhsds -- giving up." -msgstr "iTunesDB '%s' שבור: כבר מצאנו mhsds של שתי רשימות השמעה -- מוותר." - #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1759 +#: ../src/itdb_itunesdb.c:2414 +#, fuzzy msgid "" -"iTunesDB possibly corrupt: number of tracks (mhit hunks) inconsistent. " -"Trying to continue.\n" +"iTunesDB corrupt: number of tracks (mhit hunks) inconsistent. Trying to " +"continue.\n" msgstr "" "יכול להיות ש-iTuneDB שבור: מספר רצועות (mhit חתיכות) לא עקביות. מנסה " "להמשיך.\n" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1841 +#: ../src/itdb_itunesdb.c:2477 msgid "" "iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. " "Trying to continue.\n" @@ -153,81 +189,106 @@ msgstr "" "יכול להיות ש-iTuneDB שבור: מספר רשימות השמעה (mhyp חתיכות) לא עקביות. מנסה " "להמשיך.\n" -#: ../src/itdb_itunesdb.c:1879 +#: ../src/itdb_itunesdb.c:2524 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find tracklist (no mhsd type 1 section " +"found)" +msgstr "iTunesDB '%s' שבור: כבר מצאנו mhsds של שתי רשימות השמעה -- מוותר." + +#: ../src/itdb_itunesdb.c:2553 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find playlists (no mhsd type 2 or type 3 " +"sections found)" +msgstr "iTunesDB '%s' שבור: כבר מצאנו mhsds של שתי רשימות השמעה -- מוותר." + +#: ../src/itdb_itunesdb.c:2575 +#, c-format +msgid "iTunes directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2592 +#, c-format +msgid "Music directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2610 +#, c-format +msgid "Control directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2677 #, c-format msgid "File not found: '%s'." msgstr "קובץ לא קיים: '%s'." -#: ../src/itdb_itunesdb.c:2396 +#: ../src/itdb_itunesdb.c:3465 #, c-format msgid "Cannot write mhod of type %d\n" msgstr "לא יכול לכתוב mhod של סוג %d\n" -#: ../src/itdb_itunesdb.c:2522 ../src/itdb_itunesdb.c:2635 -msgid "Database in memory corrupt (track pointer == NULL). Aborting export." -msgstr "מסד הנתונים בזיכרון שבור (מצביע רצועה == NULL). מבטל ייצוא." - -#: ../src/itdb_itunesdb.c:2678 -msgid "Database in memory corrupt (playlist pointer == NULL). Aborting export." -msgstr "מסד הנתונים בזיכרון שבור (מצביע רשימת השמעה == NULL). מבטל ייצוא." - -#: ../src/itdb_itunesdb.c:2718 +#: ../src/itdb_itunesdb.c:4014 #, c-format msgid "Opening of '%s' for writing failed." msgstr "פתיחת '%s' לכתיבה נכשלה." -#: ../src/itdb_itunesdb.c:2729 +#: ../src/itdb_itunesdb.c:4025 #, c-format msgid "Writing to '%s' failed." msgstr "נכשלה כתיבה ל '%s'." -#: ../src/itdb_itunesdb.c:2740 +#: ../src/itdb_itunesdb.c:4036 #, c-format msgid "Writing to '%s' failed (%s)." msgstr "נכשלה כתיבה ל '%s' (%s)." -#: ../src/itdb_itunesdb.c:2881 ../src/itdb_itunesdb.c:3052 -#: ../src/itdb_itunesdb.c:3245 ../src/itdb_itunesdb.c:3451 -#, c-format -msgid "Path not found: '%s'." +#: ../src/itdb_itunesdb.c:4370 +#, fuzzy, c-format +msgid "Path not found: '%s' (or similar)." msgstr "נתיב לא נמצא: '%s'." -#: ../src/itdb_itunesdb.c:3265 +#: ../src/itdb_itunesdb.c:4573 #, c-format msgid "Error renaming '%s' to '%s' (%s)." msgstr "תקלה בשינוי שם '%s' ל '%s' (%s)." -#: ../src/itdb_itunesdb.c:3282 +#: ../src/itdb_itunesdb.c:4590 ../src/itdb_itunesdb.c:4607 #, c-format msgid "Error removing '%s' (%s)." msgstr "תקלה בהסרת '%s' (%s)" -#: ../src/itdb_itunesdb.c:3426 +#: ../src/itdb_itunesdb.c:4747 #, c-format msgid "No 'F..' directories found in '%s'." msgstr "" -#: ../src/itdb_itunesdb.c:3589 +#: ../src/itdb_itunesdb.c:4775 +#, c-format +msgid "Path not found: '%s'." +msgstr "נתיב לא נמצא: '%s'." + +#: ../src/itdb_itunesdb.c:4925 #, c-format msgid "Error opening '%s' for reading (%s)." msgstr "תקלה בפתיחת '%s' לקריאה (%s)." -#: ../src/itdb_itunesdb.c:3600 +#: ../src/itdb_itunesdb.c:4936 #, c-format msgid "Error opening '%s' for writing (%s)." msgstr "תקלה בפתיחת '%s' לכתיבה (%s)." -#: ../src/itdb_itunesdb.c:3617 +#: ../src/itdb_itunesdb.c:4953 #, c-format msgid "Error while reading from '%s' (%s)." msgstr "תקלה בזמן קריאה מ '%s' (%s)." -#: ../src/itdb_itunesdb.c:3633 +#: ../src/itdb_itunesdb.c:4969 #, c-format msgid "Error while writing to '%s' (%s)." msgstr "תקלה בזמן כתיבה ל '%s' (%s)." -#: ../src/itdb_itunesdb.c:3646 ../src/itdb_itunesdb.c:3656 +#: ../src/itdb_itunesdb.c:4982 ../src/itdb_itunesdb.c:4992 #, c-format msgid "Error when closing '%s' (%s)." msgstr "תקלה בזמן סגירה '%s' (%s)." @@ -237,3 +298,13 @@ msgstr "תקלה בזמן סגירה '%s' (%s)." #, c-format msgid "Unknown action (%d) in smart playlist will be ignored.\n" msgstr "התעלמות מפעולה לא ידועה (%d) ברשימת השמעה חכמה.\n" + +#~ msgid "Did not find SLst hunk as expected. Trying to continue.\n" +#~ msgstr "לא נמצאה חתיכת SLst כצפוי. מנסה להמשיך.\n" + +#~ msgid "Database in memory corrupt (track pointer == NULL). Aborting export." +#~ msgstr "מסד הנתונים בזיכרון שבור (מצביע רצועה == NULL). מבטל ייצוא." + +#~ msgid "" +#~ "Database in memory corrupt (playlist pointer == NULL). Aborting export." +#~ msgstr "מסד הנתונים בזיכרון שבור (מצביע רשימת השמעה == NULL). מבטל ייצוא." @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: it2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-14 21:51+0900\n" +"POT-Creation-Date: 2006-03-31 23:04+0900\n" "PO-Revision-Date: 2005-06-20 23:25+0900\n" "Last-Translator: \n" "Language-Team: <it@li.org>\n" @@ -21,36 +21,43 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.9.1\n" -#: ../src/itdb_itunesdb.c:313 +#: ../src/itdb_itunesdb.c:361 #, c-format msgid "Illegal seek to offset %ld (length %ld) in file '%s'." msgstr "ricerca illegale all'offest %ld (lunghezza %ld) nel file '%s'" -#: ../src/itdb_itunesdb.c:521 +#: ../src/itdb_itunesdb.c:815 #, c-format msgid "Not a Play Counts file: '%s' (missing mhdp header)." msgstr "Non è un file conta riproduzioni: '%s' (intestazione mhdp mancante)" -#: ../src/itdb_itunesdb.c:535 +#: ../src/itdb_itunesdb.c:830 #, c-format msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)." msgstr "" "File conta-riproduzioni ('%s'): lunghezza della intestazione più piccolo di " "quanto ci si aspettava (%d<96)" -#: ../src/itdb_itunesdb.c:548 +#: ../src/itdb_itunesdb.c:843 #, c-format msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)." msgstr "" "File conta-riproduzioni ('%s'): lunghezza della voce più piccoladi quanto ci " "si aspettava (%d<12)" -#: ../src/itdb_itunesdb.c:803 +#: ../src/itdb_itunesdb.c:921 +#, fuzzy, c-format +msgid "iTunesStats file ('%s'): entry length smaller than expected (%d<18)." +msgstr "" +"File conta-riproduzioni ('%s'): lunghezza della voce più piccoladi quanto ci " +"si aspettava (%d<12)" + +#: ../src/itdb_itunesdb.c:1197 #, c-format msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'." msgstr "iTunesDB corrotto: nessun MHOD all'offest %ld nel file '%s'." -#: ../src/itdb_itunesdb.c:923 +#: ../src/itdb_itunesdb.c:1354 #, c-format msgid "" "Length of smart playlist rule field (%d) not as expected. Trying to continue " @@ -59,12 +66,12 @@ msgstr "" "La lunghezza del campo della regola della playlist intelligente (%d) non è " "come la si aspettava. Si prova a continuare.\n" -#: ../src/itdb_itunesdb.c:966 -msgid "Did not find SLst hunk as expected. Trying to continue.\n" -msgstr "" -"Impossibile trovare hunk SLst come ci si aspettava. Si prova a continuare.\n" +#: ../src/itdb_itunesdb.c:1386 +#, fuzzy, c-format +msgid "iTunesDB corrupt: no SLst at offset %ld in file '%s'." +msgstr "iTunesDB corrotto: nessun MHOD all'offest %ld nel file '%s'." -#: ../src/itdb_itunesdb.c:972 +#: ../src/itdb_itunesdb.c:1399 #, c-format msgid "" "Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n" @@ -74,47 +81,96 @@ msgstr "" "Ignorato.\n" "\n" -#: ../src/itdb_itunesdb.c:1053 ../src/itdb_itunesdb.c:1744 -#: ../src/itdb_itunesdb.c:1779 +#: ../src/itdb_itunesdb.c:1461 #, c-format msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'." msgstr "iTunesDB corrotto: hunk di lunghezza 0 per l'hunk %ld nel file '%s'." -#: ../src/itdb_itunesdb.c:1148 -msgid "Master-PL" -msgstr "PL principale" +#: ../src/itdb_itunesdb.c:1474 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: no section '%s' found in section '%s' starting at %ld." +msgstr "iTunesDB corrotto: nessun MHOD all'offest %ld nel file '%s'." -#: ../src/itdb_itunesdb.c:1150 -msgid "Playlist" -msgstr "Playlist" +#: ../src/itdb_itunesdb.c:1488 +#, fuzzy, c-format +msgid "" +"header length of '%s' smaller than expected (%d < %d) at offset %ld in file " +"'%s'." +msgstr "" +"iTunesDB ('%s'): lunghezza della intestazione del hunk mhsd più piccolo " +"delle aspettative (%ld<32). Interrompo." -#: ../src/itdb_itunesdb.c:1175 +#: ../src/itdb_itunesdb.c:1573 #, c-format -msgid "iTunesDB corrupt: found mhyp at %ld in file '%s'." +msgid "Not a iTunesDB: '%s' (missing mhdb header)." +msgstr "Non è un file iTunesDB: '%s' (intestazione mhdb mancante)" + +#: ../src/itdb_itunesdb.c:1590 +#, fuzzy, c-format +msgid "" +"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%d<32). " +"Aborting." +msgstr "" +"iTunesDB ('%s'): lunghezza della intestazione del hunk mhsd più piccolo " +"delle aspettative (%ld<32). Interrompo." + +#: ../src/itdb_itunesdb.c:1611 +#, fuzzy, c-format +msgid "iTunesDB '%s' corrupt: mhsd expected at %ld." msgstr "iTunesDB corrotto: trovato mhyp a %ld nel file '%s'." -#: ../src/itdb_itunesdb.c:1223 +#: ../src/itdb_itunesdb.c:1728 +#, c-format +msgid "Number of MHODs in mhip at %ld inconsistent in file '%s'." +msgstr "" + +#: ../src/itdb_itunesdb.c:1746 #, c-format msgid "Itdb_Track ID '%d' not found.\n" msgstr "itDB_Track ID '%d' non trovato.\n" -#: ../src/itdb_itunesdb.c:1487 +#: ../src/itdb_itunesdb.c:1903 +#, fuzzy, c-format +msgid "Number of MHODs in mhyp at %ld inconsistent in file '%s'." +msgstr "iTunesDB corrotto: trovato mhyp a %ld nel file '%s'." + +#: ../src/itdb_itunesdb.c:1913 +msgid "Master-PL" +msgstr "PL principale" + +#: ../src/itdb_itunesdb.c:1917 +msgid "Podcasts" +msgstr "" + +#: ../src/itdb_itunesdb.c:1919 +msgid "Playlist" +msgstr "Playlist" + +#: ../src/itdb_itunesdb.c:1941 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: number of mhip sections inconsistent in mhyp starting at %" +"ld in file '%s'." +msgstr "iTunesDB corrotto: trovato mhyp a %ld nel file '%s'." + +#: ../src/itdb_itunesdb.c:2222 msgid "OTG Playlist" msgstr "Playlist OTG" -#: ../src/itdb_itunesdb.c:1501 +#: ../src/itdb_itunesdb.c:2240 #, c-format msgid "Not a OTG playlist file: '%s' (missing mhpo header)." msgstr "Non è una file playlist OTG: '%s' (manca l'intestazione mhpo)" -#: ../src/itdb_itunesdb.c:1515 +#: ../src/itdb_itunesdb.c:2254 #, c-format msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)." msgstr "" "File playlist OTG ('%s'): lunghezza della intestazione più piccola delle " "aspettative (%d<20)" -#: ../src/itdb_itunesdb.c:1527 +#: ../src/itdb_itunesdb.c:2266 #, c-format msgid "" "OTG playlist file file ('%s'): entry length smaller than expected (%d<4)." @@ -122,46 +178,28 @@ msgstr "" "File playlist OTG ('%s'): lunghezza della voce più piccola delle aspettative " "(%d<4)" -#: ../src/itdb_itunesdb.c:1562 +#: ../src/itdb_itunesdb.c:2301 #, c-format msgid "OTG playlist file '%s': reference to non-existent track (%d)." msgstr "Playlist OTG '%s': Punta ad una traccia non esistente (%d)." -#: ../src/itdb_itunesdb.c:1607 +#: ../src/itdb_itunesdb.c:2346 #, c-format msgid "OTG Playlist %d" msgstr "Playlist OTG %d" -#: ../src/itdb_itunesdb.c:1650 -#, c-format -msgid "Not a iTunesDB: '%s' (missing mhdb header)." -msgstr "Non è un file iTunesDB: '%s' (intestazione mhdb mancante)" - -#: ../src/itdb_itunesdb.c:1666 -#, c-format -msgid "" -"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%ld<32). " -"Aborting." -msgstr "" -"iTunesDB ('%s'): lunghezza della intestazione del hunk mhsd più piccolo " -"delle aspettative (%ld<32). Interrompo." - -#: ../src/itdb_itunesdb.c:1698 -#, c-format -msgid "iTunesDB '%s' corrupt: already found two playlist mhsds -- giving up." -msgstr "iTunesDB '%s' corrotto: trovate già due playlist mhsds -- ci rinuncio." - #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1759 +#: ../src/itdb_itunesdb.c:2414 +#, fuzzy msgid "" -"iTunesDB possibly corrupt: number of tracks (mhit hunks) inconsistent. " -"Trying to continue.\n" +"iTunesDB corrupt: number of tracks (mhit hunks) inconsistent. Trying to " +"continue.\n" msgstr "" "L'iTunes è probabilmente corrotto: il numero di tracce (mhit hunks) è " "inconsistente. Provo a continuare.\n" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1841 +#: ../src/itdb_itunesdb.c:2477 msgid "" "iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. " "Trying to continue.\n" @@ -169,85 +207,106 @@ msgstr "" "L'iTunes è probabilmente corrotto: il numero di playlist (mhyp hunks) è " "inconsistente. Provo a continuare.\n" -#: ../src/itdb_itunesdb.c:1879 +#: ../src/itdb_itunesdb.c:2524 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find tracklist (no mhsd type 1 section " +"found)" +msgstr "iTunesDB '%s' corrotto: trovate già due playlist mhsds -- ci rinuncio." + +#: ../src/itdb_itunesdb.c:2553 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find playlists (no mhsd type 2 or type 3 " +"sections found)" +msgstr "iTunesDB '%s' corrotto: trovate già due playlist mhsds -- ci rinuncio." + +#: ../src/itdb_itunesdb.c:2575 +#, c-format +msgid "iTunes directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2592 +#, c-format +msgid "Music directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2610 +#, c-format +msgid "Control directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2677 #, c-format msgid "File not found: '%s'." msgstr "file non trovato: '%s'." -#: ../src/itdb_itunesdb.c:2396 +#: ../src/itdb_itunesdb.c:3465 #, c-format msgid "Cannot write mhod of type %d\n" msgstr "Impossibile scrivere il mhod del tipo %d\n" -#: ../src/itdb_itunesdb.c:2522 ../src/itdb_itunesdb.c:2635 -msgid "Database in memory corrupt (track pointer == NULL). Aborting export." -msgstr "" -"Database in memoria corrotto (track pointer == NULl). Esportazione " -"interrotta." - -#: ../src/itdb_itunesdb.c:2678 -msgid "Database in memory corrupt (playlist pointer == NULL). Aborting export." -msgstr "" -"Database in memoria corrotto (playlist pointer == NULL). Esportazione " -"Interrotta." - -#: ../src/itdb_itunesdb.c:2718 +#: ../src/itdb_itunesdb.c:4014 #, c-format msgid "Opening of '%s' for writing failed." msgstr "Apertura di '%s' in scrittura fallita." -#: ../src/itdb_itunesdb.c:2729 +#: ../src/itdb_itunesdb.c:4025 #, c-format msgid "Writing to '%s' failed." msgstr "Scrittura verso '%s' fallita." -#: ../src/itdb_itunesdb.c:2740 +#: ../src/itdb_itunesdb.c:4036 #, c-format msgid "Writing to '%s' failed (%s)." msgstr "Scrittura verso '%s' falita (%s)." -#: ../src/itdb_itunesdb.c:2881 ../src/itdb_itunesdb.c:3052 -#: ../src/itdb_itunesdb.c:3245 ../src/itdb_itunesdb.c:3451 -#, c-format -msgid "Path not found: '%s'." +#: ../src/itdb_itunesdb.c:4370 +#, fuzzy, c-format +msgid "Path not found: '%s' (or similar)." msgstr "Percorso non trovato: '%s'." -#: ../src/itdb_itunesdb.c:3265 +#: ../src/itdb_itunesdb.c:4573 #, c-format msgid "Error renaming '%s' to '%s' (%s)." msgstr "Errore nella rinominazione da '%s' a '%s' (%s)." -#: ../src/itdb_itunesdb.c:3282 +#: ../src/itdb_itunesdb.c:4590 ../src/itdb_itunesdb.c:4607 #, c-format msgid "Error removing '%s' (%s)." msgstr "Errore nella rimozione di '%s' (%s)." -#: ../src/itdb_itunesdb.c:3426 +#: ../src/itdb_itunesdb.c:4747 #, c-format msgid "No 'F..' directories found in '%s'." msgstr "Nessuna directory 'F..' trovata in '%s'" -#: ../src/itdb_itunesdb.c:3589 +#: ../src/itdb_itunesdb.c:4775 +#, c-format +msgid "Path not found: '%s'." +msgstr "Percorso non trovato: '%s'." + +#: ../src/itdb_itunesdb.c:4925 #, c-format msgid "Error opening '%s' for reading (%s)." msgstr "Errore nell'apertura in lettura di '%s' (%s)." -#: ../src/itdb_itunesdb.c:3600 +#: ../src/itdb_itunesdb.c:4936 #, c-format msgid "Error opening '%s' for writing (%s)." msgstr "Errore nell'apertura in scrittura di '%s' (%s)." -#: ../src/itdb_itunesdb.c:3617 +#: ../src/itdb_itunesdb.c:4953 #, c-format msgid "Error while reading from '%s' (%s)." msgstr "Errore nella lettura da '%s' (%s)." -#: ../src/itdb_itunesdb.c:3633 +#: ../src/itdb_itunesdb.c:4969 #, c-format msgid "Error while writing to '%s' (%s)." msgstr "Errore nella scrittura verso '%s' (%s)." -#: ../src/itdb_itunesdb.c:3646 ../src/itdb_itunesdb.c:3656 +#: ../src/itdb_itunesdb.c:4982 ../src/itdb_itunesdb.c:4992 #, c-format msgid "Error when closing '%s' (%s)." msgstr "Errore nella chiusura di '%s' (%s)." @@ -257,3 +316,19 @@ msgstr "Errore nella chiusura di '%s' (%s)." #, c-format msgid "Unknown action (%d) in smart playlist will be ignored.\n" msgstr "Azione sconosciuta (%d) nella playlist intelligente verrà ignorata.\n" + +#~ msgid "Did not find SLst hunk as expected. Trying to continue.\n" +#~ msgstr "" +#~ "Impossibile trovare hunk SLst come ci si aspettava. Si prova a " +#~ "continuare.\n" + +#~ msgid "Database in memory corrupt (track pointer == NULL). Aborting export." +#~ msgstr "" +#~ "Database in memoria corrotto (track pointer == NULl). Esportazione " +#~ "interrotta." + +#~ msgid "" +#~ "Database in memory corrupt (playlist pointer == NULL). Aborting export." +#~ msgstr "" +#~ "Database in memoria corrotto (playlist pointer == NULL). Esportazione " +#~ "Interrotta." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gtkpod 0.40\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-11 08:51+0900\n" +"POT-Creation-Date: 2006-03-31 23:04+0900\n" "PO-Revision-Date: 2006-02-14 16:48+0900\n" "Last-Translator: Kentaro Fukuchi <fukuchi@users.sourceforge.net>\n" "Language-Team: n/a\n" @@ -16,39 +16,39 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/itdb_itunesdb.c:358 +#: ../src/itdb_itunesdb.c:361 #, c-format msgid "Illegal seek to offset %ld (length %ld) in file '%s'." msgstr "ʥ: '%3$s', եå %1$ld, Ĺ (%2$ld)" -#: ../src/itdb_itunesdb.c:604 +#: ../src/itdb_itunesdb.c:815 #, c-format msgid "Not a Play Counts file: '%s' (missing mhdp header)." msgstr "եǤϤޤ: '%s' (mhdp إå̵)" -#: ../src/itdb_itunesdb.c:618 +#: ../src/itdb_itunesdb.c:830 #, c-format msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)." msgstr "ե ('%s'): إåĹޤ(%d<96)" -#: ../src/itdb_itunesdb.c:631 +#: ../src/itdb_itunesdb.c:843 #, c-format msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)." msgstr "ե ('%s'): ȥĹޤ(%d<12)" -#: ../src/itdb_itunesdb.c:709 +#: ../src/itdb_itunesdb.c:921 #, c-format msgid "iTunesStats file ('%s'): entry length smaller than expected (%d<18)." msgstr "iTunesStats ե ('%s'): ȥĹޤ(%d<18)" -#: ../src/itdb_itunesdb.c:986 +#: ../src/itdb_itunesdb.c:1197 #, c-format msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'." msgstr "" "iTunesDB Ƥޤ: MHOD դޤ(ե '%2$s', եå " "%1$ld)" -#: ../src/itdb_itunesdb.c:1128 +#: ../src/itdb_itunesdb.c:1354 #, c-format msgid "" "Length of smart playlist rule field (%d) not as expected. Trying to continue " @@ -57,14 +57,14 @@ msgstr "" "ޡȥץ쥤ꥹȤΥ롼Ĺ (%d) ԤĹȰۤʤޤ" "³ޤ\n" -#: ../src/itdb_itunesdb.c:1160 +#: ../src/itdb_itunesdb.c:1386 #, c-format msgid "iTunesDB corrupt: no SLst at offset %ld in file '%s'." msgstr "" "iTunesDB Ƥޤ: SLst դޤ(ե '%2$s', եå " "%1$ld)" -#: ../src/itdb_itunesdb.c:1173 +#: ../src/itdb_itunesdb.c:1399 #, c-format msgid "" "Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n" @@ -74,14 +74,14 @@ msgstr "" "\n" "\n" -#: ../src/itdb_itunesdb.c:1235 +#: ../src/itdb_itunesdb.c:1461 #, c-format msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'." msgstr "" "iTunesDB Ƥޤ: hunk Ĺ 0 Ǥ(ե '%2$s', եå %" "1$ld)" -#: ../src/itdb_itunesdb.c:1248 +#: ../src/itdb_itunesdb.c:1474 #, c-format msgid "" "iTunesDB corrupt: no section '%s' found in section '%s' starting at %ld." @@ -89,60 +89,62 @@ msgstr "" "iTunesDB Ƥޤ: %3$ld ΰ֤ˤ륻 '%2$s' ˥" " '%1$s' Ϥޤ" -#: ../src/itdb_itunesdb.c:1262 +#: ../src/itdb_itunesdb.c:1488 #, c-format msgid "" "header length of '%s' smaller than expected (%d < %d) at offset %ld in file " "'%s'." -msgstr "'%1$s' ΥإåĹޤ (%2$d < %3$d) (ե '%5$s', եå %4$ld)" +msgstr "" +"'%1$s' ΥإåĹޤ (%2$d < %3$d) (ե '%5$s', եå " +"%4$ld)" -#: ../src/itdb_itunesdb.c:1343 +#: ../src/itdb_itunesdb.c:1573 #, c-format msgid "Not a iTunesDB: '%s' (missing mhdb header)." msgstr "iTunesDB ǤϤޤ: '%s' (mhdb إå̵)" -#: ../src/itdb_itunesdb.c:1359 +#: ../src/itdb_itunesdb.c:1590 #, c-format msgid "" "iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%d<32). " "Aborting." msgstr "iTunesDB ('%s'): mhsd ΥإåĹޤ(%d<32)ߤޤ" -#: ../src/itdb_itunesdb.c:1380 +#: ../src/itdb_itunesdb.c:1611 #, c-format msgid "iTunesDB '%s' corrupt: mhsd expected at %ld." msgstr "iTunesDB '%s' Ƥޤ: mhsd %ld ΰ֤˸դޤ" -#: ../src/itdb_itunesdb.c:1497 +#: ../src/itdb_itunesdb.c:1728 #, c-format msgid "Number of MHODs in mhip at %ld inconsistent in file '%s'." msgstr "" "mhip MHOD οäƤޤ(ե '%2$s', եå %1$ld)" -#: ../src/itdb_itunesdb.c:1515 +#: ../src/itdb_itunesdb.c:1746 #, c-format msgid "Itdb_Track ID '%d' not found.\n" msgstr "Itdb_Track ID '%d' դޤ\n" -#: ../src/itdb_itunesdb.c:1669 +#: ../src/itdb_itunesdb.c:1903 #, c-format msgid "Number of MHODs in mhyp at %ld inconsistent in file '%s'." msgstr "" "mhyp MHOD οäƤޤ(ե '%2$s', եå %1$ld)" -#: ../src/itdb_itunesdb.c:1679 +#: ../src/itdb_itunesdb.c:1913 msgid "Master-PL" msgstr "" -#: ../src/itdb_itunesdb.c:1683 +#: ../src/itdb_itunesdb.c:1917 msgid "Podcasts" msgstr "" -#: ../src/itdb_itunesdb.c:1685 +#: ../src/itdb_itunesdb.c:1919 msgid "Playlist" msgstr "ץ쥤ꥹ" -#: ../src/itdb_itunesdb.c:1707 +#: ../src/itdb_itunesdb.c:1941 #, c-format msgid "" "iTunesDB corrupt: number of mhip sections inconsistent in mhyp starting at %" @@ -151,39 +153,39 @@ msgstr "" "iTunesDB Ƥޤ: mhyp mhip οäƤޤ" "(ե '%2$s', եå %1$ld)" -#: ../src/itdb_itunesdb.c:1981 +#: ../src/itdb_itunesdb.c:2222 msgid "OTG Playlist" msgstr "OTG ץ쥤ꥹ" -#: ../src/itdb_itunesdb.c:1995 +#: ../src/itdb_itunesdb.c:2240 #, c-format msgid "Not a OTG playlist file: '%s' (missing mhpo header)." msgstr "OTG ץ쥤ꥹȤΥեǤϤޤ: '%s' (mhpo إå̵)" -#: ../src/itdb_itunesdb.c:2009 +#: ../src/itdb_itunesdb.c:2254 #, c-format msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)." msgstr "OTG ץ쥤ꥹȥե ('%s'): إåĹޤ(%d<20)" -#: ../src/itdb_itunesdb.c:2021 +#: ../src/itdb_itunesdb.c:2266 #, c-format msgid "" "OTG playlist file file ('%s'): entry length smaller than expected (%d<4)." msgstr "OTG ץ쥤ꥹȥե ('%s'): ȥĹޤ(%d<4)" -#: ../src/itdb_itunesdb.c:2056 +#: ../src/itdb_itunesdb.c:2301 #, c-format msgid "OTG playlist file '%s': reference to non-existent track (%d)." msgstr "" "OTG ץ쥤ꥹȥե ('%s'): ¸ߤʤֹ (%d) ؤλȤޤ" -#: ../src/itdb_itunesdb.c:2101 +#: ../src/itdb_itunesdb.c:2346 #, c-format msgid "OTG Playlist %d" msgstr "OTG ץ쥤ꥹ %d" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:2169 +#: ../src/itdb_itunesdb.c:2414 msgid "" "iTunesDB corrupt: number of tracks (mhit hunks) inconsistent. Trying to " "continue.\n" @@ -192,7 +194,7 @@ msgstr "" "\n" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:2232 +#: ../src/itdb_itunesdb.c:2477 msgid "" "iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. " "Trying to continue.\n" @@ -200,7 +202,7 @@ msgstr "" "iTunesDB ¿ʬƤޤ: ץ쥤ꥹȤο (mhyp ο) äƤ" "³ޤ\n" -#: ../src/itdb_itunesdb.c:2279 +#: ../src/itdb_itunesdb.c:2524 #, c-format msgid "" "iTunesDB '%s' corrupt: Could not find tracklist (no mhsd type 1 section " @@ -209,7 +211,7 @@ msgstr "" "iTunesDB '%s' Ƥޤ: ʥꥹȤդޤ(mhsd 1 " "դʤ)" -#: ../src/itdb_itunesdb.c:2297 +#: ../src/itdb_itunesdb.c:2553 #, c-format msgid "" "iTunesDB '%s' corrupt: Could not find playlists (no mhsd type 2 or type 3 " @@ -218,73 +220,92 @@ msgstr "" "iTunesDB '%s' Ƥޤ: ץ쥤ꥹȤդޤ(mhsd 2 " " 3 Υդʤ)" -#: ../src/itdb_itunesdb.c:2356 +#: ../src/itdb_itunesdb.c:2575 +#, c-format +msgid "iTunes directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2592 +#, c-format +msgid "Music directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2610 +#, c-format +msgid "Control directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2677 #, c-format msgid "File not found: '%s'." msgstr "ե뤬Ĥޤ: '%s'" -#: ../src/itdb_itunesdb.c:2939 +#: ../src/itdb_itunesdb.c:3465 #, c-format msgid "Cannot write mhod of type %d\n" msgstr "mhod %d ޤ\n" -#: ../src/itdb_itunesdb.c:3485 +#: ../src/itdb_itunesdb.c:4014 #, c-format msgid "Opening of '%s' for writing failed." msgstr "'%s' Ѥ˳ȤǤޤ" -#: ../src/itdb_itunesdb.c:3496 +#: ../src/itdb_itunesdb.c:4025 #, c-format msgid "Writing to '%s' failed." msgstr "'%s'νߤ˼Ԥޤ" -#: ../src/itdb_itunesdb.c:3507 +#: ../src/itdb_itunesdb.c:4036 #, c-format msgid "Writing to '%s' failed (%s)." msgstr "'%s'νߤ˼Ԥޤ(%s)" -#: ../src/itdb_itunesdb.c:3679 ../src/itdb_itunesdb.c:3841 -#: ../src/itdb_itunesdb.c:4029 ../src/itdb_itunesdb.c:4265 -#, c-format -msgid "Path not found: '%s'." +#: ../src/itdb_itunesdb.c:4370 +#, fuzzy, c-format +msgid "Path not found: '%s' (or similar)." msgstr "ѥĤޤ: '%s'" -#: ../src/itdb_itunesdb.c:4050 +#: ../src/itdb_itunesdb.c:4573 #, c-format msgid "Error renaming '%s' to '%s' (%s)." msgstr "'%s' '%s' ѹ뤳ȤǤޤ(%s)" -#: ../src/itdb_itunesdb.c:4067 ../src/itdb_itunesdb.c:4084 +#: ../src/itdb_itunesdb.c:4590 ../src/itdb_itunesdb.c:4607 #, c-format msgid "Error removing '%s' (%s)." msgstr "'%s' κ˥顼ȯޤ(%s)" -#: ../src/itdb_itunesdb.c:4240 +#: ../src/itdb_itunesdb.c:4747 #, c-format msgid "No 'F..' directories found in '%s'." msgstr "'F..' ǥ쥯ȥ꤬ '%s' ˤޤ" -#: ../src/itdb_itunesdb.c:4403 +#: ../src/itdb_itunesdb.c:4775 +#, c-format +msgid "Path not found: '%s'." +msgstr "ѥĤޤ: '%s'" + +#: ../src/itdb_itunesdb.c:4925 #, c-format msgid "Error opening '%s' for reading (%s)." msgstr "'%s' ɤ߹Ѥ˳ȤǤޤ(%s)" -#: ../src/itdb_itunesdb.c:4414 +#: ../src/itdb_itunesdb.c:4936 #, c-format msgid "Error opening '%s' for writing (%s)." msgstr "'%s' Ѥ˳ȤǤޤ(%s)" -#: ../src/itdb_itunesdb.c:4431 +#: ../src/itdb_itunesdb.c:4953 #, c-format msgid "Error while reading from '%s' (%s)." msgstr "'%s' ɤ߹˥顼ȯޤ(%s)" -#: ../src/itdb_itunesdb.c:4447 +#: ../src/itdb_itunesdb.c:4969 #, c-format msgid "Error while writing to '%s' (%s)." msgstr "'%s' ν˥顼ȯޤ(%s)" -#: ../src/itdb_itunesdb.c:4460 ../src/itdb_itunesdb.c:4470 +#: ../src/itdb_itunesdb.c:4982 ../src/itdb_itunesdb.c:4992 #, c-format msgid "Error when closing '%s' (%s)." msgstr "'%s' Ĥݤ˥顼ȯޤ(%s)" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-09-14 21:51+0900\n" +"POT-Creation-Date: 2006-03-31 23:04+0900\n" "PO-Revision-Date: 2005-06-22 17:56+0200\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n" "Language-Team: Svenska <sv@li.org>\n" @@ -16,32 +16,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11\n" -#: ../src/itdb_itunesdb.c:313 +#: ../src/itdb_itunesdb.c:361 #, c-format msgid "Illegal seek to offset %ld (length %ld) in file '%s'." msgstr "Ogiltig sökning till position %ld (längd %ld) i filen '%s'." -#: ../src/itdb_itunesdb.c:521 +#: ../src/itdb_itunesdb.c:815 #, c-format msgid "Not a Play Counts file: '%s' (missing mhdp header)." msgstr "Inte en uppspelningsdatafil: '%s' (saknar mhdp-huvud)." -#: ../src/itdb_itunesdb.c:535 +#: ../src/itdb_itunesdb.c:830 #, c-format msgid "Play Counts file ('%s'): header length smaller than expected (%d<96)." msgstr "Uppspelningsdatafil ('%s'): Huvudlängd mindre än väntat (%d < 96)" -#: ../src/itdb_itunesdb.c:548 +#: ../src/itdb_itunesdb.c:843 #, c-format msgid "Play Counts file ('%s'): entry length smaller than expected (%d<12)." msgstr "Uppspelningsdatafil ('%s'): Postlängd mindre än väntat (%d < 12)" -#: ../src/itdb_itunesdb.c:803 +#: ../src/itdb_itunesdb.c:921 +#, fuzzy, c-format +msgid "iTunesStats file ('%s'): entry length smaller than expected (%d<18)." +msgstr "Uppspelningsdatafil ('%s'): Postlängd mindre än väntat (%d < 12)" + +#: ../src/itdb_itunesdb.c:1197 #, c-format msgid "iTunesDB corrupt: no MHOD at offset %ld in file '%s'." msgstr "iTunes databas skadad: Ingen MHOD på position %ld i filen '%s'." -#: ../src/itdb_itunesdb.c:923 +#: ../src/itdb_itunesdb.c:1354 #, c-format msgid "" "Length of smart playlist rule field (%d) not as expected. Trying to continue " @@ -50,11 +55,12 @@ msgstr "" "Regelfältets längd (%d) i den smarta spellistan är inte den förväntade. " "Försöker fortsätta ändå.\n" -#: ../src/itdb_itunesdb.c:966 -msgid "Did not find SLst hunk as expected. Trying to continue.\n" -msgstr "Hittade inte SLst data som förväntat. Försöker fortsätta ändå.\n" +#: ../src/itdb_itunesdb.c:1386 +#, fuzzy, c-format +msgid "iTunesDB corrupt: no SLst at offset %ld in file '%s'." +msgstr "iTunes databas skadad: Ingen MHOD på position %ld i filen '%s'." -#: ../src/itdb_itunesdb.c:972 +#: ../src/itdb_itunesdb.c:1399 #, c-format msgid "" "Encountered unknown MHOD type (%d) while parsing the iTunesDB. Ignoring.\n" @@ -64,92 +70,122 @@ msgstr "" "den.\n" "\n" -#: ../src/itdb_itunesdb.c:1053 ../src/itdb_itunesdb.c:1744 -#: ../src/itdb_itunesdb.c:1779 +#: ../src/itdb_itunesdb.c:1461 #, c-format msgid "iTunesDB corrupt: hunk length 0 for hunk at %ld in file '%s'." msgstr "" "iTunes databas skadad: Datalängd 0 för data på position %ld i filen '%s'." -#: ../src/itdb_itunesdb.c:1148 -msgid "Master-PL" -msgstr "Huvudspellista" +#: ../src/itdb_itunesdb.c:1474 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: no section '%s' found in section '%s' starting at %ld." +msgstr "iTunes databas skadad: Ingen MHOD på position %ld i filen '%s'." -#: ../src/itdb_itunesdb.c:1150 -msgid "Playlist" -msgstr "Spellista" +#: ../src/itdb_itunesdb.c:1488 +#, fuzzy, c-format +msgid "" +"header length of '%s' smaller than expected (%d < %d) at offset %ld in file " +"'%s'." +msgstr "" +"iTunes databas (%s): Huvudlängd för mhsd-data mindre än väntat (%ld < 32). " +"Avbryter." -#: ../src/itdb_itunesdb.c:1175 +#: ../src/itdb_itunesdb.c:1573 #, c-format -msgid "iTunesDB corrupt: found mhyp at %ld in file '%s'." +msgid "Not a iTunesDB: '%s' (missing mhdb header)." +msgstr "Inte en iTunes databas: '%s' (saknar mhdb-huvud)." + +#: ../src/itdb_itunesdb.c:1590 +#, fuzzy, c-format +msgid "" +"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%d<32). " +"Aborting." +msgstr "" +"iTunes databas (%s): Huvudlängd för mhsd-data mindre än väntat (%ld < 32). " +"Avbryter." + +#: ../src/itdb_itunesdb.c:1611 +#, fuzzy, c-format +msgid "iTunesDB '%s' corrupt: mhsd expected at %ld." msgstr "iTunes databas skadad: Hittade mhyp på position %ld i filen '%s'." -#: ../src/itdb_itunesdb.c:1223 +#: ../src/itdb_itunesdb.c:1728 +#, c-format +msgid "Number of MHODs in mhip at %ld inconsistent in file '%s'." +msgstr "" + +#: ../src/itdb_itunesdb.c:1746 #, c-format msgid "Itdb_Track ID '%d' not found.\n" msgstr "ITunes databas spår-id '%d' hittades inte.\n" -#: ../src/itdb_itunesdb.c:1487 +#: ../src/itdb_itunesdb.c:1903 +#, fuzzy, c-format +msgid "Number of MHODs in mhyp at %ld inconsistent in file '%s'." +msgstr "iTunes databas skadad: Hittade mhyp på position %ld i filen '%s'." + +#: ../src/itdb_itunesdb.c:1913 +msgid "Master-PL" +msgstr "Huvudspellista" + +#: ../src/itdb_itunesdb.c:1917 +msgid "Podcasts" +msgstr "" + +#: ../src/itdb_itunesdb.c:1919 +msgid "Playlist" +msgstr "Spellista" + +#: ../src/itdb_itunesdb.c:1941 +#, fuzzy, c-format +msgid "" +"iTunesDB corrupt: number of mhip sections inconsistent in mhyp starting at %" +"ld in file '%s'." +msgstr "iTunes databas skadad: Hittade mhyp på position %ld i filen '%s'." + +#: ../src/itdb_itunesdb.c:2222 msgid "OTG Playlist" msgstr "OTG-spellista" -#: ../src/itdb_itunesdb.c:1501 +#: ../src/itdb_itunesdb.c:2240 #, c-format msgid "Not a OTG playlist file: '%s' (missing mhpo header)." msgstr "Inte en OTG-spellistefil: '%s' (saknar mhpo-huvud)." -#: ../src/itdb_itunesdb.c:1515 +#: ../src/itdb_itunesdb.c:2254 #, c-format msgid "OTG playlist file ('%s'): header length smaller than expected (%d<20)." msgstr "OTG-spellistefil ('%s'): Huvudlängd mindre än väntat (%d < 20)" -#: ../src/itdb_itunesdb.c:1527 +#: ../src/itdb_itunesdb.c:2266 #, c-format msgid "" "OTG playlist file file ('%s'): entry length smaller than expected (%d<4)." msgstr "OTG-spellistefil ('%s'): Postlängd mindre än väntat (%d < 4)" -#: ../src/itdb_itunesdb.c:1562 +#: ../src/itdb_itunesdb.c:2301 #, c-format msgid "OTG playlist file '%s': reference to non-existent track (%d)." msgstr "OTG-spellistefil '%s': Referens till spår som inte finns (%d)." -#: ../src/itdb_itunesdb.c:1607 +#: ../src/itdb_itunesdb.c:2346 #, c-format msgid "OTG Playlist %d" msgstr "OTG-spellista %d" -#: ../src/itdb_itunesdb.c:1650 -#, c-format -msgid "Not a iTunesDB: '%s' (missing mhdb header)." -msgstr "Inte en iTunes databas: '%s' (saknar mhdb-huvud)." - -#: ../src/itdb_itunesdb.c:1666 -#, c-format -msgid "" -"iTunesDB ('%s'): header length of mhsd hunk smaller than expected (%ld<32). " -"Aborting." -msgstr "" -"iTunes databas (%s): Huvudlängd för mhsd-data mindre än väntat (%ld < 32). " -"Avbryter." - -#: ../src/itdb_itunesdb.c:1698 -#, c-format -msgid "iTunesDB '%s' corrupt: already found two playlist mhsds -- giving up." -msgstr "" -"iTunes databas '%s' skadad: Två mhsd för spellistor redan hittade. Ger upp." - #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1759 +#: ../src/itdb_itunesdb.c:2414 +#, fuzzy msgid "" -"iTunesDB possibly corrupt: number of tracks (mhit hunks) inconsistent. " -"Trying to continue.\n" +"iTunesDB corrupt: number of tracks (mhit hunks) inconsistent. Trying to " +"continue.\n" msgstr "" "iTunes databas möjligen skadad: Antal spår (mhit-data) inte konsekvent. " "Försöker fortsätta.\n" #. this should not be -- issue warning -#: ../src/itdb_itunesdb.c:1841 +#: ../src/itdb_itunesdb.c:2477 msgid "" "iTunesDB possibly corrupt: number of playlists (mhyp hunks) inconsistent. " "Trying to continue.\n" @@ -157,81 +193,108 @@ msgstr "" "iTunes databas möjligen skadad: Antal spellistor (mhyp-data) inte " "konsekvent. Försöker fortsätta.\n" -#: ../src/itdb_itunesdb.c:1879 +#: ../src/itdb_itunesdb.c:2524 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find tracklist (no mhsd type 1 section " +"found)" +msgstr "" +"iTunes databas '%s' skadad: Två mhsd för spellistor redan hittade. Ger upp." + +#: ../src/itdb_itunesdb.c:2553 +#, fuzzy, c-format +msgid "" +"iTunesDB '%s' corrupt: Could not find playlists (no mhsd type 2 or type 3 " +"sections found)" +msgstr "" +"iTunes databas '%s' skadad: Två mhsd för spellistor redan hittade. Ger upp." + +#: ../src/itdb_itunesdb.c:2575 +#, c-format +msgid "iTunes directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2592 +#, c-format +msgid "Music directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2610 +#, c-format +msgid "Control directory not found: '%s' (or similar)." +msgstr "" + +#: ../src/itdb_itunesdb.c:2677 #, c-format msgid "File not found: '%s'." msgstr "Filen hittades inte: '%s'." -#: ../src/itdb_itunesdb.c:2396 +#: ../src/itdb_itunesdb.c:3465 #, c-format msgid "Cannot write mhod of type %d\n" msgstr "Kan inte skriva mhod av typen %d\n" -#: ../src/itdb_itunesdb.c:2522 ../src/itdb_itunesdb.c:2635 -msgid "Database in memory corrupt (track pointer == NULL). Aborting export." -msgstr "Databas i minnet skadad (spårpekare == NULL). Avbryter export." - -#: ../src/itdb_itunesdb.c:2678 -msgid "Database in memory corrupt (playlist pointer == NULL). Aborting export." -msgstr "Databas i minnet skadad (spårlistepekare == NULL). Avbryter export." - -#: ../src/itdb_itunesdb.c:2718 +#: ../src/itdb_itunesdb.c:4014 #, c-format msgid "Opening of '%s' for writing failed." msgstr "Fel när '%s' skulle öppnas för skrivning." -#: ../src/itdb_itunesdb.c:2729 +#: ../src/itdb_itunesdb.c:4025 #, c-format msgid "Writing to '%s' failed." msgstr "Fel vid skrivning till '%s'." -#: ../src/itdb_itunesdb.c:2740 +#: ../src/itdb_itunesdb.c:4036 #, c-format msgid "Writing to '%s' failed (%s)." msgstr "Fel vid skrivning till '%s' (%s)." -#: ../src/itdb_itunesdb.c:2881 ../src/itdb_itunesdb.c:3052 -#: ../src/itdb_itunesdb.c:3245 ../src/itdb_itunesdb.c:3451 -#, c-format -msgid "Path not found: '%s'." +#: ../src/itdb_itunesdb.c:4370 +#, fuzzy, c-format +msgid "Path not found: '%s' (or similar)." msgstr "Sökväg hittades inte: '%s'." -#: ../src/itdb_itunesdb.c:3265 +#: ../src/itdb_itunesdb.c:4573 #, c-format msgid "Error renaming '%s' to '%s' (%s)." msgstr "Fel vid byte av namn på '%s' till '%s' (%s)." -#: ../src/itdb_itunesdb.c:3282 +#: ../src/itdb_itunesdb.c:4590 ../src/itdb_itunesdb.c:4607 #, c-format msgid "Error removing '%s' (%s)." msgstr "Fel vid borttagning av '%s' (%s)." -#: ../src/itdb_itunesdb.c:3426 +#: ../src/itdb_itunesdb.c:4747 #, c-format msgid "No 'F..' directories found in '%s'." msgstr "" -#: ../src/itdb_itunesdb.c:3589 +#: ../src/itdb_itunesdb.c:4775 +#, c-format +msgid "Path not found: '%s'." +msgstr "Sökväg hittades inte: '%s'." + +#: ../src/itdb_itunesdb.c:4925 #, c-format msgid "Error opening '%s' for reading (%s)." msgstr "Fel när '%s' skulle öppnas för läsning (%s)." -#: ../src/itdb_itunesdb.c:3600 +#: ../src/itdb_itunesdb.c:4936 #, c-format msgid "Error opening '%s' for writing (%s)." msgstr "Fel när '%s' skulle öppnas för skrivning (%s)." -#: ../src/itdb_itunesdb.c:3617 +#: ../src/itdb_itunesdb.c:4953 #, c-format msgid "Error while reading from '%s' (%s)." msgstr "Fel vid läsning från '%s' (%s)." -#: ../src/itdb_itunesdb.c:3633 +#: ../src/itdb_itunesdb.c:4969 #, c-format msgid "Error while writing to '%s' (%s)." msgstr "Fel vid skrivning till '%s' (%s)." -#: ../src/itdb_itunesdb.c:3646 ../src/itdb_itunesdb.c:3656 +#: ../src/itdb_itunesdb.c:4982 ../src/itdb_itunesdb.c:4992 #, c-format msgid "Error when closing '%s' (%s)." msgstr "Fel när '%s' skulle stängas (%s)." @@ -241,3 +304,13 @@ msgstr "Fel när '%s' skulle stängas (%s)." #, c-format msgid "Unknown action (%d) in smart playlist will be ignored.\n" msgstr "Okänd åtgärd (%d) i smart spellista kommer att ignoreras.\n" + +#~ msgid "Did not find SLst hunk as expected. Trying to continue.\n" +#~ msgstr "Hittade inte SLst data som förväntat. Försöker fortsätta ändå.\n" + +#~ msgid "Database in memory corrupt (track pointer == NULL). Aborting export." +#~ msgstr "Databas i minnet skadad (spårpekare == NULL). Avbryter export." + +#~ msgid "" +#~ "Database in memory corrupt (playlist pointer == NULL). Aborting export." +#~ msgstr "Databas i minnet skadad (spårlistepekare == NULL). Avbryter export." @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-03-24 00:38:39 jcs> +/* Time-stamp: <2006-04-04 23:41:58 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -631,8 +631,9 @@ struct _Itdb_Track (always 0x01010100?), zero otherwise */ guint32 unk152; /* unknown */ guint32 unk156, unk160; - guint8 flag1; /* basically unknown. set to 0x02 for - * podcasts, 0x00 otherwise. */ + guint8 has_artwork; /* 0x01: artwork is present. 0x02: no artwork is + present for this track (used by the iPod to + decide whether to display Artwork or not) */ guint8 flag2; /* "Skip when shuffling" when set to 0x01, set to 0x00 otherwise. .m4b and .aa files always seem to be skipped when shuffling, however */ @@ -652,7 +653,9 @@ struct _Itdb_Track ("ULST"), 0x00 otherwise */ guint8 movie_flag; /* set to 0x01 if it's a movie file, 0x00 otherwise */ - guint8 unk178; /* unknown (sometimes 0x01) */ + guint8 mark_unplayed; /* A value of 0x02 marks a podcast as unplayed + on the iPod (bullet) once played it is set to + 0x01. Non-podcasts have this set to 0x01. */ guint8 unk179; /* unknown (always 0x00 so far) */ guint32 unk180, unk184; guint32 samplecount;/* Number of samples in the song. First observed diff --git a/src/itdb_device.c b/src/itdb_device.c index 91066ee..f8812e9 100644 --- a/src/itdb_device.c +++ b/src/itdb_device.c @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-03-21 17:22:25 jcs> +/* Time-stamp: <2006-04-05 22:53:35 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -45,18 +45,26 @@ static const Itdb_IpodModel ipod_model_table [] = { {"Unknown", 0, MODEL_TYPE_UNKNOWN, UNKNOWN_GENERATION}, /* First Generation */ + /* Mechanical buttons arranged around rotating "scroll wheel". + 8513, 8541 and 8709 are Mac types, 8697 is PC */ {"8513", 5 * GB, MODEL_TYPE_REGULAR, FIRST_GENERATION}, {"8541", 5 * GB, MODEL_TYPE_REGULAR, FIRST_GENERATION}, {"8697", 5 * GB, MODEL_TYPE_REGULAR, FIRST_GENERATION}, {"8709", 10 * GB, MODEL_TYPE_REGULAR, FIRST_GENERATION}, /* Second Generation */ + /* Same buttons as First Generation but around touch-sensitive + * "touch wheel". 8737 and 8738 are Mac types, 8740 and 8741 + are PC */ {"8737", 10 * GB, MODEL_TYPE_REGULAR, SECOND_GENERATION}, {"8740", 10 * GB, MODEL_TYPE_REGULAR, SECOND_GENERATION}, {"8738", 20 * GB, MODEL_TYPE_REGULAR, SECOND_GENERATION}, {"8741", 20 * GB, MODEL_TYPE_REGULAR, SECOND_GENERATION}, /* Third Generation */ + /* Touch sensitive buttons and arranged in a line above "touch + wheel". Docking connector was introduced here, same models + for Mac and PC from now on. */ {"8976", 10 * GB, MODEL_TYPE_REGULAR, THIRD_GENERATION}, {"8946", 15 * GB, MODEL_TYPE_REGULAR, THIRD_GENERATION}, {"9460", 15 * GB, MODEL_TYPE_REGULAR, THIRD_GENERATION}, @@ -64,8 +72,8 @@ static const Itdb_IpodModel ipod_model_table [] = { {"8948", 30 * GB, MODEL_TYPE_REGULAR, THIRD_GENERATION}, {"9245", 40 * GB, MODEL_TYPE_REGULAR, THIRD_GENERATION}, - /* Fourth Generation */ + /* Buttons are now integrated into the "touch wheel". */ {"9282", 20 * GB, MODEL_TYPE_REGULAR, FOURTH_GENERATION}, {"9787", 25 * GB, MODEL_TYPE_REGULAR_U2, FOURTH_GENERATION}, {"9268", 40 * GB, MODEL_TYPE_REGULAR, FOURTH_GENERATION}, @@ -91,6 +99,7 @@ static const Itdb_IpodModel ipod_model_table [] = { {"9807", 6 * GB, MODEL_TYPE_MINI_GREEN, SECOND_GENERATION}, /* Photo / Fourth Generation */ + /* Buttons are integrated into the "touch wheel". */ {"9829", 30 * GB, MODEL_TYPE_COLOR, FOURTH_GENERATION}, {"9585", 40 * GB, MODEL_TYPE_COLOR, FOURTH_GENERATION}, {"9586", 60 * GB, MODEL_TYPE_COLOR, FOURTH_GENERATION}, @@ -101,6 +110,7 @@ static const Itdb_IpodModel ipod_model_table [] = { {"9725", GB, MODEL_TYPE_SHUFFLE, FOURTH_GENERATION}, /* Nano / Fifth Generation */ + /* Buttons are integrated into the "touch wheel". */ {"A350", GB * 1, MODEL_TYPE_NANO_WHITE, FIFTH_GENERATION}, {"A352", GB * 1, MODEL_TYPE_NANO_BLACK, FIFTH_GENERATION}, {"A004", GB * 2, MODEL_TYPE_NANO_WHITE, FIFTH_GENERATION}, @@ -109,20 +119,21 @@ static const Itdb_IpodModel ipod_model_table [] = { {"A107", GB * 4, MODEL_TYPE_NANO_BLACK, FIFTH_GENERATION}, /* Video / Fifth Generation */ + /* Buttons are integrated into the "touch wheel". */ {"A002", GB * 30, MODEL_TYPE_VIDEO_WHITE, FIFTH_GENERATION}, {"A146", GB * 30, MODEL_TYPE_VIDEO_BLACK, FIFTH_GENERATION}, {"A003", GB * 60, MODEL_TYPE_VIDEO_WHITE, FIFTH_GENERATION}, {"A147", GB * 60, MODEL_TYPE_VIDEO_BLACK, FIFTH_GENERATION}, /* HP iPods, need contributions for this table */ - {"E436", 40 * GB, MODEL_TYPE_REGULAR, FOURTH_GENERATION}, - {"S492", 30 * GB, MODEL_TYPE_COLOR, FOURTH_GENERATION}, + /* Buttons are integrated into the "touch wheel". */ + {"E436", 40 * GB, MODEL_TYPE_REGULAR, FOURTH_GENERATION}, + {"S492", 30 * GB, MODEL_TYPE_COLOR, FOURTH_GENERATION}, /* No known model number -- create a Device/SysInfo file with * one entry, e.g.: ModelNumStr: Mmobile1 */ - {"mobile1", -1, MODEL_TYPE_MOBILE_1, MOBILE_GENERATION}, {NULL, 0, 0, 0} diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c index 7a4c768..0665d7c 100644 --- a/src/itdb_itunesdb.c +++ b/src/itdb_itunesdb.c @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-03-24 00:40:16 jcs> +/* Time-stamp: <2006-04-04 23:42:19 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -2063,14 +2063,14 @@ static glong get_mhit (FImport *fimp, glong mhit_seek) { track->unk156 = get32lint (cts, seek+156); track->unk160 = get32lint (cts, seek+160); - track->flag1 = get8int (cts, seek+164); + track->has_artwork = get8int (cts, seek+164); track->flag2 = get8int (cts, seek+165); track->flag3 = get8int (cts, seek+166); track->flag4 = get8int (cts, seek+167); track->dbid2 = get64lint (cts, seek+168); track->lyrics_flag = get8int (cts, seek+176); track->movie_flag = get8int (cts, seek+177); - track->unk178 = get8int (cts, seek+178); + track->mark_unplayed = get8int (cts, seek+178); track->unk179 = get8int (cts, seek+179); track->unk180 = get32lint (cts, seek+180); track->unk184 = get32lint (cts, seek+184); @@ -2198,6 +2198,10 @@ static glong get_mhit (FImport *fimp, glong mhit_seek) track->bookmark_time = playcount->bookmark_time; track->playcount += playcount->playcount; + if (playcount->playcount != 0) + { /* unmark the 'unplayed' flag */ + track->mark_unplayed = 0x01; + } track->recent_playcount = playcount->playcount; g_free (playcount); } @@ -2663,6 +2667,7 @@ Itdb_iTunesDB *itdb_parse (const gchar *mp, GError **error) * should be modified by the repository name. */ ipod_parse_artwork_db (itdb); + } g_free (filename); } @@ -3228,14 +3233,14 @@ static void mk_mhit (WContents *cts, Itdb_Track *track) /* since iTunesDB version 0x0c */ put32lint (cts, track->unk156); put32lint (cts, track->unk160); - put8int (cts, track->flag1); + put8int (cts, track->has_artwork); put8int (cts, track->flag2); put8int (cts, track->flag3); put8int (cts, track->flag4); put64lint (cts, track->dbid2); put8int (cts, track->lyrics_flag); put8int (cts, track->movie_flag); - put8int (cts, track->unk178); + put8int (cts, track->mark_unplayed); put8int (cts, track->unk179); put32lint (cts, track->unk180); put32lint (cts, track->unk184); diff --git a/src/itdb_track.c b/src/itdb_track.c index 9f051a9..51d0929 100644 --- a/src/itdb_track.c +++ b/src/itdb_track.c @@ -1,4 +1,4 @@ -/* Time-stamp: <2006-03-23 23:30:34 jcs> +/* Time-stamp: <2006-04-04 00:08:14 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project. @@ -86,6 +86,14 @@ static void itdb_track_set_defaults (Itdb_Track *tr) g_return_if_fail (tr); g_return_if_fail (tr->itdb); + if (tr->mark_unplayed == 0) + { + /* don't have the iPod mark this track with a bullet as + unplayed. Should be set to 0x02 for podcasts that have not + yet been played. */ + tr->mark_unplayed = 0x01; + } + /* The exact meaning of unk126 is unknown, but always seems to be 0xffff for MP3/AAC tracks, 0x0 for uncompressed tracks (like WAVE format), 0x1 for Audible. */ @@ -346,10 +354,12 @@ gboolean itdb_track_set_thumbnails (Itdb_Track *track, /* for some reason artwork->artwork_size is always track->artwork_size + track->artwork_count */ track->artwork->artwork_size += track->artwork_count; + /* indicate artwork is present */ + track->has_artwork = 0x01; } else { - itdb_artwork_remove_thumbnails (track->artwork); + itdb_track_remove_thumbnails (track); } return result; @@ -362,6 +372,8 @@ void itdb_track_remove_thumbnails (Itdb_Track *track) itdb_artwork_remove_thumbnails (track->artwork); track->artwork_size = 0; track->artwork_count = 0; + /* indicate no artwork is present */ + track->has_artwork = 0x02; } |