[Pkg-gtkpod-devel] r306 - in gtkpod/branches/etch-bpo: . data data/icons data/icons/32x32 data/icons/48x48 data/icons/64x64 debian debian/patches po scripts src
djpig at alioth.debian.org
djpig at alioth.debian.org
Thu Apr 17 18:50:58 UTC 2008
Author: djpig
Date: 2008-04-17 18:50:56 +0000 (Thu, 17 Apr 2008)
New Revision: 306
Added:
gtkpod/branches/etch-bpo/data/gphoto_album_menuitem-32.png
gtkpod/branches/etch-bpo/data/gphoto_album_menuitem-48.png
gtkpod/branches/etch-bpo/data/gphoto_images_menuitem-32.png
gtkpod/branches/etch-bpo/data/gphoto_images_menuitem-48.png
gtkpod/branches/etch-bpo/data/gphoto_playlist_icon-48.png
gtkpod/branches/etch-bpo/data/gphoto_tools_menuitem-32.png
gtkpod/branches/etch-bpo/data/gphoto_tools_menuitem-48.png
gtkpod/branches/etch-bpo/data/gtkpod-read-16.png
gtkpod/branches/etch-bpo/data/tunes_playlist_icon-48.png
gtkpod/branches/etch-bpo/po/ro.po
gtkpod/branches/etch-bpo/po/ru.po
gtkpod/branches/etch-bpo/scripts/convert-2m4a.sh
gtkpod/branches/etch-bpo/scripts/convert-2mp3.sh
gtkpod/branches/etch-bpo/scripts/gtkpod-convert-common.sh
gtkpod/branches/etch-bpo/src/display_photo.c
gtkpod/branches/etch-bpo/src/display_photo.h
gtkpod/branches/etch-bpo/src/stock_icons.c
gtkpod/branches/etch-bpo/src/stock_icons.h
Removed:
gtkpod/branches/etch-bpo/debian/patches/02_missing_fclose.dpatch
gtkpod/branches/etch-bpo/debian/patches/03_itdb-set-local-to-imported.dpatch
gtkpod/branches/etch-bpo/scripts/convert-flac2m4a.sh
gtkpod/branches/etch-bpo/scripts/convert-flac2mp3.sh
gtkpod/branches/etch-bpo/scripts/convert-m4a2mp3.sh
gtkpod/branches/etch-bpo/scripts/convert-mp32m4a.sh
gtkpod/branches/etch-bpo/scripts/convert-ogg2m4a.sh
gtkpod/branches/etch-bpo/scripts/convert-ogg2mp3.sh
gtkpod/branches/etch-bpo/scripts/convert-wav2m4a.sh
gtkpod/branches/etch-bpo/scripts/convert-wav2mp3.sh
Modified:
gtkpod/branches/etch-bpo/AUTHORS
gtkpod/branches/etch-bpo/COPYING
gtkpod/branches/etch-bpo/ChangeLog
gtkpod/branches/etch-bpo/INSTALL
gtkpod/branches/etch-bpo/Makefile.am
gtkpod/branches/etch-bpo/Makefile.in
gtkpod/branches/etch-bpo/NEWS
gtkpod/branches/etch-bpo/README
gtkpod/branches/etch-bpo/TODOandBUGS.txt
gtkpod/branches/etch-bpo/TROUBLESHOOTING
gtkpod/branches/etch-bpo/aclocal.m4
gtkpod/branches/etch-bpo/autogen.sh
gtkpod/branches/etch-bpo/config.guess
gtkpod/branches/etch-bpo/config.h.in
gtkpod/branches/etch-bpo/config.sub
gtkpod/branches/etch-bpo/configure
gtkpod/branches/etch-bpo/configure.in
gtkpod/branches/etch-bpo/data/Makefile.am
gtkpod/branches/etch-bpo/data/Makefile.in
gtkpod/branches/etch-bpo/data/gtkpod-add-dirs.png
gtkpod/branches/etch-bpo/data/gtkpod-add-files.png
gtkpod/branches/etch-bpo/data/gtkpod-add-playlists.png
gtkpod/branches/etch-bpo/data/gtkpod-logo.png
gtkpod/branches/etch-bpo/data/gtkpod-read.png
gtkpod/branches/etch-bpo/data/gtkpod.desktop.in
gtkpod/branches/etch-bpo/data/gtkpod.glade
gtkpod/branches/etch-bpo/data/icons/32x32/Makefile.in
gtkpod/branches/etch-bpo/data/icons/48x48/Makefile.in
gtkpod/branches/etch-bpo/data/icons/64x64/Makefile.in
gtkpod/branches/etch-bpo/data/icons/Makefile.in
gtkpod/branches/etch-bpo/debian/changelog
gtkpod/branches/etch-bpo/debian/compat
gtkpod/branches/etch-bpo/debian/control
gtkpod/branches/etch-bpo/debian/copyright
gtkpod/branches/etch-bpo/debian/dirs
gtkpod/branches/etch-bpo/debian/docs
gtkpod/branches/etch-bpo/debian/gtkpod-icon-32x32.xpm
gtkpod/branches/etch-bpo/debian/gtkpod.desktop
gtkpod/branches/etch-bpo/debian/gtkpod.pod
gtkpod/branches/etch-bpo/debian/install
gtkpod/branches/etch-bpo/debian/menu
gtkpod/branches/etch-bpo/debian/patches/00list
gtkpod/branches/etch-bpo/debian/patches/01_mountpoint.dpatch
gtkpod/branches/etch-bpo/debian/rules
gtkpod/branches/etch-bpo/debian/watch
gtkpod/branches/etch-bpo/depcomp
gtkpod/branches/etch-bpo/install-sh
gtkpod/branches/etch-bpo/intltool-extract.in
gtkpod/branches/etch-bpo/intltool-merge.in
gtkpod/branches/etch-bpo/intltool-update.in
gtkpod/branches/etch-bpo/missing
gtkpod/branches/etch-bpo/mkinstalldirs
gtkpod/branches/etch-bpo/po/ChangeLog
gtkpod/branches/etch-bpo/po/Makefile.in.in
gtkpod/branches/etch-bpo/po/POTFILES.in
gtkpod/branches/etch-bpo/po/POTFILES.skip
gtkpod/branches/etch-bpo/po/de.po
gtkpod/branches/etch-bpo/po/es.po
gtkpod/branches/etch-bpo/po/fr.po
gtkpod/branches/etch-bpo/po/he.po
gtkpod/branches/etch-bpo/po/it.po
gtkpod/branches/etch-bpo/po/ja.po
gtkpod/branches/etch-bpo/po/sv.po
gtkpod/branches/etch-bpo/scripts/Makefile.am
gtkpod/branches/etch-bpo/scripts/Makefile.in
gtkpod/branches/etch-bpo/scripts/ldif2vcf.sh
gtkpod/branches/etch-bpo/scripts/mab2vcard
gtkpod/branches/etch-bpo/scripts/sync-abook.sh
gtkpod/branches/etch-bpo/scripts/sync-evocalendar.sh
gtkpod/branches/etch-bpo/scripts/sync-evolution.sh
gtkpod/branches/etch-bpo/scripts/sync-kaddressbook.sh
gtkpod/branches/etch-bpo/scripts/sync-knotes.sh
gtkpod/branches/etch-bpo/scripts/sync-korganizer.sh
gtkpod/branches/etch-bpo/scripts/sync-ldif.sh
gtkpod/branches/etch-bpo/scripts/sync-notes.sh
gtkpod/branches/etch-bpo/scripts/sync-palm-jppy.py
gtkpod/branches/etch-bpo/scripts/sync-thunderbird-nano.sh
gtkpod/branches/etch-bpo/scripts/sync-thunderbird.sh
gtkpod/branches/etch-bpo/scripts/sync-tomboy.sh
gtkpod/branches/etch-bpo/scripts/sync-webcalendar.sh
gtkpod/branches/etch-bpo/src/Makefile.am
gtkpod/branches/etch-bpo/src/Makefile.in
gtkpod/branches/etch-bpo/src/autodetection.c
gtkpod/branches/etch-bpo/src/charset.c
gtkpod/branches/etch-bpo/src/charset.h
gtkpod/branches/etch-bpo/src/clientserver.c
gtkpod/branches/etch-bpo/src/clientserver.h
gtkpod/branches/etch-bpo/src/confirmation.c
gtkpod/branches/etch-bpo/src/confirmation.h
gtkpod/branches/etch-bpo/src/context_menus.c
gtkpod/branches/etch-bpo/src/context_menus.h
gtkpod/branches/etch-bpo/src/date_parser.c
gtkpod/branches/etch-bpo/src/date_parser.h
gtkpod/branches/etch-bpo/src/date_parser.l
gtkpod/branches/etch-bpo/src/date_parser2.c
gtkpod/branches/etch-bpo/src/date_parser2.l
gtkpod/branches/etch-bpo/src/details.c
gtkpod/branches/etch-bpo/src/display.c
gtkpod/branches/etch-bpo/src/display.h
gtkpod/branches/etch-bpo/src/display_coverart.c
gtkpod/branches/etch-bpo/src/display_coverart.h
gtkpod/branches/etch-bpo/src/display_itdb.c
gtkpod/branches/etch-bpo/src/display_itdb.h
gtkpod/branches/etch-bpo/src/display_playlists.c
gtkpod/branches/etch-bpo/src/display_private.h
gtkpod/branches/etch-bpo/src/display_sorttabs.c
gtkpod/branches/etch-bpo/src/display_spl.c
gtkpod/branches/etch-bpo/src/display_tracks.c
gtkpod/branches/etch-bpo/src/fetchcover.c
gtkpod/branches/etch-bpo/src/fetchcover.h
gtkpod/branches/etch-bpo/src/file.c
gtkpod/branches/etch-bpo/src/file.h
gtkpod/branches/etch-bpo/src/file_convert.c
gtkpod/branches/etch-bpo/src/file_export.c
gtkpod/branches/etch-bpo/src/file_itunesdb.c
gtkpod/branches/etch-bpo/src/fileselection.c
gtkpod/branches/etch-bpo/src/fileselection.h
gtkpod/branches/etch-bpo/src/flacfile.c
gtkpod/branches/etch-bpo/src/getopt.c
gtkpod/branches/etch-bpo/src/getopt.h
gtkpod/branches/etch-bpo/src/getopt1.c
gtkpod/branches/etch-bpo/src/info.c
gtkpod/branches/etch-bpo/src/info.h
gtkpod/branches/etch-bpo/src/itdb.h
gtkpod/branches/etch-bpo/src/main.c
gtkpod/branches/etch-bpo/src/misc.c
gtkpod/branches/etch-bpo/src/misc.h
gtkpod/branches/etch-bpo/src/misc_confirm.c
gtkpod/branches/etch-bpo/src/misc_conversion.c
gtkpod/branches/etch-bpo/src/misc_input.c
gtkpod/branches/etch-bpo/src/misc_playlist.c
gtkpod/branches/etch-bpo/src/misc_track.c
gtkpod/branches/etch-bpo/src/misc_track.h
gtkpod/branches/etch-bpo/src/mp3file.c
gtkpod/branches/etch-bpo/src/mp3file.h
gtkpod/branches/etch-bpo/src/mp4file.c
gtkpod/branches/etch-bpo/src/mp4file.h
gtkpod/branches/etch-bpo/src/prefs.c
gtkpod/branches/etch-bpo/src/prefs.h
gtkpod/branches/etch-bpo/src/prefs_window.c
gtkpod/branches/etch-bpo/src/prefs_window.h
gtkpod/branches/etch-bpo/src/tools.c
gtkpod/branches/etch-bpo/src/tools.h
gtkpod/branches/etch-bpo/src/wavfile.c
gtkpod/branches/etch-bpo/src/wavfile.h
gtkpod/branches/etch-bpo/ylwrap
Log:
Merge 0.99.12-1 into etch-bpo
Property changes on: gtkpod/branches/etch-bpo/AUTHORS
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/COPYING
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/ChangeLog
===================================================================
--- gtkpod/branches/etch-bpo/ChangeLog 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/ChangeLog 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,3 +1,66 @@
+gtkpod V0.99.12
+
+ NEW FEATURE: Import and management of photographs on ipods
+ that support them. Update of README to include photo management.
+
+ UPDATE: Application requires libgpod version 0.6.0 or higher.
+
+ UPDATE: Better icon theme specification compliance.
+
+ BUGFIX: Fixes to tomboy script. Thanks to Javier Kohen.
+
+ BUGFIX: Issues with display of track length. Inconsistent units used
+ in conjunction with libgpod (Jorg).
+
+ UPDATE: Cover art preview window either displays an album cover
+ to its full size or to a size consistent with the user's desktop.
+
+ UPDATE: Download of Album Art from the net feature modified to the
+ ability of dragging-and-dropping a .jpg image from a web browser. This
+ has been changed due to licensing concerns over album art. Drag and
+ Drop section of README updated accordingly (Paul).
+
+ BUGFIX: Issues on detecting changed local / podcast database. Thanks to
+ Mario Rossi.
+
+ BUGFIX: Issues addressed on Details Window.
+
+ BUGFIX: Crash avoided when auto-detecting an iTunes database that
+ cannot be read.
+
+ UPDATE: Display of error output of scripts (Jorg).
+
+ IMPROVEMENT: Configuring and Compilation support (Todd).
+
+ UPDATE: New scripts for flac, ogg, mp3, m4a, wav conversion to mp3 and
+ m4a. Thanks to Peter van de Does.
+
+ BUGFIX: Model number identified and written to ipod upon loading to ensure
+ libgpod can read the ipod's artwork.
+
+ UPDATE: Updates and bug fixes to gapless playback. Thanks to
+ Michael Tiffany.
+
+ BUGFIX: When Cover Art Display is widened, covers space out rather
+ than stretch.
+
+ BUGFIX: Fixed memory leaks in CoverArt Display and Details window.
+ Thanks to Daniele Forsi.
+
+ UPDATE: French translation. Thanks to Éric Lassauge.
+
+ UPDATE: Italian translation. Thanks to Daniele Forsi.
+
+ UPDATE: Hebrew translation. Thanks to Assaf Gillat.
+
+ UPDATE: Swedish translation. Thanks to Stefan Asserhäll.
+
+ NEW FEATURE: Added Romanian translation support. Thanks to
+ Alex Eftimie.
+
+ NEW FEATURE: Added Russian translation support. Thanks to
+ Matvey Kozhev.
+
gtkpod V0.99.10
NEW FEATURE: on-the-fly conversion of WAV, FLAC and OGG (as well
Property changes on: gtkpod/branches/etch-bpo/ChangeLog
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/INSTALL
===================================================================
--- gtkpod/branches/etch-bpo/INSTALL 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/INSTALL 2008-04-17 18:50:56 UTC (rev 306)
@@ -32,21 +32,24 @@
autoconf (at least 2.55)
flex (or lex)
- glib (at least 2.4.0)
+ gettext
+ glib (at least 2.4.0)
gtk+ (at least 2.6.0)
libglade (at least 2.4.0)
- libgpod (at least 0.4.0)
+ libgnomecanvas (at least 2.14.0)
+ libgpod (at least 0.5.2)
libid3tag (at least 0.15)
+ perl XML::Parser module
pkgconfig
Optional packages:
+ libcurl (for coverart download support)
+ libflac (for FLAC support)
+ libgnome-vfs-2.0 >2.6 (for iPod autodetection under GNOME)
+ libhal >0.5 <0.6 (in combination with libgnome-vfs: better detection of iPods)
+ libvorbis (for ogg libvorbis support)
libmpv4 (for AAC/M4A support)
- libvorbis (for ogg libvorbis support)
- libflac (for FLAC support)
- libcurl (for coverart download support)
- libgnome-vfs-2.0 >2.6 (for iPod autodetection under GNOME)
- libhal >0.5 <0.6 (in combination with libgnome-vfs: better detection of iPods)
2. If you install libraries to /usr/local/lib please don't forget to
Property changes on: gtkpod/branches/etch-bpo/INSTALL
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/Makefile.am
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/Makefile.in
===================================================================
--- gtkpod/branches/etch-bpo/Makefile.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/Makefile.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
@@ -13,17 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +29,50 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ config.guess config.sub depcomp install-sh missing \
+ mkinstalldirs ylwrap
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -64,17 +97,22 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -85,14 +123,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -104,28 +140,31 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+LIBGNOMECANVAS_LIBS = @LIBGNOMECANVAS_LIBS@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOUNT = @MOUNT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -143,24 +182,28 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-have_pkgconfig = @have_pkgconfig@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -175,6 +218,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -182,11 +226,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = src po scripts data
-
EXTRA_DIST = \
autogen.sh \
intltool-extract.in \
@@ -195,67 +240,65 @@
TROUBLESHOOTING \
TODOandBUGS.txt
-
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL Makefile.am NEWS aclocal.m4 \
- config.guess config.h.in config.sub configure.in depcomp \
- install-sh missing mkinstalldirs ylwrap
-DIST_SUBDIRS = $(SUBDIRS)
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+ cd $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(srcdir) && $(AUTOCONF)
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_srcdir) && $(AUTOHEADER)
- touch $(srcdir)/config.h.in
+ rm -f stamp-h1
+ touch $@
distclean-hdr:
-rm -f config.h stamp-h1
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -264,7 +307,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -276,15 +325,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -305,7 +359,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -316,14 +370,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -332,19 +378,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
+ test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -354,10 +403,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
-
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -380,40 +430,25 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/po
- @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; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -424,15 +459,19 @@
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -440,22 +479,49 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
+ $(am__remove_distdir)
+
dist dist-all: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- $(am__remove_distdir)
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
@@ -475,19 +541,20 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
- && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
- @echo "$(distdir).tar.gz is ready for distribution" | \
- sed 'h;s/./=/g;p;x;p;x'
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -511,7 +578,6 @@
all-am: Makefile config.h
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -531,7 +597,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -550,18 +616,28 @@
dvi-am:
+html: html-recursive
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -582,28 +658,28 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip uninstall-am
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-recursive ctags ctags-recursive dist \
- dist-all dist-gzip distcheck distclean distclean-generic \
- distclean-hdr distclean-recursive distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am dvi-recursive info \
- info-am info-recursive install install-am install-data \
- install-data-am install-data-recursive install-exec \
- install-exec-am install-exec-recursive install-info \
- install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
- ps-recursive tags tags-recursive uninstall uninstall-am \
- uninstall-info-am uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-hook
uninstall-hook:
Property changes on: gtkpod/branches/etch-bpo/Makefile.in
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/NEWS
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/README
===================================================================
--- gtkpod/branches/etch-bpo/README 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/README 2008-04-17 18:50:56 UTC (rev 306)
@@ -20,6 +20,7 @@
- Tracks
- Filter Tabs
- Playlists
+ - Photos
- Drag and Drop
- Duplicate Detection
- Preferences File
@@ -135,6 +136,35 @@
"Ctrl-D", or by selecting "Delete Playlist" from the Edit menu.
+Photos
+------
+
+If your ipod supports photos then a special dynamic playlist is created in
+the playlist tree. YOU CANNOT DELETE IT! Indeed when clicking on it all the
+usual track related ipod functions are disabled or removed.
+
+Instead, the track window elements are replaced with the photo management pane.
+This displays the Photo Library and all the saved photos from the ipod and
+allows you to add new albums, add new images, remove albums, remove images and
+drag n drop image between albums.
+
+You cannot delete the Photo Library as this is the original photo database. All
+images are stored in it and thus clicking on it, all the images on the ipod are
+displayed in it. Subsequent albums display a subset of the Photo Library's images.
+
+Removing an image from an album will remove it from the album but it will still
+be stored on the ipod in the Photo Library.
+
+Removing an image from the Photo Library will delete it completely from the ipod.
+
+You can select a set of images from a selected album (inc. the Photo Library) and
+drag n drop them into another album.
+
+Any changes made in the photo management window will change the Photo playlist to
+italics indicating that a "Save Changes" should occur before exiting in order to
+preserve those changes.
+
+
Drag and Drop
-------------
@@ -162,7 +192,15 @@
playlist view or track view. Drops between two existing playlists
create a new playlist.
+3) between external web browser and gtkpod
+- jpg files can be displayed in a web browser (eg. firefox, konqueror)
+ and dragged onto the coverart display or the image in the Edit Details
+ window. This will download the jpg to the album's directory then apply
+ it to the album's tracks. In the case of Edit Details, the jpg will
+ only be applied to the selected tracks (or only the one track if the
+ "Change all track simultaneously).
+
Preferences File
----------------
Property changes on: gtkpod/branches/etch-bpo/README
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/TODOandBUGS.txt
===================================================================
--- gtkpod/branches/etch-bpo/TODOandBUGS.txt 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/TODOandBUGS.txt 2008-04-17 18:50:56 UTC (rev 306)
@@ -19,51 +19,13 @@
- save extended database when rehash was done, even if main database
is not changed.
-CoverArt_display:
-- Remove the preference and add by default, complete with arrows to minimize the display if required.
-# Add a title to the display indicating the album displayed.
-# Selection of a track causes the display to switch to the relevant album cover
-# Selecting an album from either sort list causes switching display to relevant album cover
-# Update the covers when the alphabetize function is called
-- Improve animation?
-- Automatically retrieve album art through Amazon or Google
-# Clear images before setting them in case a null is returned from get_thumb()
-- On Delete of album / track / artist, call cover_set_images again
-- On add of album / track / artist, call cover_set_images again
+- handle missing .ext file more decently
+- Add tooltips back to the track attributes section of the prefs or find a
+ way to not need them. Perhaps using shorter versions of the previous
+ tooltips in the lists would work. That way, users wouldn't even need to
+ wait for the tooltip popup to know what the attribute was for.
-###
-
-CoverArt_display:
-- Remove the preference and add by default, complete with arrows to minimize the display if required.
-# Add a title to the display indicating the album displayed.
-# Selection of a track causes the display to switch to the relevant album cover
-# Selecting an album from either sort list causes switching display to relevant album cover
-# Update the covers when the alphabetize function is called
-- Improve animation?
-- Automatically retrieve album art through Amazon or Google
-# Clear images before setting them in case a null is returned from get_thumb()
-- On Delete of album / track / artist, call cover_set_images again
-- On add of album / track / artist, call cover_set_images again
-
-
-###
-
-CoverArt_display:
-# Remove the preference and add by default, complete with arrows to minimize the display if required.
-# Add a title to the display indicating the album displayed.
-# Selection of a track causes the display to switch to the relevant album cover
-# Selecting an album from either sort list causes switching display to relevant album cover
-# Update the covers when the alphabetize function is called
-# Improve animation?
-- Automatically retrieve album art through Amazon or Google
-# Clear images before setting them in case a null is returned from get_thumb()
-# On Delete of album / track / artist, call cover_set_images again
-# On add of album / track / artist, call cover_set_images again
-
-
-###
-
- unload iPods when exiting gtkpod (ask/option).
- cddb lookup (http://freedb.freedb.org). See also
Property changes on: gtkpod/branches/etch-bpo/TODOandBUGS.txt
___________________________________________________________________
Name: svn:mime-type
- text/plain
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/TROUBLESHOOTING
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/aclocal.m4
===================================================================
--- gtkpod/branches/etch-bpo/aclocal.m4 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/aclocal.m4 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
# This file 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.
@@ -11,1004 +11,448 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Do all the work for Automake. -*- Autoconf -*-
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 10
-
-AC_PREREQ([2.54])
-
-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
- if (cygpath --version) >/dev/null 2>/dev/null; then
- CYGPATH_W='cygpath -w'
- else
- CYGPATH_W=echo
- fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
- case $_am_header in
- $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.9])])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright 2001, 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
-# Check to make sure that the build environment is sane.
+# This file is free software, distributed under the terms of the GNU
+# General Public License. As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
#
-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# -*- Autoconf -*-
-
-
-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# This file can be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory. The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run. This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
#
-# $ac_aux_dir/missing
-# fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-# fails if $ac_aux_dir is absolute,
-# fails when called from a subdirectory in a VPATH build with
-# a relative $ac_aux_dir
+# Modified to never use included libintl.
+# Owen Taylor <otaylor at redhat.com>, 12/15/1998
#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
+# Major rework to remove unused code
+# Owen Taylor <otaylor at redhat.com>, 12/11/2002
#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-# MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
+# Added better handling of ALL_LINGUAS from GNU gettext version
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH. The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# -*- Autoconf -*-
-# Copyright (C) 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# serial 5 -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
+# Modified to require ngettext
+# Matthias Clasen <mclasen at redhat.com> 08/06/2004
#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+dnl
+dnl We go to great lengths to make sure that aclocal won't
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
-AC_CACHE_CHECK([dependency style of $depcc],
- [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+ [AC_CHECK_HEADERS([locale.h])
+ if test $ac_cv_header_locale_h = yes; then
+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+ if test $am_cv_val_LC_MESSAGES = yes; then
+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
+ [Define if your <locale.h> file defines LC_MESSAGES.])
+ fi
+ fi])
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+ /*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word"
break
fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
fi
done
-
- cd ..
- rm -rf conftest.dir
+ IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+ ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+ AC_MSG_RESULT([$]$1)
else
- am_cv_$1_dependencies_compiler_type=none
+ AC_MSG_RESULT(no)
fi
+AC_SUBST($1)dnl
])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+ dnl NLS is obligatory
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
+ AC_SUBST(USE_NLS)
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
+ gt_cv_have_gettext=no
+ CATOBJEXT=NONE
+ XGETTEXT=:
+ INTLLIBS=
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking Speeds up one-time builds
- --enable-dependency-tracking Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
+ AC_CHECK_HEADER(libintl.h,
+ [gt_cv_func_dgettext_libintl="no"
+ libintl_extra_libs=""
-# Generate code to set up dependency tracking. -*- Autoconf -*-
+ #
+ # First check in libc
+ #
+ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !ngettext ("","", 1)],
+ gt_cv_func_ngettext_libc=yes,
+ gt_cv_func_ngettext_libc=no)
+ ])
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+ [AC_TRY_LINK([
+#include <libintl.h>
+],
+ [return !dgettext ("","")],
+ gt_cv_func_dgettext_libc=yes,
+ gt_cv_func_dgettext_libc=no)
+ ])
+ fi
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ fi
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ #
+ # If we don't have everything we want, check in libintl
+ #
+ if test "$gt_cv_func_dgettext_libc" != "yes" \
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+ AC_CHECK_LIB(intl, bindtextdomain,
+ [AC_CHECK_LIB(intl, ngettext,
+ [AC_CHECK_LIB(intl, dgettext,
+ gt_cv_func_dgettext_libintl=yes)])])
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+ AC_MSG_CHECKING([if -liconv is needed to use gettext])
+ AC_MSG_RESULT([])
+ AC_CHECK_LIB(intl, ngettext,
+ [AC_CHECK_LIB(intl, dcgettext,
+ [gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv],
+ :,-liconv)],
+ :,-liconv)
+ fi
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+ #
+ # If we found libintl, then check in it for bind_textdomain_codeset();
+ # we'll prefer libc if neither have bind_textdomain_codeset(),
+ # and both have dgettext and ngettext
+ #
+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
+ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ LIBS="$glib_save_LIBS"
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+ gt_cv_func_dgettext_libc=no
+ else
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ && test "$gt_cv_func_ngettext_libc" = "yes"; then
+ gt_cv_func_dgettext_libintl=no
+ fi
+ fi
+ fi
+ fi
-#serial 2
+ if test "$gt_cv_func_dgettext_libc" = "yes" \
+ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ gt_cv_have_gettext=yes
+ fi
+
+ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+ INTLLIBS="-lintl $libintl_extra_libs"
+ fi
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+ AC_DEFINE(HAVE_GETTEXT,1,
+ [Define if the GNU gettext() function is already present or preinstalled.])
+ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+ if test "$MSGFMT" != "no"; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS $INTLLIBS"
+ AC_CHECK_FUNCS(dcgettext)
+ MSGFMT_OPTS=
+ AC_MSG_CHECKING([if msgfmt accepts -c])
+ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo at bar.xx>\n"
+"Language-Team: C <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+ AC_SUBST(MSGFMT_OPTS)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share and
+ dnl and CATOBJEXT=.gmo in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [CATOBJEXT=.gmo
+ DATADIRNAME=share],
+ [CATOBJEXT=.mo
+ DATADIRNAME=lib])
+ ;;
+ *)
+ CATOBJEXT=.mo
+ DATADIRNAME=lib
+ ;;
+ esac])
+ LIBS="$glib_save_LIBS"
+ INSTOBJEXT=.mo
+ else
+ gt_cv_have_gettext=no
+ fi
+ fi
+ ])
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
- test -z "$DEPDIR" && continue
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+ if test "$gt_cv_have_gettext" = "yes" ; then
+ AC_DEFINE(ENABLE_NLS, 1,
+ [always defined to indicate that i18n is enabled])
+ fi
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is not GNU xgettext we define it as : so that the
+ dnl Makefiles still can work.
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+ AC_MSG_RESULT(
+ [found xgettext program is not GNU xgettext; ignore it])
+ XGETTEXT=":"
+ fi
+ fi
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+ # We need to process the po/ directory.
+ POSUB=po
-# Check to see how 'make' treats includes. -*- Autoconf -*-
+ AC_OUTPUT_COMMANDS(
+ [case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac])
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ dnl These rules are solely for the distribution goal. While doing this
+ dnl we only have to keep exactly one list of the available catalogs
+ dnl in configure.in.
+ for lang in $ALL_LINGUAS; do
+ GMOFILES="$GMOFILES $lang.gmo"
+ POFILES="$POFILES $lang.po"
+ done
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+ dnl Make all variables we use known to autoconf.
+ AC_SUBST(CATALOGS)
+ AC_SUBST(CATOBJEXT)
+ AC_SUBST(DATADIRNAME)
+ AC_SUBST(GMOFILES)
+ AC_SUBST(INSTOBJEXT)
+ AC_SUBST(INTLLIBS)
+ AC_SUBST(PO_IN_DATADIR_TRUE)
+ AC_SUBST(PO_IN_DATADIR_FALSE)
+ AC_SUBST(POFILES)
+ AC_SUBST(POSUB)
+ ])
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+ [AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+
+ GLIB_LC_MESSAGES
+ GLIB_WITH_NLS
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+ if test "$gt_cv_have_gettext" = "yes"; then
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+ AC_MSG_CHECKING(for catalogs to be installed)
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+ AC_MSG_RESULT($LINGUAS)
+ fi
-# serial 2
+ dnl Construct list of names of catalog files to be constructed.
+ if test -n "$LINGUAS"; then
+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+ fi
+ fi
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+ dnl Try to locate is.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
-# AM_CONDITIONAL -*- Autoconf -*-
+ dnl Generate list of files to be processed by xgettext which will
+ dnl be included in po/Makefile.
+ test -d po || mkdir po
+ if test "x$srcdir" != "x."; then
+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+ posrcprefix="$srcdir/"
+ else
+ posrcprefix="../$srcdir/"
+ fi
+ else
+ posrcprefix="../"
+ fi
+ rm -f po/POTFILES
+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+ < $srcdir/po/POTFILES.in > po/POTFILES
+ ])
-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 5
-
-AC_PREREQ(2.52)
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+ localedir=`eval echo "${libdir}/locale"`
else
- $1_TRUE='#'
- $1_FALSE=
+ localedir=`eval echo "${datadir}/locale"`
fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+ [Define the location where the catalogs will be installed])
+])
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_in,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+#
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+ m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_PREREQ([2.52])
-
-# serial 6
-
-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
- dnl maintainer-mode is disabled by default
- AC_ARG_ENABLE(maintainer-mode,
-[ --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer],
- USE_MAINTAINER_MODE=$enableval,
- USE_MAINTAINER_MODE=no)
- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
- MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST(MAINT)dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-
-# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# @defmac AC_PROG_CC_STDC
-# @maindex PROG_CC_STDC
-# @ovindex CC
-# If the C compiler in not in ANSI C mode by default, try to add an option
-# to output variable @code{CC} to make it so. This macro tries various
-# options that select ANSI C on some system or another. It considers the
-# compiler to be in ANSI C mode if it handles function prototypes correctly.
-#
-# If you use this macro, you should check after calling it whether the C
-# compiler has been set to accept ANSI C; if not, the shell variable
-# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
-# code in ANSI C, you can make an un-ANSIfied copy of it by using the
-# program @code{ansi2knr}, which comes with Ghostscript.
-# @end defmac
-
-AC_DEFUN([AM_PROG_CC_STDC],
-[AC_REQUIRE([AC_PROG_CC])
-AC_BEFORE([$0], [AC_C_INLINE])
-AC_BEFORE([$0], [AC_C_CONST])
-dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require
-dnl a magic option to avoid problems with ANSI preprocessor commands
-dnl like #elif.
-dnl FIXME: can't do this because then AC_AIX won't work due to a
-dnl circular dependency.
-dnl AC_BEFORE([$0], [AC_PROG_CPP])
-AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
-AC_CACHE_VAL(am_cv_prog_cc_stdc,
-[am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- AC_TRY_COMPILE(
-[#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-], [
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-],
-[am_cv_prog_cc_stdc="$ac_arg"; break])
-done
-CC="$ac_save_CC"
-])
-if test -z "$am_cv_prog_cc_stdc"; then
- AC_MSG_RESULT([none needed])
-else
- AC_MSG_RESULT([$am_cv_prog_cc_stdc])
-fi
-case "x$am_cv_prog_cc_stdc" in
- x|xno) ;;
- *) CC="$CC $am_cv_prog_cc_stdc" ;;
-esac
-])
-
-AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
-
-
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
+# serial 36 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
@@ -1021,7 +465,7 @@
esac
if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
+ AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
@@ -1050,6 +494,7 @@
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_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_SERVICE_RULE='%.service: %.service.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_POLICY_RULE='%.policy: %.policy.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 $< [$]@'
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -1069,6 +514,7 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
@@ -1091,19 +537,16 @@
fi
fi
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
@@ -1144,10 +587,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
@@ -1162,9 +601,7 @@
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
])
@@ -1359,7 +796,7 @@
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -1369,438 +806,932 @@
fi[]dnl
])# PKG_CHECK_MODULES
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+#
+# This file 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.
-# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.10], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# serial 3
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
-AC_PREREQ(2.50)
-
-# AM_PROG_LEX
-# -----------
-# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
-# "missing" invocation, for better error output.
-AC_DEFUN([AM_PROG_LEX],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
-if test "$LEX" = :; then
- LEX=${am_missing_run}flex
-fi])
-
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
#
-# This file is free software, distributed under the terms of the GNU
-# General Public License. As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
#
-# Modified to never use included libintl.
-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
#
-# Major rework to remove unused code
-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
+# Free Software Foundation, Inc.
#
-# Added better handling of ALL_LINGUAS from GNU gettext version
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+# This file 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.
+
+# serial 4
+
+# This was merged into AC_PROG_CC in Autoconf.
+
+AU_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+AC_DIAGNOSE([obsolete], [$0:
+ your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
+ `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
+ you adjust the code. You can also remove the above call to
+ AC_PROG_CC if you already called it elsewhere.])
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+])
+AU_DEFUN([fp_PROG_CC_STDC])
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
#
-# Modified to require ngettext
-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+# This file 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.
+
+# serial 8
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
+# This file 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.
-dnl
-dnl We go to great lengths to make sure that aclocal won't
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
+# serial 9
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
- [AC_CHECK_HEADERS([locale.h])
- if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
break
fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
fi
done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
+
+ cd ..
+ rm -rf conftest.dir
else
- AC_MSG_RESULT(no)
+ am_cv_$1_dependencies_compiler_type=none
fi
-AC_SUBST($1)dnl
])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
- gt_cv_have_gettext=no
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+])
- #
- # First check in libc
- #
- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !ngettext ("","", 1)],
- gt_cv_func_ngettext_libc=yes,
- gt_cv_func_ngettext_libc=no)
- ])
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !dgettext ("","")],
- gt_cv_func_dgettext_libc=yes,
- gt_cv_func_dgettext_libc=no)
- ])
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
+# Generate code to set up dependency tracking. -*- Autoconf -*-
- #
- # If we don't have everything we want, check in libintl
- #
- if test "$gt_cv_func_dgettext_libc" != "yes" \
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
- AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
- AC_MSG_RESULT([])
- AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dcgettext,
- [gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv],
- :,-liconv)],
- :,-liconv)
- fi
+#serial 3
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
- # we'll prefer libc if neither have bind_textdomain_codeset(),
- # and both have dgettext and ngettext
- #
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
- else
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- && test "$gt_cv_func_ngettext_libc" = "yes"; then
- gt_cv_func_dgettext_libintl=no
- fi
- fi
- fi
- fi
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
- gt_cv_have_gettext=yes
- fi
-
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS="-lintl $libintl_extra_libs"
- fi
-
- if test "$gt_cv_have_gettext" = "yes"; then
- AC_DEFINE(HAVE_GETTEXT,1,
- [Define if the GNU gettext() function is already present or preinstalled.])
- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
- AC_CHECK_FUNCS(dcgettext)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share and
- dnl and CATOBJEXT=.gmo in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [CATOBJEXT=.mo
- DATADIRNAME=lib])
- ;;
- *)
- CATOBJEXT=.mo
- DATADIRNAME=lib
- ;;
- esac])
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
- gt_cv_have_gettext=no
- fi
- fi
- ])
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
- [always defined to indicate that i18n is enabled])
- fi
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is not GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
+# serial 8
- # We need to process the po/ directory.
- POSUB=po
+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
- AC_OUTPUT_COMMANDS(
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
+# Do all the work for Automake. -*- Autoconf -*-
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
+#
+# This file 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.
- dnl Make all variables we use known to autoconf.
- AC_SUBST(CATALOGS)
- AC_SUBST(CATOBJEXT)
- AC_SUBST(DATADIRNAME)
- AC_SUBST(GMOFILES)
- AC_SUBST(INSTOBJEXT)
- AC_SUBST(INTLLIBS)
- AC_SUBST(PO_IN_DATADIR_TRUE)
- AC_SUBST(PO_IN_DATADIR_FALSE)
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
- ])
+# serial 12
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
- fi
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.60])dnl
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+ fi
+fi
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
+ else
+ CYGPATH_W=echo
+ fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $1 | $1:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 5
+
+# AM_PROG_LEX
+# -----------
+# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
+# "missing" invocation, for better error output.
+AC_DEFUN([AM_PROG_LEX],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
+AC_REQUIRE([AC_PROG_LEX])dnl
+if test "$LEX" = :; then
+ LEX=${am_missing_run}flex
+fi])
+
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 4
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Check to see how 'make' treats includes. -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 3
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
fi
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
- dnl Try to locate is.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 5
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
+fi
+])
+
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 3
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 4
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftest.file`
fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
- ])
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
else
- localedir=`eval echo "${datadir}/locale"`
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
- [Define the location where the catalogs will be installed])
-])
+AC_MSG_RESULT(yes)])
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+#
+# This file 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.
+
+# serial 2
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
Property changes on: gtkpod/branches/etch-bpo/aclocal.m4
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/autogen.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/config.guess
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/config.h.in
===================================================================
--- gtkpod/branches/etch-bpo/config.h.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/config.h.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,21 +1,29 @@
/* config.h.in. Generated from configure.in by autoheader. */
+/* libmp4v2 probably version 1.6 or higher: MP4GetMetadataCoverArt accepts an
+ extra argument */
+#undef COVERART_ACCEPTS_EXTRA_ARG
+
/* always defined to indicate that i18n is enabled */
#undef ENABLE_NLS
+/* libmp4v2 probably version 1.6 or higher: MP4GetMetadataFreeForm accepts
+ extra argument */
+#undef FREEFORM_ACCEPTS_EXTRA_ARG
+
/* "Gettext package name" */
#undef GETTEXT_PACKAGE
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
-/* "libcurl support" */
+/* Define if you have curl support */
#undef HAVE_CURL
/* Define to 1 if you have the `dcgettext' function. */
#undef HAVE_DCGETTEXT
-/* "Define to 1 if you have the flac library" */
+/* Define if you have the flac library */
#undef HAVE_FLAC
/* Define to 1 if you have the `flock' function. */
@@ -30,7 +38,7 @@
/* Define if you have gnome-vfs support */
#undef HAVE_GNOME_VFS
-/* Define if you want HAL support */
+/* Define if you have HAL support */
#undef HAVE_HAL
/* Define to 1 if you have the <inttypes.h> header file. */
@@ -39,10 +47,10 @@
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
-/* "Define to 1 if you have the mp4v2 library" */
+/* Define if you have the mp4v2 library */
#undef HAVE_LIBMP4V2
-/* "Define to 1 if you have the ogg library" */
+/* Define if you have the ogg/vorbis library */
#undef HAVE_LIBVORBISFILE
/* Define to 1 if you have the <linux/cdrom.h> header file. */
Property changes on: gtkpod/branches/etch-bpo/config.h.in
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/config.sub
===================================================================
--- gtkpod/branches/etch-bpo/config.sub 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/config.sub 2008-04-17 18:50:56 UTC (rev 306)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
Property changes on: gtkpod/branches/etch-bpo/config.sub
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/configure
===================================================================
--- gtkpod/branches/etch-bpo/configure 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/configure 2008-04-17 18:50:56 UTC (rev 306)
@@ -653,6 +653,7 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -661,13 +662,16 @@
AUTOMAKE
AUTOHEADER
MAKEINFO
-AMTAR
install_sh
STRIP
INSTALL_STRIP_PROGRAM
+mkdir_p
AWK
SET_MAKE
am__leading_dot
+AMTAR
+am__tar
+am__untar
MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
@@ -713,21 +717,29 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
+INTLTOOL_POLICY_RULE
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
INTLTOOL_PERL
-INTLTOOL_ICONV
-INTLTOOL_MSGFMT
-INTLTOOL_MSGMERGE
-INTLTOOL_XGETTEXT
ALL_LINGUAS
DATADIRNAME
GETTEXT_PACKAGE
-have_pkgconfig
PKG_CONFIG
-PACKAGE_CFLAGS
-PACKAGE_LIBS
+GTK_CFLAGS
+GTK_LIBS
+GLIB_CFLAGS
+GLIB_LIBS
+GMODULE_CFLAGS
+GMODULE_LIBS
+GTHREAD_CFLAGS
+GTHREAD_LIBS
+LIBGLADE_CFLAGS
+LIBGLADE_LIBS
+LIBGNOMECANVAS_CFLAGS
+LIBGNOMECANVAS_LIBS
+LIBGPOD_CFLAGS
+LIBGPOD_LIBS
LEX
LEX_OUTPUT_ROOT
LEXLIB
@@ -738,6 +750,7 @@
EGREP
USE_NLS
MSGFMT
+MSGFMT_OPTS
GMSGFMT
XGETTEXT
CATALOGS
@@ -753,6 +766,8 @@
LIBOBJS
CURL_CFLAGS
CURL_LIBS
+HAVE_CURL_TRUE
+HAVE_CURL_FALSE
GNOME_VFS_CFLAGS
GNOME_VFS_LIBS
HAVE_GNOME_VFS_TRUE
@@ -761,6 +776,12 @@
HAL_LIBS
HAVE_HAL_TRUE
HAVE_HAL_FALSE
+HAVE_LIBMP4V2_TRUE
+HAVE_LIBMP4V2_FALSE
+HAVE_LIBVORBISFILE_TRUE
+HAVE_LIBVORBISFILE_FALSE
+HAVE_FLAC_TRUE
+HAVE_FLAC_FALSE
LTLIBOBJS'
ac_subst_files=''
ac_precious_vars='build_alias
@@ -772,8 +793,20 @@
LIBS
CPPFLAGS
PKG_CONFIG
-PACKAGE_CFLAGS
-PACKAGE_LIBS
+GTK_CFLAGS
+GTK_LIBS
+GLIB_CFLAGS
+GLIB_LIBS
+GMODULE_CFLAGS
+GMODULE_LIBS
+GTHREAD_CFLAGS
+GTHREAD_LIBS
+LIBGLADE_CFLAGS
+LIBGLADE_LIBS
+LIBGNOMECANVAS_CFLAGS
+LIBGNOMECANVAS_LIBS
+LIBGPOD_CFLAGS
+LIBGPOD_LIBS
CPP
CURL_CFLAGS
CURL_LIBS
@@ -1358,16 +1391,20 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer
- --disable-dependency-tracking Speeds up one-time builds
- --enable-dependency-tracking Do not reject slow dependency extractors
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --without-curl Disable coverart download support
--without-gnome-vfs Disable autodetection support
--without-hal Disable HAL support
+ --without-mp4v2 Disable MP4/AAC support
+ --without-ogg Disable Ogg/Vorbis support
+ --without-flac Disable FLAC support
Some influential environment variables:
CC C compiler command
@@ -1378,10 +1415,30 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
PKG_CONFIG path to pkg-config utility
- PACKAGE_CFLAGS
- C compiler flags for PACKAGE, overriding pkg-config
- PACKAGE_LIBS
- linker flags for PACKAGE, overriding pkg-config
+ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
+ GTK_LIBS linker flags for GTK, overriding pkg-config
+ GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
+ GLIB_LIBS linker flags for GLIB, overriding pkg-config
+ GMODULE_CFLAGS
+ C compiler flags for GMODULE, overriding pkg-config
+ GMODULE_LIBS
+ linker flags for GMODULE, overriding pkg-config
+ GTHREAD_CFLAGS
+ C compiler flags for GTHREAD, overriding pkg-config
+ GTHREAD_LIBS
+ linker flags for GTHREAD, overriding pkg-config
+ LIBGLADE_CFLAGS
+ C compiler flags for LIBGLADE, overriding pkg-config
+ LIBGLADE_LIBS
+ linker flags for LIBGLADE, overriding pkg-config
+ LIBGNOMECANVAS_CFLAGS
+ C compiler flags for LIBGNOMECANVAS, overriding pkg-config
+ LIBGNOMECANVAS_LIBS
+ linker flags for LIBGNOMECANVAS, overriding pkg-config
+ LIBGPOD_CFLAGS
+ C compiler flags for LIBGPOD, overriding pkg-config
+ LIBGPOD_LIBS
+ linker flags for LIBGPOD, overriding pkg-config
CPP C preprocessor
CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
CURL_LIBS linker flags for CURL, overriding pkg-config
@@ -1814,7 +1871,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version="1.7"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -1984,7 +2042,6 @@
program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
rm -f conftest.sed
-
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
@@ -1998,6 +2055,54 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2079,12 +2184,16 @@
fi
rmdir .tst 2>/dev/null
- # test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2099,7 +2208,7 @@
# Define the identity of the package.
PACKAGE=gtkpod
- VERSION=0.99.10
+ VERSION=0.99.12
cat >>confdefs.h <<_ACEOF
@@ -2127,11 +2236,8 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
@@ -2234,13 +2340,20 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
+# Always define AMTAR for backward compatibility.
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
ac_config_headers="$ac_config_headers config.h"
{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -2254,9 +2367,7 @@
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+ if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
@@ -2403,9 +2514,7 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -2414,7 +2523,6 @@
fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3375,7 +3483,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -3399,13 +3509,19 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
@@ -3423,9 +3539,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -4237,7 +4351,9 @@
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- : > sub/conftst$i.h
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
@@ -4261,13 +4377,19 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
- # (even with -Werror). So we grep stderr for any message
- # that says an option was ignored.
- if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
am_cv_CC_dependencies_compiler_type=$depmode
break
fi
@@ -4285,9 +4407,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -4298,32 +4418,574 @@
fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-{ echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
-echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6; }
-if test "${am_cv_prog_cc_stdc+set}" = set; then
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- am_cv_prog_cc_stdc=no
-ac_save_CC="$CC"
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
- CC="$ac_save_CC $ac_arg"
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ fi
+fi
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CC" && break
+done
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO: checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -v >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler -V >&5") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_compiler_gnu=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_compiler_gnu=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ CFLAGS=""
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+ if test "$GCC" = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-g"
+ fi
+else
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
+fi
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
#include <sys/types.h>
@@ -4346,24 +5008,40 @@
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
int argc;
char **argv;
-
int
main ()
{
-
return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -4380,7 +5058,7 @@
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- am_cv_prog_cc_stdc="$ac_arg"; break
+ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -4388,26 +5066,147 @@
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-CC="$ac_save_CC"
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+esac
-if test -z "$am_cv_prog_cc_stdc"; then
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; }
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC" am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- { echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6; }
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
fi
-case "x$am_cv_prog_cc_stdc" in
- x|xno) ;;
- *) CC="$CC $am_cv_prog_cc_stdc" ;;
-esac
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+
+
+
case "$am__api_version" in
1.01234)
{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
@@ -4452,6 +5251,7 @@
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_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_SERVICE_RULE='%.service: %.service.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_POLICY_RULE='%.policy: %.policy.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 $< $@'
@@ -4472,6 +5272,7 @@
+
# Use the tools built into the package, not the ones that are installed.
INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
@@ -4543,171 +5344,6 @@
fi
fi
-# Extract the first word of "iconv", so it can be a program name with args.
-set dummy iconv; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $INTLTOOL_ICONV in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
- ;;
-esac
-fi
-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
-if test -n "$INTLTOOL_ICONV"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $INTLTOOL_MSGFMT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
- ;;
-esac
-fi
-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
-if test -n "$INTLTOOL_MSGFMT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $INTLTOOL_MSGMERGE in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
- ;;
-esac
-fi
-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
-if test -n "$INTLTOOL_MSGMERGE"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $INTLTOOL_XGETTEXT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
- ;;
-esac
-fi
-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
-if test -n "$INTLTOOL_XGETTEXT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
# Substitute ALL_LINGUAS so we can use it in po/Makefile
@@ -4725,7 +5361,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr
+ return _nl_msg_cat_cntr
;
return 0;
}
@@ -4863,14 +5499,14 @@
if test "x$GCC" = "xyes"; then
- if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
- CFLAGS="$CFLAGS -Wall"
- fi
- # gcc < 4.0 does not know '-Wno-pointer-sign'. Try to find out
- # whether we can set this option or not.
- CFLAGS_orig=$CFLAGS
- CFLAGS="$CFLAGS -Wno-pointer-sign"
- cat >conftest.$ac_ext <<_ACEOF
+ if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -Wall"
+ fi
+ # gcc < 4.0 does not know '-Wno-pointer-sign'. Try to find out
+ # whether we can set this option or not.
+ CFLAGS_orig=$CFLAGS
+ CFLAGS="$CFLAGS -Wno-pointer-sign"
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4921,24 +5557,27 @@
_ACEOF
-# Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_have_pkgconfig+set}" = set; then
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$have_pkgconfig"; then
- ac_cv_prog_have_pkgconfig="$have_pkgconfig" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_have_pkgconfig=""ok""
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4946,25 +5585,88 @@
done
IFS=$as_save_IFS
+ ;;
+esac
fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
-have_pkgconfig=$ac_cv_prog_have_pkgconfig
-if test -n "$have_pkgconfig"; then
- { echo "$as_me:$LINENO: result: $have_pkgconfig" >&5
-echo "${ECHO_T}$have_pkgconfig" >&6; }
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
-
-if test "y$have_pkgconfig" = "y"; then
- { { echo "$as_me:$LINENO: error: **** pkg-config required (http://www.freedesktop.org/software/pkgconfig)
+if test -z "$PKG_CONFIG"; then
+ { { echo "$as_me:$LINENO: error: *** pkg-config required (http://www.freedesktop.org/software/pkgconfig)
See \`config.log' for more details." >&5
-echo "$as_me: error: **** pkg-config required (http://www.freedesktop.org/software/pkgconfig)
+echo "$as_me: error: *** pkg-config required (http://www.freedesktop.org/software/pkgconfig)
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
+else
+ ac_cv_env_PKG_CONFIG_set=set
fi
@@ -5089,20 +5791,20 @@
fi
pkg_failed=no
-{ echo "$as_me:$LINENO: checking for PACKAGE" >&5
-echo $ECHO_N "checking for PACKAGE... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for GTK" >&5
+echo $ECHO_N "checking for GTK... $ECHO_C" >&6; }
if test -n "$PKG_CONFIG"; then
- if test -n "$PACKAGE_CFLAGS"; then
- pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS"
+ if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2\"") >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2" 2>/dev/null`
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -5111,16 +5813,16 @@
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
- if test -n "$PACKAGE_LIBS"; then
- pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS"
+ if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2\"") >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.6.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2" 2>/dev/null`
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -5139,36 +5841,511 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0"`
else
- PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$PACKAGE_PKG_ERRORS" >&5
+ echo "$GTK_PKG_ERRORS" >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error: *** $PACKAGE_PKG_ERRORS
+ { { echo "$as_me:$LINENO: error: *** $GTK_PKG_ERRORS
See \`config.log' for more details." >&5
-echo "$as_me: error: *** $PACKAGE_PKG_ERRORS
+echo "$as_me: error: *** $GTK_PKG_ERRORS
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: *** $PACKAGE_PKG_ERRORS
+ { { echo "$as_me:$LINENO: error: *** $GTK_PKG_ERRORS
See \`config.log' for more details." >&5
-echo "$as_me: error: *** $PACKAGE_PKG_ERRORS
+echo "$as_me: error: *** $GTK_PKG_ERRORS
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
- PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS
- PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS
+ GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+ GTK_LIBS=$pkg_cv_GTK_LIBS
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
:
fi
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GLIB" >&5
+echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GLIB_CFLAGS"; then
+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GLIB_LIBS"; then
+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0"`
+ else
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GLIB_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error: *** $GLIB_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $GLIB_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: *** $GLIB_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $GLIB_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+ GLIB_LIBS=$pkg_cv_GLIB_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GMODULE" >&5
+echo $ECHO_N "checking for GMODULE... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GMODULE_CFLAGS"; then
+ pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GMODULE_LIBS"; then
+ pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmodule-2.0"`
+ else
+ GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GMODULE_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error: *** $GMODULE_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $GMODULE_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: *** $GMODULE_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $GMODULE_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
+ GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GTHREAD" >&5
+echo $ECHO_N "checking for GTHREAD... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GTHREAD_CFLAGS"; then
+ pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 0.14.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 0.14.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GTHREAD_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 >= 0.14.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GTHREAD_LIBS"; then
+ pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 >= 0.14.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 >= 0.14.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GTHREAD_LIBS=`$PKG_CONFIG --libs "gthread-2.0 >= 0.14.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0 >= 0.14.0"`
+ else
+ GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 >= 0.14.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTHREAD_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error: *** $GTHREAD_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $GTHREAD_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: *** $GTHREAD_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $GTHREAD_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ GTHREAD_CFLAGS=$pkg_cv_GTHREAD_CFLAGS
+ GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for LIBGLADE" >&5
+echo $ECHO_N "checking for LIBGLADE... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBGLADE_CFLAGS"; then
+ pkg_cv_LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.4.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.4.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBGLADE_CFLAGS=`$PKG_CONFIG --cflags "libglade-2.0 >= 2.4.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBGLADE_LIBS"; then
+ pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libglade-2.0 >= 2.4.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libglade-2.0 >= 2.4.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBGLADE_LIBS=`$PKG_CONFIG --libs "libglade-2.0 >= 2.4.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libglade-2.0 >= 2.4.0"`
+ else
+ LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0 >= 2.4.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBGLADE_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error: *** $LIBGLADE_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $LIBGLADE_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: *** $LIBGLADE_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $LIBGLADE_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ LIBGLADE_CFLAGS=$pkg_cv_LIBGLADE_CFLAGS
+ LIBGLADE_LIBS=$pkg_cv_LIBGLADE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for LIBGNOMECANVAS" >&5
+echo $ECHO_N "checking for LIBGNOMECANVAS... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBGNOMECANVAS_CFLAGS"; then
+ pkg_cv_LIBGNOMECANVAS_CFLAGS="$LIBGNOMECANVAS_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomecanvas-2.0 >= 2.14.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgnomecanvas-2.0 >= 2.14.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBGNOMECANVAS_CFLAGS=`$PKG_CONFIG --cflags "libgnomecanvas-2.0 >= 2.14.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBGNOMECANVAS_LIBS"; then
+ pkg_cv_LIBGNOMECANVAS_LIBS="$LIBGNOMECANVAS_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomecanvas-2.0 >= 2.14.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgnomecanvas-2.0 >= 2.14.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBGNOMECANVAS_LIBS=`$PKG_CONFIG --libs "libgnomecanvas-2.0 >= 2.14.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBGNOMECANVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomecanvas-2.0 >= 2.14.0"`
+ else
+ LIBGNOMECANVAS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomecanvas-2.0 >= 2.14.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBGNOMECANVAS_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error: *** $LIBGNOMECANVAS_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $LIBGNOMECANVAS_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: *** $LIBGNOMECANVAS_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $LIBGNOMECANVAS_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ LIBGNOMECANVAS_CFLAGS=$pkg_cv_LIBGNOMECANVAS_CFLAGS
+ LIBGNOMECANVAS_LIBS=$pkg_cv_LIBGNOMECANVAS_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for LIBGPOD" >&5
+echo $ECHO_N "checking for LIBGPOD... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBGPOD_CFLAGS"; then
+ pkg_cv_LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 >= 0.6.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgpod-1.0 >= 0.6.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBGPOD_CFLAGS=`$PKG_CONFIG --cflags "libgpod-1.0 >= 0.6.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBGPOD_LIBS"; then
+ pkg_cv_LIBGPOD_LIBS="$LIBGPOD_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 >= 0.6.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libgpod-1.0 >= 0.6.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_LIBGPOD_LIBS=`$PKG_CONFIG --libs "libgpod-1.0 >= 0.6.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgpod-1.0 >= 0.6.0"`
+ else
+ LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgpod-1.0 >= 0.6.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBGPOD_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { { echo "$as_me:$LINENO: error: *** $LIBGPOD_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $LIBGPOD_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: *** $LIBGPOD_PKG_ERRORS
+See \`config.log' for more details." >&5
+echo "$as_me: error: *** $LIBGPOD_PKG_ERRORS
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ LIBGPOD_CFLAGS=$pkg_cv_LIBGPOD_CFLAGS
+ LIBGPOD_LIBS=$pkg_cv_LIBGPOD_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS $LIBGLADE_CFLAGS $LIBGNOMECANVAS_CFLAGS $LIBGPOD_CFLAGS"
+LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS $LIBGNOMECANVAS_LIBS $LIBGPOD_LIBS"
+
for ac_prog in flex lex
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -5377,13 +6554,13 @@
LEX=${am_missing_run}flex
fi
if ! test "y$LEX" = "yflex"; then
- if ! test "y$LEX" = "ylex"; then
- { { echo "$as_me:$LINENO: error: **** flex or lex required
+ if ! test "y$LEX" = "ylex"; then
+ { { echo "$as_me:$LINENO: error: *** flex or lex required
See \`config.log' for more details." >&5
-echo "$as_me: error: **** flex or lex required
+echo "$as_me: error: *** flex or lex required
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
- fi
+ fi
fi
# Extract the first word of "mount", so it can be a program name with args.
@@ -5469,7 +6646,7 @@
-ALL_LINGUAS="de es fr he it ja sv"
+ALL_LINGUAS="de es fr he it ja ru ro sv"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6307,7 +7484,7 @@
fi
fi
- USE_NLS=yes
+ USE_NLS=yes
gt_cv_have_gettext=no
@@ -7262,6 +8439,35 @@
fi
done
+ MSGFMT_OPTS=
+ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+ cat >conftest.foo <<_ACEOF
+
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo at bar.xx>\n"
+"Language-Team: C <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+echo "$as_me: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
+fi
+
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -8076,6 +9282,13 @@
+# Check whether --with-curl was given.
+if test "${with_curl+set}" = set; then
+ withval=$with_curl;
+fi
+
+if test "x$with_curl" != "xno"; then
+
pkg_failed=no
{ echo "$as_me:$LINENO: checking for CURL" >&5
echo $ECHO_N "checking for CURL... $ECHO_C" >&6; }
@@ -8146,8 +9359,22 @@
echo "${ECHO_T}yes" >&6; }
have_curl=yes
fi
-if test "$have_curl" != "no"; then
+ if test "x$with_curl" = "xyes" -a "x$have_curl" = "xno"; then
+ { { echo "$as_me:$LINENO: error: curl support explicitly requested but curl couldn't be found" >&5
+echo "$as_me: error: curl support explicitly requested but curl couldn't be found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+ if test "x$have_curl" = "xyes"; then
+ HAVE_CURL_TRUE=
+ HAVE_CURL_FALSE='#'
+else
+ HAVE_CURL_TRUE='#'
+ HAVE_CURL_FALSE=
+fi
+if test "x$have_curl" = "xyes"; then
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_CURL 1
_ACEOF
@@ -8155,9 +9382,8 @@
have_curl="yes -- will build with coverart download support"
CPPFLAGS="$CPPFLAGS $CURL_CFLAGS"
CFLAGS="$CFLAGS $CURL_CFLAGS"
- LDFLAGS="$LDFLAGS $CURL_LIBS"
+ LIBS="$LIBS $CURL_LIBS"
else
- echo "*** libcurl could not be found, not building coverart download support"
have_curl="*no -- will build without coverart download support"
fi
@@ -8229,47 +9455,44 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- enable_gnome_vfs=no
+ have_gnome_vfs=no
elif test $pkg_failed = untried; then
- enable_gnome_vfs=no
+ have_gnome_vfs=no
else
GNOME_VFS_CFLAGS=$pkg_cv_GNOME_VFS_CFLAGS
GNOME_VFS_LIBS=$pkg_cv_GNOME_VFS_LIBS
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- enable_gnome_vfs=yes
+ have_gnome_vfs=yes
fi
- if test "x$enable_gnome_vfs" != "xyes" -a "x$with_gnome_vfs" = "xyes"; then
- { { echo "$as_me:$LINENO: error: gnome-vfs support explicitly requested but gnome-vfs couldn't be found" >&5
+ if test "x$with_gnome_vfs" = "xyes" -a "x$have_gnome_vfs" = "xno"; then
+ { { echo "$as_me:$LINENO: error: gnome-vfs support explicitly requested but gnome-vfs couldn't be found" >&5
echo "$as_me: error: gnome-vfs support explicitly requested but gnome-vfs couldn't be found" >&2;}
{ (exit 1); exit 1; }; }
- fi
+ fi
fi
-if test "x$enable_gnome_vfs" = "xyes"; then
- have_gnomevfs="yes -- will build with automount support"
+ if test "x$have_gnome_vfs" = "xyes"; then
+ HAVE_GNOME_VFS_TRUE=
+ HAVE_GNOME_VFS_FALSE='#'
+else
+ HAVE_GNOME_VFS_TRUE='#'
+ HAVE_GNOME_VFS_FALSE=
+fi
+if test "x$have_gnome_vfs" = "xyes"; then
+ have_gnome_vfs="yes -- will build with automount support"
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_GNOME_VFS 1
_ACEOF
CPPFLAGS="$CPPFLAGS $GNOME_VFS_CFLAGS"
CFLAGS="$CFLAGS $GNOME_VFS_CFLAGS"
- LDFLAGS="$LDFLAGS $GNOME_VFS_LIBS"
+ LIBS="$LIBS $GNOME_VFS_LIBS"
else
- echo "*** gnome-vfs-2 not found or disabled, not building iPod autodetection support"
- have_gnomevfs="*no -- will build without iPod autodetection support"
+ have_gnome_vfs="*no -- will build without iPod autodetection support"
fi
-
-if test x"$enable_gnome_vfs" = xyes; then
- HAVE_GNOME_VFS_TRUE=
- HAVE_GNOME_VFS_FALSE='#'
-else
- HAVE_GNOME_VFS_TRUE='#'
- HAVE_GNOME_VFS_FALSE=
-fi
-
-
#dnl Check for HAL
# Check whether --with-hal was given.
@@ -8339,48 +9562,52 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- enable_hal=no
+ have_hal=no
elif test $pkg_failed = untried; then
- enable_hal=no
+ have_hal=no
else
HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
HAL_LIBS=$pkg_cv_HAL_LIBS
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- enable_hal=yes
+ have_hal=yes
fi
- if test "x$enable_hal" != "xyes" -a "x$with_hal" = "xyes"; then
- { { echo "$as_me:$LINENO: error: HAL support explicitly requested but HAL couldn't be found" >&5
+ if test "x$with_hal" = "xyes" -a "x$have_hal" = "xno"; then
+ { { echo "$as_me:$LINENO: error: HAL support explicitly requested but HAL couldn't be found" >&5
echo "$as_me: error: HAL support explicitly requested but HAL couldn't be found" >&2;}
{ (exit 1); exit 1; }; }
- fi
+ fi
fi
-if test "x$enable_hal" = "xyes"; then
- have_hal="yes -- will build with HAL support"
+ if test "x$have_hal" = "xyes"; then
+ HAVE_HAL_TRUE=
+ HAVE_HAL_FALSE='#'
+else
+ HAVE_HAL_TRUE='#'
+ HAVE_HAL_FALSE=
+fi
+if test "x$have_hal" = "xyes"; then
+ have_hal="yes -- will build with HAL support"
+
cat >>confdefs.h <<\_ACEOF
#define HAVE_HAL 1
_ACEOF
- CPPFLAGS="$CPPFLAGS $HAL_CFLAGS"
- CFLAGS="$CFLAGS $HAL_CFLAGS"
- LDFLAGS="$LDFLAGS $HAL_LIBS"
+ CPPFLAGS="$CPPFLAGS $HAL_CFLAGS"
+ CFLAGS="$CFLAGS $HAL_CFLAGS"
+ LIBS="$LIBS $HAL_LIBS"
else
- have_hal="*no -- will build without HAL support"
+ have_hal="*no -- will build without HAL support"
fi
-if test x"$enable_hal" = xyes; then
- HAVE_HAL_TRUE=
- HAVE_HAL_FALSE='#'
-else
- HAVE_HAL_TRUE='#'
- HAVE_HAL_FALSE=
+# Check whether --with-mp4v2 was given.
+if test "${with_mp4v2+set}" = set; then
+ withval=$with_mp4v2;
fi
-
-
-{ echo "$as_me:$LINENO: checking for library containing MP4GetMetadataGrouping" >&5
+if test "x$with_mp4v2" != "xno"; then
+ { echo "$as_me:$LINENO: checking for library containing MP4GetMetadataGrouping" >&5
echo $ECHO_N "checking for library containing MP4GetMetadataGrouping... $ECHO_C" >&6; }
if test "${ac_cv_search_MP4GetMetadataGrouping+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8586,24 +9813,160 @@
fi
if test $ac_cv_header_mp4_h = yes; then
- have_mp4v2="yes -- will build with aac support"
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMP4V2 1
+ have_mp4v2=yes
+else
+ have_mp4v2_header=no
+fi
+
+
+else
+ have_mp4v2=no
+fi
+
+ if test "x$have_mp4v2_header" = "xno"; then
+ have_mp4v2="no"
+ { echo "$as_me:$LINENO: WARNING: mp4.h cannot be found or is unusable. Check your mp4v2 installation." >&5
+echo "$as_me: WARNING: mp4.h cannot be found or is unusable. Check your mp4v2 installation." >&2;}
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <mp4.h>
+int
+main ()
+{
+bool TestMP4GetMetadataFreeForm(MP4FileHandle hFile, const char *name,
+ u_int8_t** pValue, u_int32_t* valueSize, const char *owner)
+ {
+ MP4GetMetadataFreeForm(hFile, name,pValue, valueSize, owner);
+ }
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ freeform_accepts_extra_arg=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <mp4.h>
+int
+main ()
+{
+bool TestMP4GetMetadataCoverArt(MP4FileHandle hFile,
+ u_int8_t **coverArt, u_int32_t* size, uint32_t index)
+ {
+ MP4GetMetadataCoverArt(hFile, coverArt, size, index);
+ }
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ coverart_accepts_extra_arg=yes
else
- echo "*** mp4.h cannot be found. Check your mp4v2 installation."
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test "x$freeform_accepts_extra_arg" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define FREEFORM_ACCEPTS_EXTRA_ARG 1
+_ACEOF
+
+ fi
+ if test "x$coverart_accepts_extra_arg" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define COVERART_ACCEPTS_EXTRA_ARG 1
+_ACEOF
+
+ fi
+ fi
+ if test "x$with_mp4v2" = "xyes" -a "x$have_mp4v2" = "xno"; then
+ { { echo "$as_me:$LINENO: error: MP4/AAC support explicitly requested but libmp4v2 couldn't be found" >&5
+echo "$as_me: error: MP4/AAC support explicitly requested but libmp4v2 couldn't be found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi
+ if test "x$have_mp4v2" = "xyes"; then
+ HAVE_LIBMP4V2_TRUE=
+ HAVE_LIBMP4V2_FALSE='#'
+else
+ HAVE_LIBMP4V2_TRUE='#'
+ HAVE_LIBMP4V2_FALSE=
+fi
+if test "x$have_mp4v2" = "xyes"; then
+ have_mp4v2="yes -- will build with aac support"
-if test "y$have_mp4v2" = "y"; then
- have_mp4v2="*no -- will build without aac support"
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBMP4V2 1
+_ACEOF
+
+else
+ have_mp4v2="*no -- will build without aac support"
fi
-{ echo "$as_me:$LINENO: checking for library containing ov_open" >&5
+
+# Check whether --with-ogg was given.
+if test "${with_ogg+set}" = set; then
+ withval=$with_ogg;
+fi
+
+if test "x$with_ogg" != "xno"; then
+ { echo "$as_me:$LINENO: checking for library containing ov_open" >&5
echo $ECHO_N "checking for library containing ov_open... $ECHO_C" >&6; }
if test "${ac_cv_search_ov_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8809,23 +10172,54 @@
fi
if test $ac_cv_header_vorbis_vorbisfile_h = yes; then
- have_vorbisfile="yes -- will build with ogg support"
-cat >>confdefs.h <<_ACEOF
+ have_ogg=yes
+else
+ have_ogg_header=no
+fi
+
+
+else
+ have_ogg=no
+fi
+
+ if test "x$have_ogg_header" = "xno"; then
+ have_ogg="no"
+ { echo "$as_me:$LINENO: WARNING: vorbis/vorbisfile.h cannot be found or is unusable. Check your ogg/vorbis installation." >&5
+echo "$as_me: WARNING: vorbis/vorbisfile.h cannot be found or is unusable. Check your ogg/vorbis installation." >&2;}
+ fi
+ if test "x$with_ogg" = "xyes" -a "x$have_ogg" = "xno"; then
+ { { echo "$as_me:$LINENO: error: Ogg/Vorbis support explicitly requested but ogg/vorbis libs couldn't be found" >&5
+echo "$as_me: error: Ogg/Vorbis support explicitly requested but ogg/vorbis libs couldn't be found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+ if test "x$have_ogg" = "xyes"; then
+ HAVE_LIBVORBISFILE_TRUE=
+ HAVE_LIBVORBISFILE_FALSE='#'
+else
+ HAVE_LIBVORBISFILE_TRUE='#'
+ HAVE_LIBVORBISFILE_FALSE=
+fi
+
+if test "x$have_ogg" = "xyes"; then
+ have_ogg="yes -- will build with ogg support"
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBVORBISFILE 1
_ACEOF
else
- echo "*** vorbisfile.h cannot be found. Check your ogg/vorbis installation."
+ have_ogg="*no -- will build without ogg support"
fi
+# Check whether --with-flac was given.
+if test "${with_flac+set}" = set; then
+ withval=$with_flac;
fi
-if test "y$have_vorbisfile" = "y"; then
- have_vorbisfile="*no -- will build without ogg support"
-fi
-
-{ echo "$as_me:$LINENO: checking for library containing FLAC__metadata_get_streaminfo" >&5
+if test "x$with_flac" != "xno"; then
+ { echo "$as_me:$LINENO: checking for library containing FLAC__metadata_get_streaminfo" >&5
echo $ECHO_N "checking for library containing FLAC__metadata_get_streaminfo... $ECHO_C" >&6; }
if test "${ac_cv_search_FLAC__metadata_get_streaminfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9031,22 +10425,46 @@
fi
if test $ac_cv_header_FLAC_metadata_h = yes; then
- have_flac="yes -- will build with FLAC support"
-cat >>confdefs.h <<_ACEOF
-#define HAVE_FLAC 1
-_ACEOF
-
+ have_flac=yes
else
- echo "*** FLAC/metadata.h cannot be found. Check your FLAC installation."
+ have_flac_header=no
fi
+else
+ have_flac=no
fi
-if test "y$have_flac" = "y"; then
- have_flac="*no -- will build without FLAC support"
+ if test "x$have_flac_header" = "xno"; then
+ have_flac="no"
+ { echo "$as_me:$LINENO: WARNING: FLAC/metadata.h cannot be found or is unusable. Check your FLACinstallation." >&5
+echo "$as_me: WARNING: FLAC/metadata.h cannot be found or is unusable. Check your FLACinstallation." >&2;}
+ fi
+ if test "xwith_flac" = "xyes" -a "x$have_flac" = "xno"; then
+ { { echo "$as_me:$LINENO: error: FLAC support explicitly requested but flac libs couldn't be found" >&5
+echo "$as_me: error: FLAC support explicitly requested but flac libs couldn't be found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi
+ if test "x$have_flac" = "xyes"; then
+ HAVE_FLAC_TRUE=
+ HAVE_FLAC_FALSE='#'
+else
+ HAVE_FLAC_TRUE='#'
+ HAVE_FLAC_FALSE=
+fi
+if test "x$have_flac" = "xyes"; then
+ have_flac="yes -- will build with FLAC support"
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_FLAC 1
+_ACEOF
+
+else
+ have_flac="*no -- will build without FLAC support"
+fi
+
{ echo "$as_me:$LINENO: checking for library containing bind" >&5
echo $ECHO_N "checking for library containing bind... $ECHO_C" >&6; }
if test "${ac_cv_search_bind+set}" = set; then
@@ -9401,10 +10819,24 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
ac_config_commands="$ac_config_commands po/stamp-it"
+if test -z "${HAVE_CURL_TRUE}" && test -z "${HAVE_CURL_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_CURL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_CURL\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${HAVE_GNOME_VFS_TRUE}" && test -z "${HAVE_GNOME_VFS_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_VFS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -9419,6 +10851,27 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_LIBMP4V2_TRUE}" && test -z "${HAVE_LIBMP4V2_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBMP4V2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_LIBMP4V2\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_LIBVORBISFILE_TRUE}" && test -z "${HAVE_LIBVORBISFILE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBVORBISFILE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_LIBVORBISFILE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_FLAC_TRUE}" && test -z "${HAVE_FLAC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_FLAC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_FLAC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -9783,6 +11236,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -9878,9 +11332,7 @@
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
_ACEOF
@@ -10007,6 +11459,7 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -10015,13 +11468,16 @@
AUTOMAKE!$AUTOMAKE$ac_delim
AUTOHEADER!$AUTOHEADER$ac_delim
MAKEINFO!$MAKEINFO$ac_delim
-AMTAR!$AMTAR$ac_delim
install_sh!$install_sh$ac_delim
STRIP!$STRIP$ac_delim
INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+mkdir_p!$mkdir_p$ac_delim
AWK!$AWK$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
am__leading_dot!$am__leading_dot$ac_delim
+AMTAR!$AMTAR$ac_delim
+am__tar!$am__tar$ac_delim
+am__untar!$am__untar$ac_delim
MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
MAINT!$MAINT$ac_delim
@@ -10060,10 +11516,6 @@
INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
-INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
-INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
-INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
-INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -10105,24 +11557,36 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
+INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
+INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
+INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
DATADIRNAME!$DATADIRNAME$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-have_pkgconfig!$have_pkgconfig$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
-PACKAGE_CFLAGS!$PACKAGE_CFLAGS$ac_delim
-PACKAGE_LIBS!$PACKAGE_LIBS$ac_delim
+GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+GTK_LIBS!$GTK_LIBS$ac_delim
+GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+GLIB_LIBS!$GLIB_LIBS$ac_delim
+GMODULE_CFLAGS!$GMODULE_CFLAGS$ac_delim
+GMODULE_LIBS!$GMODULE_LIBS$ac_delim
+GTHREAD_CFLAGS!$GTHREAD_CFLAGS$ac_delim
+GTHREAD_LIBS!$GTHREAD_LIBS$ac_delim
+LIBGLADE_CFLAGS!$LIBGLADE_CFLAGS$ac_delim
+LIBGLADE_LIBS!$LIBGLADE_LIBS$ac_delim
+LIBGNOMECANVAS_CFLAGS!$LIBGNOMECANVAS_CFLAGS$ac_delim
+LIBGNOMECANVAS_LIBS!$LIBGNOMECANVAS_LIBS$ac_delim
+LIBGPOD_CFLAGS!$LIBGPOD_CFLAGS$ac_delim
+LIBGPOD_LIBS!$LIBGPOD_LIBS$ac_delim
LEX!$LEX$ac_delim
LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
LEXLIB!$LEXLIB$ac_delim
@@ -10133,6 +11597,7 @@
EGREP!$EGREP$ac_delim
USE_NLS!$USE_NLS$ac_delim
MSGFMT!$MSGFMT$ac_delim
+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
CATALOGS!$CATALOGS$ac_delim
@@ -10148,6 +11613,8 @@
LIBOBJS!$LIBOBJS$ac_delim
CURL_CFLAGS!$CURL_CFLAGS$ac_delim
CURL_LIBS!$CURL_LIBS$ac_delim
+HAVE_CURL_TRUE!$HAVE_CURL_TRUE$ac_delim
+HAVE_CURL_FALSE!$HAVE_CURL_FALSE$ac_delim
GNOME_VFS_CFLAGS!$GNOME_VFS_CFLAGS$ac_delim
GNOME_VFS_LIBS!$GNOME_VFS_LIBS$ac_delim
HAVE_GNOME_VFS_TRUE!$HAVE_GNOME_VFS_TRUE$ac_delim
@@ -10156,10 +11623,16 @@
HAL_LIBS!$HAL_LIBS$ac_delim
HAVE_HAL_TRUE!$HAVE_HAL_TRUE$ac_delim
HAVE_HAL_FALSE!$HAVE_HAL_FALSE$ac_delim
+HAVE_LIBMP4V2_TRUE!$HAVE_LIBMP4V2_TRUE$ac_delim
+HAVE_LIBMP4V2_FALSE!$HAVE_LIBMP4V2_FALSE$ac_delim
+HAVE_LIBVORBISFILE_TRUE!$HAVE_LIBVORBISFILE_TRUE$ac_delim
+HAVE_LIBVORBISFILE_FALSE!$HAVE_LIBVORBISFILE_FALSE$ac_delim
+HAVE_FLAC_TRUE!$HAVE_FLAC_TRUE$ac_delim
+HAVE_FLAC_FALSE!$HAVE_FLAC_FALSE$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -10386,6 +11859,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -10439,6 +11917,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@@ -10603,8 +12082,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
@@ -10631,27 +12111,21 @@
else
continue
fi
- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -10729,10 +12203,6 @@
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
@@ -10812,15 +12282,15 @@
Install path .........: $prefix
GTK2 version .........: `pkg-config gtk+-2.0 --modversion`
GLib2/GThread version : `pkg-config gthread-2.0 --modversion`
- gnome-vfs.............: $have_gnomevfs
+ gnome-vfs.............: $have_gnome_vfs
hal...................: $have_hal
libcurl ..............: $have_curl
mp4v2 ................: $have_mp4v2
- vorbisfile ...........: $have_vorbisfile
+ vorbisfile ...........: $have_ogg
FLAC .................: $have_flac
Preprocessor .........: $CC $CPPFLAGS
- Compiler .............: $CC $CFLAGS $PACKAGE_CFLAGS
- Linker ...............: $CC $LDFLAGS $LIBS $PACKAGE_LIBS
+ Compiler .............: $CC $CFLAGS
+ Linker ...............: $CC $LDFLAGS $LIBS
Now type 'make' to build $PACKAGE $VERSION,
and then 'make install' for installation.
Property changes on: gtkpod/branches/etch-bpo/configure
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/configure.in
===================================================================
--- gtkpod/branches/etch-bpo/configure.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/configure.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -4,7 +4,7 @@
AC_PREREQ(2.55)
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gtkpod, 0.99.10)
+AM_INIT_AUTOMAKE(gtkpod, 0.99.12)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
@@ -16,15 +16,15 @@
dnl Only use -Wall if we have gcc
if test "x$GCC" = "xyes"; then
- if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
- CFLAGS="$CFLAGS -Wall"
- fi
- # gcc < 4.0 does not know '-Wno-pointer-sign'. Try to find out
- # whether we can set this option or not.
- CFLAGS_orig=$CFLAGS
- CFLAGS="$CFLAGS -Wno-pointer-sign"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]])],
- [], [CFLAGS=$CFLAGS_orig])
+ if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
+ CFLAGS="$CFLAGS -Wall"
+ fi
+ # gcc < 4.0 does not know '-Wno-pointer-sign'. Try to find out
+ # whether we can set this option or not.
+ CFLAGS_orig=$CFLAGS
+ CFLAGS="$CFLAGS -Wno-pointer-sign"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]])],
+ [], [CFLAGS=$CFLAGS_orig])
fi
GETTEXT_PACKAGE=gtkpod
@@ -32,23 +32,31 @@
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",["Gettext package name"])
dnl check if pkg-config exists -- if not print a meaningful error message
-AC_CHECK_PROG([have_pkgconfig], [pkg-config], ["ok"])
-
-if test "y$have_pkgconfig" = "y"; then
- AC_MSG_FAILURE([**** pkg-config required (http://www.freedesktop.org/software/pkgconfig)])
+AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+if test -z "$PKG_CONFIG"; then
+ AC_MSG_FAILURE([*** pkg-config required (http://www.freedesktop.org/software/pkgconfig)])
+else
+ ac_cv_env_PKG_CONFIG_set=set
fi
-dnl check for libs that are managed with pkg-config
-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0 libgpod-1.0 >= 0.5.2],,[AC_MSG_FAILURE([*** $PACKAGE_PKG_ERRORS])])
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
+dnl check for required libs that are managed with pkg-config
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0,, [AC_MSG_FAILURE([*** $GTK_PKG_ERRORS])])
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.4.0,, [AC_MSG_FAILURE([*** $GLIB_PKG_ERRORS])])
+PKG_CHECK_MODULES(GMODULE, gmodule-2.0,, [AC_MSG_FAILURE([*** $GMODULE_PKG_ERRORS])])
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 0.14.0,, [AC_MSG_FAILURE([*** $GTHREAD_PKG_ERRORS])])
+PKG_CHECK_MODULES(LIBGLADE, libglade-2.0 >= 2.4.0,, [AC_MSG_FAILURE([*** $LIBGLADE_PKG_ERRORS])])
+PKG_CHECK_MODULES(LIBGNOMECANVAS, libgnomecanvas-2.0 >= 2.14.0,, [AC_MSG_FAILURE([*** $LIBGNOMECANVAS_PKG_ERRORS])])
+PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.6.0,, [AC_MSG_FAILURE([*** $LIBGPOD_PKG_ERRORS])])
+CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS $LIBGLADE_CFLAGS $LIBGNOMECANVAS_CFLAGS $LIBGPOD_CFLAGS"
+LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS $LIBGNOMECANVAS_LIBS $LIBGPOD_LIBS"
+
dnl we need 'flex'
AM_PROG_LEX
if ! test "y$LEX" = "yflex"; then
- if ! test "y$LEX" = "ylex"; then
- AC_MSG_FAILURE([**** flex or lex required])
- fi
+ if ! test "y$LEX" = "ylex"; then
+ AC_MSG_FAILURE([*** flex or lex required])
+ fi
fi
dnl Retrieve the path of mount and umount binaries
@@ -58,7 +66,7 @@
AC_SUBST(UMOUNT)
dnl Add the languages which your application supports here.
-ALL_LINGUAS="de es fr he it ja sv"
+ALL_LINGUAS="de es fr he it ja ru ro sv"
AM_GLIB_GNU_GETTEXT
dnl Check if we have to supply getopt_long
@@ -67,109 +75,162 @@
AC_CHECK_FUNCS(getopt_long_only, , [AC_LIBOBJ(getopt)])
AC_CHECK_FUNCS(getopt_long_only, , [AC_LIBOBJ(getopt1)])
-dnl Check if flock() is available (seems to be missing on some
-dnl solaris versions)
+dnl Check if flock() is available (seems to be missing on some solaris versions)
AC_CHECK_FUNCS(flock)
-dnl Check if statvfs() is available (otherwise we fall back on
-dnl 'df' to determine free space on the iPod
+dnl Check if statvfs() is available (otherwise we fall back on 'df' to determine
+dnl free space on the iPod
AC_CHECK_FUNCS(statvfs)
dnl Check for libid3tag
-AC_SEARCH_LIBS([id3_frame_field],
- ["id3tag" "id3tag -lz"],
- ,
- AC_MSG_ERROR([*** id3tag >= 0.15 lib not found (0.14 will not work!)]))
+AC_SEARCH_LIBS([id3_frame_field], ["id3tag" "id3tag -lz"],,
+ AC_MSG_ERROR([*** id3tag >= 0.15 lib not found (0.14 will not work!)]))
dnl Check for libcurl
-PKG_CHECK_MODULES(CURL, [libcurl >= 7.10.0], have_curl=yes, have_curl=no)
-if test "$have_curl" != "no"; then
- AC_DEFINE(HAVE_CURL, 1, ["libcurl support"])
+AC_ARG_WITH(curl, AC_HELP_STRING([--without-curl], [Disable coverart download support]))
+if test "x$with_curl" != "xno"; then
+ PKG_CHECK_MODULES(CURL, [libcurl >= 7.10.0], have_curl=yes, have_curl=no)
+ if test "x$with_curl" = "xyes" -a "x$have_curl" = "xno"; then
+ AC_MSG_ERROR([curl support explicitly requested but curl couldn't be found])
+ fi
+fi
+AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes")
+if test "x$have_curl" = "xyes"; then
+ AC_DEFINE(HAVE_CURL, 1, [Define if you have curl support])
have_curl="yes -- will build with coverart download support"
CPPFLAGS="$CPPFLAGS $CURL_CFLAGS"
CFLAGS="$CFLAGS $CURL_CFLAGS"
- LDFLAGS="$LDFLAGS $CURL_LIBS"
+ LIBS="$LIBS $CURL_LIBS"
else
- echo "*** libcurl could not be found, not building coverart download support"
have_curl="*no -- will build without coverart download support"
fi
dnl Check for gnome-vfs
-AC_ARG_WITH(gnome-vfs,
- AC_HELP_STRING([--without-gnome-vfs],[Disable autodetection support]))
+AC_ARG_WITH(gnome-vfs, AC_HELP_STRING([--without-gnome-vfs],[Disable autodetection support]))
if test "x$with_gnome_vfs" != "xno"; then
- PKG_CHECK_MODULES(GNOME_VFS, [gnome-vfs-2.0 >= 2.6.0], enable_gnome_vfs=yes, enable_gnome_vfs=no)
- if test "x$enable_gnome_vfs" != "xyes" -a "x$with_gnome_vfs" = "xyes"; then
- AC_MSG_ERROR([gnome-vfs support explicitly requested but gnome-vfs couldn't be found])
- fi
+ PKG_CHECK_MODULES(GNOME_VFS, [gnome-vfs-2.0 >= 2.6.0], have_gnome_vfs=yes, have_gnome_vfs=no)
+ if test "x$with_gnome_vfs" = "xyes" -a "x$have_gnome_vfs" = "xno"; then
+ AC_MSG_ERROR([gnome-vfs support explicitly requested but gnome-vfs couldn't be found])
+ fi
fi
-if test "x$enable_gnome_vfs" = "xyes"; then
- have_gnomevfs="yes -- will build with automount support"
+AM_CONDITIONAL(HAVE_GNOME_VFS, test "x$have_gnome_vfs" = "xyes")
+if test "x$have_gnome_vfs" = "xyes"; then
+ have_gnome_vfs="yes -- will build with automount support"
AC_DEFINE(HAVE_GNOME_VFS, 1, [Define if you have gnome-vfs support])
CPPFLAGS="$CPPFLAGS $GNOME_VFS_CFLAGS"
CFLAGS="$CFLAGS $GNOME_VFS_CFLAGS"
- LDFLAGS="$LDFLAGS $GNOME_VFS_LIBS"
+ LIBS="$LIBS $GNOME_VFS_LIBS"
else
- echo "*** gnome-vfs-2 not found or disabled, not building iPod autodetection support"
- have_gnomevfs="*no -- will build without iPod autodetection support"
+ have_gnome_vfs="*no -- will build without iPod autodetection support"
fi
-AM_CONDITIONAL(HAVE_GNOME_VFS, test x"$enable_gnome_vfs" = xyes)
#dnl Check for HAL
-AC_ARG_WITH(hal,
- AC_HELP_STRING([--without-hal],[Disable HAL support]))
+AC_ARG_WITH(hal, AC_HELP_STRING([--without-hal],[Disable HAL support]))
if test "x$with_hal" != "xno"; then
- PKG_CHECK_MODULES(HAL, hal >= 0.5 hal < 0.6, enable_hal=yes, enable_hal=no)
- if test "x$enable_hal" != "xyes" -a "x$with_hal" = "xyes"; then
- AC_MSG_ERROR([HAL support explicitly requested but HAL couldn't be found])
- fi
+ PKG_CHECK_MODULES(HAL, hal >= 0.5 hal < 0.6, have_hal=yes, have_hal=no)
+ if test "x$with_hal" = "xyes" -a "x$have_hal" = "xno"; then
+ AC_MSG_ERROR([HAL support explicitly requested but HAL couldn't be found])
+ fi
fi
-if test "x$enable_hal" = "xyes"; then
- have_hal="yes -- will build with HAL support"
- AC_DEFINE(HAVE_HAL, 1, [Define if you want HAL support])
- CPPFLAGS="$CPPFLAGS $HAL_CFLAGS"
- CFLAGS="$CFLAGS $HAL_CFLAGS"
- LDFLAGS="$LDFLAGS $HAL_LIBS"
+AM_CONDITIONAL(HAVE_HAL, test "x$have_hal" = "xyes")
+if test "x$have_hal" = "xyes"; then
+ have_hal="yes -- will build with HAL support"
+ AC_DEFINE(HAVE_HAL, 1, [Define if you have HAL support])
+ CPPFLAGS="$CPPFLAGS $HAL_CFLAGS"
+ CFLAGS="$CFLAGS $HAL_CFLAGS"
+ LIBS="$LIBS $HAL_LIBS"
else
- have_hal="*no -- will build without HAL support"
+ have_hal="*no -- will build without HAL support"
fi
-AM_CONDITIONAL(HAVE_HAL, test x"$enable_hal" = xyes)
-
dnl Check for libmp4v2 (and mp4.h)
-AC_SEARCH_LIBS(MP4GetMetadataGrouping,
- ["mp4v2" "mp4v2 -lstdc++" "mp4v2 -lz" "mp4v2 -lz -lstdc++"],
- [AC_CHECK_HEADER(mp4.h,
- [have_mp4v2="yes -- will build with aac support" AC_DEFINE_UNQUOTED(HAVE_LIBMP4V2, 1, ["Define to 1 if you have the mp4v2 library"])],
- [echo "*** mp4.h cannot be found. Check your mp4v2 installation."])])
+AC_ARG_WITH(mp4v2, AC_HELP_STRING([--without-mp4v2], [Disable MP4/AAC support]))
+if test "x$with_mp4v2" != "xno"; then
+ AC_SEARCH_LIBS(MP4GetMetadataGrouping,
+ ["mp4v2" "mp4v2 -lstdc++" "mp4v2 -lz" "mp4v2 -lz -lstdc++"],
+ [AC_CHECK_HEADER(mp4.h, have_mp4v2=yes, have_mp4v2_header=no)], have_mp4v2=no)
+ if test "x$have_mp4v2_header" = "xno"; then
+ have_mp4v2="no"
+ AC_MSG_WARN([mp4.h cannot be found or is unusable. Check your mp4v2 installation.])
+ else
+ AC_TRY_COMPILE( [#include <mp4.h> ],
+ [bool TestMP4GetMetadataFreeForm(MP4FileHandle hFile, const char *name,
+ u_int8_t** pValue, u_int32_t* valueSize, const char *owner)
+ {
+ MP4GetMetadataFreeForm(hFile, name,pValue, valueSize, owner);
+ } ], freeform_accepts_extra_arg=yes)
+ AC_TRY_COMPILE( [#include <mp4.h>],
+ [bool TestMP4GetMetadataCoverArt(MP4FileHandle hFile,
+ u_int8_t **coverArt, u_int32_t* size, uint32_t index)
+ {
+ MP4GetMetadataCoverArt(hFile, coverArt, size, index);
+ }], coverart_accepts_extra_arg=yes)
-if test "y$have_mp4v2" = "y"; then
- have_mp4v2="*no -- will build without aac support"
+ if test "x$freeform_accepts_extra_arg" = "xyes"; then
+ AC_DEFINE(FREEFORM_ACCEPTS_EXTRA_ARG, 1,[libmp4v2 probably version 1.6 or higher:
+ MP4GetMetadataFreeForm accepts extra argument])
+ fi
+ if test "x$coverart_accepts_extra_arg" = "xyes"; then
+ AC_DEFINE(COVERART_ACCEPTS_EXTRA_ARG, 1,[libmp4v2 probably version 1.6 or higher:
+ MP4GetMetadataCoverArt accepts an extra argument] )
+ fi
+ fi
+ if test "x$with_mp4v2" = "xyes" -a "x$have_mp4v2" = "xno"; then
+ AC_MSG_ERROR([MP4/AAC support explicitly requested but libmp4v2 couldn't be found])
+ fi
fi
+AM_CONDITIONAL(HAVE_LIBMP4V2, test "x$have_mp4v2" = "xyes")
+if test "x$have_mp4v2" = "xyes"; then
+ have_mp4v2="yes -- will build with aac support"
+ AC_DEFINE(HAVE_LIBMP4V2, 1, [Define if you have the mp4v2 library])
+else
+ have_mp4v2="*no -- will build without aac support"
+fi
-dnl Check for libvorbisfile
-AC_SEARCH_LIBS(ov_open,
- ["vorbisfile"],
- [AC_CHECK_HEADER(vorbis/vorbisfile.h,
- [have_vorbisfile="yes -- will build with ogg support" AC_DEFINE_UNQUOTED(HAVE_LIBVORBISFILE, 1, ["Define to 1 if you have the ogg library"])],
- [echo "*** vorbisfile.h cannot be found. Check your ogg/vorbis installation."])])
-if test "y$have_vorbisfile" = "y"; then
- have_vorbisfile="*no -- will build without ogg support"
+dnl Check for libvorbisfile
+AC_ARG_WITH(ogg, AC_HELP_STRING([--without-ogg], [Disable Ogg/Vorbis support]))
+if test "x$with_ogg" != "xno"; then
+ AC_SEARCH_LIBS(ov_open, ["vorbisfile"],
+ [AC_CHECK_HEADER(vorbis/vorbisfile.h, have_ogg=yes, have_ogg_header=no)], have_ogg=no)
+ if test "x$have_ogg_header" = "xno"; then
+ have_ogg="no"
+ AC_MSG_WARN([vorbis/vorbisfile.h cannot be found or is unusable. Check your ogg/vorbis installation.])
+ fi
+ if test "x$with_ogg" = "xyes" -a "x$have_ogg" = "xno"; then
+ AC_MSG_ERROR([Ogg/Vorbis support explicitly requested but ogg/vorbis libs couldn't be found])
+ fi
fi
+AM_CONDITIONAL(HAVE_LIBVORBISFILE, test "x$have_ogg" = "xyes")
+if test "x$have_ogg" = "xyes"; then
+ have_ogg="yes -- will build with ogg support"
+ AC_DEFINE(HAVE_LIBVORBISFILE, 1, [Define if you have the ogg/vorbis library])
+else
+ have_ogg="*no -- will build without ogg support"
+fi
dnl Check for FLAC
-AC_SEARCH_LIBS(FLAC__metadata_get_streaminfo,
- ["FLAC"],
- [AC_CHECK_HEADER(FLAC/metadata.h,
- [have_flac="yes -- will build with FLAC support" AC_DEFINE_UNQUOTED(HAVE_FLAC, 1, ["Define to 1 if you have the flac library"])],
- [echo "*** FLAC/metadata.h cannot be found. Check your FLAC installation."])])
-if test "y$have_flac" = "y"; then
- have_flac="*no -- will build without FLAC support"
+AC_ARG_WITH(flac, AC_HELP_STRING([--without-flac], [Disable FLAC support]))
+if test "x$with_flac" != "xno"; then
+ AC_SEARCH_LIBS(FLAC__metadata_get_streaminfo, ["FLAC"],
+ [AC_CHECK_HEADER(FLAC/metadata.h, have_flac=yes, have_flac_header=no)], have_flac=no)
+ if test "x$have_flac_header" = "xno"; then
+ have_flac="no"
+ AC_MSG_WARN([FLAC/metadata.h cannot be found or is unusable. Check your FLACinstallation.])
+ fi
+ if test "xwith_flac" = "xyes" -a "x$have_flac" = "xno"; then
+ AC_MSG_ERROR([FLAC support explicitly requested but flac libs couldn't be found])
+ fi
fi
+AM_CONDITIONAL(HAVE_FLAC, test "x$have_flac" = "xyes")
+if test "x$have_flac" = "xyes"; then
+ have_flac="yes -- will build with FLAC support"
+ AC_DEFINE(HAVE_FLAC, 1, [Define if you have the flac library])
+else
+ have_flac="*no -- will build without FLAC support"
+fi
dnl Additional libs maybe needed when compiling under solaris
-AC_SEARCH_LIBS(bind,
- ["socket" "nsl" "socket -lnsl"])
+AC_SEARCH_LIBS(bind, ["socket" "nsl" "socket -lnsl"])
dnl Check for Linux-specific headers (so we can compile Linux-specific
dnl stuff only when compiling under Linux)
@@ -195,15 +256,15 @@
Install path .........: $prefix
GTK2 version .........: `pkg-config gtk+-2.0 --modversion`
GLib2/GThread version : `pkg-config gthread-2.0 --modversion`
- gnome-vfs.............: $have_gnomevfs
+ gnome-vfs.............: $have_gnome_vfs
hal...................: $have_hal
libcurl ..............: $have_curl
mp4v2 ................: $have_mp4v2
- vorbisfile ...........: $have_vorbisfile
+ vorbisfile ...........: $have_ogg
FLAC .................: $have_flac
Preprocessor .........: $CC $CPPFLAGS
- Compiler .............: $CC $CFLAGS $PACKAGE_CFLAGS
- Linker ...............: $CC $LDFLAGS $LIBS $PACKAGE_LIBS
+ Compiler .............: $CC $CFLAGS
+ Linker ...............: $CC $LDFLAGS $LIBS
Now type 'make' to build $PACKAGE $VERSION,
and then 'make install' for installation.
Property changes on: gtkpod/branches/etch-bpo/configure.in
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/data/Makefile.am
===================================================================
--- gtkpod/branches/etch-bpo/data/Makefile.am 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/data/Makefile.am 2008-04-17 18:50:56 UTC (rev 306)
@@ -20,7 +20,16 @@
gtkpod-logo.png \
gtkpod-new-playlist.png \
gtkpod-read.png \
- gtkpod-sync.png
+ gtkpod-read-16.png \
+ gtkpod-sync.png \
+ gphoto_album_menuitem-32.png \
+ gphoto_album_menuitem-48.png \
+ gphoto_images_menuitem-32.png \
+ gphoto_images_menuitem-48.png \
+ gphoto_tools_menuitem-32.png \
+ gphoto_tools_menuitem-48.png \
+ gphoto_playlist_icon-48.png \
+ tunes_playlist_icon-48.png
EXTRA_DIST = \
$(desktop_in_files) \
Modified: gtkpod/branches/etch-bpo/data/Makefile.in
===================================================================
--- gtkpod/branches/etch-bpo/data/Makefile.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/data/Makefile.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
@@ -14,16 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +30,44 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+subdir = data
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)"
+appdataDATA_INSTALL = $(INSTALL_DATA)
+desktopDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(appdata_DATA) $(desktop_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -64,17 +92,22 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -85,14 +118,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -104,28 +135,31 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+LIBGNOMECANVAS_LIBS = @LIBGNOMECANVAS_LIBS@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOUNT = @MOUNT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -143,24 +177,28 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-have_pkgconfig = @have_pkgconfig@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -175,6 +213,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -182,14 +221,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = icons
-
desktopdir = $(datadir)/applications
desktop_in_files = gtkpod.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
appdatadir = $(pkgdatadir)/data
appdata_DATA = \
gtkpod.glade \
@@ -205,78 +245,90 @@
gtkpod-logo.png \
gtkpod-new-playlist.png \
gtkpod-read.png \
- gtkpod-sync.png
+ gtkpod-read-16.png \
+ gtkpod-sync.png \
+ gphoto_album_menuitem-32.png \
+ gphoto_album_menuitem-48.png \
+ gphoto_images_menuitem-32.png \
+ gphoto_images_menuitem-48.png \
+ gphoto_tools_menuitem-32.png \
+ gphoto_tools_menuitem-48.png \
+ gphoto_playlist_icon-48.png \
+ tunes_playlist_icon-48.png
-
EXTRA_DIST = \
$(desktop_in_files) \
$(appdata_DATA)
-
CLEANFILES = \
$(desktop_DATA) \
gtkpod.gladep
-subdir = data
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(appdata_DATA) $(desktop_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-appdataDATA_INSTALL = $(INSTALL_DATA)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-appdataDATA: $(appdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(appdatadir)
+ test -z "$(appdatadir)" || $(MKDIR_P) "$(DESTDIR)$(appdatadir)"
@list='$(appdata_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(appdataDATA_INSTALL) $$d$$p $(DESTDIR)$(appdatadir)/$$f"; \
- $(appdataDATA_INSTALL) $$d$$p $(DESTDIR)$(appdatadir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " $(appdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdatadir)/$$f'"; \
+ $(appdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdatadir)/$$f"; \
done
uninstall-appdataDATA:
@$(NORMAL_UNINSTALL)
@list='$(appdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(appdatadir)/$$f"; \
- rm -f $(DESTDIR)$(appdatadir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(appdatadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(appdatadir)/$$f"; \
done
-desktopDATA_INSTALL = $(INSTALL_DATA)
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(desktopdir)
+ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(desktopdir)/$$f"; \
- $(desktopDATA_INSTALL) $$d$$p $(DESTDIR)$(desktopdir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
+ $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
done
uninstall-desktopDATA:
@$(NORMAL_UNINSTALL)
@list='$(desktop_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(desktopdir)/$$f"; \
- rm -f $(DESTDIR)$(desktopdir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
done
# This directory's subdirectories are mostly independent; you can cd
@@ -286,7 +338,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -298,15 +356,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -327,7 +390,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -338,14 +401,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -354,19 +409,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
+ test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -376,10 +434,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
-
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -402,28 +461,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
distdir: $(DISTFILES)
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -434,15 +488,19 @@
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -452,8 +510,9 @@
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(appdatadir) $(DESTDIR)$(desktopdir)
-
+ for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -474,7 +533,7 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -491,18 +550,28 @@
dvi-am:
+html: html-recursive
+
info: info-recursive
info-am:
install-data-am: install-appdataDATA install-desktopDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -521,27 +590,24 @@
ps-am:
-uninstall-am: uninstall-appdataDATA uninstall-desktopDATA \
- uninstall-info-am
+uninstall-am: uninstall-appdataDATA uninstall-desktopDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-recursive ctags ctags-recursive distclean \
- distclean-generic distclean-recursive distclean-tags distdir \
- dvi dvi-am dvi-recursive info info-am info-recursive install \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
install-am install-appdataDATA install-data install-data-am \
- install-data-recursive install-desktopDATA install-exec \
- install-exec-am install-exec-recursive install-info \
- install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
- ps-recursive tags tags-recursive uninstall uninstall-am \
- uninstall-appdataDATA uninstall-desktopDATA uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
+ install-desktopDATA install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-appdataDATA uninstall-desktopDATA
@INTLTOOL_DESKTOP_RULE@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Copied: gtkpod/branches/etch-bpo/data/gphoto_album_menuitem-32.png (from rev 305, gtkpod/tags/0.99.12-1/data/gphoto_album_menuitem-32.png)
===================================================================
(Binary files differ)
Copied: gtkpod/branches/etch-bpo/data/gphoto_album_menuitem-48.png (from rev 305, gtkpod/tags/0.99.12-1/data/gphoto_album_menuitem-48.png)
===================================================================
(Binary files differ)
Copied: gtkpod/branches/etch-bpo/data/gphoto_images_menuitem-32.png (from rev 305, gtkpod/tags/0.99.12-1/data/gphoto_images_menuitem-32.png)
===================================================================
(Binary files differ)
Copied: gtkpod/branches/etch-bpo/data/gphoto_images_menuitem-48.png (from rev 305, gtkpod/tags/0.99.12-1/data/gphoto_images_menuitem-48.png)
===================================================================
(Binary files differ)
Copied: gtkpod/branches/etch-bpo/data/gphoto_playlist_icon-48.png (from rev 305, gtkpod/tags/0.99.12-1/data/gphoto_playlist_icon-48.png)
===================================================================
(Binary files differ)
Copied: gtkpod/branches/etch-bpo/data/gphoto_tools_menuitem-32.png (from rev 305, gtkpod/tags/0.99.12-1/data/gphoto_tools_menuitem-32.png)
===================================================================
(Binary files differ)
Copied: gtkpod/branches/etch-bpo/data/gphoto_tools_menuitem-48.png (from rev 305, gtkpod/tags/0.99.12-1/data/gphoto_tools_menuitem-48.png)
===================================================================
(Binary files differ)
Modified: gtkpod/branches/etch-bpo/data/gtkpod-add-dirs.png
===================================================================
(Binary files differ)
Modified: gtkpod/branches/etch-bpo/data/gtkpod-add-files.png
===================================================================
(Binary files differ)
Modified: gtkpod/branches/etch-bpo/data/gtkpod-add-playlists.png
===================================================================
(Binary files differ)
Modified: gtkpod/branches/etch-bpo/data/gtkpod-logo.png
===================================================================
(Binary files differ)
Copied: gtkpod/branches/etch-bpo/data/gtkpod-read-16.png (from rev 305, gtkpod/tags/0.99.12-1/data/gtkpod-read-16.png)
===================================================================
(Binary files differ)
Modified: gtkpod/branches/etch-bpo/data/gtkpod-read.png
===================================================================
(Binary files differ)
Modified: gtkpod/branches/etch-bpo/data/gtkpod.desktop.in
===================================================================
--- gtkpod/branches/etch-bpo/data/gtkpod.desktop.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/data/gtkpod.desktop.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -3,6 +3,6 @@
_GenericName=iPod Manager
_Comment=Manage music and video on an Apple iPod
Exec=gtkpod
-Icon=gtkpod.png
+Icon=gtkpod
Type=Application
Categories=GTK;AudioVideo;
Modified: gtkpod/branches/etch-bpo/data/gtkpod.glade
===================================================================
--- gtkpod/branches/etch-bpo/data/gtkpod.glade 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/data/gtkpod.glade 2008-04-17 18:50:56 UTC (rev 306)
@@ -53,7 +53,7 @@
<child internal-child="image">
<widget class="GtkImage" id="image3992">
<property name="visible">True</property>
- <property name="pixbuf">gtkpod-read.png</property>
+ <property name="pixbuf">gtkpod-read-16.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -69,6 +69,7 @@
<property name="label" translatable="yes">_Save Changes</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_save_changes_mi" last_modification_time="Sat, 20 May 2006 14:22:12 GMT"/>
+ <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image3993">
@@ -108,7 +109,7 @@
<child>
<widget class="GtkImageMenuItem" id="add_directory1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add _Directory</property>
+ <property name="label" translatable="yes">Add Fol_der</property>
<property name="use_underline">True</property>
<signal name="activate" handler="dirbrowser_create_callback" last_modification_time="Sun, 24 Jun 2007 15:25:37 GMT"/>
@@ -547,7 +548,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_playlist_including_tracks_from_ipod">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected playlist including tracks from iPod</property>
+ <property name="label" translatable="yes">Selected Playlist Including Tracks from iPod</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_ipod" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -556,7 +557,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_playlist_including_tracks_from_database">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected playlist including tracks from database</property>
+ <property name="label" translatable="yes">Selected Playlist Including Tracks from Database</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_database" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -565,7 +566,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_playlist_including_tracks_from_harddisk">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected playlist including tracks from harddisk</property>
+ <property name="label" translatable="yes">Selected Playlist Including Tracks from Hard Disk</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_harddisk" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -580,7 +581,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_entry_from_playlist">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected filter tab entry from playlist</property>
+ <property name="label" translatable="yes">Selected Filter Tab Entry from Playlist</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_entry_from_playlist" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -589,7 +590,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_entry_from_ipod">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected filter tab entry from iPod</property>
+ <property name="label" translatable="yes">Selected Filter Tab Entry from iPod</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_entry_from_ipod" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -598,7 +599,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_entry_from_database">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected filter tab entry from database</property>
+ <property name="label" translatable="yes">Selected Filter Tab Entry from Database</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_entry_from_database" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -607,7 +608,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_entry_from_harddisk">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected filter tab entry from harddisk</property>
+ <property name="label" translatable="yes">Selected Filter Tab Entry from Hard Disk</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_entry_from_harddisk" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -622,7 +623,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_tracks_from_playlist">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected tracks from playlist</property>
+ <property name="label" translatable="yes">Selected Tracks from Playlist</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_tracks_from_playlist" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -631,7 +632,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_tracks_from_ipod">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected tracks from iPod</property>
+ <property name="label" translatable="yes">Selected Tracks from iPod</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_tracks_from_ipod" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -640,7 +641,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_tracks_from_database">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected tracks from database</property>
+ <property name="label" translatable="yes">Selected Tracks from Database</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_tracks_from_database" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -649,7 +650,7 @@
<child>
<widget class="GtkMenuItem" id="delete_selected_tracks_from_harddisk">
<property name="visible">True</property>
- <property name="label" translatable="yes">Selected tracks from harddisk</property>
+ <property name="label" translatable="yes">Selected Tracks from Hard Disk</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_delete_selected_tracks_from_harddisk" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
</widget>
@@ -674,7 +675,7 @@
<child internal-child="image">
<widget class="GtkImage" id="image4005">
<property name="visible">True</property>
- <property name="stock">gtk-copy</property>
+ <property name="stock">gtk-new</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -861,7 +862,6 @@
<property name="label" translatable="yes">_Sorting</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_sorting_activate" last_modification_time="Mon, 22 Sep 2003 08:00:42 GMT"/>
- <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image4006">
@@ -1311,14 +1311,14 @@
<child>
<widget class="GtkImageMenuItem" id="about1">
<property name="visible">True</property>
- <property name="label" translatable="yes">_About</property>
+ <property name="label" translatable="yes">_About gtkpod</property>
<property name="use_underline">True</property>
<signal name="activate" handler="open_about_window" last_modification_time="Sun, 05 Jun 2005 13:09:31 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image4014">
<property name="visible">True</property>
- <property name="stock">gtk-dialog-info</property>
+ <property name="stock">gtk-about</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1341,130 +1341,156 @@
</child>
<child>
- <widget class="GtkToolbar" id="toolbar">
- <property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
- <property name="tooltips">True</property>
- <property name="show_arrow">True</property>
-
- <child>
- <widget class="GtkToolButton" id="load_ipods_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Try to load contents of all connected iPods. For each iPod a separate repository must be set up.</property>
- <property name="label" translatable="yes">Load iPod(s)</property>
- <property name="use_underline">True</property>
- <property name="icon">gtkpod-read.png</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- <signal name="clicked" handler="on_load_ipods_clicked" last_modification_time="Sat, 20 May 2006 14:20:43 GMT"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="save_changes_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Write all changes made to the disk and the iPod(s).</property>
- <property name="label" translatable="yes">Save Changes</property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-save</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- <signal name="clicked" handler="on_save_changes_clicked" last_modification_time="Sat, 20 May 2006 14:20:33 GMT"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="add_files_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Add Files or Directories</property>
- <property name="label" translatable="yes">Files</property>
- <property name="use_underline">True</property>
- <property name="icon">gtkpod-add-files.png</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- <signal name="clicked" handler="create_add_files_callback" last_modification_time="Sun, 24 Jun 2007 14:43:28 GMT"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="add_dirs_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Add Directories Recursively</property>
- <property name="label" translatable="yes">Dirs</property>
- <property name="use_underline">True</property>
- <property name="icon">gtkpod-add-dirs.png</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- <signal name="clicked" handler="dirbrowser_create_callback" last_modification_time="Sun, 24 Jun 2007 15:25:22 GMT"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="add_PL_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Add playlist from file</property>
- <property name="label" translatable="yes">Playlist</property>
- <property name="use_underline">True</property>
- <property name="icon">gtkpod-add-playlists.png</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- <signal name="clicked" handler="create_add_playlists_callback" last_modification_time="Sun, 24 Jun 2007 15:42:57 GMT"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="new_PL_button">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Create New Playlist</property>
- <property name="label" translatable="yes">New PL</property>
- <property name="use_underline">True</property>
- <property name="icon">gtkpod-new-playlist.png</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- <signal name="clicked" handler="on_new_playlist_button" last_modification_time="Thu, 05 Dec 2002 12:17:43 GMT"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
+ <widget class="GtkToolbar" id="toolbar">
+ <property name="visible">True</property>
+ <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+ <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+ <property name="tooltips">True</property>
+ <property name="show_arrow">True</property>
+
+ <child>
+ <widget class="GtkToolButton" id="load_ipods_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Try to load contents of all connected iPods. For each iPod a separate repository must be set up.</property>
+ <property name="label" translatable="yes">Load iPod(s)</property>
+ <property name="use_underline">True</property>
+ <property name="icon">gtkpod-read.png</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="on_load_ipods_clicked" last_modification_time="Sat, 20 May 2006 14:20:43 GMT"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolButton" id="save_changes_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Write all changes made to the disk and the iPod(s).</property>
+ <property name="label" translatable="yes">Save Changes</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-save</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="on_save_changes_clicked" last_modification_time="Sat, 20 May 2006 14:20:33 GMT"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
+ <property name="visible">True</property>
+ <property name="draw">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolButton" id="add_files_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add Files or Directories</property>
+ <property name="label" translatable="yes">Add Files</property>
+ <property name="use_underline">True</property>
+ <property name="icon">gtkpod-add-files.png</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="create_add_files_callback" last_modification_time="Sun, 24 Jun 2007 14:43:28 GMT"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolButton" id="add_dirs_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add Directories Recursively</property>
+ <property name="label" translatable="yes">Add Folder</property>
+ <property name="use_underline">True</property>
+ <property name="icon">gtkpod-add-dirs.png</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="dirbrowser_create_callback" last_modification_time="Sun, 24 Jun 2007 15:25:22 GMT"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolButton" id="add_PL_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add playlist from file</property>
+ <property name="label" translatable="yes">Add Playlist</property>
+ <property name="use_underline">True</property>
+ <property name="icon">gtkpod-add-playlists.png</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="create_add_playlists_callback" last_modification_time="Sun, 24 Jun 2007 15:42:57 GMT"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
+ <property name="visible">True</property>
+ <property name="draw">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolButton" id="new_PL_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Create New Playlist</property>
+ <property name="label" translatable="yes">New Playlist</property>
+ <property name="use_underline">True</property>
+ <property name="stock_id">gtk-new</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <signal name="clicked" handler="on_new_playlist_button" last_modification_time="Thu, 05 Dec 2002 12:17:43 GMT"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
<child>
@@ -10410,7 +10436,7 @@
<child>
<widget class="GtkLabel" id="label267">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Displayed Track Attributes</b></property>
+ <property name="label" translatable="yes"><b>Track Attributes</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -10464,7 +10490,221 @@
</child>
<child>
- <placeholder/>
+ <widget class="GtkTable" id="table54">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">10</property>
+
+ <child>
+ <widget class="GtkLabel" id="label469">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Available:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label470">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Displayed:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox183">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox184">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">5</property>
+
+ <child>
+ <widget class="GtkButton" id="track_cols_show_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Move selected attributes to the displayed list</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkImage" id="image4020">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-forward</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="track_cols_hide_button">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Remove selected attributes from the displayed list</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkImage" id="image4021">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-back</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow35">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="track_cols_show_tv">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow34">
+ <property name="height_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="track_cols_hide_tv">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
<packing>
@@ -12041,6 +12281,27 @@
<property name="fill">False</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="photo_library_confirm_delete_toggle">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Check before removing photos from a photo album whether
+they should be deleted from the Photo Database.</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_photo_library_confirm_delete_toggled" last_modification_time="Fri, 09 Nov 2007 01:03:03 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -13912,7 +14173,6 @@
</widget>
<widget class="GtkWindow" id="details_window">
- <property name="visible">True</property>
<property name="title" translatable="yes">Details</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -14201,84 +14461,6 @@
</child>
<child>
- <widget class="GtkButton" id="details_button_fetch_cover">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment14">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox206">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image3859">
- <property name="visible">True</property>
- <property name="stock">gtk-network</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label444">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Set Cover Art from _Web</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">6</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkButton" id="details_button_remove_artwork">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -14519,7 +14701,7 @@
<child>
<widget class="GtkLabel" id="details_label_41">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -15317,7 +15499,7 @@
<child>
<widget class="GtkLabel" id="details_label_48">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -15345,7 +15527,7 @@
<child>
<widget class="GtkLabel" id="details_label_50">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -15373,7 +15555,7 @@
<child>
<widget class="GtkLabel" id="details_label_49">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -15401,7 +15583,7 @@
<child>
<widget class="GtkLabel" id="details_label_52">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -15534,7 +15716,7 @@
<child>
<widget class="GtkLabel" id="details_label_53">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -16069,7 +16251,7 @@
<child>
<widget class="GtkLabel" id="details_label_43">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -16097,7 +16279,7 @@
<child>
<widget class="GtkLabel" id="details_label_44">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -16125,7 +16307,7 @@
<child>
<widget class="GtkLabel" id="details_label_45">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -16153,7 +16335,7 @@
<child>
<widget class="GtkLabel" id="details_label_46">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="label">label</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -17187,6 +17369,56 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="details_label_54">
+ <property name="visible">True</property>
+ <property name="label">label</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="details_checkbutton_54">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -20085,160 +20317,6 @@
</child>
</widget>
-<widget class="GtkDialog" id="fetchcover_dialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Download Cover</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">True</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">True</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area3">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="cancelbutton2">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-2</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="okbutton2">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-3</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="panelbox">
- <property name="border_width">10</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkHBox" id="canvasbutton_hbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <widget class="GtkVBox" id="buttonbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkButton" id="next_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Find _New</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="prev_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Previous</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkStatusbar" id="fetchcover_statusbar">
- <property name="visible">True</property>
- <property name="has_resize_grip">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
<widget class="GtkWindow" id="file_transfer_information_dialog">
<property name="border_width">2</property>
<property name="title" translatable="yes">Progress Information</property>
@@ -20415,4 +20493,415 @@
</child>
</widget>
+<widget class="GtkDialog" id="coverart_preview_dialog">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Artwork Preview</property>
+ <property name="type">GTK_WINDOW_POPUP</property>
+ <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+ <property name="modal">True</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="icon_name">gtk-dialog-info</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+ <property name="has_separator">True</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area3">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+ <child>
+ <widget class="GtkButton" id="okbutton2">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="response_id">-5</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="coverart_preview_dialog_vbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="coverart_preview_dialog_res_lbl">
+ <property name="visible">True</property>
+ <property name="label"><b>Placeholder for image information</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+<widget class="GtkWindow" id="photo_panel">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Photo Window</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkViewport" id="photo_viewport">
+ <property name="border_width">5</property>
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
+
+ <child>
+ <widget class="GtkHPaned" id="hpaned1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox185">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkMenuBar" id="menubar1">
+ <property name="visible">True</property>
+ <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+ <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="photo_album_menuItem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Album</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_photo_album_menuItem_activate" last_modification_time="Mon, 05 Nov 2007 23:53:52 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4266">
+ <property name="visible">True</property>
+ <property name="pixbuf">gphoto_album_menuitem-32.png</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenu" id="photo_album_menuItem_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="photo_add_album_menuItem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Add Album</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4267">
+ <property name="visible">True</property>
+ <property name="stock">gtk-justify-fill</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="photo_remove_album_menuItem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Remove Album</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4268">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="photo_rename_album_menuItem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">R_ename Album</property>
+ <property name="use_underline">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="menuitem14">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Image</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4269">
+ <property name="visible">True</property>
+ <property name="pixbuf">gphoto_images_menuitem-32.png</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenu" id="menuitem14_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="photo_add_image_menuItem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Add Image</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4270">
+ <property name="visible">True</property>
+ <property name="stock">gtk-file</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="photo_add_image_dir_menuItem">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add Images from a Directory</property>
+ <property name="label" translatable="yes">Add Image_s</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4271">
+ <property name="visible">True</property>
+ <property name="stock">gtk-directory</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="photo_remove_image_menuItem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Remove Images</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4272">
+ <property name="visible">True</property>
+ <property name="stock">gtk-missing-image</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="menuitem15">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Tools</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4273">
+ <property name="visible">True</property>
+ <property name="pixbuf">gphoto_tools_menuitem-32.png</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenu" id="menuitem15_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="photo_view_full_size_menuItem">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">View Full Size</property>
+ <property name="use_underline">True</property>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image4274">
+ <property name="visible">True</property>
+ <property name="stock">gtk-zoom-fit</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="photo_album_window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkImage" id="photo_preview_image">
+ <property name="width_request">250</property>
+ <property name="height_request">176</property>
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="shrink">False</property>
+ <property name="resize">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="photo_thumbnail_window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="shrink">True</property>
+ <property name="resize">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
Modified: gtkpod/branches/etch-bpo/data/icons/32x32/Makefile.in
===================================================================
--- gtkpod/branches/etch-bpo/data/icons/32x32/Makefile.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/data/icons/32x32/Makefile.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
@@ -14,16 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +30,31 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+subdir = data/icons/32x32
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(appicondir)"
+appiconDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(appicon_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -64,17 +79,22 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -85,14 +105,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -104,28 +122,31 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+LIBGNOMECANVAS_LIBS = @LIBGNOMECANVAS_LIBS@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOUNT = @MOUNT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -143,24 +164,28 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-have_pkgconfig = @have_pkgconfig@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -175,6 +200,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -182,47 +208,62 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
appicondir = $(datadir)/icons/hicolor/32x32/apps
appicon_DATA = gtkpod.png
-
EXTRA_DIST = $(appicon_DATA)
-subdir = data/icons/32x32
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(appicon_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/32x32/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/32x32/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-appiconDATA_INSTALL = $(INSTALL_DATA)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-appiconDATA: $(appicon_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(appicondir)
+ test -z "$(appicondir)" || $(MKDIR_P) "$(DESTDIR)$(appicondir)"
@list='$(appicon_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(appiconDATA_INSTALL) $$d$$p $(DESTDIR)$(appicondir)/$$f"; \
- $(appiconDATA_INSTALL) $$d$$p $(DESTDIR)$(appicondir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " $(appiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appicondir)/$$f'"; \
+ $(appiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appicondir)/$$f"; \
done
uninstall-appiconDATA:
@$(NORMAL_UNINSTALL)
@list='$(appicon_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(appicondir)/$$f"; \
- rm -f $(DESTDIR)$(appicondir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \
+ rm -f "$(DESTDIR)$(appicondir)/$$f"; \
done
tags: TAGS
TAGS:
@@ -230,28 +271,23 @@
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
distdir: $(DISTFILES)
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -265,9 +301,10 @@
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(appicondir)
+ for dir in "$(DESTDIR)$(appicondir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -287,7 +324,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -304,18 +341,28 @@
dvi-am:
+html: html-am
+
info: info-am
info-am:
install-data-am: install-appiconDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -334,16 +381,20 @@
ps-am:
-uninstall-am: uninstall-appiconDATA uninstall-info-am
+uninstall-am: uninstall-appiconDATA
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-appiconDATA install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-appiconDATA uninstall-info-am
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-appiconDATA install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-appiconDATA
# 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.
Modified: gtkpod/branches/etch-bpo/data/icons/48x48/Makefile.in
===================================================================
--- gtkpod/branches/etch-bpo/data/icons/48x48/Makefile.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/data/icons/48x48/Makefile.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
@@ -14,16 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +30,31 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+subdir = data/icons/48x48
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(appicondir)"
+appiconDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(appicon_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -64,17 +79,22 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -85,14 +105,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -104,28 +122,31 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+LIBGNOMECANVAS_LIBS = @LIBGNOMECANVAS_LIBS@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOUNT = @MOUNT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -143,24 +164,28 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-have_pkgconfig = @have_pkgconfig@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -175,6 +200,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -182,47 +208,62 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
appicondir = $(datadir)/icons/hicolor/48x48/apps
appicon_DATA = gtkpod.png
-
EXTRA_DIST = $(appicon_DATA)
-subdir = data/icons/48x48
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(appicon_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/48x48/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/48x48/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-appiconDATA_INSTALL = $(INSTALL_DATA)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-appiconDATA: $(appicon_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(appicondir)
+ test -z "$(appicondir)" || $(MKDIR_P) "$(DESTDIR)$(appicondir)"
@list='$(appicon_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(appiconDATA_INSTALL) $$d$$p $(DESTDIR)$(appicondir)/$$f"; \
- $(appiconDATA_INSTALL) $$d$$p $(DESTDIR)$(appicondir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " $(appiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appicondir)/$$f'"; \
+ $(appiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appicondir)/$$f"; \
done
uninstall-appiconDATA:
@$(NORMAL_UNINSTALL)
@list='$(appicon_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(appicondir)/$$f"; \
- rm -f $(DESTDIR)$(appicondir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \
+ rm -f "$(DESTDIR)$(appicondir)/$$f"; \
done
tags: TAGS
TAGS:
@@ -230,28 +271,23 @@
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
distdir: $(DISTFILES)
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -265,9 +301,10 @@
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(appicondir)
+ for dir in "$(DESTDIR)$(appicondir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -287,7 +324,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -304,18 +341,28 @@
dvi-am:
+html: html-am
+
info: info-am
info-am:
install-data-am: install-appiconDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -334,16 +381,20 @@
ps-am:
-uninstall-am: uninstall-appiconDATA uninstall-info-am
+uninstall-am: uninstall-appiconDATA
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-appiconDATA install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-appiconDATA uninstall-info-am
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-appiconDATA install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-appiconDATA
# 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.
Modified: gtkpod/branches/etch-bpo/data/icons/64x64/Makefile.in
===================================================================
--- gtkpod/branches/etch-bpo/data/icons/64x64/Makefile.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/data/icons/64x64/Makefile.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
@@ -14,16 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +30,31 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+subdir = data/icons/64x64
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(appicondir)"
+appiconDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(appicon_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -64,17 +79,22 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -85,14 +105,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -104,28 +122,31 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+LIBGNOMECANVAS_LIBS = @LIBGNOMECANVAS_LIBS@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOUNT = @MOUNT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -143,24 +164,28 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-have_pkgconfig = @have_pkgconfig@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -175,6 +200,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -182,47 +208,62 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
appicondir = $(datadir)/icons/hicolor/64x64/apps
appicon_DATA = gtkpod.png
-
EXTRA_DIST = $(appicon_DATA)
-subdir = data/icons/64x64
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(appicon_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/64x64/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/64x64/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-appiconDATA_INSTALL = $(INSTALL_DATA)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-appiconDATA: $(appicon_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(appicondir)
+ test -z "$(appicondir)" || $(MKDIR_P) "$(DESTDIR)$(appicondir)"
@list='$(appicon_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(appiconDATA_INSTALL) $$d$$p $(DESTDIR)$(appicondir)/$$f"; \
- $(appiconDATA_INSTALL) $$d$$p $(DESTDIR)$(appicondir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " $(appiconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appicondir)/$$f'"; \
+ $(appiconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appicondir)/$$f"; \
done
uninstall-appiconDATA:
@$(NORMAL_UNINSTALL)
@list='$(appicon_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(appicondir)/$$f"; \
- rm -f $(DESTDIR)$(appicondir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \
+ rm -f "$(DESTDIR)$(appicondir)/$$f"; \
done
tags: TAGS
TAGS:
@@ -230,28 +271,23 @@
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
distdir: $(DISTFILES)
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -265,9 +301,10 @@
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(appicondir)
+ for dir in "$(DESTDIR)$(appicondir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -287,7 +324,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -304,18 +341,28 @@
dvi-am:
+html: html-am
+
info: info-am
info-am:
install-data-am: install-appiconDATA
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -334,16 +381,20 @@
ps-am:
-uninstall-am: uninstall-appiconDATA uninstall-info-am
+uninstall-am: uninstall-appiconDATA
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-appiconDATA install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-appiconDATA uninstall-info-am
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-appiconDATA install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-appiconDATA
# 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.
Modified: gtkpod/branches/etch-bpo/data/icons/Makefile.in
===================================================================
--- gtkpod/branches/etch-bpo/data/icons/Makefile.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/data/icons/Makefile.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
@@ -13,17 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +29,34 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+subdir = data/icons
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -64,17 +81,22 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -85,14 +107,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -104,28 +124,31 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+LIBGNOMECANVAS_LIBS = @LIBGNOMECANVAS_LIBS@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOUNT = @MOUNT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -143,24 +166,28 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-have_pkgconfig = @have_pkgconfig@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -175,6 +202,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -182,35 +210,46 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = 32x32 48x48 64x64
-
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-subdir = data/icons
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu data/icons/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -218,7 +257,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -230,15 +275,20 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -259,7 +309,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -270,14 +320,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -286,19 +328,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
+ test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -308,10 +353,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
-
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -334,28 +380,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
distdir: $(DISTFILES)
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -366,15 +407,19 @@
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -384,7 +429,6 @@
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -404,7 +448,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -421,6 +465,8 @@
dvi-am:
+html: html-recursive
+
info: info-recursive
info-am:
@@ -429,12 +475,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -453,26 +507,26 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-data-am install-strip uninstall-am
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-recursive ctags ctags-recursive distclean \
- distclean-generic distclean-recursive distclean-tags distdir \
- dvi dvi-am dvi-recursive info info-am info-recursive install \
- install-am install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
- ps-recursive tags tags-recursive uninstall uninstall-am \
- uninstall-info-am uninstall-info-recursive uninstall-recursive
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-data-hook \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-hook
install-data-hook: update-icon-cache
Copied: gtkpod/branches/etch-bpo/data/tunes_playlist_icon-48.png (from rev 305, gtkpod/tags/0.99.12-1/data/tunes_playlist_icon-48.png)
===================================================================
(Binary files differ)
Modified: gtkpod/branches/etch-bpo/debian/changelog
===================================================================
--- gtkpod/branches/etch-bpo/debian/changelog 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/debian/changelog 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,10 +1,23 @@
-gtkpod (0.99.10-5~bpo40+1) etch-backports; urgency=low
+gtkpod (0.99.12-1~bpo40+1) etch-backports; urgency=low
* Build against etch backports.
- replace libcurl4-gnutls-dev with libcurl3-gnutls-dev in build-depends
- -- Frank Lichtenheld <djpig at debian.org> Tue, 15 Jan 2008 13:40:36 +0100
+ -- Frank Lichtenheld <djpig at debian.org> Thu, 17 Apr 2008 20:50:11 +0200
+gtkpod (0.99.12-1) unstable; urgency=low
+
+ * New upstream release.
+ * Adjust build-dependency on libgpod, >= 0.6.0 is now needed.
+ * Bumped Standards version, no changes needed.
+ * Updating 01_mountpoint.dpatch cause it did no longer apply.
+ * Remove 03_itdb-set-local-to-imported.dpatch, included upstream.
+ * Remove 02_missing_fclose.dpatch, not needed anymore. Upstream source code
+ changed and the function does not have a local FILE stream that needs to be
+ closed anymore.
+
+ -- Nico Golde <nion at debian.org> Sun, 13 Jan 2008 17:24:33 +0100
+
gtkpod (0.99.10-5) unstable; urgency=low
* Add changing mountpoint as well in prefs.c
Property changes on: gtkpod/branches/etch-bpo/debian/changelog
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/compat
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/debian/control
===================================================================
--- gtkpod/branches/etch-bpo/debian/control 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/debian/control 2008-04-17 18:50:56 UTC (rev 306)
@@ -3,8 +3,8 @@
Priority: extra
Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at lists.alioth.debian.org>
Uploaders: Frank Lichtenheld <djpig at debian.org>, Nico Golde <nion at debian.org>
-Build-Depends: debhelper (>= 5), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.5.2), libcurl3-gnutls-dev, libhal-dev, dpatch
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), gettext, flex, autotools-dev, perl, libxml-parser-perl, libgtk2.0-dev, libglade2-dev, libgnomecanvas2-dev, libgnomevfs2-dev, libid3tag0-dev, libvorbis-dev, libflac-dev, libgpod-dev (>= 0.6.0), libcurl3-gnutls-dev, libhal-dev, dpatch
+Standards-Version: 3.7.3
Homepage: http://www.gtkpod.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-gtkpod/gtkpod/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gtkpod/gtkpod/trunk
Property changes on: gtkpod/branches/etch-bpo/debian/control
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/copyright
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/dirs
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/docs
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/gtkpod-icon-32x32.xpm
___________________________________________________________________
Name: svn:mime-type
- image/x-xpixmap
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/gtkpod.desktop
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/gtkpod.pod
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/install
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/menu
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/debian/patches/00list
===================================================================
--- gtkpod/branches/etch-bpo/debian/patches/00list 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/debian/patches/00list 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,3 +1 @@
01_mountpoint
-02_missing_fclose
-03_itdb-set-local-to-imported
Modified: gtkpod/branches/etch-bpo/debian/patches/01_mountpoint.dpatch
===================================================================
--- gtkpod/branches/etch-bpo/debian/patches/01_mountpoint.dpatch 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/debian/patches/01_mountpoint.dpatch 2008-04-17 18:50:56 UTC (rev 306)
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad trunk~/README trunk/README
---- trunk~/README 2007-11-18 16:47:22.000000000 +0100
-+++ trunk/README 2007-11-20 14:20:36.000000000 +0100
-@@ -52,7 +52,7 @@
+--- trunk~/README 2008-01-13 17:22:28.000000000 +0100
++++ trunk/README 2008-01-13 17:37:38.000000000 +0100
+@@ -53,7 +53,7 @@
1) If your iPod is not mounted automatically when connecting it to
your computer follow steps 1-7 in the "Connecting your iPod to a
Linux box" (basically you need to get the iPod partition mounted to
@@ -17,7 +17,7 @@
these days.
2) If you are using GNOME, starting with V1.0 of gtkpod your iPod will
-@@ -699,13 +699,13 @@
+@@ -737,13 +737,13 @@
(Obviously you need to change the filesystem type from 'vfat' to
'hfsplus' when you use an HFS formatted iPod.)
@@ -34,7 +34,7 @@
won't have to worry about doing mounting/unmouting yourself any more.
-@@ -750,19 +750,19 @@
+@@ -788,19 +788,19 @@
* -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1)
@@ -58,7 +58,7 @@
please note that it's just '/dev/sda')
-@@ -770,7 +770,7 @@
+@@ -808,7 +808,7 @@
NOTE: Some users have had problems with newer versions of mount(newer than
mount-2.11h) The following fstab entry might work better for you.
@@ -67,7 +67,7 @@
5) Install the hotplug utilities
(http://linux-hotplug.sourceforge.net/, debian package: 'hotplug')
-@@ -819,13 +819,13 @@
+@@ -857,13 +857,13 @@
7) Mount the iPod hard drive
@@ -83,7 +83,7 @@
10) Unload the module sbp2 (as most likely as root):
-@@ -874,19 +874,19 @@
+@@ -912,19 +912,19 @@
* -> Codepage 437 (CONFIG_NLS_CODEPAGE_437)
* -> NLS ISO 8859-1 (CONFIG_NLS_ISO8859_1)
@@ -107,7 +107,7 @@
please note that it's just '/dev/sda')
-@@ -894,7 +894,7 @@
+@@ -932,7 +932,7 @@
NOTE: Some users have had problems with newer versions of mount(newer than
mount-2.11h) The following fstab entry might work better for you.
@@ -116,7 +116,7 @@
NOTE: You can add ",umask=0" to the options to make the iPod
readable/writable for all users.
-@@ -934,13 +934,13 @@
+@@ -972,13 +972,13 @@
7) Mount the iPod hard drive
@@ -132,7 +132,7 @@
10) Unload the module sbp2 (as most likely as root):
-@@ -974,7 +974,7 @@
+@@ -1012,7 +1012,7 @@
- since the iPod's hdd was already spun up, the SCSI subsystem now
recognizes it and mounts it as /dev/sda
@@ -141,7 +141,7 @@
On the other hand: with my 4G iPod under 2.6.9 and 2.6.10 I never had
any problem whatsoever getting the iPod to work. With IEEE it was
-@@ -1030,10 +1030,10 @@
+@@ -1068,10 +1068,10 @@
/**********/
Add a line similar to the below to your /etc/fstab, this will enable users
to mount the ipod with read/write capabilities. Example line assumes your
@@ -155,8 +155,8 @@
diff -urNad trunk~/scripts/sync-abook.sh trunk/scripts/sync-abook.sh
---- trunk~/scripts/sync-abook.sh 2007-11-18 16:28:19.000000000 +0100
-+++ trunk/scripts/sync-abook.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-abook.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-abook.sh 2008-01-13 17:38:11.000000000 +0100
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -167,8 +167,8 @@
ENCODING_FROM=UTF-8 # encoding used by abook
ENCODING=ISO-8859-15 # encoding used by ipod
diff -urNad trunk~/scripts/sync-evocalendar.sh trunk/scripts/sync-evocalendar.sh
---- trunk~/scripts/sync-evocalendar.sh 2007-11-18 16:28:23.000000000 +0100
-+++ trunk/scripts/sync-evocalendar.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-evocalendar.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-evocalendar.sh 2008-01-13 17:38:13.000000000 +0100
@@ -10,7 +10,7 @@
#
# with the following defaults:
@@ -179,20 +179,20 @@
#the path to a script that will be passed the ical information from STDIN and filter, if needed
#FILTER_SCRIPT=
diff -urNad trunk~/scripts/sync-evolution.sh trunk/scripts/sync-evolution.sh
---- trunk~/scripts/sync-evolution.sh 2007-11-18 16:28:26.000000000 +0100
-+++ trunk/scripts/sync-evolution.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-evolution.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-evolution.sh 2008-01-13 17:38:16.000000000 +0100
@@ -13,7 +13,7 @@
#
# with the following defaults:
-IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
+IPOD_MOUNT=/media/ipod # mountpoint of ipod
- EVOPATH='/opt/gnome/libexec/evolution/2.0:/usr/lib/evolution/2.0:/opt/gnome/bin' # additional path
ENCODING=ISO-8859-15 # encoding used by ipod
+ # try to find the path to evolution-addressbook-export
diff -urNad trunk~/scripts/sync-kaddressbook.sh trunk/scripts/sync-kaddressbook.sh
---- trunk~/scripts/sync-kaddressbook.sh 2007-11-18 16:28:29.000000000 +0100
-+++ trunk/scripts/sync-kaddressbook.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-kaddressbook.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-kaddressbook.sh 2008-01-13 17:38:18.000000000 +0100
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -203,8 +203,8 @@
ENCODING=ISO-8859-15 # encoding used by ipod
diff -urNad trunk~/scripts/sync-korganizer.sh trunk/scripts/sync-korganizer.sh
---- trunk~/scripts/sync-korganizer.sh 2007-11-18 16:28:35.000000000 +0100
-+++ trunk/scripts/sync-korganizer.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-korganizer.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-korganizer.sh 2008-01-13 17:38:23.000000000 +0100
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -215,8 +215,8 @@
ENCODING=ISO-8859-15 # encoding used by ipod
diff -urNad trunk~/scripts/sync-ldif.sh trunk/scripts/sync-ldif.sh
---- trunk~/scripts/sync-ldif.sh 2007-11-19 18:49:28.000000000 +0100
-+++ trunk/scripts/sync-ldif.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-ldif.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-ldif.sh 2008-01-13 17:38:25.000000000 +0100
@@ -15,7 +15,7 @@
# differently...This is still Chinese for me!! :)
@@ -227,8 +227,8 @@
declare ENCODING=ISO-8859-15 # To try others encodings : 'iconv --list'
declare DELETE="NO" # To delete old .vcf files by default? 'NO'!!
diff -urNad trunk~/scripts/sync-thunderbird-nano.sh trunk/scripts/sync-thunderbird-nano.sh
---- trunk~/scripts/sync-thunderbird-nano.sh 2007-11-18 16:28:43.000000000 +0100
-+++ trunk/scripts/sync-thunderbird-nano.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-thunderbird-nano.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-thunderbird-nano.sh 2008-01-13 17:38:32.000000000 +0100
@@ -25,7 +25,7 @@
# with the following defaults:
@@ -239,8 +239,8 @@
NAME=thunderbird # default file export name
FILE_FLAG='' # flag used to determine end of file
diff -urNad trunk~/scripts/sync-thunderbird.sh trunk/scripts/sync-thunderbird.sh
---- trunk~/scripts/sync-thunderbird.sh 2007-11-18 16:28:46.000000000 +0100
-+++ trunk/scripts/sync-thunderbird.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-thunderbird.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-thunderbird.sh 2008-01-13 17:38:34.000000000 +0100
@@ -18,7 +18,7 @@
# with the following defaults:
@@ -251,8 +251,8 @@
NAME=thunderbird # default file export name
diff -urNad trunk~/scripts/sync-webcalendar.sh trunk/scripts/sync-webcalendar.sh
---- trunk~/scripts/sync-webcalendar.sh 2007-11-18 16:28:52.000000000 +0100
-+++ trunk/scripts/sync-webcalendar.sh 2007-11-20 14:20:36.000000000 +0100
+--- trunk~/scripts/sync-webcalendar.sh 2008-01-13 17:22:26.000000000 +0100
++++ trunk/scripts/sync-webcalendar.sh 2008-01-13 17:38:38.000000000 +0100
@@ -9,7 +9,7 @@
# with the following defaults:
@@ -263,9 +263,9 @@
DATAFILE='https://somewhere.local/calendar.ics'
# calendar name
diff -urNad trunk~/src/prefs.c trunk/src/prefs.c
---- trunk~/src/prefs.c 2007-11-18 16:45:09.000000000 +0100
-+++ trunk/src/prefs.c 2007-11-20 14:20:44.000000000 +0100
-@@ -178,7 +178,7 @@
+--- trunk~/src/prefs.c 2008-01-13 17:22:24.000000000 +0100
++++ trunk/src/prefs.c 2008-01-13 17:38:56.000000000 +0100
+@@ -179,7 +179,7 @@
prefs_set_int("delete_file", TRUE);
prefs_set_int("delete_local_file", TRUE);
prefs_set_int("delete_database", TRUE);
Deleted: gtkpod/branches/etch-bpo/debian/patches/02_missing_fclose.dpatch
===================================================================
--- gtkpod/branches/etch-bpo/debian/patches/02_missing_fclose.dpatch 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/debian/patches/02_missing_fclose.dpatch 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_missing_fclose.dpatch by Nico Golde <nion at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gtkpod-0.99.10~/src/mp3file.c gtkpod-0.99.10/src/mp3file.c
---- gtkpod-0.99.10~/src/mp3file.c 2007-06-27 21:29:33.000000000 +0200
-+++ gtkpod-0.99.10/src/mp3file.c 2007-11-18 14:02:07.000000000 +0100
-@@ -2353,6 +2353,7 @@
- gd->gapless_data = totaldatasize - finaleight;
- /* total samples minus pre/postgap */
- gd->samplecount = totalframes * mysamplesperframe - gd->pregap - gd->postgap;
-+ fclose(file);
-
- return TRUE;
-
Deleted: gtkpod/branches/etch-bpo/debian/patches/03_itdb-set-local-to-imported.dpatch
===================================================================
--- gtkpod/branches/etch-bpo/debian/patches/03_itdb-set-local-to-imported.dpatch 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/debian/patches/03_itdb-set-local-to-imported.dpatch 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## itdb-set-local-to-imported.dpatch by John Dong <jdong at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set local iTunesDB's imported status to TRUE
-## DP: Stolen-from: Upstream SVN revno 1596
-## DP: Resolves a bug where a fresh Local repository refuses to accept
-## DP: new track additions, such as LP #145506
-
- at DPATCH@
-diff -urNad gtkpod-aac-0.99.10~/src/display_itdb.c gtkpod-aac-0.99.10/src/display_itdb.c
---- gtkpod-aac-0.99.10~/src/display_itdb.c 2007-06-27 15:29:33.000000000 -0400
-+++ gtkpod-aac-0.99.10/src/display_itdb.c 2007-11-16 23:59:54.000000000 -0500
-@@ -998,8 +998,16 @@
- itdb_playlist_set_mpl (pl);
- itdb_playlist_add (itdb, pl, -1);
-
-- eitdb->data_changed = FALSE;
-- eitdb->itdb_imported = FALSE;
-+ if ((type & GP_ITDB_TYPE_PODCASTS) || (type & GP_ITDB_TYPE_LOCAL))
-+ {
-+ eitdb->data_changed = TRUE;
-+ eitdb->itdb_imported = TRUE;
-+ }
-+ else
-+ {
-+ eitdb->data_changed = FALSE;
-+ eitdb->itdb_imported = FALSE;
-+ }
- }
- else
- {
Modified: gtkpod/branches/etch-bpo/debian/rules
===================================================================
--- gtkpod/branches/etch-bpo/debian/rules 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/debian/rules 2008-04-17 18:50:56 UTC (rev 306)
@@ -13,7 +13,7 @@
CFLAGS += -O2
endif
-config.status: patch configure
+config.status: patch-stamp configure
dh_testdir
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
Property changes on: gtkpod/branches/etch-bpo/debian/rules
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/debian/watch
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/depcomp
===================================================================
--- gtkpod/branches/etch-bpo/depcomp 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/depcomp 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,11 @@
#! /bin/sh
-
# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000, 2003 Free Software Foundation, Inc.
+scriptversion=2006-10-15.18
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
+
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
@@ -15,8 +18,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -25,22 +28,45 @@
# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+ exit $?
+ ;;
+esac
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
-# `libtool' can also be set to `yes' or `no'.
-if test -z "$depfile"; then
- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
- dir=`echo "$object" | sed 's,/.*$,/,'`
- if test "$dir" = "$object"; then
- dir=
- fi
- # FIXME: should be _deps on DOS.
- depfile="$dir.deps/$base"
-fi
-
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
@@ -66,7 +92,20 @@
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -251,6 +290,46 @@
rm -f "$tmpdepfile"
;;
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -262,27 +341,43 @@
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
- tmpdepfile1="$dir.libs/$base.lo.d"
- tmpdepfile2="$dir.libs/$base.d"
+ # With Tru64 cc, shared objects can also be used to make a
+ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+ tmpdepfile2=$dir$base.o.d # libtool 1.5
+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
- tmpdepfile1="$dir$base.o.d"
- tmpdepfile2="$dir$base.d"
+ tmpdepfile1=$dir$base.o.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ tmpdepfile4=$dir$base.d
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
- if test -f "$tmpdepfile1"; then
- tmpdepfile="$tmpdepfile1"
- else
- tmpdepfile="$tmpdepfile2"
- fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a tab and a space in the [].
@@ -426,7 +521,8 @@
done
"$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
@@ -477,3 +573,12 @@
esac
exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Property changes on: gtkpod/branches/etch-bpo/depcomp
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/install-sh
===================================================================
--- gtkpod/branches/etch-bpo/install-sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/install-sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,7 +1,8 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-#
+
+scriptversion=2006-10-14.15
+
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
# following copyright and license.
@@ -38,18 +39,25 @@
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
@@ -59,236 +67,441 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
+chowncmd=
+chgrpcmd=
+stripcmd=
rmcmd="$rmprog -f"
mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd=$cpprog
- shift
- continue;;
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
- -d) dir_arg=true
- shift
- continue;;
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
+Options:
+-c (ignored)
+-d create directories instead of installing files.
+-g GROUP $chgrpprog installed files to GROUP.
+-m MODE $chmodprog installed files to MODE.
+-o USER $chownprog installed files to USER.
+-s $stripprog installed files.
+-t DIRECTORY install into DIRECTORY.
+-T report an error if DSTFILE is a directory.
+--help display this help and exit.
+--version display version info and exit.
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+while test $# -ne 0; do
+ case $1 in
+ -c) shift
+ continue;;
- -s) stripcmd=$stripprog
- shift
- continue;;
+ -d) dir_arg=true
+ shift
+ continue;;
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
+ -g) chgrpcmd="$chgrpprog $2"
+ shift
+ shift
+ continue;;
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
+ --help) echo "$usage"; exit $?;;
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
+ -m) mode=$2
+ shift
+ shift
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ continue;;
-if [ x"$src" = x ]
-then
- echo "$0: no input file specified" >&2
- exit 1
-else
- :
-fi
+ -o) chowncmd="$chownprog $2"
+ shift
+ shift
+ continue;;
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
- if [ -d "$dst" ]; then
- instcmd=:
- chmodcmd=""
- else
- instcmd=$mkdirprog
- fi
-else
+ -t) dstarg=$2
+ shift
+ shift
+ continue;;
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+ -T) no_target_directory=true
+ shift
+ continue;;
- if [ -f "$src" ] || [ -d "$src" ]
- then
- :
- else
- echo "$0: $src does not exist" >&2
- exit 1
- fi
+ --version) echo "$0 $scriptversion"; exit $?;;
- if [ x"$dst" = x ]
- then
- echo "$0: no destination specified" >&2
- exit 1
- else
- :
- fi
+ --) shift
+ break;;
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
- if [ -d "$dst" ]
- then
- dst=$dst/`basename "$src"`
- else
- :
- fi
+ *) break;;
+ esac
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
fi
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+ fi
+ # It's OK to call `install-sh -d' without argument.
+ # This can happen when creating conditional directories.
+ exit 0
+fi
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
- '
-IFS="${IFS-$defaultIFS}"
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
-pathcomp=''
+for src
+do
+ # Protect names starting with `-'.
+ case $src in
+ -*) src=./$src ;;
+ esac
-while [ $# -ne 0 ] ; do
- pathcomp=$pathcomp$1
- shift
+ if test -n "$dir_arg"; then
+ dst=$src
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
- if [ ! -d "$pathcomp" ] ;
- then
- $mkdirprog "$pathcomp"
- else
- :
- fi
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+ echo "$0: $src does not exist." >&2
+ exit 1
+ fi
- pathcomp=$pathcomp/
-done
-fi
+ if test -z "$dstarg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd "$dst" &&
+ dst=$dstarg
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst ;;
+ esac
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
-# If we're going to rename the final executable, determine the name now.
+ test -d "$dstdir"
+ dstdir_status=$?
+ fi
+ fi
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename "$dst"`
- else
- dstfile=`basename "$dst" $transformbasename |
- sed $transformarg`$transformbasename
- fi
+ obsolete_mkdir_used=false
-# don't allow the sed command to completely eliminate the filename
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename "$dst"`
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
else
- :
+ mkdir_mode=
fi
-# Make a couple of temp file names in the proper directory.
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
- dsttmp=$dstdir/_inst.$$_
- rmtmp=$dstdir/_rm.$$_
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
-# Trap to clean up temp files at exit.
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
- trap '(exit $?); exit' 1 2 13 15
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
-# Move or copy the file name to the temp name
+ case $dstdir in
+ /*) prefix=/ ;;
+ -*) prefix=./ ;;
+ *) prefix= ;;
+ esac
- $doit $instcmd "$src" "$dsttmp" &&
+ case $posix_glob in
+ '')
+ if (set -f) 2>/dev/null; then
+ posix_glob=true
+ else
+ posix_glob=false
+ fi ;;
+ esac
-# and set any options; do chmod last to preserve setuid bits
+ oIFS=$IFS
+ IFS=/
+ $posix_glob && set -f
+ set fnord $dstdir
+ shift
+ $posix_glob && set +f
+ IFS=$oIFS
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
+ prefixes=
- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+ for d
+ do
+ test -z "$d" && continue
-# Now remove or move aside any old file at destination location. We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons. In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
- if [ -f "$dstdir/$dstfile" ]
- then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
- {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
- }
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
else
- :
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
fi
-} &&
+ prefix=$prefix/
+ done
-# Now rename the file to the real destination.
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+ if test -n "$dir_arg"; then
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
-fi &&
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
-# The final little trick to "correctly" pass the exit status to the exit trap.
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-{
- (exit 0); exit
-}
+ # Copy the file name to the temp name.
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+ # If any of these fail, we abort the whole thing. If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # Now rename the file to the real destination.
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ if test -f "$dst"; then
+ $doit $rmcmd -f "$dst" 2>/dev/null \
+ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ || {
+ echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ else
+ :
+ fi
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ } || exit 1
+
+ trap '' 0
+ fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Property changes on: gtkpod/branches/etch-bpo/install-sh
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/intltool-extract.in
===================================================================
--- gtkpod/branches/etch-bpo/intltool-extract.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/intltool-extract.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.0";
+my $VERSION = "0.36.2";
## Loaded modules
use strict;
@@ -114,6 +114,11 @@
sub place_normal {
$FILE = $ARGV[0];
$OUTFILE = "$FILE.h";
+
+ my $dirname = dirname ($OUTFILE);
+ if (! -d "$dirname" && $dirname ne "") {
+ system ("mkdir -p $dirname");
+ }
}
sub place_local {
@@ -156,7 +161,7 @@
--type=TYPE Specify the file type of FILENAME. Currently supports:
"gettext/glade", "gettext/ini", "gettext/keys"
"gettext/rfc822deb", "gettext/schemas",
- "gettext/scheme", "gettext/xml"
+ "gettext/scheme", "gettext/xml", "gettext/quoted"
-l, --local Writes output into current working directory
(conflicts with --update)
--update Writes output into the same directory the source file
@@ -212,6 +217,7 @@
&type_scheme if $gettext_type eq "scheme";
&type_schemas if $gettext_type eq "schemas";
&type_rfc822deb if $gettext_type eq "rfc822deb";
+ &type_quoted if $gettext_type eq "quoted";
}
sub entity_decode_minimal
@@ -231,9 +237,9 @@
s/'/'/g; # '
s/"/"/g; # "
- s/&/&/g;
s/</</g;
s/>/>/g;
+ s/&/&/g;
return $_;
}
@@ -242,7 +248,7 @@
{
return '\"' if $_ eq '"';
return '\n' if $_ eq "\n";
- return '\\' if $_ eq '\\';
+ return '\\\\' if $_ eq '\\';
return $_;
}
@@ -255,8 +261,11 @@
sub type_ini {
### For generic translatable desktop files ###
- while ($input =~ /^_.*=(.*)$/mg) {
- $messages{$1} = [];
+ while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
+ if (defined($2)) {
+ $comments{$3} = $2;
+ }
+ $messages{$3} = [];
}
}
@@ -711,6 +720,17 @@
return @list;
}
+sub type_quoted {
+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+ my $message = $1;
+ my $before = $`;
+ $message =~ s/\\\"/\"/g;
+ $before =~ s/[^\n]//g;
+ $messages{$message} = [];
+ $loc{$message} = length ($before) + 2;
+ }
+}
+
sub type_glade {
### For translatable Glade XML files ###
Modified: gtkpod/branches/etch-bpo/intltool-merge.in
===================================================================
--- gtkpod/branches/etch-bpo/intltool-merge.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/intltool-merge.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.0";
+my $VERSION = "0.36.2";
## Loaded modules
use strict;
@@ -60,6 +60,7 @@
my $DESKTOP_STYLE_ARG = 0;
my $SCHEMAS_STYLE_ARG = 0;
my $RFC822DEB_STYLE_ARG = 0;
+my $QUOTED_STYLE_ARG = 0;
my $QUIET_ARG = 0;
my $PASS_THROUGH_ARG = 0;
my $UTF8_ARG = 0;
@@ -79,6 +80,7 @@
"desktop-style|d" => \$DESKTOP_STYLE_ARG,
"schemas-style|s" => \$SCHEMAS_STYLE_ARG,
"rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
"pass-through|p" => \$PASS_THROUGH_ARG,
"utf8|u" => \$UTF8_ARG,
"multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -91,9 +93,24 @@
my %po_files_by_lang = ();
my %translations = ();
-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
+my $iconv = $ENV{"ICONV"} || "iconv";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+sub isProgramInPath
+{
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
+ return 0;
+}
+
+if (! isProgramInPath ("$iconv"))
+{
+ print STDERR " *** iconv is not found on this system!\n".
+ " *** Without it, intltool-merge can not convert encodings.\n";
+ exit;
+}
+
# Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
@@ -157,6 +174,14 @@
&rfc822deb_merge_translations;
&finalize;
}
+elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
+{
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ "ed_merge_translations;
+ &finalize;
+}
else
{
&print_help;
@@ -193,6 +218,7 @@
-k, --keys-style includes translations in the keys style
-s, --schemas-style includes translations in the schemas style
-r, --rfc822deb-style includes translations in the RFC822 style
+ --quoted-style includes translations in the quoted string style
-x, --xml-style includes translations in the standard xml style
Other options:
@@ -249,9 +275,43 @@
sub gather_po_files
{
- for my $po_file (glob "$PO_DIR/*.po") {
- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
+ if (my $linguas = $ENV{"LINGUAS"})
+ {
+ for my $lang (split / /, $linguas) {
+ my $po_file = $PO_DIR . "/" . $lang . ".po";
+ if (-e $po_file) {
+ $po_files_by_lang{$lang} = $po_file;
+ }
+ }
}
+ else
+ {
+ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
+ {
+ while (<LINGUAS_FILE>)
+ {
+ next if /^#/;
+
+ if (/([-a-zA-Z_ at .]+)\n/)
+ {
+ my $lang = $1;
+
+ my $po_file = $PO_DIR . "/" . $lang . ".po";
+ if (-e $po_file) {
+ $po_files_by_lang{$lang} = $po_file;
+ }
+ }
+ }
+
+ close LINGUAS_FILE;
+ }
+ else
+ {
+ for my $po_file (glob "$PO_DIR/*.po") {
+ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
+ }
+ }
+ }
}
sub get_local_charset
@@ -415,7 +475,7 @@
{
$nextfuzzy = 1 if /^#, fuzzy/;
- if (/^msgid "((\\.|[^\\])*)"/ )
+ if (/^msgid "((\\.|[^\\]+)*)"/ )
{
$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
$msgid = "";
@@ -431,14 +491,14 @@
$nextfuzzy = 0;
}
- if (/^msgstr "((\\.|[^\\])*)"/)
+ if (/^msgstr "((\\.|[^\\]+)*)"/)
{
$msgstr = unescape_po_string($1);
$inmsgstr = 1;
$inmsgid = 0;
}
- if (/^"((\\.|[^\\])*)"/)
+ if (/^"((\\.|[^\\]+)*)"/)
{
$msgid .= unescape_po_string($1) if $inmsgid;
$msgstr .= unescape_po_string($1) if $inmsgstr;
@@ -483,16 +543,15 @@
return $string;
}
-## NOTE: deal with < - < but not > - > because it seems its ok to have
-## > in the entity. For further info please look at #84738.
sub entity_decode
{
local ($_) = @_;
s/'/'/g; # '
s/"/"/g; # "
+ s/</</g;
+ s/>/>/g;
s/&/&/g;
- s/</</g;
return $_;
}
@@ -1006,8 +1065,8 @@
if ($MULTIPLE_OUTPUT) {
for my $lang (sort keys %po_files_by_lang) {
- if ( ! -e $lang ) {
- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
+ if ( ! -d $lang ) {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
}
open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
binmode (OUTPUT) if $^O eq 'MSWin32';
@@ -1354,3 +1413,39 @@
return @list;
}
+sub quoted_translation
+{
+ my ($lang, $string) = @_;
+
+ $string =~ s/\\\"/\"/g;
+
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
+
+ $translation =~ s/\"/\\\"/g;
+ return $translation
+}
+
+sub quoted_merge_translations
+{
+ if (!$MULTIPLE_OUTPUT) {
+ print "Quoted only supports Multiple Output.\n";
+ exit(1);
+ }
+
+ for my $lang (sort keys %po_files_by_lang) {
+ if ( ! -d $lang ) {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+ }
+ open INPUT, "<${FILE}" or die;
+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ while (<INPUT>)
+ {
+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
+ print OUTPUT;
+ }
+ close OUTPUT;
+ close INPUT;
+ }
+}
Modified: gtkpod/branches/etch-bpo/intltool-update.in
===================================================================
--- gtkpod/branches/etch-bpo/intltool-update.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/intltool-update.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.0";
+my $VERSION = "0.36.2";
my $PACKAGE = "intltool";
## Loaded modules
@@ -71,7 +71,8 @@
"sheet(?:\\.in)+|". # ?
"schemas(?:\\.in)+|". # GConf specific
"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+"; # GOK specific.
+"kbd(?:\\.in)+|". # GOK specific.
+"policy(?:\\.in)+"; # PolicyKit files
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
@@ -90,10 +91,9 @@
$| = 1;
## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
+my $SRCDIR = $ENV{"srcdir"} || ".";
my $POTFILES_in;
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
$POTFILES_in = "<$SRCDIR/POTFILES.in";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
@@ -124,8 +124,10 @@
&Console_Write_IntltoolHelp if $arg_count > 1;
+my $PKGNAME = FindPackageName ();
+
# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
+my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
if ($POT_ARG)
{
@@ -316,7 +318,8 @@
@buf_potfiles_ignore,
@buf_allfiles,
@buf_allfiles_sorted,
- @buf_potfiles_sorted
+ @buf_potfiles_sorted,
+ @buf_potfiles_ignore_sorted
);
## Search and find all translatable files
@@ -326,8 +329,13 @@
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
}, "..";
+ find sub {
+ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+ }, "$SRCDIR/..";
-
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
close POTFILES;
@@ -342,7 +350,7 @@
## comparing with POTFILES.in
foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
{
- (-s $ignore) or next;
+ (-s "$SRCDIR/$ignore") or next;
if ("$ignore" eq "POTFILES.ignore")
{
@@ -351,7 +359,7 @@
}
print "Found $ignore: Ignoring files...\n" if $VERBOSE;
- open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
+ open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
while (<FILE>)
{
@@ -359,7 +367,7 @@
}
close FILE;
- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
+ @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
}
foreach my $file (@buf_i18n_plain)
@@ -417,7 +425,7 @@
}
}
- if (/\.GetString ?\(QUOTEDTEXT/)
+ if (/\w\.GetString *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -426,7 +434,8 @@
last;
}
- if (/_\(QUOTEDTEXT/)
+ ## N_ Q_ and _ are the three macros defined in gi8n.h
+ if (/[NQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -486,16 +495,32 @@
my %in2;
foreach (@buf_potfiles_sorted)
{
+ s#^$SRCDIR/../##;
+ s#^$SRCDIR/##;
$in2{$_} = 1;
}
+ foreach (@buf_potfiles_ignore_sorted)
+ {
+ s#^$SRCDIR/../##;
+ s#^$SRCDIR/##;
+ $in2{$_} = 1;
+ }
+
my @result;
foreach (@buf_allfiles_sorted)
{
- if (!exists($in2{$_}))
+ my $dummy = $_;
+ my $srcdir = $SRCDIR;
+
+ $srcdir =~ s#^../##;
+ $dummy =~ s#^$srcdir/../##;
+ $dummy =~ s#^$srcdir/##;
+ $dummy =~ s#_build/##;
+ if (!exists($in2{$dummy}))
{
- push @result, $_
+ push @result, $dummy
}
}
@@ -504,7 +529,7 @@
foreach (@buf_potfiles_sorted)
{
chomp (my $dummy = $_);
- if ("$dummy" ne "" and ! -f "../$dummy")
+ if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
{
push @buf_potfiles_notexist, $_;
}
@@ -537,7 +562,7 @@
warn "\n" if ($VERBOSE or @result);
warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
warn @buf_potfiles_notexist, "\n";
- warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
+ warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
"containing this list of absent files has been written in the current directory.\n";
}
}
@@ -555,16 +580,33 @@
exit 1;
}
+sub isProgramInPath
+{
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 0;
+}
+
+sub isGNUGettextTool
+{
+ my ($file) = @_;
+ # Check that we are using GNU gettext tools
+ if (isProgramInPath ($file))
+ {
+ my $version = `$file --version`;
+ return 1 if ($version =~ m/.*\(GNU .*\).*/);
+ }
+ return 0;
+}
+
sub GenerateHeaders
{
- my $EXTRACT = "@INTLTOOL_EXTRACT@";
- chomp $EXTRACT;
+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
-
## Generate the .h header files, so we can allow glade and
## xml translation support
- if (! -x "$EXTRACT")
+ if (! isProgramInPath ("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
@@ -611,13 +653,13 @@
#
sub GeneratePOTemplate
{
- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
+ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
chomp $XGETTEXT;
- if (! -x $XGETTEXT)
+ if (! isGNUGettextTool ("$XGETTEXT"))
{
- print STDERR " *** xgettext is not found on this system!\n".
+ print STDERR " *** GNU xgettext is not found on this system!\n".
" *** Without it, intltool-update can not extract strings.\n";
exit;
}
@@ -671,12 +713,8 @@
}
else
{
- if ($SRCDIR eq ".") {
- print OUTFILE "../$_\n";
- } else {
- print OUTFILE "$SRCDIR/../$_\n";
- }
- $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ print OUTFILE "$SRCDIR/../$_\n";
+ $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
}
next if (! $gettext_support_nonascii);
@@ -717,7 +755,23 @@
unlink "$MODULE.pot";
my @xgettext_argument=("$XGETTEXT",
"--add-comments",
- "--directory\=\.",
+ "--directory\=.",
+ "--default-domain\=$MODULE",
+ "--flag\=g_strdup_printf:1:c-format",
+ "--flag\=g_string_printf:2:c-format",
+ "--flag\=g_string_append_printf:2:c-format",
+ "--flag\=g_error_new:3:c-format",
+ "--flag\=g_set_error:4:c-format",
+ "--flag\=g_markup_printf_escaped:1:c-format",
+ "--flag\=g_log:3:c-format",
+ "--flag\=g_print:1:c-format",
+ "--flag\=g_printerr:1:c-format",
+ "--flag\=g_printf:1:c-format",
+ "--flag\=g_fprintf:2:c-format",
+ "--flag\=g_sprintf:2:c-format",
+ "--flag\=g_snprintf:3:c-format",
+ "--flag\=g_scanner_error:2:c-format",
+ "--flag\=g_scanner_warn:2:c-format",
"--output\=$MODULE\.pot",
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
@@ -784,9 +838,16 @@
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
+ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
my ($lang, $outfile) = @_;
+ if (! isGNUGettextTool ("$MSGMERGE"))
+ {
+ print STDERR " *** GNU msgmerge is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
+
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
my $infile = "$SRCDIR/$lang.po";
@@ -827,8 +888,15 @@
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+ if (! isGNUGettextTool ("$MSGFMT"))
+ {
+ print STDERR " *** GNU msgfmt is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
+
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
system ("$MSGFMT", "-o", "$devnull", "--verbose", $output_file);
@@ -836,21 +904,28 @@
sub Console_Write_CoverageReport
{
- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
+ if (! isGNUGettextTool ("$MSGFMT"))
+ {
+ print STDERR " *** GNU msgfmt is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
+
&GatherPOFiles;
foreach my $lang (@languages)
{
- print "$lang: ";
+ print STDERR "$lang: ";
&POFile_Update ($lang, "");
}
- print "\n\n * Current translation support in $MODULE \n\n";
+ print STDERR "\n\n * Current translation support in $MODULE \n\n";
foreach my $lang (@languages)
{
- print "$lang: ";
+ print STDERR "$lang: ";
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
@@ -924,13 +999,13 @@
$conf_in || die "Cannot find top_builddir in Makevars.";
}
- elsif (-f "../configure.ac")
+ elsif (-f "$SRCDIR/../configure.ac")
{
- $conf_in = "../configure.ac";
+ $conf_in = "$SRCDIR/../configure.ac";
}
- elsif (-f "../configure.in")
+ elsif (-f "$SRCDIR/../configure.in")
{
- $conf_in = "../configure.in";
+ $conf_in = "$SRCDIR/../configure.in";
}
else
{
Modified: gtkpod/branches/etch-bpo/missing
===================================================================
--- gtkpod/branches/etch-bpo/missing 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/missing 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -15,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,19 +44,25 @@
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
@@ -67,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +87,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake at gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,14 +104,44 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
@@ -102,13 +149,8 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
@@ -116,13 +158,8 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +177,8 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -156,20 +188,15 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -185,74 +212,67 @@
bison|yacc)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
lex|flex)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -262,32 +282,36 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,8 +347,8 @@
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
@@ -334,3 +358,10 @@
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Property changes on: gtkpod/branches/etch-bpo/missing
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/mkinstalldirs
___________________________________________________________________
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/po/ChangeLog
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/po/Makefile.in.in
===================================================================
--- gtkpod/branches/etch-bpo/po/Makefile.in.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/Makefile.in.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -25,7 +25,7 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ..
+top_builddir = @top_builddir@
VPATH = @srcdir@
prefix = @prefix@
@@ -56,15 +56,19 @@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
-#This Gets Replace for some reason
+# This comment gets stripped out
-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
@@ -98,11 +102,7 @@
install-data-no: all
install-data-yes: all
$(mkdir_p) $(DESTDIR)$(itlocaledir)
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
@@ -133,20 +133,21 @@
dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
-installcheck:
+install-exec installcheck:
uninstall:
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
+ rm -f missing notexist
+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+ if [ -r missing -o -r notexist ]; then \
+ exit 1; \
+ fi
mostlyclean:
rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
@@ -179,11 +180,7 @@
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
@@ -211,8 +208,8 @@
$(MAKE) stamp-it; \
fi
-stamp-it: Makefile.in.in ../config.status POTFILES.in
- cd .. \
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
$(SHELL) ./config.status
Property changes on: gtkpod/branches/etch-bpo/po/Makefile.in.in
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/po/POTFILES.in
===================================================================
--- gtkpod/branches/etch-bpo/po/POTFILES.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/POTFILES.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,9 +1,8 @@
-# List of source files containing translatable strings (output of
-# ls src/*.[cl] data/*.glade data/*.desktop.in | grep -vf po/POTFILES.skip
-# in a clean checkout)
+[encoding: UTF-8]
data/gtkpod.desktop.in
data/gtkpod.glade
+src/autodetection.c
src/charset.c
src/clientserver.c
src/confirmation.c
@@ -14,6 +13,7 @@
src/display.c
src/display_coverart.c
src/display_itdb.c
+src/display_photo.c
src/display_playlists.c
src/display_sorttabs.c
src/display_spl.c
Property changes on: gtkpod/branches/etch-bpo/po/POTFILES.in
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/po/POTFILES.skip
===================================================================
--- gtkpod/branches/etch-bpo/po/POTFILES.skip 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/POTFILES.skip 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,3 +1,4 @@
+src/date_parser.c
src/md5.c
src/podcast.c
src/support.c
Modified: gtkpod/branches/etch-bpo/po/de.po
===================================================================
--- gtkpod/branches/etch-bpo/po/de.po 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/de.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-14 22:57+0900\n"
+"POT-Creation-Date: 2007-12-13 18:36-0500\n"
"PO-Revision-Date: 2007-03-15 22:33+0100\n"
"Last-Translator: Kai-Ove\n"
"Language-Team: <de at li.org>\n"
@@ -175,75 +175,76 @@
msgstr "<b>Sicherheitsabfrage beim Löschen</b>"
#: ../data/gtkpod.glade.h:37
-msgid "<b>Displayed Track Attributes</b>"
-msgstr "<b>Angezeigte Informationen</b>"
-
-#: ../data/gtkpod.glade.h:38
msgid "<b>Examples</b>"
msgstr "<b>Beispiele</b>"
-#: ../data/gtkpod.glade.h:39
+#: ../data/gtkpod.glade.h:38
msgid "<b>Ignore Frequent Words</b>"
msgstr "<b>Ignoriere oft verwendete Wörter</b>"
-#: ../data/gtkpod.glade.h:40
+#: ../data/gtkpod.glade.h:39
msgid "<b>Misc</b>"
msgstr "<b>Verschiedenes</b>"
-#: ../data/gtkpod.glade.h:41
+#: ../data/gtkpod.glade.h:40
msgid "<b>Mountpoint and individual repository/playlist options</b>"
msgstr ""
"<b>Einhängepunkt u. individuelle Datenbank/Wiedergabeliste Optionen</b>"
-#: ../data/gtkpod.glade.h:42
+#: ../data/gtkpod.glade.h:41
#, fuzzy
msgid "<b>On-the-fly Conversion</b>"
msgstr "<b>Sicherheitsabfrage beim Löschen</b>"
-#: ../data/gtkpod.glade.h:43
+#: ../data/gtkpod.glade.h:42
msgid "<b>Play</b>"
msgstr "<b>Wiedergabe</b>"
-#: ../data/gtkpod.glade.h:44
+#: ../data/gtkpod.glade.h:43
msgid "<b>Playlists</b>"
msgstr "<b>Wiedergabeliste(n)</b>"
-#: ../data/gtkpod.glade.h:45
+#: ../data/gtkpod.glade.h:44
msgid "<b>Please select mountpoint and your iPod model</b>"
msgstr "<b>Bitte Einhängepunkt und iPod Modell wählen</b>"
-#: ../data/gtkpod.glade.h:46
+#: ../data/gtkpod.glade.h:45
msgid "<b>Repositories</b>"
msgstr "<b>Datenbanken</b>"
-#: ../data/gtkpod.glade.h:47
+#: ../data/gtkpod.glade.h:46
msgid "<b>Sort Order</b>"
msgstr "<b>Sortier-Reihenfolge</b>"
-#: ../data/gtkpod.glade.h:48
+#: ../data/gtkpod.glade.h:47
msgid "<b>Sort Tabs</b>"
msgstr "<b>Sortierungseinträge</b>"
-#: ../data/gtkpod.glade.h:49
+#: ../data/gtkpod.glade.h:48
msgid "<b>Sync</b>"
msgstr "<b>Abgleichen</b>"
-#: ../data/gtkpod.glade.h:50
+#: ../data/gtkpod.glade.h:49
msgid "<b>Synchronization</b>"
msgstr "<b>Abgleich</b>"
-#: ../data/gtkpod.glade.h:51
+#: ../data/gtkpod.glade.h:50
msgid "<b>Tag Reading</b>"
msgstr "<b>Lesen von Tags</b>"
-#: ../data/gtkpod.glade.h:52
+#: ../data/gtkpod.glade.h:51
msgid "<b>Toolbar</b>"
msgstr "<b>Werkzeugleiste</b>"
-#: ../data/gtkpod.glade.h:53
+#: ../data/gtkpod.glade.h:52
msgid "<b>Tooltips</b>"
msgstr "<b>Werkzeugtipps</b>"
+#: ../data/gtkpod.glade.h:53
+#, fuzzy
+msgid "<b>Track Attributes</b>"
+msgstr "<b>Angezeigte Informationen</b>"
+
#: ../data/gtkpod.glade.h:54
msgid "<b>Track Editing</b>"
msgstr "<b>Bearbeiten von Stücken</b>"
@@ -269,93 +270,123 @@
msgstr "Verzeichnisse rekursiv hinzufügen"
#: ../data/gtkpod.glade.h:60
+#, fuzzy
+msgid "Add Files"
+msgstr "_Dateien hinzufügen"
+
+#: ../data/gtkpod.glade.h:61
msgid "Add Files or Directories"
msgstr "Dateien oder Verzeichnisse hinzufügen."
-#: ../data/gtkpod.glade.h:61
-msgid "Add _Directory"
-msgstr "_Verzeichnisse hinzufügen"
+#: ../data/gtkpod.glade.h:62
+#, fuzzy
+msgid "Add Fol_der"
+msgstr "_Dateien hinzufügen"
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:63
+#, fuzzy
+msgid "Add Folder"
+msgstr "_Dateien hinzufügen"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Image_s"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:65
+#, fuzzy
+msgid "Add Images from a Directory"
+msgstr "Dateien oder Verzeichnisse hinzufügen."
+
+#: ../data/gtkpod.glade.h:66
+#, fuzzy
+msgid "Add Playlist"
+msgstr "_Wiedergabeliste hinzufügen"
+
+#: ../data/gtkpod.glade.h:67
msgid "Add _Files"
msgstr "_Dateien hinzufügen"
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:68
msgid "Add _Playlist"
msgstr "_Wiedergabeliste hinzufügen"
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:69
msgid "Add coverart from file using the following template"
msgstr "Cover-Bild nach folgender Schablone aus Datei einlesen"
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:70
msgid "Add directories recursively"
msgstr "Verzeichnisse rekursiv hinzufügen"
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:71
msgid "Add new repository/iPod"
msgstr "Füge Verzeichnis/iPod hinzu"
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:72
msgid "Add playlist from file"
msgstr "Wiedergabeliste aus Datei hinzufügen"
-#: ../data/gtkpod.glade.h:68 ../src/display_sorttabs.c:3232
-#: ../src/display_tracks.c:1996
+#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
msgid "Added"
msgstr "Hinzugefügt"
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:74
msgid "Advanced Sorting Options"
msgstr "Weitere Sortieroptionen"
#. 0
-#: ../data/gtkpod.glade.h:70 ../src/display_sorttabs.c:2954
+#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
msgid "Album"
msgstr "Album"
-#: ../data/gtkpod.glade.h:71
+#: ../data/gtkpod.glade.h:76
#, fuzzy
msgid "Album Art"
msgstr "Album"
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:77
msgid "All (AND)"
msgstr "Alle (UND)"
-#: ../data/gtkpod.glade.h:73
+#: ../data/gtkpod.glade.h:78
msgid "All Tracks Never Listened To"
msgstr "Nie gehörte Stücke"
-#: ../data/gtkpod.glade.h:74
+#: ../data/gtkpod.glade.h:79
msgid "All Tracks Played Since Last Time"
msgstr "Seit dem letzten Mal gespielte Stücke"
-#: ../data/gtkpod.glade.h:75
+#: ../data/gtkpod.glade.h:80
msgid "All Tracks not Listed in any Playlist"
msgstr "In keiner Wiedergabeliste aufgeführte Stücke"
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:81
msgid "Also include tracks never played in \"Best Rated\" playlist"
msgstr ""
"Auch Stücke in die 'am besten' bewertete' Wiedergabeliste aufnehmen, die nie "
"gespielt wurden"
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:82
msgid "Always write ID3v2.4 tags (only applies to MP3)"
msgstr "Immer ID3v2.4 Tags schreiben (trifft nur auf MP3 zu)"
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:83
msgid "Any (OR)"
msgstr "Eines (ODER)"
-#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2951
+#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
msgid "Artist"
msgstr "Künstler"
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:85
+#, fuzzy
+msgid "Artwork Preview"
+msgstr "Pfad zu Bilddateien"
+
+#: ../data/gtkpod.glade.h:86
msgid ""
"As a last resort set the following tags to the\n"
"filename if they are (still) empty:"
@@ -363,28 +394,15 @@
"Falls Tags (immer noch) nicht gesetzt sind, die folgenden Tags mit dem "
"Dateinamen initialisieren:"
-#: ../data/gtkpod.glade.h:82
+#: ../data/gtkpod.glade.h:88
msgid "Ascending"
msgstr "Aufsteigend"
-#: ../data/gtkpod.glade.h:83
-msgid ""
-"Audio/Video\n"
-"Audio\n"
-"Video\n"
-"Podcast\n"
-"Video Podcast\n"
-"Audiobook\n"
-"Music Video\n"
-"TV Show\n"
-"TV Show & Music Video\n"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:93
+#: ../data/gtkpod.glade.h:89
msgid "Auto Store"
msgstr "Autom. speichern"
-#: ../data/gtkpod.glade.h:94
+#: ../data/gtkpod.glade.h:90
msgid ""
"Automatically start displaying tracks that match the criteria entered above. "
"If not selected, you must press 'Display' to start displaying."
@@ -393,53 +411,57 @@
"automatisch starten. Wenn diese Option nicht aktiviert ist, müssen Sie "
"'Anzeige' drücken."
-#: ../data/gtkpod.glade.h:95
+#: ../data/gtkpod.glade.h:91
+msgid "Available:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:92
msgid "Before removing playlists or tracks from a playlist"
msgstr ""
"Vor dem Entfernen von Wiedergabelisten oder Stücken aus einer Wiedergabeliste"
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:93
msgid "Before removing tracks from the harddisk"
msgstr "Vor dem vollständigen Löschen auf der Festplatte"
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:94
msgid "Before removing tracks from the iPod"
msgstr "Vor dem vollständigen Löschen vom iPod"
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:95
msgid "Before removing tracks from the local database"
msgstr "Vor dem Entfernen aus der lokalen Datenbank"
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:96
msgid "Best Rated Tracks"
msgstr "Am besten bewertete Stücke"
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:97
msgid "Browse"
msgstr "Durchsuchen"
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:98
#, fuzzy
msgid "Cache directory:"
msgstr "_Verzeichnisse hinzufügen"
-#: ../data/gtkpod.glade.h:102
+#: ../data/gtkpod.glade.h:99
msgid "Calendar"
msgstr "Kalender"
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:100
msgid "Calendar sync command:"
msgstr "Befehl zum Abgleich des Kalenders:"
-#: ../data/gtkpod.glade.h:104
+#: ../data/gtkpod.glade.h:101
msgid "Call automatically when synchronizing iTunesDB"
msgstr "Automatisch aufrufen, wenn die iTunesDB abgeglichen wird"
-#: ../data/gtkpod.glade.h:105
+#: ../data/gtkpod.glade.h:102
msgid "Category: "
msgstr "Kategorie: "
-#: ../data/gtkpod.glade.h:106
+#: ../data/gtkpod.glade.h:103
msgid ""
"Change all tracks\n"
"simultaneously"
@@ -447,30 +469,36 @@
"Alle Stücke simultan \n"
"modifizieren"
-#: ../data/gtkpod.glade.h:108
+#: ../data/gtkpod.glade.h:105
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:107
msgid "Check for existing files when copying from iPod."
msgstr "Bei Kopieren vom iPod Überprüfen, ob Datei bereits existiert."
-#: ../data/gtkpod.glade.h:109
+#: ../data/gtkpod.glade.h:108
msgid "Command for 'Enqueue':"
msgstr "Befehl für 'Zum Abspielen Vormerken':"
-#: ../data/gtkpod.glade.h:110
+#: ../data/gtkpod.glade.h:109
msgid "Command for 'Play now':"
msgstr "Befehl für 'Jetzt abspielen':"
#. 5
-#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
#: ../src/misc_conversion.c:65
msgid "Composer"
msgstr "Komponist"
-#: ../data/gtkpod.glade.h:112
+#: ../data/gtkpod.glade.h:111
msgid "Confirm before removing tracks from the iPod or repository"
msgstr ""
"Bestätigung vor dem vollständigen Löschen vom iPod oder aus der Datenbank"
-#: ../data/gtkpod.glade.h:113
+#: ../data/gtkpod.glade.h:112
msgid ""
"Confirm before removing tracks from the iPod or repository\n"
"when syncing playlists"
@@ -478,55 +506,55 @@
"Bestätigung vor dem Löschen vom iPod oder Musikverzeichnis beim Abgleichen "
"der Wiedergabelisten."
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:114
msgid "Confirm lists of directories"
msgstr "Liste der Verzeichnisse bestätigen"
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:115
msgid "Contacts sync command:"
msgstr "Befehl zum Abgleich der Kontakte:"
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:116
msgid "Containing Displayed Tracks"
msgstr "Aus den angezeigten Stücken"
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:117
msgid "Containing Selected Tracks"
msgstr "Aus den ausgewählten Stücken"
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:118
msgid "Conversion Progress Display"
msgstr ""
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:119
msgid "Cover"
msgstr "Cover"
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:120
msgid "Create New Playlist"
msgstr "Neue Wiedergabeliste erstellen"
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:121
msgid "Create Repository"
msgstr "Erstelle Datenbank "
-#: ../data/gtkpod.glade.h:123
+#: ../data/gtkpod.glade.h:122
msgid "Create _Playlist File"
msgstr "_Erstelle Datei der Wiedergabeliste"
-#: ../data/gtkpod.glade.h:124
+#: ../data/gtkpod.glade.h:123
msgid "Credits"
msgstr "Danksagung"
-#: ../data/gtkpod.glade.h:125
+#: ../data/gtkpod.glade.h:124
msgid "Currently only rating is supported."
msgstr "Gegenwärtig wird nur 'Bewertung' unterstützt."
-#: ../data/gtkpod.glade.h:126
+#: ../data/gtkpod.glade.h:125
msgid "Delete repository"
msgstr "Datenbank löschen"
-#: ../data/gtkpod.glade.h:127
+#: ../data/gtkpod.glade.h:126
#, fuzzy
msgid ""
"Delete tracks that are no longer present from the\n"
@@ -535,19 +563,19 @@
"Lösche Stücke, die nicht mehr auf dem iPod oder in der Datenbank vorhanden "
"sind."
-#: ../data/gtkpod.glade.h:129
+#: ../data/gtkpod.glade.h:128
msgid "Deleted tracks"
msgstr "Gelöschte Stücke"
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:129
msgid "Descending"
msgstr "Absteigend"
-#: ../data/gtkpod.glade.h:131
+#: ../data/gtkpod.glade.h:130
msgid "Details"
msgstr "Details"
-#: ../data/gtkpod.glade.h:133
+#: ../data/gtkpod.glade.h:132
#, no-c-format
msgid ""
"Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -564,7 +592,7 @@
"Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y, ursprünglicher "
"Dateiname (benötigt 'Erweiterte Informationen'): %o, das Zeichen '%': %%."
-#: ../data/gtkpod.glade.h:135
+#: ../data/gtkpod.glade.h:134
#, no-c-format
msgid ""
"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -582,7 +610,7 @@
"Dateiname (benötigt 'Erweiterte Informationen'): %o, die aktuelle "
"Wiedergabeliste: %p, das Zeichen '%': %%."
-#: ../data/gtkpod.glade.h:137
+#: ../data/gtkpod.glade.h:136
#, no-c-format
msgid ""
"Determines the name of the file with the cover art. You can separate several "
@@ -601,7 +629,7 @@
"Dateiname ohne Erweiterung: %O, die aktuelle Wiedergabelist: %p, das Zeichen "
"'%': %%."
-#: ../data/gtkpod.glade.h:138
+#: ../data/gtkpod.glade.h:137
msgid ""
"Directories to sync with are determined from the filenames of the tracks in "
"the playlist."
@@ -609,66 +637,62 @@
"Abzugleichende Verzeichnisse werden aus den Dateinamen der Wiedergabeliste "
"ermittelt."
-#: ../data/gtkpod.glade.h:139
-msgid "Dirs"
-msgstr "Verzeichnisse"
-
-#: ../data/gtkpod.glade.h:140
+#: ../data/gtkpod.glade.h:138
msgid "Display a list of tracks that could actually be updated."
msgstr ""
"Nach dem Aktualisieren eine Liste der Stücke anzeigen,\n"
"die tatsächlich aktualisiert werden könnten."
-#: ../data/gtkpod.glade.h:141
+#: ../data/gtkpod.glade.h:139
msgid "Display a list of tracks that could not be updated."
msgstr ""
"Liste der Stücke anzeigen, bei denen die Aktualisierung\n"
"nicht vorgenommen werden konnte."
-#: ../data/gtkpod.glade.h:142
+#: ../data/gtkpod.glade.h:140
msgid "Display conversion log"
msgstr ""
-#: ../data/gtkpod.glade.h:143
+#: ../data/gtkpod.glade.h:141
msgid "Display info about detected duplicates"
msgstr "Information über erkannte Duplikate anzeigen"
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:142
msgid "Display info about non-updated tracks"
msgstr "Informationen über nicht aktualisierte Stücke anzeigen"
-#: ../data/gtkpod.glade.h:145
+#: ../data/gtkpod.glade.h:143
msgid "Display info about updated tracks"
msgstr "Informationen über aktualisierte Stücke anzeigen"
-#: ../data/gtkpod.glade.h:146
+#: ../data/gtkpod.glade.h:144
msgid "Display messages and warnings at startup"
msgstr "Nachrichten und Warnungen beim Start des Programms anzeigen"
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:145
msgid ""
"Display the list of duplicates that have been detected after adding files."
msgstr ""
"Eine Liste der Duplikate anzeigen, die während des Hinzufügens von Stücken "
"erkannt wurden."
-#: ../data/gtkpod.glade.h:148
+#: ../data/gtkpod.glade.h:146
msgid "Display toolbar..."
msgstr "Werkzeugleiste anzeigen..."
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:147
msgid "Display tooltips in main window"
msgstr "Werkzeugtipps im Hauptfenster anzeigen"
-#: ../data/gtkpod.glade.h:150
+#: ../data/gtkpod.glade.h:148
msgid "Display tooltips in prefs window"
msgstr "Werkzeugtipps im Fenster 'Einstellungen' anzeigen"
-#: ../data/gtkpod.glade.h:151
+#: ../data/gtkpod.glade.h:149
msgid "Display tracks that match the criteria entered above."
msgstr "Stücke anzeigen, welche die oben genannten Kriterien erfüllen."
-#: ../data/gtkpod.glade.h:152
+#: ../data/gtkpod.glade.h:150
msgid ""
"Displayed\n"
"Tracks"
@@ -676,74 +700,78 @@
"Angezeigte\n"
"Stücke"
-#: ../data/gtkpod.glade.h:154
+#: ../data/gtkpod.glade.h:152
+#, fuzzy
+msgid "Displayed:"
+msgstr "_Anzeige"
+
+#: ../data/gtkpod.glade.h:153
msgid "Don't allow file duplication"
msgstr "Mehrfaches Einlesen von Stücken verhindern"
-#: ../data/gtkpod.glade.h:155
+#: ../data/gtkpod.glade.h:154
msgid "Don't automatically sync on startup"
msgstr "Beim Start nicht automatisch abgleichen"
-#: ../data/gtkpod.glade.h:156
-msgid "Download Cover"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:157
+#: ../data/gtkpod.glade.h:155
#, fuzzy
msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
msgstr ""
"Die Duplikat-Erkennung basiert auf einem (modifizierten) md5-Hash über die "
"Dateien."
-#: ../data/gtkpod.glade.h:158
+#: ../data/gtkpod.glade.h:156
msgid "Edit Repository/iPod Options"
msgstr "_Ändere Verzeichnis / iPod Optionen"
-#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:659
+#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
msgid "Edit Smart Playlist"
msgstr "Intelligente Wiedergabeliste editieren"
-#: ../data/gtkpod.glade.h:160 ../src/context_menus.c:746
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
msgid "Edit Track Details"
msgstr "_Bearbeite Stücke"
-#: ../data/gtkpod.glade.h:161
+#: ../data/gtkpod.glade.h:159
msgid "Edit _Preferences"
msgstr "_Einstellungen ändern"
-#: ../data/gtkpod.glade.h:162
+#: ../data/gtkpod.glade.h:160
msgid "Effective free space"
msgstr "Effektiv freier Platz"
-#: ../data/gtkpod.glade.h:163
+#: ../data/gtkpod.glade.h:161
msgid "Empty Playlist"
msgstr "Wiedergabeliste leeren"
-#: ../data/gtkpod.glade.h:164
+#: ../data/gtkpod.glade.h:162
msgid "Exclude file mask(s)"
msgstr "Schließe Dateimaske(n) aus"
-#: ../data/gtkpod.glade.h:165
+#: ../data/gtkpod.glade.h:163
+#, fuzzy
+msgid "Export can be continued at a later time if canceled."
+msgstr ""
+"Zum Abbrechen bitte anklicken.\n"
+"Der Export kann zu einem späteren Zeitpunkt fortgesetzt werden."
+
+#: ../data/gtkpod.glade.h:164
msgid "File size"
msgstr "Dateigröße"
-#: ../data/gtkpod.glade.h:166
+#: ../data/gtkpod.glade.h:165
msgid "File size (deleted)"
msgstr "Dateigröße (gelöscht)"
-#: ../data/gtkpod.glade.h:167
+#: ../data/gtkpod.glade.h:166
msgid "File size (non-transferred)"
msgstr "Dateigröße (nicht übertragen)"
-#: ../data/gtkpod.glade.h:168
+#: ../data/gtkpod.glade.h:167
msgid "Filename Format: "
msgstr "Format für Dateinamen: "
-#: ../data/gtkpod.glade.h:169
-msgid "Files"
-msgstr "Dateien"
-
-#: ../data/gtkpod.glade.h:170
+#: ../data/gtkpod.glade.h:168
#, fuzzy
msgid ""
"Find orphan files (files with no track info in DB) and dangling tracks "
@@ -752,16 +780,16 @@
"Verwaiste Stücke (Stücke, für die kein Eintrag in der iTunesDB erscheint) "
"und verlorene Stücke (Stücke ohne Datei auf dem iPod) finden"
-#: ../data/gtkpod.glade.h:171
+#: ../data/gtkpod.glade.h:169
#, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
msgstr "Versuche zuerst <i>folder.jpg</i>, dann <i><Künstler>.jpg</i>"
-#: ../data/gtkpod.glade.h:172
+#: ../data/gtkpod.glade.h:170
msgid "Flac with :"
msgstr ""
-#: ../data/gtkpod.glade.h:174
+#: ../data/gtkpod.glade.h:172
#, no-c-format
msgid ""
"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
@@ -770,7 +798,7 @@
"'xmms %s', z.B., löscht die aktuelle Wiedergabeliste von xmms, fügt die "
"ausgewählten Stücke hinzu und beginnt mit der Wiedergabe."
-#: ../data/gtkpod.glade.h:176
+#: ../data/gtkpod.glade.h:174
#, no-c-format
msgid ""
"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
@@ -779,16 +807,16 @@
"'xmms -e %s', z.B., fügt die ausgewählten Stücke zur aktuellen "
"Wiedergabeliste von xmms hinzu."
-#: ../data/gtkpod.glade.h:177 ../src/display_sorttabs.c:2957
+#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
msgid "Genre"
msgstr "Genre"
-#: ../data/gtkpod.glade.h:178
+#: ../data/gtkpod.glade.h:176
msgid "Group artists on compilation CDs"
msgstr "Künstler auf Sampler-CDs gruppieren"
-#: ../data/gtkpod.glade.h:179
+#: ../data/gtkpod.glade.h:177
#, fuzzy
msgid ""
"Highly recommended for faster import when taking advantage of the "
@@ -805,12 +833,12 @@
"rekonstruieren (dazu müssen die 'transferred=' Einträge in der gesicherten "
"Datenbank auf '0' gesetzt und 'offline' eingelesen werden)."
-#: ../data/gtkpod.glade.h:180 ../src/context_menus.c:682
-#: ../src/context_menus.c:700 ../src/context_menus.c:824
+#: ../data/gtkpod.glade.h:178 ../src/context_menus.c:685
+#: ../src/context_menus.c:703 ../src/context_menus.c:820
msgid "I'm sure"
msgstr "Ich bin sicher"
-#: ../data/gtkpod.glade.h:181
+#: ../data/gtkpod.glade.h:179
msgid ""
"If available, the local copy of the track is referenced in the playlist. "
"Otherwise the file on the iPod is used."
@@ -818,11 +846,11 @@
"Falls verfügbar, wird die lokale Kopie des Stückes in die Wiedergabeliste "
"eingetragen. Andernfalls wird die Datei auf dem iPod verwendet."
-#: ../data/gtkpod.glade.h:182
+#: ../data/gtkpod.glade.h:180
msgid "If both options are selected, embedded APIC data takes precedence."
msgstr "Falls beide Optionen angewählt sind, werden die APIC-Daten verwendet."
-#: ../data/gtkpod.glade.h:183
+#: ../data/gtkpod.glade.h:181
msgid ""
"If checked, sorting will be case sensitive. Please note that case sensitive "
"sorting will not work well with most charsets."
@@ -831,7 +859,7 @@
"Kleinschreibung beachtet. Mit den meisten Zeichensätzen funktioniert diese "
"Funktion jedoch nicht wie gewünscht."
-#: ../data/gtkpod.glade.h:184
+#: ../data/gtkpod.glade.h:182
msgid ""
"If the filename (full path) of an existing track matches that of a track to "
"be added, this option allows you to update the information about the "
@@ -846,12 +874,12 @@
"die Option 'Mehrfaches Einlesen von Stücken verhindern' aktiviert haben, "
"wird das Einlesen ebenfalls übersprungen."
-#: ../data/gtkpod.glade.h:185
+#: ../data/gtkpod.glade.h:183
msgid "If you check this, gtkpod will descend into subdirectories recursively."
msgstr ""
"Wenn Sie diese Option wählen, werden Verzeichnisse rekursiv eingelesen."
-#: ../data/gtkpod.glade.h:186
+#: ../data/gtkpod.glade.h:184
msgid ""
"If you check this, information (cover art and meta information) changed for "
"this track will be copied to all other selected tracks as well. Use with "
@@ -861,7 +889,7 @@
"Stück (Cover und sonstige Angaben) automatisch in alle ausgewählten Stücke "
"kopiert. Bitte mit Vorsicht verwenden."
-#: ../data/gtkpod.glade.h:187
+#: ../data/gtkpod.glade.h:185
msgid ""
"If you don't select the master playlist automatically, the initial database "
"import is much faster because the display dosn't have to be updated."
@@ -870,7 +898,7 @@
"der Import der iTunes Datenbank zu Beginn deutlich schneller, da die Anzeige "
"nicht aktualisiert werden muss."
-#: ../data/gtkpod.glade.h:188
+#: ../data/gtkpod.glade.h:186
msgid ""
"If you select several tracks in the track list and edit a tag of the first "
"track, the tags in the other tracks are updated as well."
@@ -879,11 +907,11 @@
"ersten Stückes geändert wird, werden die entsprechenden Tags auch in den "
"anderen Stücken aktualisiert."
-#: ../data/gtkpod.glade.h:189
+#: ../data/gtkpod.glade.h:187
msgid "Ignore these words when at the beginning of the following fields:"
msgstr "Ignoriere folgende Wörter, wenn Sie am Anfang von Feldern stehen:"
-#: ../data/gtkpod.glade.h:190
+#: ../data/gtkpod.glade.h:188
msgid ""
"In order to save the displayed track order to the iPod choose 'Save "
"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
@@ -892,11 +920,11 @@
"'Dargestellte Reihenfolge speichern' im 'Bearbeiten' Menü oder wählen die "
"Option \"Autom. speichern\" unten aus."
-#: ../data/gtkpod.glade.h:191
+#: ../data/gtkpod.glade.h:189
msgid "Initialize iPod"
msgstr "Initialisiere iPod"
-#: ../data/gtkpod.glade.h:192
+#: ../data/gtkpod.glade.h:190
msgid ""
"Insert before\n"
"Insert after"
@@ -904,68 +932,72 @@
"Davor einfügen\n"
"Danach einfügen"
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:192
msgid "Keeps all compilation CDs grouped together in the artists sort tab."
msgstr ""
"Alle Sampler-CDs im Filter-Eintrag 'Künstler' als 'Sampler' gruppieren."
-#: ../data/gtkpod.glade.h:195
+#: ../data/gtkpod.glade.h:193
msgid "Live _updating"
msgstr "Live Akt_ualisierung"
-#: ../data/gtkpod.glade.h:196
+#: ../data/gtkpod.glade.h:194
msgid "Load iPod(s)"
msgstr "iPod(s) einlesen"
-#: ../data/gtkpod.glade.h:197
+#: ../data/gtkpod.glade.h:195
msgid "Lower Margin"
msgstr "Untere Grenze"
-#: ../data/gtkpod.glade.h:198
+#: ../data/gtkpod.glade.h:196
msgid "M4A with :"
msgstr ""
-#: ../data/gtkpod.glade.h:199
+#: ../data/gtkpod.glade.h:197
msgid "MP3 with :"
msgstr ""
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:198
msgid "Match al_l of the following"
msgstr "Al_le der folgenden Regeln"
-#: ../data/gtkpod.glade.h:201
+#: ../data/gtkpod.glade.h:199
msgid "Match an_y of the following"
msgstr "Mindestens _eine der folgenden Regeln"
-#: ../data/gtkpod.glade.h:202
+#: ../data/gtkpod.glade.h:200
msgid "Match only _checked tracks"
msgstr "Nur ausgewählte Stü_cke einbeziehen"
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:201
msgid "Maximum number of background threads:"
msgstr ""
-#: ../data/gtkpod.glade.h:204
+#: ../data/gtkpod.glade.h:202
msgid "Maximum size of cache directory (in GB):"
msgstr ""
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:203
msgid "Model:"
msgstr "Modell:"
-#: ../data/gtkpod.glade.h:206 ../src/display_tracks.c:1993
+#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
msgid "Modified"
msgstr "Modifiziert"
-#: ../data/gtkpod.glade.h:207
+#: ../data/gtkpod.glade.h:205
msgid "Most Recently Played Tracks"
msgstr "Zuletzt gespielte Stücke"
-#: ../data/gtkpod.glade.h:208
+#: ../data/gtkpod.glade.h:206
+msgid "Move selected attributes to the displayed list"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:207
msgid "Music Root:"
msgstr "Stammverzeichnis für Musik:"
-#: ../data/gtkpod.glade.h:209
+#: ../data/gtkpod.glade.h:208
msgid ""
"Music files can have images embedded in the APIC tag. Currently this is only "
"supported for MP3 files."
@@ -973,31 +1005,34 @@
"Musikdateien können Bilder im 'APIC Tag' enthalten. Dies wird derzeit nur "
"bei MP3-Dateien unterstützt."
-#: ../data/gtkpod.glade.h:210
+#: ../data/gtkpod.glade.h:209
msgid "Never show this dialogue again"
msgstr "Diesen Dialog nie wieder zeigen"
-#: ../data/gtkpod.glade.h:211
-msgid "New PL"
+#: ../data/gtkpod.glade.h:210 ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66 ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93 ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428 ../src/misc_playlist.c:430
+msgid "New Playlist"
msgstr "Neue Wiedergabeliste"
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:211
msgid "No lower margin"
msgstr "Keine untere Grenze"
-#: ../data/gtkpod.glade.h:213
+#: ../data/gtkpod.glade.h:212
msgid "No upper margin"
msgstr "Keine obere Grenze"
-#: ../data/gtkpod.glade.h:214
+#: ../data/gtkpod.glade.h:213
msgid "Non-transferred tracks"
msgstr "Nicht übertragene Stücke"
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:214
msgid "None"
msgstr "Keine"
-#: ../data/gtkpod.glade.h:216
+#: ../data/gtkpod.glade.h:215
msgid ""
"Normally the charset specified when first importing the track will be used "
"for the filename. If you set this option you can set a different charset "
@@ -1015,7 +1050,7 @@
"eingelesen wurden, haben keine Informationen über den Zeichensatz "
"gespeichert und der oben spezifizierte Zeichensatz wird verwendet."
-#: ../data/gtkpod.glade.h:217
+#: ../data/gtkpod.glade.h:216
msgid ""
"Normally the charset specified when first importing the track will be used "
"to update the track information. If you have chosen a wrong charset when "
@@ -1035,7 +1070,7 @@
"eingelesen wurden, haben keine Informationen über den Zeichensatz "
"gespeichert und der oben spezifizierte Zeichensatz wird verwendet."
-#: ../data/gtkpod.glade.h:218
+#: ../data/gtkpod.glade.h:217
msgid ""
"Normally the charset specified when first importing the track will be used "
"to write the tags. If you have chosen a wrong charset when first importing a "
@@ -1055,7 +1090,7 @@
"Informationen über den Zeichensatz gespeichert und der auf der 'Eingabe/"
"Ausgabe'-Seite eingestellte Zeichensatz wird verwendet."
-#: ../data/gtkpod.glade.h:219
+#: ../data/gtkpod.glade.h:218
msgid ""
"Normally, if a track is no longer present in the sync directory, it will be "
"removed from the playlist, but not from the iPod or local repository.\n"
@@ -1074,23 +1109,23 @@
"diese Option gewählt sein, wenn Stücke gelöscht werden sollen, da Löschen "
"aus der Wiedergabeliste auch Löschen auf dem iPod bedeutet."
-#: ../data/gtkpod.glade.h:222
+#: ../data/gtkpod.glade.h:221
msgid "Notes sync command:"
msgstr "Befehl zum Abgleich der Notizen:"
-#: ../data/gtkpod.glade.h:223
+#: ../data/gtkpod.glade.h:222
msgid "Number of playlists"
msgstr "Anzahl der Wiedergabelisten"
-#: ../data/gtkpod.glade.h:224
+#: ../data/gtkpod.glade.h:223
msgid "Number of tracks"
msgstr "Anzahl der Stücke"
-#: ../data/gtkpod.glade.h:225
+#: ../data/gtkpod.glade.h:224
msgid "Number of tracks in generated playlists:"
msgstr "Anzahl der Stücke in generierten Wiedergabelisten:"
-#: ../data/gtkpod.glade.h:226
+#: ../data/gtkpod.glade.h:225
msgid ""
"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
@@ -1099,59 +1134,64 @@
"Stücke', 'Höchstbewertete Stücke' und 'Zuletzt gespielte Stücke'. Wählen Sie "
"'0', wenn Sie die Anzahl nicht begrenzen wollen."
-#: ../data/gtkpod.glade.h:227
+#: ../data/gtkpod.glade.h:226
msgid "Ogg with :"
msgstr ""
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:227
msgid "On startup automatically sync with playlist directories"
msgstr "Beim Start automatisch mit den Wiedergabelisten abgleichen"
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:228
msgid "On startup automatically sync with the following directory"
msgstr "Beim Start automatisch mit folgendem Verzeichnis abgleichen"
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:229
msgid "On startup automatically update (Live Playlist)"
msgstr "Automatische Aktualisierung beim Start"
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:230
msgid "One for each Album"
msgstr "Eine für jedes Album"
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:231
msgid "One for each Artist"
msgstr "Eine für jeden Künstler"
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:232
msgid "One for each Composer"
msgstr "Eine für jeden Komponisten"
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:233
msgid "One for each Genre"
msgstr "Eine für jedes Genre"
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:234
msgid "One for each Rating"
msgstr "Eine für jede Bewertung"
-#: ../data/gtkpod.glade.h:236
+#: ../data/gtkpod.glade.h:235
msgid "One for each Year"
msgstr "Eine für jedes Jahr"
-#: ../data/gtkpod.glade.h:237
+#: ../data/gtkpod.glade.h:236
msgid "Overwrite tags that are already set"
msgstr "Tags, die bereits gesetzt sind, überschreiben."
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:237
msgid "Password:"
msgstr ""
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:238
msgid "Path:"
msgstr "Pfad:"
-#: ../data/gtkpod.glade.h:240
+#: ../data/gtkpod.glade.h:239
+#, fuzzy
+msgid "Photo Window"
+msgstr "Info _Fenster"
+
+#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
msgid "Play time"
msgstr "Spielzeit"
@@ -1160,118 +1200,107 @@
msgid "Playcount"
msgstr "Wiedergabezähler"
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:1990
+#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
msgid "Played"
msgstr "Gespielt"
-#: ../data/gtkpod.glade.h:243 ../src/display_spl.c:105
-msgid "Playlist"
-msgstr "Wiedergabeliste"
-
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:243
msgid "Playlist name:"
msgstr "Name der Wiedergabeliste:"
-#: ../data/gtkpod.glade.h:245
+#: ../data/gtkpod.glade.h:244
msgid "Playlist type:"
msgstr "Art der Wiedergabeliste:"
-#: ../data/gtkpod.glade.h:246 ../src/display_playlists.c:2176
+#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
msgid "Playlists"
msgstr "Wiedergabelisten"
-#: ../data/gtkpod.glade.h:247
+#: ../data/gtkpod.glade.h:246
msgid "Please refer to the notice below."
msgstr "Bitte beachten Sie den Hinweis weiter unten."
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:247
msgid "Please specify a time interval"
msgstr "Bitte Zeitintervall angeben"
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:248
msgid "Preferences"
msgstr "Einstellungen"
-#: ../data/gtkpod.glade.h:250
-msgid ""
-"Press button to abort.\n"
-"Export can be continued at a later time."
-msgstr ""
-"Zum Abbrechen bitte anklicken.\n"
-"Der Export kann zu einem späteren Zeitpunkt fortgesetzt werden."
-
-#: ../data/gtkpod.glade.h:252
-msgid "Previous"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:253
+#: ../data/gtkpod.glade.h:249
#, fuzzy
msgid "Progress Information"
msgstr "Information"
-#: ../data/gtkpod.glade.h:254
+#: ../data/gtkpod.glade.h:250
+msgid "R_ename Album"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:251
msgid "Random Playlist from Displayed Tracks"
msgstr "Zufällige aus den angezeigten Stücken"
-#: ../data/gtkpod.glade.h:255
+#: ../data/gtkpod.glade.h:252
msgid "Randomize Current Playlist"
msgstr "_Aktuelle Wiedergabeliste zufällig sortieren"
-#: ../data/gtkpod.glade.h:256 ../src/display_spl.c:101
+#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
#: ../src/misc_conversion.c:78
msgid "Rating"
msgstr "Bewertung"
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:254
msgid "Read coverart from embedded APIC data"
msgstr "Lese Cover-Bild aus den APIC Daten"
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:255
msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
msgstr "Tags aus der Datei lesen (z.B. ID3 Tags bei MP3 Dateien)"
-#: ../data/gtkpod.glade.h:259
-msgid "Remove Cover Art"
-msgstr "Cover-Bild entfernen"
+#: ../data/gtkpod.glade.h:256
+#, fuzzy
+msgid "Remove selected attributes from the displayed list"
+msgstr "Ausgewählte Stücke aus der Wiedergabeliste"
-#: ../data/gtkpod.glade.h:260
+#: ../data/gtkpod.glade.h:257
msgid "Repository Options"
msgstr "Datenbank-Optionen"
-#: ../data/gtkpod.glade.h:261
+#: ../data/gtkpod.glade.h:258
msgid "Repository name:"
msgstr "Datenbankname:"
-#: ../data/gtkpod.glade.h:262
+#: ../data/gtkpod.glade.h:259
msgid "Repository type:"
msgstr "Datenbanktyp:"
-#: ../data/gtkpod.glade.h:263
+#: ../data/gtkpod.glade.h:260
msgid "Root directory of mserv database (trackinfo root)."
msgstr "Stammverzeichnis für die mserv Datenbank (trackinfo root)."
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:261
msgid "Rules"
msgstr "Regeln"
-#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:808
+#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
msgid "Save Changes"
msgstr "Änderungen sichern"
-#: ../data/gtkpod.glade.h:266
+#: ../data/gtkpod.glade.h:263
#, fuzzy
msgid "Scrobble Tracks?"
msgstr "Ausgewählte _Stücke"
-#: ../data/gtkpod.glade.h:267
+#: ../data/gtkpod.glade.h:264
msgid "Select '-1' for no upper limit."
msgstr "'-1' wählen für 'keine obere Schranke'."
-#: ../data/gtkpod.glade.h:268
+#: ../data/gtkpod.glade.h:265
msgid "Select '0' for no lower limit."
msgstr "'0' wählen für 'keine untere Schranke'."
-#: ../data/gtkpod.glade.h:269
+#: ../data/gtkpod.glade.h:266
msgid ""
"Selected\n"
"Playlist"
@@ -1279,7 +1308,7 @@
"Ausgewählte\n"
"Wiedergabeliste"
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:268
msgid ""
"Selected\n"
"Tracks"
@@ -1287,94 +1316,100 @@
"Ausgewählte\n"
"Stücke"
+#: ../data/gtkpod.glade.h:270
+#, fuzzy
+msgid "Selected Filter Tab Entry from Database"
+msgstr "Ausgewählter Filter-Eintrag der lokalen Datenbank"
+
+#: ../data/gtkpod.glade.h:271
+#, fuzzy
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "Ausgewählter Filter-Eintrag der Festplatte"
+
+#: ../data/gtkpod.glade.h:272
+#, fuzzy
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "Ausgewählter Filter-Eintrag der Wiedergabeliste"
+
#: ../data/gtkpod.glade.h:273
-msgid "Selected Tab _Entry"
-msgstr "Ausgewählter _Eintrag"
+#, fuzzy
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "Ausgewählter Filter-Eintrag vom iPod"
#: ../data/gtkpod.glade.h:274
-msgid "Selected _Playlist"
-msgstr "Ausgewählte _Wiedergabeliste"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from Database"
+msgstr ""
+"Ausgewählte Wiedergabeliste einschließlich der Stücke aus der Datenbank"
#: ../data/gtkpod.glade.h:275
-msgid "Selected _Tracks"
-msgstr "Ausgewählte _Stücke"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr ""
+"Ausgewählte Wiedergabeliste einschließlich der Stücke von der Festplatte"
#: ../data/gtkpod.glade.h:276
-msgid "Selected filter tab entry from database"
-msgstr "Ausgewählter Filter-Eintrag der lokalen Datenbank"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "Ausgewählte Wiedergabeliste einschließlich der Stücke vom iPod"
#: ../data/gtkpod.glade.h:277
-msgid "Selected filter tab entry from harddisk"
-msgstr "Ausgewählter Filter-Eintrag der Festplatte"
+msgid "Selected Tab _Entry"
+msgstr "Ausgewählter _Eintrag"
#: ../data/gtkpod.glade.h:278
-msgid "Selected filter tab entry from iPod"
-msgstr "Ausgewählter Filter-Eintrag vom iPod"
+#, fuzzy
+msgid "Selected Tracks from Database"
+msgstr "Ausgewählte Stücke aus der Datenbank"
#: ../data/gtkpod.glade.h:279
-msgid "Selected filter tab entry from playlist"
-msgstr "Ausgewählter Filter-Eintrag der Wiedergabeliste"
+#, fuzzy
+msgid "Selected Tracks from Hard Disk"
+msgstr "Ausgewählte Stücke von der Festplatte"
#: ../data/gtkpod.glade.h:280
-msgid "Selected playlist"
-msgstr "Ausgewählte Wiedergabeliste"
+#, fuzzy
+msgid "Selected Tracks from Playlist"
+msgstr "Ausgewählte Stücke aus der Wiedergabeliste"
#: ../data/gtkpod.glade.h:281
-msgid "Selected playlist including tracks from database"
-msgstr ""
-"Ausgewählte Wiedergabeliste einschließlich der Stücke aus der Datenbank"
+#, fuzzy
+msgid "Selected Tracks from iPod"
+msgstr "Ausgewählte Stücke vom iPod"
#: ../data/gtkpod.glade.h:282
-msgid "Selected playlist including tracks from harddisk"
-msgstr ""
-"Ausgewählte Wiedergabeliste einschließlich der Stücke von der Festplatte"
+msgid "Selected _Playlist"
+msgstr "Ausgewählte _Wiedergabeliste"
#: ../data/gtkpod.glade.h:283
-msgid "Selected playlist including tracks from iPod"
-msgstr "Ausgewählte Wiedergabeliste einschließlich der Stücke vom iPod"
+msgid "Selected _Tracks"
+msgstr "Ausgewählte _Stücke"
#: ../data/gtkpod.glade.h:284
-msgid "Selected tracks from database"
-msgstr "Ausgewählte Stücke aus der Datenbank"
+msgid "Selected playlist"
+msgstr "Ausgewählte Wiedergabeliste"
#: ../data/gtkpod.glade.h:285
-msgid "Selected tracks from harddisk"
-msgstr "Ausgewählte Stücke von der Festplatte"
-
-#: ../data/gtkpod.glade.h:286
-msgid "Selected tracks from iPod"
-msgstr "Ausgewählte Stücke vom iPod"
-
-#: ../data/gtkpod.glade.h:287
-msgid "Selected tracks from playlist"
-msgstr "Ausgewählte Stücke aus der Wiedergabeliste"
-
-#: ../data/gtkpod.glade.h:288
#, fuzzy
msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
msgstr ""
"Per Semikolon getrennte Liste der durch Maske ausgeschlossenen Stücke, z.B. "
"'*.mp3'"
-#: ../data/gtkpod.glade.h:289
+#: ../data/gtkpod.glade.h:286
#, fuzzy
-msgid "Set Cover Art from File"
+msgid "Set Cover Art from _File"
msgstr "Lege Cover-Bild fest"
-#: ../data/gtkpod.glade.h:290
-#, fuzzy
-msgid "Set Cover Art from Web"
-msgstr "Lege Cover-Bild fest"
-
-#: ../data/gtkpod.glade.h:291
+#: ../data/gtkpod.glade.h:287
msgid "Set mountpoint or edit repository options"
msgstr "Einhängepunkt festlegen oder Datenbank-Optionen editieren"
-#: ../data/gtkpod.glade.h:292
+#: ../data/gtkpod.glade.h:288
msgid "Set options for Calendar/Contacts/Notes"
msgstr "Setze Optionen für Kalender/Kontakte/Notizen"
-#: ../data/gtkpod.glade.h:293
+#: ../data/gtkpod.glade.h:289
msgid ""
"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
@@ -1384,7 +1419,7 @@
"Falls gewählt, werden Normalisierungsdaten für m4a und m4b Dateien errechnet "
"und zu den Musikinformationen hinzugefügt."
-#: ../data/gtkpod.glade.h:294
+#: ../data/gtkpod.glade.h:290
msgid ""
"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for mp3 files "
@@ -1394,66 +1429,66 @@
"Falls gewählt, werden Normalisierungsdaten für mp3 Dateien errechnet und zu "
"den Musikinformationen hinzugefügt."
-#: ../data/gtkpod.glade.h:295
+#: ../data/gtkpod.glade.h:291
msgid "Set this to your last.fm password"
msgstr ""
-#: ../data/gtkpod.glade.h:296
+#: ../data/gtkpod.glade.h:292
msgid "Set this to your last.fm username"
msgstr ""
-#: ../data/gtkpod.glade.h:297
+#: ../data/gtkpod.glade.h:293
msgid ""
"Set to 0 to effectively disable caching (a maximum of one track will be "
"cached at a time)."
msgstr ""
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:294
msgid ""
"Set to 0 to use as many background threads as CPUs are available on your "
"system."
msgstr ""
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:295
msgid "Show information about problems when accessing mserv"
msgstr ""
"Informationen über Probleme während des Zugriffs auf die mserv Datenbank "
"anzeigen."
-#: ../data/gtkpod.glade.h:300
+#: ../data/gtkpod.glade.h:296
msgid "Show summary of sync result"
msgstr "Zeige Zusammenfassung nach Abgleich."
-#: ../data/gtkpod.glade.h:301 ../src/misc_playlist.c:96
+#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
#: ../src/repository.c:1356
msgid "Smart Playlist"
msgstr "Intelligente Wiedergabeliste"
-#: ../data/gtkpod.glade.h:302
+#: ../data/gtkpod.glade.h:298
msgid "Sort tracks according to: "
msgstr "Sortiere Stücke nach: "
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:299
msgid "Sorting Options"
msgstr "Sortieroptionen"
-#: ../data/gtkpod.glade.h:304
+#: ../data/gtkpod.glade.h:300
msgid "Sorting case sensitive"
msgstr "Beim Sortieren Groß-/Kleinschreibung beachten"
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:301
msgid "Sorttab: "
msgstr "Sortierungseintrag: "
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:302
msgid "Sorttabs"
msgstr "Sortierungseinträge"
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:303
msgid "Source:"
msgstr "Quelle:"
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:305
#, no-c-format
msgid ""
"Specify exact path including command line options. '%i' will be replaced "
@@ -1462,39 +1497,39 @@
"Geben sie den genauen Pfad einschließlich Kommandozeilenoptionen an. '%i' "
"wird durch den Einhängepunkt des iPods ersetzt."
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:306
msgid "Specify interval"
msgstr "Intervall angeben"
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:307
msgid "Start display automatically"
msgstr "Anzeige automatisch starten"
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:308
msgid "Synchronise Contacts, Calendar and Notes"
msgstr "Kontakte, Kalender und Notizen abgleichen"
-#: ../data/gtkpod.glade.h:313
+#: ../data/gtkpod.glade.h:309
msgid "Synchronize All"
msgstr "Alles abgleichen"
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:310
msgid "Synchronize Calendar"
msgstr "Kalender abgleichen"
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:311
msgid "Synchronize Contacts"
msgstr "Kontakte abgleichen"
-#: ../data/gtkpod.glade.h:316
+#: ../data/gtkpod.glade.h:312
msgid "Synchronize Notes"
msgstr "Notizen abgleichen"
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:313
msgid "Template for info field: "
msgstr "Schablone für dieses Feld: "
-#: ../data/gtkpod.glade.h:318
+#: ../data/gtkpod.glade.h:314
msgid ""
"The local copy of the track is referenced in the playlist. If the track is "
"not available locally, an error message is displayed."
@@ -1503,13 +1538,13 @@
"Falls das Stück lokal nicht verfügbar ist, wird eine Fehlermeldung "
"ausgegeben."
-#: ../data/gtkpod.glade.h:319
+#: ../data/gtkpod.glade.h:315
msgid ""
"The output of the background conversion scripts is copied below. Each page "
"of the notebook corresponds to one background thread."
msgstr ""
-#: ../data/gtkpod.glade.h:320
+#: ../data/gtkpod.glade.h:316
#, fuzzy
msgid ""
"The tags are written to the files on your harddrive and on the iPod (if "
@@ -1518,17 +1553,17 @@
"Die Tags werden in die Originaldateien auf der Festplatte und auch auf dem "
"iPod (falls angeschlossen) geschrieben."
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:317
msgid "The track on the iPod is referenced in the playlist file."
msgstr "Die Datei auf dem iPod wird in die Wiedergabeliste eingetragen."
-#: ../data/gtkpod.glade.h:322
+#: ../data/gtkpod.glade.h:318
msgid "This is the same option as in 'Edit/Delete Confirmation'"
msgstr ""
"Diese Option ist identisch mit der Sicherheitsabfrage \n"
"beim 'Bearbeiten/Löschen'"
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:319
msgid ""
"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
"uses unicode to store the tags, so you won't have to worry about charsets "
@@ -1544,22 +1579,22 @@
"ID3v2.4 wird ebenfalls beim Schreiben verwendet, falls die Tags in der Datei "
"bereits als V2.4 vorliegen."
-#: ../data/gtkpod.glade.h:324
+#: ../data/gtkpod.glade.h:320
msgid "This option will be re-activated when you upgrade gtkpod."
msgstr ""
"Diese Option wird automatisch aktiviert, wenn eine neue Version von gtkpod "
"installiert wird."
-#: ../data/gtkpod.glade.h:325
+#: ../data/gtkpod.glade.h:321
msgid "Time:"
msgstr "Zeit:"
-#: ../data/gtkpod.glade.h:326 ../src/display_sorttabs.c:2963
+#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
msgid "Title"
msgstr "Titel"
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:323
msgid ""
"Total\n"
"(iPod)"
@@ -1567,7 +1602,7 @@
"Insgesamt\n"
"(iPod)"
-#: ../data/gtkpod.glade.h:329
+#: ../data/gtkpod.glade.h:325
msgid ""
"Total\n"
"(local)"
@@ -1575,38 +1610,38 @@
"Insgesamt\n"
"(lokal)"
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:327
msgid "Tracks"
msgstr "Stücke"
-#: ../data/gtkpod.glade.h:332
+#: ../data/gtkpod.glade.h:328
msgid "Tracks Most Often Listened To"
msgstr "Am häufigsten gehörte Stücke"
-#: ../data/gtkpod.glade.h:333
+#: ../data/gtkpod.glade.h:329
msgid ""
"Tracks can be transferred in the background as soon as they are added to an "
"iPod repository. Otherwise they will be transferred when ejecting the "
"contents of the iPod completely unchanged until then."
msgstr ""
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:330
msgid "Tracks in Selected Tab _Entry"
msgstr "Stücke im ausgewählten _Sortierungseintrag"
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:331
msgid "Tracks in Selected _Playlist"
msgstr "Stücke in ausgewählter _Wiedergabeliste"
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:332
msgid "Transfer tracks to the iPod in the background"
msgstr ""
-#: ../data/gtkpod.glade.h:337
+#: ../data/gtkpod.glade.h:333
msgid "Translators"
msgstr "Ãœbersetzer"
-#: ../data/gtkpod.glade.h:338
+#: ../data/gtkpod.glade.h:334
msgid ""
"Try to load contents of all connected iPods. For each iPod a separate "
"repository must be set up."
@@ -1614,53 +1649,58 @@
"Versuche den Inhalt aller angeschlossenen iPods zu laden. Für jeden iPod "
"muss ein separates Verzeichnis existieren."
-#: ../data/gtkpod.glade.h:339
+#: ../data/gtkpod.glade.h:335
+#, fuzzy
+msgid "Undo _Track"
+msgstr "_Stück rückgängig"
+
+#: ../data/gtkpod.glade.h:336
msgid "Update _mserv Data from File"
msgstr "_mserv-Daten aktualisieren"
-#: ../data/gtkpod.glade.h:340
+#: ../data/gtkpod.glade.h:337
msgid "Update/Sync all playlists now"
msgstr "Aktualisierung/Abgleich aller Wiedergabelisten jetzt"
-#: ../data/gtkpod.glade.h:341
+#: ../data/gtkpod.glade.h:338
msgid "Update/Sync playlist now"
msgstr "Aktualisierung/Abgleich der Wiedergabeliste jetzt"
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:339
msgid "Upper margin"
msgstr "Obere Grenze"
-#: ../data/gtkpod.glade.h:343
+#: ../data/gtkpod.glade.h:340
msgid "Use 'Multi-Edit' also for title field"
msgstr "'Multi-Edit' auch für das Titel-Feld verwenden"
-#: ../data/gtkpod.glade.h:344
+#: ../data/gtkpod.glade.h:341
msgid "Use 'Multi-Edit' for tracks selections"
msgstr "'Multi-Edit' bei markierten Stücken verwenden"
-#: ../data/gtkpod.glade.h:345
+#: ../data/gtkpod.glade.h:342
#, fuzzy
-msgid "Use <i><Album>.jpg</i> in the parent directory"
+msgid "Use <i><Album>.jpg</i> in the parent directory"
msgstr "Benutze <i><Album>.jpg</i> im übergeordneten Verzeichnis"
-#: ../data/gtkpod.glade.h:346
+#: ../data/gtkpod.glade.h:343
#, fuzzy
-msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
msgstr "Benutze <i><Album>.jpg</i>, <i><Album>.png</i>..."
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:344
msgid "Use <i>folder.jpg</i> as cover art."
msgstr "Benutze <i>folder.jpg</i> als Cover-Bild"
-#: ../data/gtkpod.glade.h:348
+#: ../data/gtkpod.glade.h:345
msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
msgstr "Benutze <i>folder.jpg</i>, <i>folder.png</i>..."
-#: ../data/gtkpod.glade.h:349
+#: ../data/gtkpod.glade.h:346
msgid "Use mserv database to fill additional information"
msgstr "Benutze die mserv Datenbank für zusätzliche Informationen"
-#: ../data/gtkpod.glade.h:350
+#: ../data/gtkpod.glade.h:347
msgid ""
"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
"for this filename."
@@ -1668,7 +1708,7 @@
"Gewählten Zeichensatz (Einstellungen/'Hinzufügen/Aktualisieren/Abgleichen')\n"
"für diesen Dateinamen verwenden."
-#: ../data/gtkpod.glade.h:352
+#: ../data/gtkpod.glade.h:349
msgid ""
"Use selected encoding (on the 'General' page)\n"
"when writing tags"
@@ -1676,28 +1716,28 @@
"Ausgewählte Kodierung (auf der Allgemein-Seite)\n"
"beim Schreiben von ID3-Tags verwenden"
-#: ../data/gtkpod.glade.h:354
+#: ../data/gtkpod.glade.h:351
#, fuzzy
msgid "Use selected encoding also when updating or syncing tracks"
msgstr ""
"Gewählte Kodierung auch verwenden, wenn Stücke aktualisiert oder abgeglichen "
"werden"
-#: ../data/gtkpod.glade.h:355
+#: ../data/gtkpod.glade.h:352
msgid "Use this template to parse filename for tag information:"
msgstr ""
"Diese Schablone verwenden, um aus dem Dateinamen die Tags zu bestimmen:"
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:353
msgid "Username to be used for mserv database lookup."
msgstr ""
"Benutzername, der zum Nachschlagen in der mserv Datenbank verwendet wird."
-#: ../data/gtkpod.glade.h:357
+#: ../data/gtkpod.glade.h:354
msgid "Username:"
msgstr "Benutzername:"
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:355
msgid ""
"Usually you don't want to set the title of several tracks to the same text. "
"This option might avoid unwanted results (especially since there is no "
@@ -1707,11 +1747,16 @@
"gesetzt werden sollen. Diese Option verhindert möglicherweise unerwünschte "
"Resultate, insbesondere da noch keine 'Rückgängig'-Funktion existiert."
-#: ../data/gtkpod.glade.h:359
+#: ../data/gtkpod.glade.h:356
+#, fuzzy
+msgid "View Full Size"
+msgstr "Dateigröße"
+
+#: ../data/gtkpod.glade.h:357
msgid "WAV with :"
msgstr ""
-#: ../data/gtkpod.glade.h:360
+#: ../data/gtkpod.glade.h:358
msgid ""
"When adding dirs/files, update information of\n"
"existing tracks with identical filenames"
@@ -1719,7 +1764,7 @@
"Beim Hinzufügen von Stücken bereits eingeleseneStücke mit demselben "
"Dateinamen aktualisieren."
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:360
msgid ""
"When copying from iPod no check is performed on whether the destination file "
"exists. Enabling this option will make gtkpod check whether the length of "
@@ -1733,11 +1778,11 @@
"es, einen schnellen Abgleich der Daten auf Ihrer Festplatte mit denen des "
"iPods vorzunehmen."
-#: ../data/gtkpod.glade.h:363
+#: ../data/gtkpod.glade.h:361
msgid "When syncing playlists"
msgstr "Beim Abgleich von Wiedergabelisten"
-#: ../data/gtkpod.glade.h:364
+#: ../data/gtkpod.glade.h:362
msgid ""
"Will show a list of tracks removed and a list of tracks newly added or "
"updated."
@@ -1745,17 +1790,17 @@
"Zeigt eine Liste von gelöschten, neu hinzugefügten oder aktualisierten "
"Stücken."
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:363
msgid "Write ID3 tags to disk when modified in gtkpod"
msgstr ""
"ID3 Tags bei Änderungen in gtkpod ebenfalls auf\n"
"der Festplatte und auf dem iPod ändern"
-#: ../data/gtkpod.glade.h:366
+#: ../data/gtkpod.glade.h:364
msgid "Write all changes made to the disk and the iPod(s)."
msgstr "Alle Änderungen auf Festplatte und iPod(s) sichern."
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:365
#, fuzzy
msgid ""
"Write extended information (PC filenames, SHA1 hashes,\n"
@@ -1764,7 +1809,7 @@
"Erweiterte Informationen schreiben (PC Dateinamen, MD5-Prüfsummen, "
"Kodierung). Empfohlen."
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:367
msgid ""
"You can also use the table headers, but this allows you to sort according to "
"a column that is not displayed."
@@ -1772,70 +1817,81 @@
"Sie können auch die Spaltenköpfe anklicken, aber diese Option ermöglicht es "
"auch nach Spalten zu sortieren, die nicht angezeigt werden."
+#: ../data/gtkpod.glade.h:368
+#, fuzzy
+msgid "_About gtkpod"
+msgstr "Ãœber gtkpod"
+
+#: ../data/gtkpod.glade.h:369
+#, fuzzy
+msgid "_Add Album"
+msgstr "Album"
+
#: ../data/gtkpod.glade.h:370
-msgid "_About"
-msgstr "_Ãœber"
+msgid "_Add Image"
+msgstr ""
#: ../data/gtkpod.glade.h:371
+#, fuzzy
+msgid "_Album"
+msgstr "Album"
+
+#: ../data/gtkpod.glade.h:372
msgid "_All Tracks"
msgstr "_Alle Stücke"
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:373
msgid "_Arrange Sort Tabs"
msgstr "_Ordne Sortierungseinträge"
-#: ../data/gtkpod.glade.h:373
+#: ../data/gtkpod.glade.h:374
msgid "_Check iPod's Files"
msgstr "_Überprüfe iPod Dateien"
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:375
msgid "_Conversion Log"
msgstr ""
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:376
msgid "_Create Playlists"
msgstr "_Erstelle Wiedergabelisten"
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:377
msgid "_Create iPod's Directories"
msgstr "_iPod-Verzeichnis(se) erstellen"
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:378
msgid "_Delete"
msgstr "_Löschen"
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:379
msgid "_Display"
msgstr "_Anzeige"
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:380
msgid "_Displayed Tracks"
msgstr "_Angezeigte Stücke"
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:381
msgid "_Edit"
msgstr "_Bearbeiten"
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:382
msgid "_Encoding (ID3, files):"
msgstr "Kodi_erung (ID3, Dateien):"
-#: ../data/gtkpod.glade.h:382
+#: ../data/gtkpod.glade.h:383
msgid "_Enqueue"
msgstr "_Vormerken zum Abspielen"
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:384
msgid "_Export Tracks from Database"
msgstr "E_xport aus der Datenbank"
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:385
msgid "_File"
msgstr "_Datei"
-#: ../data/gtkpod.glade.h:385
-msgid "_Find New"
-msgstr ""
-
#: ../data/gtkpod.glade.h:386
msgid "_General"
msgstr "All_gemein"
@@ -1849,128 +1905,142 @@
msgstr "_Ignoriere die Regeln"
#: ../data/gtkpod.glade.h:389
+msgid "_Image"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:390
msgid "_Info Window"
msgstr "Info _Fenster"
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:391
msgid "_Last.FM"
msgstr ""
-#: ../data/gtkpod.glade.h:391
+#: ../data/gtkpod.glade.h:392
msgid "_Less Sort Tabs"
msgstr "_Weniger Sortierungseinträge"
-#: ../data/gtkpod.glade.h:392
+#: ../data/gtkpod.glade.h:393
msgid "_Limit to"
msgstr "_Begrenzen auf"
-#: ../data/gtkpod.glade.h:393
+#: ../data/gtkpod.glade.h:394
msgid "_Load iPod(s)"
msgstr "i_Pod(s) einlesen"
-#: ../data/gtkpod.glade.h:394
+#: ../data/gtkpod.glade.h:395
msgid "_Local"
msgstr "_Lokal"
-#: ../data/gtkpod.glade.h:395
+#: ../data/gtkpod.glade.h:396
msgid "_M3U"
msgstr "_M3U"
-#: ../data/gtkpod.glade.h:396
+#: ../data/gtkpod.glade.h:397
+msgid "_Misc."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:398
msgid "_More Sort Tabs"
msgstr "_Mehr Sortierungseinträge"
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:399
msgid "_Newly Added Tracks"
msgstr "_Neu hinzugefügte Stücke"
-#: ../data/gtkpod.glade.h:398
+#: ../data/gtkpod.glade.h:400
msgid "_Normalize Volume"
msgstr "_Lautstärke normalisieren"
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:401
msgid "_Number of sort tabs:"
msgstr "A_nzahl der Sortierungseinträge:"
-#: ../data/gtkpod.glade.h:400
-msgid "_Other"
-msgstr "S_onstiges"
-
-#: ../data/gtkpod.glade.h:401
+#: ../data/gtkpod.glade.h:402
msgid "_PLS"
msgstr "_PLS"
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
msgid "_Play Now"
msgstr "_Jetzt abspielen"
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
msgid "_Podcasts"
msgstr "_Podcasts"
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:405
msgid "_Prefer Local"
msgstr "_Bevorzuge lokal"
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:406
+#, fuzzy
+msgid "_Remove Album"
+msgstr "Album"
+
+#: ../data/gtkpod.glade.h:407
+#, fuzzy
+msgid "_Remove Cover Art"
+msgstr "Cover-Bild entfernen"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:409
msgid "_Save Changes"
msgstr "_Änderungen sichern"
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:410
msgid "_Save Displayed Track Order"
msgstr "_Reihenfolge der angezeigten Stücke speichern"
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:411
msgid "_Sorting"
msgstr "_Sortierung"
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:412
#, fuzzy
msgid "_Synchronize Playlist with Dir(s)"
msgstr "Wiedergabeliste mit Verzeichnis(sen) abgleichen"
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:413
msgid "_Toolbar"
msgstr "Werkzeug_leiste"
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:414
msgid "_Tools"
msgstr "_Werkzeuge"
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:415
msgid "_Tooltips"
msgstr "Werkzeug_tipps"
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:416
msgid "_Track Info"
msgstr "_Meta-Infos"
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:417
msgid "_Undo All"
msgstr "_Alles rückgängig"
-#: ../data/gtkpod.glade.h:414
-msgid "_Undo Track"
-msgstr "_Stück rückgängig"
-
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:418
msgid "_Update Tracks from File"
msgstr "_Stücke aus Datei aktualisieren"
-#: ../data/gtkpod.glade.h:416
+#: ../data/gtkpod.glade.h:419
#, fuzzy
msgid "_Video"
msgstr "_Ansicht"
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:420
msgid "_View"
msgstr "_Ansicht"
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:421
msgid "_iPod"
msgstr "_iPod"
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:423
#, no-c-format
msgid ""
"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
@@ -1984,28 +2054,28 @@
"die auf den Filenamen passt, wird verwendet. Beispiel: '%a - %A/%T %t.mp3;%t."
"wav'."
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:424
msgid "folder"
msgstr "Mappe"
-#: ../data/gtkpod.glade.h:422
+#: ../data/gtkpod.glade.h:425
msgid "folder.jpg"
msgstr "folder.jpg"
-#: ../data/gtkpod.glade.h:424
+#: ../data/gtkpod.glade.h:427
#, no-c-format
msgid "folder.jpg;%a.jpg"
msgstr "folder.jpg;%a.jpg"
-#: ../data/gtkpod.glade.h:425
+#: ../data/gtkpod.glade.h:428
msgid "gtkpod"
msgstr "gtkpod"
-#: ../data/gtkpod.glade.h:426
+#: ../data/gtkpod.glade.h:429
msgid "gtkpod Info"
msgstr "gtkpod Info"
-#: ../data/gtkpod.glade.h:427
+#: ../data/gtkpod.glade.h:430
msgid ""
"gtkpod expects the ID3 tags and the filenames to be in the encoding "
"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
@@ -2017,12 +2087,12 @@
"werden. 'Systemzeichensatz' bezeichnet die Standardkodierung der benutzten "
"Sprache."
-#: ../data/gtkpod.glade.h:428
+#: ../data/gtkpod.glade.h:431
msgid "gtkpod options"
msgstr "gtkpod Optionen"
#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
-#: ../data/gtkpod.glade.h:430
+#: ../data/gtkpod.glade.h:433
msgid ""
"iPod\n"
"Local Repository (Standard)\n"
@@ -2032,35 +2102,53 @@
"Lokale Datenbank (Standard)\n"
"Lokale Datenbank (Podcasts)\n"
-#: ../data/gtkpod.glade.h:434
+#: ../data/gtkpod.glade.h:437
msgid "iPod mountpoint:"
msgstr "iPod Einhängepunkt:"
-#: ../data/gtkpod.glade.h:435
+#: ../data/gtkpod.glade.h:438
msgid "iTunesDB backup:"
msgstr "Sicherung iTunes DB:"
-#: ../data/gtkpod.glade.h:436
-#, fuzzy
-msgid "label"
-msgstr "label21"
-
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:439
msgid "mserv Root:"
msgstr "mserv Stammverzeichnis:"
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:440
msgid "mserv database lookup will be done for music in this directory."
msgstr "Die mserv Datenbank wird für Stücke in diesem Verzeichnis verwendet."
-#: ../data/gtkpod.glade.h:439 ../src/details.c:1175
+#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
msgid "n/a"
msgstr "---"
-#: ../data/gtkpod.glade.h:440
+#: ../data/gtkpod.glade.h:442
msgid "special_sorttab -- Don't translate!"
msgstr "special_sorttab -- Don't translate!\""
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr ""
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr ""
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+
+#: ../src/autodetection.c:416
+#, fuzzy
+msgid "New iPod"
+msgstr "Neue Wiedergabeliste"
+
#: ../src/charset.c:53
msgid "Arabic (IBM-864)"
msgstr "Arabisch (IBM-864)"
@@ -2280,146 +2368,156 @@
msgid "Confirmation Dialogue"
msgstr "Sicherheitsabfrage"
-#: ../src/context_menus.c:359
+#: ../src/context_menus.c:362
#, c-format
msgid "Copied \"%s\" playlist to %s"
msgstr ""
-#: ../src/context_menus.c:398
+#: ../src/context_menus.c:401
#, fuzzy, c-format
msgid "Copied %d track to '%s'"
msgid_plural "Copied %d tracks to '%s'"
msgstr[0] "%d von insgesamt %d Stück kopiert."
msgstr[1] "%d von insgesamt %d Stücken kopiert."
-#: ../src/context_menus.c:426
+#: ../src/context_menus.c:429
#, c-format
msgid "Copied '%s' playlist to '%s' in '%s'"
msgstr ""
-#: ../src/context_menus.c:459
+#: ../src/context_menus.c:462
#, fuzzy, c-format
msgid "Copied %d track to '%s' in '%s'"
msgid_plural "Copied %d tracks to %s in '%s'"
msgstr[0] "%d Stück wurde aus der Wiedergabeliste '%s' entfernt."
msgstr[1] "%d Stücke wurden aus der Wiedergabeliste '%s' entfernt."
-#: ../src/context_menus.c:619 ../src/tools.c:854
+#: ../src/context_menus.c:622 ../src/tools.c:854
msgid "Play Now"
msgstr "Jetzt abpielen"
-#: ../src/context_menus.c:625 ../src/tools.c:867
+#: ../src/context_menus.c:628 ../src/tools.c:867
msgid "Enqueue"
msgstr "Zum Abspielen vormerken"
-#: ../src/context_menus.c:631
+#: ../src/context_menus.c:634
msgid "Copy Tracks to Filesystem"
msgstr "Kopiere Stücke zum Verzeichnis"
-#: ../src/context_menus.c:638 ../src/file_export.c:1085
+#: ../src/context_menus.c:641 ../src/file_export.c:1085
msgid "Create Playlist File"
msgstr "_Datei der Wiedergabeliste erstellen"
-#: ../src/context_menus.c:645
+#: ../src/context_menus.c:648
msgid "Create new Playlist"
msgstr "Neue Wiedergabeliste erstellen"
-#: ../src/context_menus.c:652
+#: ../src/context_menus.c:655
msgid "Update Tracks from File"
msgstr "_Aktualisiere Stücke aus der Datei"
-#: ../src/context_menus.c:666
+#: ../src/context_menus.c:669
msgid "Sync Playlist with Dir(s)"
msgstr "Wiedergabeliste mit Verzeichnis(sen) abgleichen"
-#: ../src/context_menus.c:676
+#: ../src/context_menus.c:679
msgid "Remove All Tracks from iPod"
msgstr "Alle Stücke vom iPod entfernen"
-#: ../src/context_menus.c:694
+#: ../src/context_menus.c:697
msgid "Remove All Podcasts from iPod"
msgstr "Alle Podcasts vom iPod entfernen"
-#: ../src/context_menus.c:709
+#: ../src/context_menus.c:712
msgid "Delete Including Tracks"
msgstr "Löschen inklusive der Stücke"
-#: ../src/context_menus.c:717
+#: ../src/context_menus.c:720
msgid "Delete But Keep Tracks"
msgstr "Löschen, aber Stücke behalten"
-#: ../src/context_menus.c:725
+#: ../src/context_menus.c:728
msgid "Edit iPod Properties"
msgstr "iPod Verzeichnisstruktur bearbeiten"
-#: ../src/context_menus.c:732
+#: ../src/context_menus.c:735
#, fuzzy
msgid "Edit Repository Properties"
msgstr "iPod Verzeichnisstruktur bearbeiten"
-#: ../src/context_menus.c:739
+#: ../src/context_menus.c:742
msgid "Edit Playlist Properties"
msgstr "Editiere Eigenschaften der Wiedergabeliste"
-#: ../src/context_menus.c:767
+#: ../src/context_menus.c:770
msgid "View Full Size Artwork"
msgstr ""
-#: ../src/context_menus.c:774
+#: ../src/context_menus.c:777
#, fuzzy
msgid "Select Cover From File"
msgstr "Vom iPod entfernen "
-#: ../src/context_menus.c:781
-msgid "Find Cover on Web"
-msgstr ""
-
-#: ../src/context_menus.c:794
+#: ../src/context_menus.c:790
msgid "Load iPod"
msgstr "iPod einlesen"
-#: ../src/context_menus.c:801
+#: ../src/context_menus.c:797
msgid "Eject iPod"
msgstr "iPod trennen"
-#: ../src/context_menus.c:818
+#: ../src/context_menus.c:814
msgid "Remove All Tracks from Database"
msgstr "Alle Stücke aus der Datenbank entfernen"
-#: ../src/context_menus.c:833
+#: ../src/context_menus.c:829
msgid "Delete Including Tracks (Harddisk)"
msgstr "Löschen inklusive der Stücke (Festplatte)"
-#: ../src/context_menus.c:841
+#: ../src/context_menus.c:837
msgid "Delete Including Tracks (Database)"
msgstr "Löschen inklusive der Stücke (Datenbank)"
-#: ../src/context_menus.c:849
+#: ../src/context_menus.c:845
msgid "Delete From iPod"
msgstr "Vom iPod entfernen "
-#: ../src/context_menus.c:857
+#: ../src/context_menus.c:853
msgid "Delete From Playlist"
msgstr "Aus der Wiedergabeliste entfernen"
-#: ../src/context_menus.c:865
+#: ../src/context_menus.c:861
msgid "Delete From Harddisk"
msgstr "Von der Festplatte löschen"
-#: ../src/context_menus.c:873
+#: ../src/context_menus.c:869
msgid "Delete From Database"
msgstr "Aus der Datenbank entfernen"
-#: ../src/context_menus.c:881
+#: ../src/context_menus.c:877
msgid "Alphabetize"
msgstr "Alphabetisch sortieren"
-#: ../src/context_menus.c:949 ../src/context_menus.c:998
+#: ../src/context_menus.c:895
#, fuzzy
+msgid "Remove Album"
+msgstr "Album"
+
+#: ../src/context_menus.c:905
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Cover-Bild entfernen"
+
+#: ../src/context_menus.c:922
+msgid "Rename Album"
+msgstr ""
+
+#: ../src/context_menus.c:981 ../src/context_menus.c:1030
+#, fuzzy
msgid "Copy selected playlist to..."
msgstr "Ausgewählte Wiedergabeliste"
-#: ../src/context_menus.c:1051
+#: ../src/context_menus.c:1083
#, fuzzy
msgid "Copy selected track(s) to..."
msgstr "Gelöschte Stücke"
@@ -2429,52 +2527,114 @@
msgid "Date format error: unrecognized character: '%s'\n"
msgstr "Formatfehler Datum: unbekanntes Zeichen: '%s'\n"
-#: ../src/details.c:700
+#: ../src/details.c:82
+#, fuzzy
+msgid "Audio/Video"
+msgstr "Stammverzeichnis für Musik:"
+
+#: ../src/details.c:83
+msgid "Audio"
+msgstr ""
+
+#: ../src/details.c:84
+#, fuzzy
+msgid "Video"
+msgstr "_Ansicht"
+
+#: ../src/details.c:85
+#, fuzzy
+msgid "Podcast"
+msgstr "Podcasts"
+
+#: ../src/details.c:86
+#, fuzzy
+msgid "Video Podcast"
+msgstr "Podcasts"
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr ""
+
+#: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
+#, fuzzy
+msgid "Music Video"
+msgstr "Stammverzeichnis für Musik:"
+
+#: ../src/details.c:89 ../src/display_spl.c:107 ../src/display_spl.c:210
+#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
+msgid "TV Show"
+msgstr ""
+
+#: ../src/details.c:90
+#, fuzzy
+msgid "TV Show & Music Video"
+msgstr "Stammverzeichnis für Musik:"
+
+#: ../src/details.c:836
#, c-format
msgid "%s (image data corrupted or unreadable)"
msgstr ""
-#: ../src/details.c:1246
+#: ../src/details.c:973
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr ""
+
+#: ../src/details.c:1418
msgid "<b>n/a</b>"
msgstr "<b>---</b>"
-#: ../src/display.c:647
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr ""
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr ""
+
+#: ../src/display.c:490
+#, c-format
+msgid "<b>Image Dimensions: %s</b>"
+msgstr ""
+
+#: ../src/display.c:744
msgid "Edit selected entry of which sort tab?"
msgstr "Markierten Begriff aus welchem Sortierungseintrag editieren?"
#. no entry selected
-#: ../src/display.c:654 ../src/misc_confirm.c:435 ../src/misc_track.c:2059
+#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
msgid "No entry selected."
msgstr "Kein Eintrag ausgewählt."
-#: ../src/display.c:813 ../src/display.c:1133 ../src/display.c:1189
-#: ../src/display.c:1243 ../src/display.c:1298 ../src/display.c:1559
+#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
+#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
#, c-format
msgid "No entry selected in Sort Tab %d"
msgstr "Kein Begriff im Sortierungseintrag %d ausgewählt"
-#: ../src/display.c:852
+#: ../src/display.c:949
msgid "Remove entry of which sort tab from database?"
msgstr "Markierten Begriff aus welchem Sortierungseintrag entfernen?"
-#: ../src/display.c:860
+#: ../src/display.c:957
msgid "Remove tracks in selected entry of which filter tab from the iPod?"
msgstr ""
"Stücke im ausgewählten Eintrag aus welchem Filter-Eintrag vom iPod löschen?"
-#: ../src/display.c:882
+#: ../src/display.c:979
msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
msgstr ""
"Stücke im ausgewählten Eintrag aus welchem Filter-Eintrag von der Festplatte "
"löschen?"
-#: ../src/display.c:912
+#: ../src/display.c:1009
msgid "Remove tracks in selected entry of which filter tab from playlist?"
msgstr ""
"Stücke im ausgewählten Eintrag aus welchem Filter-Eintrag der "
"Wiedergabeliste löschen?"
-#: ../src/display.c:939 ../src/display.c:977
+#: ../src/display.c:1036 ../src/display.c:1074
#, c-format
msgid ""
"iPod at '%s' is not loaded.\n"
@@ -2483,77 +2643,171 @@
"iPod unter '%s' wurde nicht eingelesen.\n"
"Bitte zuerst einlesen."
-#: ../src/display.c:1014 ../src/display.c:1041
+#: ../src/display.c:1111 ../src/display.c:1138
msgid "Update selected entry of which sort tab?"
msgstr "Markierten Begriff aus welchem Sortierungseintrag aktualisieren?"
-#: ../src/display.c:1127
+#: ../src/display.c:1224
msgid "Export selected entry of which sort tab?"
msgstr "Markierten Begriff aus welchem Sortierungseintrag exportieren?"
-#: ../src/display.c:1183
+#: ../src/display.c:1280
msgid "Create playlist file from selected entry of which sort tab?"
msgstr "Datei der Wiedergabeliste für welchen Sortierungseintrag erstellen?"
-#: ../src/display.c:1237
+#: ../src/display.c:1334
msgid "Play tracks in selected entry of which sort tab?"
msgstr "Stücke aus welchem Sortierungseintrag abspielen?"
-#: ../src/display.c:1292
+#: ../src/display.c:1389
msgid "Enqueue tracks in selected entry of which sort tab?"
msgstr "Stücke aus welchem Sortierungseintrag zum Abspielen vormerken?"
-#: ../src/display.c:1549
+#: ../src/display.c:1646
msgid "Normalize tracks in selected entry of which sort tab?"
msgstr "Stücke aus welchem Sortierungseintrag normalisieren?"
-#: ../src/display_coverart.c:1714
+#: ../src/display_coverart.c:1713
msgid "Failed to remove the album from the album hash store."
msgstr ""
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr ""
+
#: ../src/display_itdb.c:376
#, c-format
msgid "Failed to set cover art: '%s'\n"
msgstr "Konnte Cover-Bild nicht einfügen: '%s'\n"
-#: ../src/display_itdb.c:851 ../src/display_itdb.c:984
+#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
msgid "Local"
msgstr "Lokal"
#. add podcast playlist
-#: ../src/display_itdb.c:859 ../src/display_itdb.c:982
-#: ../src/display_itdb.c:1010
+#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
+#: ../src/display_itdb.c:1025
msgid "Podcasts"
msgstr "Podcasts"
-#: ../src/display_itdb.c:868 ../src/display_itdb.c:986
+#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
#: ../src/repository.c:1186
msgid "iPod"
msgstr "iPod"
-#: ../src/display_itdb.c:1069
+#: ../src/display_itdb.c:1084
#, c-format
msgid "Increased playcount for '%s'"
msgstr "Wiedergabezähler für '%s' wurde erhöht"
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr ""
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr ""
+
+#: ../src/display_photo.c:238
+msgid "Could not access the iPod's photo database."
+msgstr ""
+
+#: ../src/display_photo.c:441
+#, fuzzy
+msgid "Photo Albums"
+msgstr "Album"
+
+#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+msgid "<Unnamed>"
+msgstr ""
+
+#: ../src/display_photo.c:939
+msgid "The Photo Library album cannot be removed"
+msgstr ""
+
+#: ../src/display_photo.c:961
+#, fuzzy
+msgid "Do you want to remove the album's photos too?"
+msgstr "Sind Sie sicher, dass sie alle Podcasts vom iPod entfernen wollen?"
+
+#: ../src/display_photo.c:967
+msgid "Yes. Do Not Display Again"
+msgstr ""
+
+#: ../src/display_photo.c:1038
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr ""
+
+#: ../src/display_photo.c:1053
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr ""
+
+#: ../src/display_photo.c:1128
+msgid "New Photo Album Name"
+msgstr ""
+
+#: ../src/display_photo.c:1129
+#, fuzzy
+msgid "Please enter a new name for the photo album"
+msgstr "Bitte geben Sie einen Namen für die neue Wiedergabeliste ein"
+
+#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+msgid "An album with that name already exists."
+msgstr ""
+
+#: ../src/display_photo.c:1210
+#, fuzzy
+msgid "New Photo Album"
+msgstr "Album"
+
+#: ../src/display_photo.c:1211
+#, fuzzy
+msgid "Please enter a name for the new photo album"
+msgstr "Bitte geben Sie einen Namen für die neue Wiedergabeliste ein"
+
+#: ../src/display_photo.c:1232
+msgid "The new album failed to be created."
+msgstr ""
+
+#: ../src/display_photo.c:1256
+#, fuzzy
+msgid "Add Image to iPod"
+msgstr "Füge Verzeichnis/iPod hinzu"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1311
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr ""
+
+#: ../src/display_photo.c:1699
+#, c-format
+msgid "<No members>\n"
+msgstr ""
+
#. give a notice on the statusbar -- otherwise the user
#. * will never know why the drag is not possible
-#: ../src/display_playlists.c:500 ../src/display_playlists.c:542
+#: ../src/display_playlists.c:516 ../src/display_playlists.c:558
msgid "Error: drag from iPod not possible in offline mode."
msgstr "Fehler: Verschieben vom iPod ist im Offline-Modus nicht möglich."
-#: ../src/display_playlists.c:569 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
#, c-format
msgid "Copied one track"
msgid_plural "Copied %d tracks"
msgstr[0] "Ein Stück kopiert"
msgstr[1] "%d Stücke kopiert"
-#: ../src/display_playlists.c:849 ../src/display_playlists.c:861
+#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
msgid "Can't reorder sorted treeview."
msgstr "Die Anzeige kann nicht neu geordnet werden."
-#: ../src/display_playlists.c:938
+#: ../src/display_playlists.c:954
#, c-format
msgid ""
"This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2565,6 +2819,14 @@
"den Autor.\n"
"\n"
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr ""
+
#: ../src/display_sorttabs.c:473
msgid "'Played' condition ignored because of error."
msgstr ""
@@ -2579,32 +2841,32 @@
msgid "'Added' condition ignored because of error."
msgstr "Die Bedingung 'Hinzugefügt' wurde aufgrund eines Fehlers ignoriert."
-#: ../src/display_sorttabs.c:1563 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
msgid "All"
msgstr "Alle"
-#: ../src/display_sorttabs.c:1589
+#: ../src/display_sorttabs.c:1588
msgid "Compilations"
msgstr "Sampler"
-#: ../src/display_sorttabs.c:2960
+#: ../src/display_sorttabs.c:2988
msgid "Comp."
msgstr "Komp."
-#: ../src/display_sorttabs.c:2966 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2002 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
msgid "Year"
msgstr "Jahr"
-#: ../src/display_sorttabs.c:2969
+#: ../src/display_sorttabs.c:2997
msgid "Special"
msgstr "Spezial"
-#: ../src/display_sorttabs.c:3230
+#: ../src/display_sorttabs.c:3245
msgid "Last Played"
msgstr "Zuletzt gespielt"
-#: ../src/display_sorttabs.c:3231
+#: ../src/display_sorttabs.c:3246
msgid "Last Modified"
msgstr "Zuletzt modifiziert"
@@ -2628,7 +2890,7 @@
msgid "Hz"
msgstr "Hz"
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:777
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
msgid "MB"
msgstr "MB"
@@ -2661,10 +2923,6 @@
msgid "Size"
msgstr "Dateigröße"
-#: ../src/display_spl.c:94 ../src/display_tracks.c:1984
-msgid "Time"
-msgstr "Zeit"
-
#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
msgid "Comment"
msgstr "Kommentar"
@@ -2693,15 +2951,14 @@
msgid "Grouping"
msgstr "Gruppierung"
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "Wiedergabeliste"
+
#: ../src/display_spl.c:106
msgid "Video Kind"
msgstr ""
-#: ../src/display_spl.c:107 ../src/display_spl.c:210 ../src/display_spl.c:219
-#: ../src/misc_conversion.c:101
-msgid "TV Show"
-msgstr ""
-
#: ../src/display_spl.c:108
#, fuzzy
msgid "Season number"
@@ -2800,7 +3057,7 @@
msgid "hours"
msgstr "Stunden"
-#: ../src/display_spl.c:182 ../src/info.c:777
+#: ../src/display_spl.c:182 ../src/info.c:780
msgid "GB"
msgstr "GB"
@@ -2861,30 +3118,18 @@
msgid "Movie"
msgstr "Modifiziert"
-#: ../src/display_spl.c:209 ../src/display_spl.c:218
-#, fuzzy
-msgid "Music Video"
-msgstr "Stammverzeichnis für Musik:"
-
-#: ../src/display_spl.c:1162 ../src/display_spl.c:1177
+#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
msgid "to"
msgstr "bis"
-#: ../src/display_spl.c:1455
+#: ../src/display_spl.c:1485
msgid "-"
msgstr "-"
-#: ../src/display_spl.c:1470
+#: ../src/display_spl.c:1500
msgid "+"
msgstr "+"
-#: ../src/display_spl.c:1689 ../src/misc_playlist.c:66
-#: ../src/misc_playlist.c:68 ../src/misc_playlist.c:93
-#: ../src/misc_playlist.c:95 ../src/misc_playlist.c:428
-#: ../src/misc_playlist.c:430
-msgid "New Playlist"
-msgstr "Neue Wiedergabeliste"
-
#: ../src/display_tracks.c:281
#, c-format
msgid "Moved one track"
@@ -2892,7 +3137,7 @@
msgstr[0] "Ein Stück verschoben"
msgstr[1] "%d Stücke verschoben"
-#: ../src/display_tracks.c:1717
+#: ../src/display_tracks.c:1810
#, c-format
msgid ""
"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -2904,46 +3149,66 @@
"möglich, die Stück-Ansicht in den unsortierten Zustand zurückzusetzen.\n"
"\n"
-#: ../src/display_tracks.c:1962
+#: ../src/display_tracks.c:2069
msgid "Rtng"
msgstr "Bwrtng"
-#: ../src/display_tracks.c:1965
+#: ../src/display_tracks.c:2072
msgid "#"
msgstr "#"
-#: ../src/display_tracks.c:1968
+#: ../src/display_tracks.c:2075
msgid "CD"
msgstr "CD"
-#: ../src/display_tracks.c:1971
+#: ../src/display_tracks.c:2078
msgid "ID"
msgstr "ID"
-#: ../src/display_tracks.c:1974
+#: ../src/display_tracks.c:2081
msgid "Trnsfrd"
msgstr "Ãœbertragen"
-#: ../src/display_tracks.c:1978
+#: ../src/display_tracks.c:2085
msgid "Cmpl"
msgstr "Sampl"
-#: ../src/display_tracks.c:1987
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "Zeit"
+
+#: ../src/display_tracks.c:2094
msgid "Plycnt"
msgstr "Zähler"
-#: ../src/display_tracks.c:1999
+#: ../src/display_tracks.c:2106
msgid "Released"
msgstr "Veröffentlicht"
-#: ../src/display_tracks.c:2005
+#: ../src/display_tracks.c:2112
msgid "Vol."
msgstr "Ltst."
-#: ../src/display_tracks.c:2008
+#: ../src/display_tracks.c:2115
msgid "Sndchk."
msgstr "Sndchk."
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr ""
+
+#: ../src/fetchcover.c:371
+#, c-format
+msgid ""
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
+"\n"
+"- Clicking Yes will overwrite the existing file, possibly associating\n"
+" other music files in the same directory with this coverart file.\n"
+"- Clicking No will save the file with a unique file name.\n"
+"- Clicking Cancel will abort the fetchcover operation."
+msgstr ""
+
#: ../src/file.c:236
#, c-format
msgid ""
@@ -2960,14 +3225,11 @@
"\n"
msgstr "'%s' ist keine bekannte Wiedergabeliste.\n"
-#: ../src/file.c:283
+#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/wavfile.c:107
#, c-format
-msgid ""
-"Cannot open '%s' for reading.\n"
-"\n"
-msgstr ""
-"Datei '%s' konnte nicht zum Lesen geöffnet werden.\n"
-"\n"
+msgid "Could not open '%s' for reading.\n"
+msgstr "Datei '%s' konnte nicht zum Lesen geöffnet werden.\n"
#: ../src/file.c:369
#, c-format
@@ -2986,27 +3248,27 @@
msgid "Unknown token '%s' in template '%s'\n"
msgstr "Unbekanntes Symbol '%s' in der Schablone '%s'\n"
-#: ../src/file.c:890
+#: ../src/file.c:923
#, c-format
msgid "Local filename not valid (%s)"
msgstr "Lokaler Dateiname ist nicht gültig (%s)"
-#: ../src/file.c:949
+#: ../src/file.c:982
#, c-format
msgid "No information found for user '%s' in '%s'"
msgstr "Keine Informationen für den Benutzer '%s' gefunden in '%s'"
-#: ../src/file.c:958
+#: ../src/file.c:991
#, c-format
msgid "mserv data file (%s) not available for track (%s)"
msgstr "mserv Datei (%s) nicht verfügbar für Stück (%s)"
-#: ../src/file.c:966
+#: ../src/file.c:999
#, c-format
msgid "Track (%s) not in mserv music root directory (%s)"
msgstr "Stück (%s) ist nicht im mserv Stammverzeichnis (%s)"
-#: ../src/file.c:1090
+#: ../src/file.c:1123
#, c-format
msgid ""
"The following track could not be processed (file does not exist): '%s'\n"
@@ -3014,14 +3276,14 @@
"Das folgende Stück konnte nicht bearbeitet werden (Datei existiert nicht): '%"
"s'\n"
-#: ../src/file.c:1169
+#: ../src/file.c:1209
#, c-format
msgid "The following track could not be processed (filetype unknown): '%s'\n"
msgstr ""
"Das folgende Stück konnte nicht bearbeitet werden (Dateityp unbekannt): '%"
"s'\n"
-#: ../src/file.c:1262
+#: ../src/file.c:1307
#, c-format
msgid ""
"The following track could not be processed (filetype is known but analysis "
@@ -3030,36 +3292,36 @@
"Das folgende Stück konnte nicht bearbeitet werden (Dateityp ist bekannt, "
"aber die Analyse schlug fehl): '%s'\n"
-#: ../src/file.c:1292 ../src/file.c:1346
+#: ../src/file.c:1337 ../src/file.c:1391
msgid "Nothing to update"
msgstr "Nichts zum Aktualisieren"
-#: ../src/file.c:1313
+#: ../src/file.c:1358
#, c-format
msgid "Updating %s"
msgstr "Aktualisiere '%s'"
-#: ../src/file.c:1327
+#: ../src/file.c:1372
msgid "Updated selected tracks with info from file."
msgstr ""
"Ausgewählte Stücke wurden mit Informationen aus der Datei aktualisiert."
-#: ../src/file.c:1361
+#: ../src/file.c:1406
#, c-format
msgid "Retrieving mserv data %s"
msgstr "Hole mserv Daten %s"
-#: ../src/file.c:1366
+#: ../src/file.c:1411
msgid "no filename available"
msgstr "Es steht kein Dateiname zur Verfügung"
-#: ../src/file.c:1371
+#: ../src/file.c:1416
msgid "Updated selected tracks with data from mserv."
msgstr ""
"Die ausgewählten Stücke wurden mit Informationen aus der mserv Datenbank "
"aktualisiert."
-#: ../src/file.c:1392
+#: ../src/file.c:1437
#, c-format
msgid "The following track could not be updated"
msgid_plural "The following %d tracks could not be updated"
@@ -3068,11 +3330,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1398
+#: ../src/file.c:1443
msgid "Failed Track Update"
msgstr "Aktualisierung fehlgeschlagen"
-#: ../src/file.c:1456
+#: ../src/file.c:1501
#, c-format
msgid "The following track has been updated"
msgid_plural "The following %d tracks have been updated"
@@ -3081,11 +3343,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1462
+#: ../src/file.c:1507
msgid "Successful Track Update"
msgstr "Aktualisierung erfolgreich"
-#: ../src/file.c:1521
+#: ../src/file.c:1566
#, c-format
msgid "No mserv information could be retrieved for the following track"
msgid_plural ""
@@ -3097,92 +3359,93 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1527
+#: ../src/file.c:1572
msgid "mserv data retrieval problem"
msgstr "Problem beim Nachschlagen der mserv Daten"
-#: ../src/file.c:1616
+#: ../src/file.c:1661
msgid "no local filename available, file on the iPod will be used instead"
msgstr ""
"Kein lokaler Dateiname verfügbar, Datei auf dem iPod wird stattdessen "
"verwendet"
-#: ../src/file.c:1622
+#: ../src/file.c:1667
msgid "no local filename available and copy on iPod cannot be found"
msgstr "Kein lokaler Dateiname verfügbar, Kopie auf dem iPod nicht auffindbar"
-#: ../src/file.c:1626 ../src/file.c:1644
+#: ../src/file.c:1671 ../src/file.c:1689
#, fuzzy
msgid "no local filename available"
msgstr "Es steht kein Dateiname zur Verfügung"
-#: ../src/file.c:1634
+#: ../src/file.c:1679
msgid "local file could not be found, file on the iPod will be used instead"
msgstr ""
"Keine lokale Datei auffindbar, Datei auf dem iPod wird stattdessen verwendet"
-#: ../src/file.c:1640
+#: ../src/file.c:1685
msgid "local file as well as copy on the iPod cannot be found"
msgstr "Lokale Datei und Kopie auf dem iPod nicht auffindbar"
#. update not successful -- log this track for later display
-#: ../src/file.c:1728
-msgid "update failed (format no supported?)"
+#: ../src/file.c:1788
+#, fuzzy
+msgid "update failed (format not supported?)"
msgstr "Aktualisierung fehlgeschlagen (Format nicht unterstützt?)"
-#: ../src/file.c:1813
+#: ../src/file.c:1873 ../src/misc_playlist.c:916
#, c-format
msgid "Processing '%s'..."
msgstr "Bearbeite '%s'..."
-#: ../src/file.c:1819
-#, c-format
-msgid "File skipped. match exclude masks: '%s'\n"
-msgstr "Datei übersprungen. Erfüllt Ausschlusskriterium: '%s'\n"
+#: ../src/file.c:1879
+#, fuzzy, c-format
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "Ãœberspringe '%s', da es sich um ein Verzeichnis handelt.\n"
-#: ../src/file.c:1939 ../src/misc_track.c:1694 ../src/misc_track.c:1799
+#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
#, c-format
msgid ""
"Podcast already present: '%s'\n"
"\n"
msgstr "Podcast ist bereits vorhanden: '%s'\n"
-#: ../src/file.c:2004
+#: ../src/file.c:2064
#, c-format
msgid ""
"Writing to video files not yet supported (%s).\n"
"\n"
msgstr "Schreiben in Videodateien wird noch nicht unterstützt (%s).\n"
-#: ../src/file.c:2056 ../src/file.c:2070
+#: ../src/file.c:2116 ../src/file.c:2130
#, c-format
msgid "Couldn't change tags of file: %s\n"
msgstr "Konnte Tags der Datei '%s' nicht ändern\n"
-#: ../src/file.c:2172
+#: ../src/file.c:2232
#, c-format
msgid "Could not open '%s' for reading and writing.\n"
msgstr "Datei '%s' konnte nicht zum Lesen und Schreiben geöffnet werden.\n"
-#: ../src/file.c:2179
+#: ../src/file.c:2239
#, c-format
msgid "Could not obtain lock on '%s'.\n"
msgstr "Lock auf '%s' konnte nicht erstellt werden.\n"
#. error!
-#: ../src/file.c:2196 ../src/file.c:2205 ../src/file.c:2216 ../src/file.c:2226
+#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
#, c-format
msgid "Malformed line in '%s': %s\n"
msgstr "Ungültige Zeile in '%s': %s\n"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:2255
+#: ../src/file.c:2315
msgid "Remove offline playcounts?"
msgstr "Sollen Offline-Wiedergabe Zähler gelöscht werden?"
#. title
-#: ../src/file.c:2256
+#: ../src/file.c:2316
msgid ""
"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
"remove them from the offline playcount file, 'Cancel' to keep them."
@@ -3191,19 +3454,19 @@
"werden. Wählen Sie 'OK', um diese aus der Wiedergabezähler-Datei zu "
"entfernen, 'Abbrechen' um sie beizubehalten."
-#: ../src/file.c:2273
+#: ../src/file.c:2333
#, c-format
msgid "Error writing to '%s'.\n"
msgstr "Fehler beim Schreiben in die Datei '%s'.\n"
-#: ../src/file.c:2330 ../src/tools.c:271
+#: ../src/file.c:2390 ../src/tools.c:270
#, c-format
msgid ""
"Normalization failed: file type not supported (%s).\n"
"\n"
msgstr "Normalisierung fehlgeschlagen: Dateityp nicht unterstützt (%s).\n"
-#: ../src/file.c:2346 ../src/tools.c:288
+#: ../src/file.c:2406 ../src/tools.c:287
#, c-format
msgid ""
"Normalization failed: file not available (%s).\n"
@@ -3227,25 +3490,25 @@
msgid "Active threads: %d. Scheduled tracks: %d."
msgstr ""
-#: ../src/file_convert.c:1061
+#: ../src/file_convert.c:1071
#, fuzzy, c-format
msgid "Original filename not available for '%s.'\n"
msgstr "Normalisierung fehlgeschlagen: Datei ist nicht verfügbar (%s).\n"
-#: ../src/file_convert.c:1076
+#: ../src/file_convert.c:1086
#, c-format
msgid "Filename '%s' is no longer valid for '%s'.\n"
msgstr ""
-#: ../src/file_convert.c:1127
+#: ../src/file_convert.c:1137
msgid "Ogg Vorbis"
msgstr ""
-#: ../src/file_convert.c:1133
+#: ../src/file_convert.c:1143
msgid "FLAC"
msgstr ""
-#: ../src/file_convert.c:1188
+#: ../src/file_convert.c:1198
#, c-format
msgid ""
"Files of type '%s' are not supported by the iPod. Please go to the "
@@ -3253,17 +3516,17 @@
"\n"
msgstr ""
-#: ../src/file_convert.c:1274
+#: ../src/file_convert.c:1284
#, fuzzy
msgid "No information available"
msgstr "Es steht kein Dateiname zur Verfügung"
-#: ../src/file_convert.c:1313
+#: ../src/file_convert.c:1323
#, c-format
msgid "Could not create '%s'. Filetype conversion will not work.\n"
msgstr ""
-#: ../src/file_convert.c:1631 ../src/file_convert.c:3040
+#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
#, fuzzy, c-format
msgid ""
"Transfer of '%s' failed. %s\n"
@@ -3272,7 +3535,7 @@
"Die Ausführung von '%s' schlug fehl.\n"
"\n"
-#: ../src/file_convert.c:2035 ../src/file_convert.c:2313
+#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
#, fuzzy, c-format
msgid ""
"Conversion of '%s' failed: '%s'.\n"
@@ -3281,43 +3544,47 @@
"Die Ausführung von '%s' schlug fehl.\n"
"\n"
-#: ../src/file_convert.c:2050
+#: ../src/file_convert.c:2062
#, c-format
msgid ""
"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2079
-#, c-format
+#: ../src/file_convert.c:2091
+#, fuzzy, c-format
msgid ""
-"Conversion of '%s' failed: '%s %s' did not return filename extension as "
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
"expected.\n"
"\n"
msgstr ""
+"Die Ausführung von '%s' schlug fehl.\n"
+"\n"
-#: ../src/file_convert.c:2155
-#, c-format
+#: ../src/file_convert.c:2167
+#, fuzzy, c-format
msgid ""
-"Covnersion of '%s' failed: Could not access original file '%s' (%s).\n"
+"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
"\n"
msgstr ""
+"Die Ausführung von '%s' schlug fehl.\n"
+"\n"
-#: ../src/file_convert.c:2210
+#: ../src/file_convert.c:2222
#, c-format
msgid ""
"Conversion of '%s' failed: Could not create directory '%s'.\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2344
+#: ../src/file_convert.c:2356
#, c-format
msgid ""
"Conversion of '%s' failed: '%s' returned exit status %d.\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2383
+#: ../src/file_convert.c:2395
#, c-format
msgid ""
"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -3344,22 +3611,17 @@
msgid "Error copying '%s' to '%s' (%s)\n"
msgstr "Fehler beim Kopieren von '%s' nach '%s' (%s)\n"
-#: ../src/file_export.c:217
-#, c-format
-msgid "Unable to open '%s' for reading\n"
-msgstr "Kann '%s' nicht zum Lesen öffnen.\n"
-
#: ../src/file_export.c:327
#, c-format
msgid "Could find file for '%s' on the iPod\n"
msgstr "Konnte Datei für '%s' auf dem iPod nicht finden\n"
#. create the dialog window
-#: ../src/file_export.c:395 ../src/tools.c:361
+#: ../src/file_export.c:395 ../src/tools.c:360
msgid "Information"
msgstr "Information"
-#: ../src/file_export.c:406 ../src/tools.c:373
+#: ../src/file_export.c:406 ../src/tools.c:372
msgid "Press button to abort."
msgstr "Zum Abbrechen bitte anklicken."
@@ -3379,7 +3641,7 @@
msgstr[0] "%d von insgesamt %d Stück kopiert."
msgstr[1] "%d von insgesamt %d Stücken kopiert."
-#: ../src/file_export.c:505 ../src/tools.c:519
+#: ../src/file_export.c:505 ../src/tools.c:518
#, c-format
msgid "%d%% (%d:%02d:%02d left)"
msgstr "%d%% (noch %d:%02d:%02d)"
@@ -3439,27 +3701,28 @@
"Datei '%s' konnte nicht zum Schreiben geöffnet werden. (%s)\n"
"\n"
-#: ../src/file_itunesdb.c:127
+#: ../src/file_itunesdb.c:129
#, fuzzy, c-format
msgid "Matching SHA1 checksum for file %d/%d"
msgstr "Suche passende MD5 Prüfsumme für Datei %d/%d"
-#: ../src/file_itunesdb.c:234
-msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
+#: ../src/file_itunesdb.c:236
+#, fuzzy, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
msgstr ""
-"Die \"iTunesDB.ext\" konnte zum Lesen der erweiterten Infos nicht geöffnet "
+"Datei \"%s\" konnte nicht zum Schreiben der erweiterten Infos geöffnet "
"werden.\n"
-#: ../src/file_itunesdb.c:241
+#: ../src/file_itunesdb.c:243
msgid "Could not create hash value from itunesdb\n"
msgstr "Konnte keine Prüfsumme für die iTunesDB bilden\n"
-#: ../src/file_itunesdb.c:255
+#: ../src/file_itunesdb.c:259
#, c-format
msgid "Error while reading extended info: %s\n"
msgstr "Fehler beim Lesen der erweiterten Informationen: '%s'\n"
-#: ../src/file_itunesdb.c:272
+#: ../src/file_itunesdb.c:276
#, fuzzy, c-format
msgid ""
"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -3473,7 +3736,7 @@
"Zeit in Anspruch nehmen.\n"
"\n"
-#: ../src/file_itunesdb.c:284
+#: ../src/file_itunesdb.c:288
#, c-format
msgid ""
"%s:\n"
@@ -3482,7 +3745,7 @@
"%s:\n"
"Erwartete \"itunesdb_hash=\", aber \"%s\" gefunden\n"
-#: ../src/file_itunesdb.c:344
+#: ../src/file_itunesdb.c:348
#, c-format
msgid ""
"%s:\n"
@@ -3491,7 +3754,7 @@
"%s:\n"
"Formatfehler: %s\n"
-#: ../src/file_itunesdb.c:387
+#: ../src/file_itunesdb.c:393
#, fuzzy
msgid ""
"No SHA1 checksums on individual tracks are available.\n"
@@ -3508,7 +3771,7 @@
"iPod außer mit gtkpod noch mit anderen Programmen zu verwenden.\n"
"\n"
-#: ../src/file_itunesdb.c:451
+#: ../src/file_itunesdb.c:457
msgid ""
"Extended info will not be used. If you have non-transferred tracks,\n"
"these will be lost.\n"
@@ -3516,15 +3779,15 @@
"Die erweiterten Informationen werden nicht verwendet. Nicht auf den iPod "
"übertragene Stücke gehen verloren.\n"
-#: ../src/file_itunesdb.c:459
+#: ../src/file_itunesdb.c:465
msgid "Offline iPod database successfully imported"
msgstr "Die Offline iPod Datenbank wurde erfolgreich eingelesen"
-#: ../src/file_itunesdb.c:462
+#: ../src/file_itunesdb.c:468
msgid "Local database successfully imported"
msgstr "Lokale Datenbank wurde erfolgreich eingelesen"
-#: ../src/file_itunesdb.c:470
+#: ../src/file_itunesdb.c:476
#, c-format
msgid ""
"Offline iPod database import failed: '%s'\n"
@@ -3533,7 +3796,7 @@
"Das Einlesen der Offline iPod Datenbank schlug fehl: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:474
+#: ../src/file_itunesdb.c:480
#, c-format
msgid ""
"Local database import failed: '%s'\n"
@@ -3542,7 +3805,7 @@
"Das Einlesen der lokalen Datenbank schlug fehl: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:481
+#: ../src/file_itunesdb.c:487
msgid ""
"Offline iPod database import failed: \n"
"\n"
@@ -3550,7 +3813,7 @@
"Das Einlesen der Offline iPod Datenbank schlug fehl:\n"
"\n"
-#: ../src/file_itunesdb.c:484
+#: ../src/file_itunesdb.c:490
msgid ""
"Local database import failed: \n"
"\n"
@@ -3558,7 +3821,7 @@
"Das Einlesen der lokalen Datenbank schlug fehl:\n"
"\n"
-#: ../src/file_itunesdb.c:491
+#: ../src/file_itunesdb.c:497
#, c-format
msgid ""
"'%s' does not exist. Import aborted.\n"
@@ -3567,15 +3830,15 @@
"'%s' existiert nicht. Einlesen abgebrochen.\n"
"\n"
-#: ../src/file_itunesdb.c:514
+#: ../src/file_itunesdb.c:520
msgid "Extended info will not be used.\n"
msgstr "Erweiterte Informationen werden nicht verwendet.\n"
-#: ../src/file_itunesdb.c:521
+#: ../src/file_itunesdb.c:527
msgid "iPod Database Successfully Imported"
msgstr "iPod Datenbank wurde erfolgreich eingelesen"
-#: ../src/file_itunesdb.c:528
+#: ../src/file_itunesdb.c:534
#, c-format
msgid ""
"iPod Database Import Failed: '%s'\n"
@@ -3584,7 +3847,7 @@
"Das Einlesen der iPod Datenbank schlug fehl: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:540
msgid ""
"iPod Database Import Failed.\n"
"\n"
@@ -3592,7 +3855,7 @@
"Das Einlesen der iPod Datenbank schlug fehl\n"
"\n"
-#: ../src/file_itunesdb.c:543
+#: ../src/file_itunesdb.c:549
#, c-format
msgid ""
"'%s' (or similar) does not exist. Import aborted.\n"
@@ -3601,7 +3864,7 @@
"'%s' (o.ä.) existiert nicht. Einlesen abgebrochen.\n"
"\n"
-#: ../src/file_itunesdb.c:859
+#: ../src/file_itunesdb.c:865
#, c-format
msgid ""
"Could not find iPod directory structure at '%s'.\n"
@@ -3616,32 +3879,32 @@
"\n"
"Möchten Sie die Verzeichnisstruktur jetzt erstellen?\n"
-#: ../src/file_itunesdb.c:1140
+#: ../src/file_itunesdb.c:1180
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
msgstr ""
"Datei \"%s\" konnte nicht zum Schreiben der erweiterten Infos geöffnet "
"werden.\n"
-#: ../src/file_itunesdb.c:1155
+#: ../src/file_itunesdb.c:1195
msgid "Aborted writing of extended info.\n"
msgstr "Schreiben der erweiterten Infos abgebrochen.\n"
-#: ../src/file_itunesdb.c:1356
+#: ../src/file_itunesdb.c:1397
#, c-format
msgid "%d%%"
msgstr ""
-#: ../src/file_itunesdb.c:1370
+#: ../src/file_itunesdb.c:1411
#, fuzzy, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left)"
msgstr "%d%% (noch %d:%02d:%02d)"
-#: ../src/file_itunesdb.c:1412
+#: ../src/file_itunesdb.c:1463
msgid "Status: Deleting File"
msgstr ""
-#: ../src/file_itunesdb.c:1473
+#: ../src/file_itunesdb.c:1524
#, fuzzy, c-format
msgid ""
"Could not remove the following file: '%s'\n"
@@ -3650,7 +3913,7 @@
"Datei '%s' konnte nicht zum Schreiben geöffnet werden. (%s)\n"
"\n"
-#: ../src/file_itunesdb.c:1581
+#: ../src/file_itunesdb.c:1632
#, fuzzy
msgid ""
"The following track could not be converted successfully:\n"
@@ -3661,7 +3924,7 @@
msgstr[0] "Das folgende Stück konnte nicht aktualisiert werden"
msgstr[1] "Die folgenden %d Stücke konnten nicht aktualisiert werden"
-#: ../src/file_itunesdb.c:1591
+#: ../src/file_itunesdb.c:1642
#, fuzzy
msgid ""
"The following track could not be transferred successfully:\n"
@@ -3676,31 +3939,34 @@
#. modal,
#. gint id,
#. gboolean modal,
-#: ../src/file_itunesdb.c:1600 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
msgid "Warning"
msgstr "Warnung"
#. title
-#: ../src/file_itunesdb.c:1601
+#: ../src/file_itunesdb.c:1652
msgid ""
"The iPod could not be ejected. Please fix the problems mentioned below and "
"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
"for conversion and transfer."
msgstr ""
-#: ../src/file_itunesdb.c:1663
+#: ../src/file_itunesdb.c:1715
+#, c-format
msgid "Status: Copying track"
msgstr ""
-#: ../src/file_itunesdb.c:1669
+#: ../src/file_itunesdb.c:1721
+#, c-format
msgid "Status: Waiting for conversion to complete"
msgstr ""
-#: ../src/file_itunesdb.c:1673
+#: ../src/file_itunesdb.c:1725
+#, c-format
msgid "Status: Finished transfer"
msgstr ""
-#: ../src/file_itunesdb.c:1714
+#: ../src/file_itunesdb.c:1770
#, c-format
msgid ""
"One track could not be transferred because your iPod is full. Either delete "
@@ -3713,7 +3979,7 @@
msgstr[0] ""
msgstr[1] ""
-#: ../src/file_itunesdb.c:1792
+#: ../src/file_itunesdb.c:1852
#, c-format
msgid ""
"You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -3731,7 +3997,7 @@
"'Abbrechen', um jetzt nicht zu speichern. Wenn Sie den Vorgang abbrechen, "
"können Sie die existierende Datenbank einlesen und dann erneut abgleichen.\n"
-#: ../src/file_itunesdb.c:1827
+#: ../src/file_itunesdb.c:1887
msgid ""
"iPod directory structure must be present before synching to the iPod can be "
"performed.\n"
@@ -3739,77 +4005,99 @@
"Die iPod Verzeichnisstruktur muss vorhanden sein bevor Daten auf den iPod "
"kopiert werden können.\n"
-#: ../src/file_itunesdb.c:1836
+#: ../src/file_itunesdb.c:1896
msgid "Some tracks could not be deleted from the iPod. Export aborted!"
msgstr ""
"Einige Dateien konnten nicht vom iPod gelöscht werden. Export abgebrochen!"
-#: ../src/file_itunesdb.c:1854
-#, fuzzy
-msgid "Now writing database. Please wait..."
+#: ../src/file_itunesdb.c:1914
+#, fuzzy, c-format
+msgid "Now writing database '%s'. Please wait..."
msgstr "Schreibe iTunesDB. Bitte warten..."
-#: ../src/file_itunesdb.c:1901
+#: ../src/file_itunesdb.c:1963
#, c-format
msgid "Extended information file not deleted: '%s'"
msgstr "Die Datei mit den erweiterten Informationen wurde nicht gelöscht: '%s'"
-#: ../src/file_itunesdb.c:1987
+#: ../src/file_itunesdb.c:2070
#, c-format
msgid "%s: Database saved"
msgstr "%s: Datenbank gespeichert"
-#: ../src/file_itunesdb.c:1991
+#: ../src/file_itunesdb.c:2074
#, c-format
msgid "%s: Changes saved"
msgstr "%s: Änderungen gespeichert"
-#: ../src/fileselection.c:128
+#: ../src/fileselection.c:129
msgid "Successfully added files"
msgstr "Dateien wurden erfolgreich hinzugefügt"
-#: ../src/fileselection.c:130
+#: ../src/fileselection.c:131
msgid "Some files were not added successfully"
msgstr "Einige Dateien konnten nicht hinzugefügt werden"
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:160
-msgid "Add Files"
+#: ../src/fileselection.c:164 ../src/fileselection.c:305
+#: ../src/fileselection.c:792
+msgid "Please select a playlist or repository before adding tracks."
+msgstr ""
+
+#: ../src/fileselection.c:175 ../src/fileselection.c:314
+#: ../src/fileselection.c:803
+msgid "Please load the iPod before adding tracks."
+msgstr ""
+
+#: ../src/fileselection.c:185
+#, fuzzy, c-format
+msgid "Add files to '%s'"
msgstr "Dateien hinzufügen"
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:253
-msgid "Add Playlists"
-msgstr "Wiedergabeliste(n) hinzufügen"
+#: ../src/fileselection.c:189
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr ""
+#. Create window title
+#: ../src/fileselection.c:322
+#, fuzzy, c-format
+msgid "Add playlist files to '%s'"
+msgstr "Wiedergabeliste aus Datei hinzufügen"
+
#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:300
+#: ../src/fileselection.c:378
msgid "Set Cover"
msgstr "Cover auswählen"
-#: ../src/fileselection.c:721
-msgid "Select directory to add recursively"
-msgstr "Wählen Sie Verzeichnis(se) zum Hinzufügen aus"
+#: ../src/fileselection.c:816
+#, fuzzy, c-format
+msgid "Add directories to '%s'"
+msgstr "Verzeichnisse rekursiv hinzufügen"
-#: ../src/fileselection.c:992
+#: ../src/fileselection.c:820
+#, fuzzy, c-format
+msgid "Add directories to '%s/%s'"
+msgstr "Verzeichnisse rekursiv hinzufügen"
+
+#: ../src/fileselection.c:1097
msgid "Ok"
msgstr "OK"
-#: ../src/fileselection.c:1001
+#: ../src/fileselection.c:1106
msgid "Cancel"
msgstr "Abbrechen"
-#: ../src/flacfile.c:33
+#: ../src/flacfile.c:62
#, fuzzy, c-format
msgid "'%s' does not appear to be an FLAC audio file.\n"
msgstr "'%s' scheint keine mp4-Audio-Datei zu sein.\n"
-#: ../src/flacfile.c:52
+#: ../src/flacfile.c:78
#, fuzzy, c-format
msgid "Error retrieving tags for '%s'.\n"
msgstr "Fehler beim Schreiben in die Datei '%s'.\n"
-#: ../src/flacfile.c:119
+#: ../src/flacfile.c:165
#, fuzzy, c-format
msgid ""
"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
@@ -3819,7 +4107,7 @@
"mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der mp4v2 "
"Bibliothek kompilieren.\n"
-#: ../src/flacfile.c:125
+#: ../src/flacfile.c:171
#, fuzzy, c-format
msgid ""
"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
@@ -3892,54 +4180,54 @@
msgid "n/c"
msgstr "---"
-#: ../src/info.c:388 ../src/info.c:835
+#: ../src/info.c:388 ../src/info.c:838
msgid "offline"
msgstr "offline"
-#: ../src/info.c:483
+#: ../src/info.c:486
#, c-format
msgid " P:%d T:%d/%d"
msgstr " P:%d S:%d/%d"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "B"
msgstr "B"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "kB"
msgstr "kB"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "TB"
msgstr "TB"
-#: ../src/info.c:820
+#: ../src/info.c:823
#, c-format
msgid " %s Free"
msgstr " %s frei"
-#: ../src/info.c:825
+#: ../src/info.c:828
#, c-format
msgid " %s Pending"
msgstr " %s voll"
-#: ../src/info.c:830
+#: ../src/info.c:833
msgid " disconnected"
msgstr " getrennt"
-#: ../src/info.c:881
+#: ../src/info.c:884
msgid "No database or playlist selected"
msgstr "Keine Datenbank oder Wiedergabeliste gewählt"
-#: ../src/info.c:886
+#: ../src/info.c:889
msgid "No tracks selected"
msgstr "Keine Stücke ausgewählt"
-#: ../src/info.c:891
+#: ../src/info.c:894
msgid "No playlist selected"
msgstr "Keine Wiedergabeliste ausgewählt"
-#: ../src/info.c:896
+#: ../src/info.c:899
msgid "No iPod or iPod playlist selected"
msgstr "Kein iPod oder keine Wiedergabeliste gewählt"
@@ -3966,23 +4254,19 @@
msgid "<b>Please select your iPod model at </b><i>%s</i>"
msgstr "<b>Bitte Einhängepunkt und iPod Modell wählen</b>"
-#: ../src/misc.c:86
-#, c-format
+#: ../src/ipod_init.c:463
msgid ""
-"gtkpod Version %s: Cross-Platform Multi-Lingual Interface to Apple's iPod"
-"(tm)."
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
msgstr ""
-"gtkpod Version %s: Plattformübergreifendes internationalisiertes Programm "
-"für Apples iPod(TM)."
-#: ../src/misc.c:90
+#: ../src/misc.c:70
#, fuzzy
msgid ""
-"(C) 2002 - 2007\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
"Corey Donohoe (atmos at atmos dot org)\n"
-"\n"
-"\n"
msgstr ""
"(C) 2002 - 2005\n"
"Jörg Schuler (jcsjcs at users dot sourceforge dot net)\n"
@@ -3990,326 +4274,406 @@
"\n"
"\n"
-#: ../src/misc.c:96
+#: ../src/misc.c:74
+#, fuzzy
msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-msgstr ""
-"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
-"GNU General Public License, wie von der Free Software Foundation "
-"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 "
-"der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
-"\n"
-"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen "
-"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
-"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÃœR EINEN "
-"BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
-"\n"
-"Sie sollten eine Kopie der GNU General Public License zusammen mit diesem "
-"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-
-#: ../src/misc.c:104
-msgid ""
"Patches were supplied by the following people (list may be incomplete -- "
"please contact me)\n"
-"\n"
msgstr ""
"Berichtigungen und Ergänzungen wurden von folgenden Personen zur Verfügung "
"gestellt (falls die Liste unvollständig ist, schreiben Sie mir bitte)\n"
"\n"
-#: ../src/misc.c:106
-msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)\n"
+#: ../src/misc.c:75
+#, fuzzy
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
msgstr "Ramesh Dharan: 'Multi-Edit' (Tags mehrerer Stücke auf einmal ändern)\n"
-#: ../src/misc.c:108
-msgid "Hiroshi Kawashima: Japanese charset autodetecion feature\n"
+#: ../src/misc.c:76
+#, fuzzy
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
msgstr "Hiroshi Kawashima: Automatische Erkennung japanischer Zeichensätze\n"
-#: ../src/misc.c:110
-msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c\n"
+#: ../src/misc.c:77
+#, fuzzy
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
msgstr ""
"Adrian Ulrich: Portierung des Wiedergabelisten-Codes von mktunes.pl nach "
"itunesdb.c\n"
-#: ../src/misc.c:112
+#: ../src/misc.c:78
+#, fuzzy
msgid ""
"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
-"newlines at the end\n"
+"newlines at the end"
msgstr "Walter Bell: Korrekte Handhabung der kodierten DND URIs\n"
-#: ../src/misc.c:114
-msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod\n"
+#: ../src/misc.c:79
+#, fuzzy
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
msgstr ""
"Sam Clegg: benutzerdefinierte Dateinamen beim Kopieren von Stücken vom iPod\n"
-#: ../src/misc.c:116
-msgid "Chris Cutler: automatic creation of various playlist types\n"
+#: ../src/misc.c:80
+#, fuzzy
+msgid "Chris Cutler: automatic creation of various playlist types"
msgstr "Chris Cutler: automatische Erstellung diverser Wiedergabelisten\n"
-#: ../src/misc.c:118
+#: ../src/misc.c:81
+#, fuzzy
msgid ""
"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
-"dialogue during sync\n"
+"dialogue during sync"
msgstr ""
"Graeme Wilford: Lesen und Schreiben der 'Komponisten' ID3-Tags, "
"Fortschrittsbalken während iTunesDB-Abgleich.\n"
-#: ../src/misc.c:120
+#: ../src/misc.c:82
+#, fuzzy
msgid ""
"Edward Matteucci: debugging, special playlist creation, most of the volume "
-"normalizing code\n"
+"normalizing code"
msgstr ""
"Edward Matteucci: Debugging, diverse Wiedergabelistengenerierung, Hauptteil "
"des Codes für Lautstärkenormalisierung\n"
-#: ../src/misc.c:122
-msgid "Jens Lautenbach: some optical improvements\n"
+#: ../src/misc.c:83
+#, fuzzy
+msgid "Jens Lautenbach: some optical improvements"
msgstr "Jens Lautenbach: optische Verbesserungen\n"
-#: ../src/misc.c:124
-msgid "Alex Tribble: iPod eject patch\n"
+#: ../src/misc.c:84
+#, fuzzy
+msgid "Alex Tribble: iPod eject patch"
msgstr "Alex Tribble: Patch zum Auswurf des iPods\n"
-#: ../src/misc.c:126
-msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling\n"
+#: ../src/misc.c:85
+#, fuzzy
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
msgstr ""
"Yaroslav Halchenko: Bearbeitung von verwaisten und verlorenen Stücken\n"
-#: ../src/misc.c:128
+#: ../src/misc.c:86
+#, fuzzy
msgid ""
-"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes\n"
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
msgstr ""
"Andrew Huntwork: Fix zur Groß-/Kleinschreibung von Dateinamen und "
"verschiedene andere Korrekturen\n"
-#: ../src/misc.c:130
+#: ../src/misc.c:87
+#, fuzzy
msgid ""
"Ero Carrera: Filename validation and quick sync when copying tracks from the "
-"iPod\n"
+"iPod"
msgstr ""
"Ero Carrera: Dateinamenverifizierung und Schnellabgleich beim Kopieren von "
"Stücken vom iPod\n"
-#: ../src/misc.c:132
-msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume\n"
+#: ../src/misc.c:88
+#, fuzzy
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
msgstr ""
"Jens Taprogge: Unterstützung für LAMEs Replay-Gain-Tag zur "
"Lautstärkenormalisierung.\n"
-#: ../src/misc.c:134
-msgid "Armando Atienza: Support with external playcounts\n"
+#: ../src/misc.c:89
+#, fuzzy
+msgid "Armando Atienza: Support with external playcounts"
msgstr "Armando Atienza: Unterstützung bezüglich externer Playcounts\n"
-#: ../src/misc.c:136
-msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)\n"
+#: ../src/misc.c:90
+#, fuzzy
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
msgstr ""
"D.L. Sharp: Unterstützung von m4b Dateien (AAC Dateien mit Bookmark-"
"Funktion)\n"
-#: ../src/misc.c:138
-msgid "Jim Hall: Decent INSTALL file\n"
+#: ../src/misc.c:91
+#, fuzzy
+msgid "Jim Hall: Decent INSTALL file"
msgstr "Jim Hall: Ausführliche INSTALL Anleitung\n"
-#: ../src/misc.c:140
+#: ../src/misc.c:92
+#, fuzzy
msgid ""
"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
-"contacts to the iPod\n"
+"contacts to the iPod"
msgstr ""
"Jürgen Helmers, Markus Gaugusch: Skripte zum Export des Terminkalenders und "
"der Kontakte auf den iPod\n"
#. J"urgen!
-#: ../src/misc.c:142
-msgid "Flavio Stanchina: bugfixes\n"
+#: ../src/misc.c:93
+#, fuzzy
+msgid "Flavio Stanchina: bugfixes"
msgstr "Flavio Stanchina: Bugfixes\n"
-#: ../src/misc.c:144
+#: ../src/misc.c:94
+#, fuzzy
msgid ""
"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title\n"
+"the title"
msgstr ""
"Chris Micacchi: beim Sortieren wird \"the\" und ähnliches am Beginn des "
"Titels ignoriert\n"
-#: ../src/misc.c:146
-msgid "Steve Jay: use statvfs() instead of df (better portability, faster)\n"
+#: ../src/misc.c:95
+#, fuzzy
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
msgstr ""
"Steve Jay: Verwendung von statvfs() anstelle von df (bessere Portierung, "
"schneller)\n"
-#: ../src/misc.c:149
+#: ../src/misc.c:97
+#, fuzzy
msgid ""
"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
-"tags\n"
+"tags"
msgstr ""
"Christoph Kunz: Beiträge zur Kompatibilität wenn MP3-Tags als id3v2.4 "
"geschrieben werden.\n"
-#: ../src/misc.c:152
+#: ../src/misc.c:99
+#, fuzzy
msgid ""
"James Liggett:\n"
-" replacement of old GTK file selection dialogs with new GTK filechooser "
+"replacement of old GTK file selection dialogs with new GTK filechooser "
"dialogs\n"
-" refactored user preferences system.\n"
+"refactored user preferences system."
msgstr ""
"James Ligget:\n"
" Ersetzen der alten GTK Dateidialoge durch die neuen GTK Filechooser-"
"Dialoge.\n"
-#: ../src/misc.c:157
-msgid "Daniel Kercher: sync scripts for abook and webcalendar\n"
+#: ../src/misc.c:103
+#, fuzzy
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
msgstr ""
"Daniel Kercher: Synchronisationsskripte für 'abook' und 'webcalendar'\n"
-#: ../src/misc.c:160
-msgid "Clinton Gormley: sync scripts for thunderbird\n"
+#: ../src/misc.c:105
+#, fuzzy
+msgid "Clinton Gormley: sync scripts for thunderbird"
msgstr "Clinton Gormley: Snychronisationsskripte für 'tunderbird'\n"
-#: ../src/misc.c:163
-msgid "Sebastien Beridot: sync script for ldif addressbook format\n"
+#: ../src/misc.c:107
+#, fuzzy
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
msgstr ""
"Sebastien Beridot: Snychronisationsskripte für das ldif Adressbuchformat\n"
-#: ../src/misc.c:166
-msgid "Sebastian Scherer: sync script for kNotes\n"
+#: ../src/misc.c:109
+#, fuzzy
+msgid "Sebastian Scherer: sync script for kNotes"
msgstr "Sebastian Scherer: Synchronisationsskripte für 'kNotes'\n"
-#: ../src/misc.c:169
-msgid "Nick Piper: sync script for Palm, type-ahead search\n"
+#: ../src/misc.c:111
+#, fuzzy
+msgid "Nick Piper: sync script for Palm, type-ahead search"
msgstr "Nick Piper: Synchronisationsskript für Palm, 'type-ahead' Suche\n"
-#: ../src/misc.c:172
-msgid "Uwe Hermann: help with support for iPod Video\n"
+#: ../src/misc.c:113
+#, fuzzy
+msgid "Uwe Hermann: help with support for iPod Video"
msgstr "Uwe Hermann: Hilfe bei der iPod Video Unterstützung\n"
-#: ../src/misc.c:175
+#: ../src/misc.c:115
+#, fuzzy
msgid ""
"Iain Benson: support for compilation tag in mp3 files and separate display "
-"of compilations in the sort tab.\n"
+"of compilations in the sort tab."
msgstr ""
"Iain Benson: Unterstützung für Sampler-Tags in mp3 Dateien und Darstellung "
"der Sampler in den Filter-Tabs.\n"
-#: ../src/misc.c:177
+#: ../src/misc.c:116
+#, fuzzy
msgid ""
"Nicolas Chariot: icons of buttons\n"
"\n"
-"\n"
msgstr ""
"Nicolas Chariot: Icons für Knöpfe\n"
"\n"
"\n"
-#: ../src/misc.c:181
-msgid "This program borrows code from the following projects:\n"
+#: ../src/misc.c:118
+#, fuzzy
+msgid "This program borrows code from the following projects:"
msgstr "Dieses Programm verwendet Code der folgenden Projekte:\n"
-#: ../src/misc.c:183
+#: ../src/misc.c:119
+#, fuzzy
msgid ""
-" gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB "
-"(http://www.gnu.org/software/gnupod/)\n"
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
msgstr ""
" gnutools: (mktunes.pl, nach C portiert) Schreiben und Lesen der iTunesDB "
"(http://www.gnu.org/software/gnupod/)\n"
-#: ../src/misc.c:185
+#: ../src/misc.c:120
+#, fuzzy
msgid ""
-" iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some "
-"code for smart playlists is based on his C++-classes.\n"
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
msgstr ""
" iPod.cpp, iPod.h von Samuel Wood (sam dot wood at gmail dot com): "
"einiger Code für intelligente Wiedergabelisten basiert auf seinen C++-"
"Klassen.\n"
-#: ../src/misc.c:187
-msgid " mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)\n"
+#: ../src/misc.c:121
+#, fuzzy
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
msgstr " mp3info: MP3-Spielzeit-Ermittlung (http://ibiblio.org/mp3info/)\n"
-#: ../src/misc.c:189
-msgid ""
-" xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)\n"
+#: ../src/misc.c:122
+#, fuzzy
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
msgstr ""
"xmms: Verzeichnisbaum-Anzeige, MP3-Spielzeit-Ermittlung (http://www.xmms."
"org)\n"
-#: ../src/misc.c:192
-msgid ""
-"The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"
+#: ../src/misc.c:124
+#, fuzzy
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
msgstr ""
"Die graphische Benutzeroberfläche wurde mit Hilfe von glade-2 (http://glade."
"gnome.org/) erstellt.\n"
-#: ../src/misc.c:207
-msgid "French: David Le Brun (david at dyn-ns dot net)\n"
+#: ../src/misc.c:128
+#, fuzzy
+msgid "French: David Le Brun (david at dyn-ns dot net)"
msgstr "Französisch: David Le Brun (david at dyn-ns dot net)\n"
-#: ../src/misc.c:209
-msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+#: ../src/misc.c:129
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr ""
+
+#: ../src/misc.c:130
+#, fuzzy
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
msgstr "Deutsch: Jörg Schuler (jcsjcs at users dot sourceforge dot net)\n"
-#: ../src/misc.c:211
-msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)\n"
+#: ../src/misc.c:131
+msgid "German: Kai-Ove"
+msgstr ""
+
+#: ../src/misc.c:132
+#, fuzzy
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
msgstr "Hebräisch: Assaf Gillat (gillata at gmail dot com)\n"
-#: ../src/misc.c:213
+#: ../src/misc.c:133
+#, fuzzy
msgid ""
-"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net)\n"
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
msgstr ""
"Italienisch: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
"net\n"
-#: ../src/misc.c:215
-msgid "Japanese: Ayako Sano\n"
+#: ../src/misc.c:134
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr ""
+
+#: ../src/misc.c:135
+#, fuzzy
+msgid "Japanese: Ayako Sano"
msgstr "Japanisch: Ayako Sano\n"
-#: ../src/misc.c:217
-msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
+#: ../src/misc.c:136
+#, fuzzy
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
msgstr ""
"Japanisch: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
-#: ../src/misc.c:219
-msgid "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
+#: ../src/misc.c:137
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr ""
+
+#: ../src/misc.c:138
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr ""
+
+#: ../src/misc.c:139
+#, fuzzy
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
msgstr "Schwedisch: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
-#: ../src/misc.c:975
+#: ../src/misc.c:144
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+msgstr ""
+"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
+"GNU General Public License, wie von der Free Software Foundation "
+"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 "
+"der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
+"\n"
+"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen "
+"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
+"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÃœR EINEN "
+"BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
+"\n"
+"Sie sollten eine Kopie der GNU General Public License zusammen mit diesem "
+"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
+"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+"\n"
+
+#: ../src/misc.c:159
+#, fuzzy
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+msgstr ""
+"(C) 2002 - 2005\n"
+"Jörg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+"Corey Donohoe (atmos at atmos dot org)\n"
+"\n"
+"\n"
+
+#: ../src/misc.c:167
+#, fuzzy
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr ""
+"gtkpod Version %s: Plattformübergreifendes internationalisiertes Programm "
+"für Apples iPod(TM)."
+
+#: ../src/misc.c:934
#, c-format
msgid "Could not process '%s' (no filename available)"
msgstr "Kann nicht fortfahren '%s' (kein Dateiname verfügbar)"
-#: ../src/misc.c:1129
+#: ../src/misc.c:1088
#, c-format
msgid "Unknown token '%%%c' in template '%s'"
msgstr "Unbekanntes Merkmal '%%%c' in der Schablone '%s'"
-#: ../src/misc.c:1212
+#: ../src/misc.c:1171
#, c-format
msgid "Template ('%s') does not match file type '%s'\n"
msgstr "Schablone ('%s') passt nicht auf den Dateinamen '%s'\n"
-#: ../src/misc.c:1298
+#: ../src/misc.c:1257
#, c-format
msgid "Error creating %s: %s\n"
msgstr "Fehler beim Erstellen von '%s': %s\n"
-#: ../src/misc.c:1777
+#: ../src/misc.c:1691
#, fuzzy, c-format
msgid ""
"Writing preferences file '%s' failed (%s).\n"
@@ -4318,11 +4682,11 @@
"Die Ausführung von '%s' schlug fehl.\n"
"\n"
-#: ../src/misc.c:1779
+#: ../src/misc.c:1693
msgid "unspecified error"
msgstr ""
-#: ../src/misc.c:1787
+#: ../src/misc.c:1701
#, c-format
msgid ""
"Writing preferences to the iPod (%s) failed: could not get path to Control "
@@ -4466,6 +4830,7 @@
msgstr "Alle %d Stücke wurden vom iPod entfernt"
#: ../src/misc_confirm.c:541
+#, c-format
msgid "Removed all podcasts from the iPod"
msgstr "Alle Podcasts wurden vom iPod entfernt"
@@ -4499,22 +4864,24 @@
msgstr "Alle %d Stücke wurden aus der Datenbank entfernt"
#: ../src/misc_confirm.c:695
+#, c-format
msgid "Are you sure you want to remove all tracks from your iPod?"
msgstr "Sind Sie sicher, dass Sie alle Stücke vom iPod entfernen wollen?"
#: ../src/misc_confirm.c:700
+#, c-format
msgid "Are you sure you want to remove all podcasts from your iPod?"
msgstr "Sind Sie sicher, dass sie alle Podcasts vom iPod entfernen wollen?"
#: ../src/misc_confirm.c:708
-#, c-format
+#, fuzzy, c-format
msgid ""
"Are you sure you want to delete playlist '%s' and the following track "
-"completely from your ipod? The number of playlists this track is a member of "
+"completely from your iPod? The number of playlists this track is a member of "
"is indicated in parentheses."
msgid_plural ""
"Are you sure you want to delete playlist '%s' and the following tracks "
-"completely from your ipod? The number of playlists the tracks are member of "
+"completely from your iPod? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
"Sind Sie sicher, dass Sie die Wiedergabeliste '%s' und das folgende Stück "
@@ -4552,6 +4919,7 @@
"Klammern angegeben."
#: ../src/misc_confirm.c:753
+#, c-format
msgid "Are you sure you want to remove all tracks from the database?"
msgstr ""
"Sind Sie sicher, dass Sie alle Stücke von der Datenbank entfernen wollen?"
@@ -4707,57 +5075,92 @@
msgid "Episode Nr"
msgstr ""
-#: ../src/misc_conversion.c:118
+#: ../src/misc_conversion.c:106
+#, fuzzy
+msgid "Album Artist"
+msgstr "Künstler"
+
+#: ../src/misc_conversion.c:107
+#, fuzzy
+msgid "Sort Artist"
+msgstr "Künstler"
+
+#: ../src/misc_conversion.c:108
+#, fuzzy
+msgid "Sort Title"
+msgstr "Untertitel"
+
+#: ../src/misc_conversion.c:109
+#, fuzzy
+msgid "Sort Album"
+msgstr "Album"
+
+#. 50
+#: ../src/misc_conversion.c:110
+#, fuzzy
+msgid "Sort Album Artist"
+msgstr "Künstler"
+
+#: ../src/misc_conversion.c:111
+#, fuzzy
+msgid "Sort Composer"
+msgstr "Komponist"
+
+#: ../src/misc_conversion.c:112
+msgid "Sort TV Show"
+msgstr ""
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr ""
+
+#: ../src/misc_conversion.c:126
msgid "Name of file on PC, if available"
msgstr "Dateiname auf dem PC, falls verfügbar"
-#: ../src/misc_conversion.c:119
+#: ../src/misc_conversion.c:127
msgid "Name of file on the iPod"
msgstr "Name der Datei auf dem iPod"
#. 10
-#: ../src/misc_conversion.c:121
+#: ../src/misc_conversion.c:129
msgid "Track Nr. and total number of tracks on CD"
msgstr "Stück-Nr. und Gesamtzahl der Stücke auf der CD"
-#: ../src/misc_conversion.c:122
+#: ../src/misc_conversion.c:130
msgid "Whether the file has already been transferred to the iPod or not"
msgstr "Ungeachtet, ob die Datei bereits zum iPod übertragen wurde oder nicht."
-#: ../src/misc_conversion.c:128
-msgid ""
-"Supposedly something that tells the iPod to increase or decrease the "
-"playback speed"
+#: ../src/misc_conversion.c:136
+msgid "Beats per minute"
msgstr ""
-"Anscheinend ein Feld, das den iPod anweist, die Wiedergabe zu beschleunigen "
-"oder zu verlangsamen"
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:137
msgid "Number of times the track has been played"
msgstr "Wie oft dieses Stück bereits gespielt wurde"
-#: ../src/misc_conversion.c:131
+#: ../src/misc_conversion.c:138
msgid "Star rating from 0 to 5"
msgstr "Bewertung mit 0 bis 5 Sternen"
-#: ../src/misc_conversion.c:132
+#: ../src/misc_conversion.c:139
msgid "Date and time track has been added"
msgstr "Zeitpunkt zu dem das Stück hinzugefügt wurde"
#. 20
-#: ../src/misc_conversion.c:133
+#: ../src/misc_conversion.c:140
msgid "Date and time track has last been played"
msgstr "Zeitpunkt des letzten Abspielens des Stücks"
-#: ../src/misc_conversion.c:134
+#: ../src/misc_conversion.c:141
msgid "Date and time track has last been modified"
msgstr "Zeitpunkt der letzten Modifikation des Stücks"
-#: ../src/misc_conversion.c:135
+#: ../src/misc_conversion.c:142
msgid "Manual volume adjust"
msgstr "Manuelle Lautstärkeanpassung"
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:143
msgid ""
"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
"the iPod"
@@ -4766,48 +5169,56 @@
"aktiviert sein"
#. 25
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:146
msgid "CD Nr. and total number of CDS in set"
msgstr "CD-Nummer und Gesamtzahl der CDs im Set"
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:149
msgid ""
"The category (e.g. 'Technology' or 'Music') where the podcast was located."
msgstr ""
"Die Kategorie (z.B. 'Technologie' oder 'Musik') in die das Podcast "
"eingeordnet war."
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:150
msgid "Accessible by selecting the center button on the iPod."
msgstr "Wird angezeigt, wenn der mittlere Knopf auf dem iPod gedrückt wird."
-#: ../src/misc_conversion.c:147
+#: ../src/misc_conversion.c:154
msgid "Release date (for podcasts displayed next to the title on the iPod)"
msgstr ""
"Veröffentlichungsdatum (wird bei Podcasts auf dem iPod neben dem Titel "
"angezeigt)"
-#: ../src/misc_conversion.c:713
+#. 50
+#: ../src/misc_conversion.c:168 ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170 ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172 ../src/misc_conversion.c:173
+#, fuzzy
+msgid "Used for sorting on the iPod"
+msgstr "Name der Datei auf dem iPod"
+
+#: ../src/misc_conversion.c:735
#, c-format
msgid "The URI '%s' is not an absolute URI using the file scheme"
msgstr "Der URI »%s« ist kein absoluter URI, der das Dateischema verwendet"
-#: ../src/misc_conversion.c:723
+#: ../src/misc_conversion.c:745
#, c-format
msgid "The local file URI '%s' may not include a '#'"
msgstr "Die lokale URI Datei »%s« darf kein »#« enthalten"
-#: ../src/misc_conversion.c:740
+#: ../src/misc_conversion.c:762
#, c-format
msgid "The URI '%s' is invalid"
msgstr "Der URI »%s« ist ungültig"
-#: ../src/misc_conversion.c:752
+#: ../src/misc_conversion.c:774
#, c-format
msgid "The hostname of the URI '%s' is invalid"
msgstr "Der Rechnername der URI »%s« ist ungültig"
-#: ../src/misc_conversion.c:768
+#: ../src/misc_conversion.c:790
#, c-format
msgid "The URI '%s' contains invalidly escaped characters"
msgstr "Der URI »%s« enthält ungültige Escape-Zeichen"
@@ -4877,6 +5288,7 @@
msgstr "Häufig (%d)"
#: ../src/misc_playlist.c:584
+#, c-format
msgid "Never Listened"
msgstr "Nie gehört"
@@ -4920,11 +5332,6 @@
msgstr ""
"Verlorene Stücke ohne entsprechende Datei auf dem Computer wurden entfernt."
-#: ../src/misc_playlist.c:916
-#, c-format
-msgid "Processing '%s'"
-msgstr "Bearbeite '%s'"
-
#: ../src/misc_playlist.c:943
msgid "Dangling tracks with files on PC were handled."
msgstr ""
@@ -5063,76 +5470,76 @@
msgid "Duplicate detection"
msgstr "Duplikaterkennung"
-#: ../src/misc_track.c:1269
+#: ../src/misc_track.c:1339
msgid "Local Database"
msgstr "Lokale Datenbank"
#. artwork is set
-#: ../src/misc_track.c:1280
+#: ../src/misc_track.c:1350
msgid "Embedded or filename was lost"
msgstr "Eingefügt oder Dateiname war unauffindbar"
-#: ../src/misc_track.c:1284
+#: ../src/misc_track.c:1354
msgid "Artwork not set"
msgstr "Bilddatei nicht gesetzt"
-#: ../src/misc_track.c:1737
+#: ../src/misc_track.c:1816
#, fuzzy, c-format
msgid "Could not find source file for '%s'. Track not copied."
msgstr "Konnte Datei für '%s' auf dem iPod nicht finden\n"
-#: ../src/misc_track.c:1973
+#: ../src/misc_track.c:2052
#, c-format
msgid "drag and drop: ignored '%s'\n"
msgstr "Verschieben: '%s' ignoriert\n"
-#: ../src/mp3file.c:1282
+#: ../src/mp3file.c:1336
#, c-format
msgid "Error setting ID3 field: %s\n"
msgstr "Fehler beim Setzen des ID3 Feldes: '%s'\n"
-#: ../src/mp3file.c:1306 ../src/mp3file.c:1399 ../src/mp3file.c:1548
-#: ../src/mp3file.c:2186
+#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
#, c-format
msgid "ERROR while opening file: '%s' (%s).\n"
msgstr "FEHLER beim Öffnen der Datei: '%s' (%s).\n"
-#: ../src/mp3file.c:1619
+#: ../src/mp3file.c:1688
#, c-format
msgid "ERROR while writing tag to file: '%s' (%s).\n"
msgstr "FEHLER beim Schreiben eines Tags: '%s' (%s).\n"
#. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2352
+#: ../src/mp3file.c:2770
#, c-format
msgid "File \"%s\" has zero play length. Ignoring.\n"
msgstr "Die Datei '%s' hat Null Spielzeit und wird ignoriert.\n"
-#: ../src/mp4file.c:227 ../src/mp4file.c:359
+#: ../src/mp4file.c:243 ../src/mp4file.c:404
#, fuzzy, c-format
msgid "'%s' does not appear to be a mp4 audio or video file.\n"
msgstr "'%s' scheint keine mp4-Audio-Datei zu sein.\n"
-#: ../src/mp4file.c:237 ../src/mp4file.c:369
+#: ../src/mp4file.c:253 ../src/mp4file.c:414
#, c-format
msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
msgstr ""
"'%s' konnte nicht gelesen werden, oder die Datei ist keine gültige mp4-"
"Datei.\n"
-#: ../src/mp4file.c:478
+#: ../src/mp4file.c:529
#, c-format
msgid "'%s' does not appear to be a mp4 audio file.\n"
msgstr "'%s' scheint keine mp4-Audio-Datei zu sein.\n"
-#: ../src/mp4file.c:489
+#: ../src/mp4file.c:540
#, c-format
msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
msgstr ""
"'%s' konnte nicht zum Schreiben geöffnet werden, oder die Datei ist keine "
"gültige mp4-Datei.\n"
-#: ../src/mp4file.c:502
+#: ../src/mp4file.c:553
#, c-format
msgid ""
"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5142,7 +5549,7 @@
"mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der mp4v2 "
"Bibliothek kompilieren.\n"
-#: ../src/mp4file.c:508
+#: ../src/mp4file.c:559
#, c-format
msgid ""
"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5153,7 +5560,7 @@
"werden ohne die mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod "
"zusammen mit der mp4v2 Bibliothek kompilieren.\n"
-#: ../src/mp4file.c:514
+#: ../src/mp4file.c:565
#, c-format
msgid ""
"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5164,17 +5571,12 @@
"werden ohne die mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod "
"zusammen mit der mp4v2 Bibliothek kompilieren.\n"
-#: ../src/oggfile.c:62 ../src/wavfile.c:107
-#, c-format
-msgid "Could not open '%s' for reading.\n"
-msgstr "Datei '%s' konnte nicht zum Lesen geöffnet werden.\n"
-
#: ../src/oggfile.c:73
#, fuzzy, c-format
msgid "'%s' does not appear to be an ogg audio file.\n"
msgstr "'%s' scheint keine mp4-Audio-Datei zu sein.\n"
-#: ../src/oggfile.c:150
+#: ../src/oggfile.c:154
#, fuzzy, c-format
msgid ""
"Import of '%s' failed: ogg not supported without the ogg library. You must "
@@ -5184,7 +5586,7 @@
"mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der mp4v2 "
"Bibliothek kompilieren.\n"
-#: ../src/oggfile.c:156
+#: ../src/oggfile.c:160
#, fuzzy, c-format
msgid ""
"ogg metadata update for '%s' failed: ogg not supported without the ogg "
@@ -5194,90 +5596,90 @@
"werden ohne die mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod "
"zusammen mit der mp4v2 Bibliothek kompilieren.\n"
-#: ../src/prefs.c:356
+#: ../src/prefs.c:357
#, c-format
msgid "gtkpod version %s usage:\n"
msgstr "gtkpod Version %s:\n"
-#: ../src/prefs.c:357
+#: ../src/prefs.c:358
msgid " -h, --help: display this message\n"
msgstr " -h, --help: diesen Text anzeigen\n"
-#: ../src/prefs.c:358
+#: ../src/prefs.c:359
#, fuzzy
msgid " -p <file>: increment playcount for file by one\n"
msgstr " -p <Dateiname>:Wiedergabezähler für 'Dateiname' um eins erhöhen\n"
-#: ../src/prefs.c:359
+#: ../src/prefs.c:360
msgid " --hash <file>:print gtkpod hash for file\n"
msgstr ""
-#: ../src/prefs.c:360
+#: ../src/prefs.c:361
msgid " -m path: define the mountpoint of your iPod\n"
msgstr " -m <Pfad>: Einhängepunkt für iPod angeben\n"
-#: ../src/prefs.c:361
+#: ../src/prefs.c:362
msgid " --mountpoint: same as '-m'.\n"
msgstr " --Einhängepunkt: wie '-m'.\n"
-#: ../src/prefs.c:362
+#: ../src/prefs.c:363
msgid " -a: import database automatically after start.\n"
msgstr " -a: iTunesDB automatisch importieren\n"
-#: ../src/prefs.c:363
+#: ../src/prefs.c:364
msgid " --auto: same as '-a'.\n"
msgstr " --auto: wie '-a'.\n"
-#: ../src/prefs.c:560
+#: ../src/prefs.c:561
#, c-format
msgid "Couldn't create ~/.gtkpod\n"
msgstr ""
-#: ../src/prefs_window.c:134
+#: ../src/prefs_window.c:133
msgid "Please select command for 'Play Now'"
msgstr "Programm für 'Jetzt abspielen' wählen"
-#: ../src/prefs_window.c:135
+#: ../src/prefs_window.c:134
msgid "Please select command for 'Enqueue'"
msgstr "Programm für 'Zum Abspielen vormerken':"
-#: ../src/prefs_window.c:136
+#: ../src/prefs_window.c:135
msgid "Please select the mp3gain executable"
msgstr "Genauer Pfad des mp3gain-Programms"
-#: ../src/prefs_window.c:137
+#: ../src/prefs_window.c:136
msgid "Please select the aacgain executable"
msgstr "Genauer Pfad des aacgain-Programms"
-#: ../src/prefs_window.c:138
+#: ../src/prefs_window.c:137
msgid "Select the mserv music root directory"
msgstr "Wählen Sie das mserv Stammverzeichnis für Musik"
-#: ../src/prefs_window.c:139
+#: ../src/prefs_window.c:138
msgid "Select the mserv trackinfo root directory"
msgstr "Wählen Sie das mserv Stammverzeichnis (Stückinfo)"
-#: ../src/prefs_window.c:140
+#: ../src/prefs_window.c:139
msgid "Select the ogg/vorbis converter command"
msgstr ""
-#: ../src/prefs_window.c:141
+#: ../src/prefs_window.c:140
msgid "Select the flac converter command"
msgstr ""
-#: ../src/prefs_window.c:142
+#: ../src/prefs_window.c:141
msgid "Select the m4a converter command."
msgstr ""
-#: ../src/prefs_window.c:143
+#: ../src/prefs_window.c:142
msgid "Select the mp3 converter command."
msgstr ""
-#: ../src/prefs_window.c:144
+#: ../src/prefs_window.c:143
msgid "Select the wav converter command."
msgstr ""
-#: ../src/prefs_window.c:211 ../src/repository.c:662
+#: ../src/prefs_window.c:201 ../src/repository.c:662
#, fuzzy, c-format
msgid ""
"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
@@ -5289,11 +5691,11 @@
"at users.sourceforge.net, damit es in die nächste Version aufgenommen werden "
"kann.</i>"
-#: ../src/prefs_window.c:986 ../src/prefs_window.c:1004
+#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
msgid "Preferences not updated"
msgstr "Die Einstellungen wurden nicht übernommen"
-#: ../src/prefs_window.c:1013
+#: ../src/prefs_window.c:1232
msgid "Preferences applied"
msgstr "Die Einstellungen wurden übernommen"
@@ -5396,7 +5798,7 @@
msgid "Sync summary"
msgstr "Zusammenfassung des Abgleichs"
-#: ../src/tools.c:119
+#: ../src/tools.c:118
#, fuzzy, c-format
msgid ""
"Could not find '%s'.\n"
@@ -5409,7 +5811,7 @@
"'Werkzeuge' oder installieren Sie das entsprechende Programm.\n"
"\n"
-#: ../src/tools.c:204
+#: ../src/tools.c:203
#, c-format
msgid ""
"Execution of '%s' failed.\n"
@@ -5418,7 +5820,7 @@
"Die Ausführung von '%s' schlug fehl.\n"
"\n"
-#: ../src/tools.c:249
+#: ../src/tools.c:248
#, c-format
msgid ""
"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
@@ -5427,7 +5829,7 @@
"'%s' konnte nicht normalisiert werden. Bitte prüfen Sie die Pfadangabe "
"(mp3gain) im Einstellungsdialog unter 'Werkzeuge'\n"
-#: ../src/tools.c:259
+#: ../src/tools.c:258
#, c-format
msgid ""
"Did not normalize '%s'. Set aacgain path in the Tools section of the "
@@ -5436,38 +5838,38 @@
"'%s' konnte nicht normalisiert werden. Bitte prüfen Sie die Pfadangabe "
"(aacgain) im Einstellungsdialog unter 'Werkzeuge'\n"
-#: ../src/tools.c:386
+#: ../src/tools.c:385
msgid "Normalizing..."
msgstr "Lautstärke wird normalisiert..."
-#: ../src/tools.c:436
+#: ../src/tools.c:435
#, c-format
msgid "%s - %s"
msgstr "%s - %s"
-#: ../src/tools.c:462
+#: ../src/tools.c:461
msgid "Aborting..."
msgstr "Breche ab..."
-#: ../src/tools.c:466
+#: ../src/tools.c:465
msgid "Will abort after current mp3gain process ends."
msgstr "Abbruch erfolgt, nachdem der mp3gain-Prozess beendet ist."
-#: ../src/tools.c:492
+#: ../src/tools.c:491
#, c-format
msgid ""
"'%s-%s' (%s) could not be normalized.\n"
"\n"
msgstr "'%s-%s (%s) konnte nicht normalisiert werden.\n"
-#: ../src/tools.c:531
+#: ../src/tools.c:530
#, c-format
msgid "Normalized %d of %d tracks."
msgid_plural "Normalized %d of %d tracks."
msgstr[0] "%d von insgesamt %d Stück normalisiert."
msgstr[1] "%d von insgesamt %d Stücken normalisiert."
-#: ../src/tools.c:634
+#: ../src/tools.c:633
msgid ""
"Please specify the command to be called on the 'Tools' section of the "
"preferences dialog.\n"
@@ -5475,7 +5877,7 @@
"Bitte geben Sie das aufzurufende Programm im Einstellungsdialog unter "
"'Werkzeuge' an.\n"
-#: ../src/tools.c:646
+#: ../src/tools.c:645
#, c-format
msgid ""
"Could not find the command '%s'.\n"
@@ -5513,6 +5915,70 @@
msgstr "'%s' scheint keine unterstützte WAV-Datei zu sein.\n"
#, fuzzy
+#~ msgid "<b>Resolution:</b>"
+#~ msgstr "<b>Werkzeugtipps</b>"
+
+#, fuzzy
+#~ msgid "label"
+#~ msgstr "label21"
+
+#~ msgid ""
+#~ "Cannot open '%s' for reading.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Datei '%s' konnte nicht zum Lesen geöffnet werden.\n"
+#~ "\n"
+
+#~ msgid "Unable to open '%s' for reading\n"
+#~ msgstr "Kann '%s' nicht zum Lesen öffnen.\n"
+
+#~ msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
+#~ msgstr ""
+#~ "Die \"iTunesDB.ext\" konnte zum Lesen der erweiterten Infos nicht "
+#~ "geöffnet werden.\n"
+
+#~ msgid "Add _Directory"
+#~ msgstr "_Verzeichnisse hinzufügen"
+
+#~ msgid "Dirs"
+#~ msgstr "Verzeichnisse"
+
+#~ msgid "Files"
+#~ msgstr "Dateien"
+
+#~ msgid "New PL"
+#~ msgstr "Neue Wiedergabeliste"
+
+#~ msgid "_About"
+#~ msgstr "_Ãœber"
+
+#, fuzzy
+#~ msgid "Set Cover Art from _Web"
+#~ msgstr "Lege Cover-Bild fest"
+
+#~ msgid "_Other"
+#~ msgstr "S_onstiges"
+
+#~ msgid "File skipped. match exclude masks: '%s'\n"
+#~ msgstr "Datei übersprungen. Erfüllt Ausschlusskriterium: '%s'\n"
+
+#~ msgid "Add Playlists"
+#~ msgstr "Wiedergabeliste(n) hinzufügen"
+
+#~ msgid "Select directory to add recursively"
+#~ msgstr "Wählen Sie Verzeichnis(se) zum Hinzufügen aus"
+
+#~ msgid ""
+#~ "Supposedly something that tells the iPod to increase or decrease the "
+#~ "playback speed"
+#~ msgstr ""
+#~ "Anscheinend ein Feld, das den iPod anweist, die Wiedergabe zu "
+#~ "beschleunigen oder zu verlangsamen"
+
+#~ msgid "Processing '%s'"
+#~ msgstr "Bearbeite '%s'"
+
+#, fuzzy
#~ msgid "label21"
#~ msgstr "label21"
Property changes on: gtkpod/branches/etch-bpo/po/de.po
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/po/es.po
===================================================================
--- gtkpod/branches/etch-bpo/po/es.po 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/es.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: gtkpod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-14 22:57+0900\n"
+"POT-Creation-Date: 2007-12-13 18:36-0500\n"
"PO-Revision-Date: 2007-06-13 21:38+0200\n"
"Last-Translator: Alejandro Lamas Daviña <alejandro.lamas at ific.uv.es>\n"
"Language-Team: spanish <es_ES>\n"
@@ -173,75 +173,76 @@
msgstr "<b>Confirmación de borrado</b>"
#: ../data/gtkpod.glade.h:37
-msgid "<b>Displayed Track Attributes</b>"
-msgstr "<b>Atributos de la pista mostrados</b>"
-
-#: ../data/gtkpod.glade.h:38
msgid "<b>Examples</b>"
msgstr "<b>Ejemplos</b>"
-#: ../data/gtkpod.glade.h:39
+#: ../data/gtkpod.glade.h:38
msgid "<b>Ignore Frequent Words</b>"
msgstr "<b>Ignorar palabras comunes (p.e: artÃculos)</b>"
-#: ../data/gtkpod.glade.h:40
+#: ../data/gtkpod.glade.h:39
msgid "<b>Misc</b>"
msgstr "<b>Miscelaneo</b>"
-#: ../data/gtkpod.glade.h:41
+#: ../data/gtkpod.glade.h:40
msgid "<b>Mountpoint and individual repository/playlist options</b>"
msgstr ""
"<b>Opciones de punto de montaje y repositorio/lista de reproducción "
"individual</b>"
-#: ../data/gtkpod.glade.h:42
+#: ../data/gtkpod.glade.h:41
msgid "<b>On-the-fly Conversion</b>"
msgstr "<b>Conversión al vuelo</b>"
-#: ../data/gtkpod.glade.h:43
+#: ../data/gtkpod.glade.h:42
msgid "<b>Play</b>"
msgstr "<b>Reproducir</b>"
-#: ../data/gtkpod.glade.h:44
+#: ../data/gtkpod.glade.h:43
msgid "<b>Playlists</b>"
msgstr "<b>Listas de reproducción</b>"
-#: ../data/gtkpod.glade.h:45
+#: ../data/gtkpod.glade.h:44
msgid "<b>Please select mountpoint and your iPod model</b>"
msgstr "<b>Por favor, seleccionar el punto de montaje y el modelo de iPod</b>"
-#: ../data/gtkpod.glade.h:46
+#: ../data/gtkpod.glade.h:45
msgid "<b>Repositories</b>"
msgstr "<b>Repositorios</b>"
-#: ../data/gtkpod.glade.h:47
+#: ../data/gtkpod.glade.h:46
msgid "<b>Sort Order</b>"
msgstr "<b>Opción de ordenamiento</b>"
-#: ../data/gtkpod.glade.h:48
+#: ../data/gtkpod.glade.h:47
msgid "<b>Sort Tabs</b>"
msgstr "<b>Pestañas</b>"
-#: ../data/gtkpod.glade.h:49
+#: ../data/gtkpod.glade.h:48
msgid "<b>Sync</b>"
msgstr "<b>Sincronizar</b>"
-#: ../data/gtkpod.glade.h:50
+#: ../data/gtkpod.glade.h:49
msgid "<b>Synchronization</b>"
msgstr "<b>Sincronización</b>"
-#: ../data/gtkpod.glade.h:51
+#: ../data/gtkpod.glade.h:50
msgid "<b>Tag Reading</b>"
msgstr "<b>Lectura de los atributos</b>"
-#: ../data/gtkpod.glade.h:52
+#: ../data/gtkpod.glade.h:51
msgid "<b>Toolbar</b>"
msgstr "<b>Barra de herramientas</b>"
-#: ../data/gtkpod.glade.h:53
+#: ../data/gtkpod.glade.h:52
msgid "<b>Tooltips</b>"
msgstr "<b>Sugerencias</b>"
+#: ../data/gtkpod.glade.h:53
+#, fuzzy
+msgid "<b>Track Attributes</b>"
+msgstr "<b>Atributos de la pista mostrados</b>"
+
#: ../data/gtkpod.glade.h:54
msgid "<b>Track Editing</b>"
msgstr "<b>Edición de pistas</b>"
@@ -267,92 +268,122 @@
msgstr "Añadir directorios recursivamente"
#: ../data/gtkpod.glade.h:60
+#, fuzzy
+msgid "Add Files"
+msgstr "Añadir _ficheros"
+
+#: ../data/gtkpod.glade.h:61
msgid "Add Files or Directories"
msgstr "Añadir ficheros o directorios"
-#: ../data/gtkpod.glade.h:61
-msgid "Add _Directory"
-msgstr "Añadir _directorio"
+#: ../data/gtkpod.glade.h:62
+#, fuzzy
+msgid "Add Fol_der"
+msgstr "Añadir _ficheros"
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:63
+#, fuzzy
+msgid "Add Folder"
+msgstr "Añadir _ficheros"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Image_s"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:65
+#, fuzzy
+msgid "Add Images from a Directory"
+msgstr "Añadir ficheros o directorios"
+
+#: ../data/gtkpod.glade.h:66
+#, fuzzy
+msgid "Add Playlist"
+msgstr "Añadir lista de _reproducción"
+
+#: ../data/gtkpod.glade.h:67
msgid "Add _Files"
msgstr "Añadir _ficheros"
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:68
msgid "Add _Playlist"
msgstr "Añadir lista de _reproducción"
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:69
msgid "Add coverart from file using the following template"
msgstr "Añadir carátulas desde fichero usando la siguiente plantilla"
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:70
msgid "Add directories recursively"
msgstr "Añadir directorios recursivamente"
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:71
msgid "Add new repository/iPod"
msgstr "Añadir nuevo repositorio/iPod"
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:72
msgid "Add playlist from file"
msgstr "Añadir lista de reproducción desde fichero"
-#: ../data/gtkpod.glade.h:68 ../src/display_sorttabs.c:3232
-#: ../src/display_tracks.c:1996
+#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
msgid "Added"
msgstr "Añadido"
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:74
msgid "Advanced Sorting Options"
msgstr "Opciones de ordenación avanzadas"
#. 0
-#: ../data/gtkpod.glade.h:70 ../src/display_sorttabs.c:2954
+#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
msgid "Album"
msgstr "Ãlbum"
-#: ../data/gtkpod.glade.h:71
+#: ../data/gtkpod.glade.h:76
msgid "Album Art"
msgstr "Carátula de álbum"
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:77
msgid "All (AND)"
msgstr "y (AND)"
-#: ../data/gtkpod.glade.h:73
+#: ../data/gtkpod.glade.h:78
msgid "All Tracks Never Listened To"
msgstr "Todas las pistas nunca escuchadas"
-#: ../data/gtkpod.glade.h:74
+#: ../data/gtkpod.glade.h:79
msgid "All Tracks Played Since Last Time"
msgstr "Todas las pistas reproducidas desde la última vez"
-#: ../data/gtkpod.glade.h:75
+#: ../data/gtkpod.glade.h:80
msgid "All Tracks not Listed in any Playlist"
msgstr "Todas las pistas no incluidas en otras listas de reproducción"
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:81
msgid "Also include tracks never played in \"Best Rated\" playlist"
msgstr ""
"Incluir también las pistas nunca reproducidas en las listas de reproducción "
"\"Mejor puntuadas\""
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:82
msgid "Always write ID3v2.4 tags (only applies to MP3)"
msgstr "Escribir siempre atributos ID3v2.4 (aplicable sólo a ficheros MP3)"
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:83
msgid "Any (OR)"
msgstr "o (OR)"
-#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2951
+#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
msgid "Artist"
msgstr "Artista"
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:85
+#, fuzzy
+msgid "Artwork Preview"
+msgstr "Ruta de la carátula"
+
+#: ../data/gtkpod.glade.h:86
msgid ""
"As a last resort set the following tags to the\n"
"filename if they are (still) empty:"
@@ -360,37 +391,15 @@
"Como último recurso, establecer los siguientes\n"
" atributos al nombre de fichero si (todavÃa) están vacÃos."
-#: ../data/gtkpod.glade.h:82
+#: ../data/gtkpod.glade.h:88
msgid "Ascending"
msgstr "Ascendente"
-#: ../data/gtkpod.glade.h:83
-msgid ""
-"Audio/Video\n"
-"Audio\n"
-"Video\n"
-"Podcast\n"
-"Video Podcast\n"
-"Audiobook\n"
-"Music Video\n"
-"TV Show\n"
-"TV Show & Music Video\n"
-msgstr ""
-"Audio/VÃdeo\n"
-"Audio\n"
-"VÃdeo\n"
-"Podcast\n"
-"Podcast de vÃdeo\n"
-"Audiolibro\n"
-"VÃdeo musical\n"
-"TV Show\n"
-"TV Show & VÃdeo musical\n"
-
-#: ../data/gtkpod.glade.h:93
+#: ../data/gtkpod.glade.h:89
msgid "Auto Store"
msgstr "Guardar automáticamente"
-#: ../data/gtkpod.glade.h:94
+#: ../data/gtkpod.glade.h:90
msgid ""
"Automatically start displaying tracks that match the criteria entered above. "
"If not selected, you must press 'Display' to start displaying."
@@ -399,52 +408,56 @@
"búsqueda. Si no está seleccionado se deberá pulsar 'Mostar' para que "
"comiencen a visualizarse."
-#: ../data/gtkpod.glade.h:95
+#: ../data/gtkpod.glade.h:91
+msgid "Available:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:92
msgid "Before removing playlists or tracks from a playlist"
msgstr ""
"Antes de borrar listas de reproducción o pistas de una lista de reproducción"
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:93
msgid "Before removing tracks from the harddisk"
msgstr "Antes de borrar pistas del disco duro"
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:94
msgid "Before removing tracks from the iPod"
msgstr "Antes de borrar pistas del iPod"
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:95
msgid "Before removing tracks from the local database"
msgstr "Antes de borrar pistas de la base de datos"
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:96
msgid "Best Rated Tracks"
msgstr "Pistas con mayor puntuación"
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:97
msgid "Browse"
msgstr "Examinar"
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:98
msgid "Cache directory:"
msgstr "Directorio de caché"
-#: ../data/gtkpod.glade.h:102
+#: ../data/gtkpod.glade.h:99
msgid "Calendar"
msgstr "Calendario"
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:100
msgid "Calendar sync command:"
msgstr "Programa de sincronización del calendario:"
-#: ../data/gtkpod.glade.h:104
+#: ../data/gtkpod.glade.h:101
msgid "Call automatically when synchronizing iTunesDB"
msgstr "Llamar automáticamente al sincronizar la base de datos iTunes"
-#: ../data/gtkpod.glade.h:105
+#: ../data/gtkpod.glade.h:102
msgid "Category: "
msgstr "CategorÃa: "
-#: ../data/gtkpod.glade.h:106
+#: ../data/gtkpod.glade.h:103
msgid ""
"Change all tracks\n"
"simultaneously"
@@ -452,29 +465,35 @@
"Cambiar todas las pistas\n"
"a la vez"
-#: ../data/gtkpod.glade.h:108
+#: ../data/gtkpod.glade.h:105
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:107
msgid "Check for existing files when copying from iPod."
msgstr "Comprobar la existencia previa de ficheros al copiar del iPod."
-#: ../data/gtkpod.glade.h:109
+#: ../data/gtkpod.glade.h:108
msgid "Command for 'Enqueue':"
msgstr "Programa para 'Encolar':"
-#: ../data/gtkpod.glade.h:110
+#: ../data/gtkpod.glade.h:109
msgid "Command for 'Play now':"
msgstr "Programa para 'Reproducir':"
#. 5
-#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
#: ../src/misc_conversion.c:65
msgid "Composer"
msgstr "Compositor"
-#: ../data/gtkpod.glade.h:112
+#: ../data/gtkpod.glade.h:111
msgid "Confirm before removing tracks from the iPod or repository"
msgstr "Confirmar antes de borrar pistas del iPod o del repositorio"
-#: ../data/gtkpod.glade.h:113
+#: ../data/gtkpod.glade.h:112
msgid ""
"Confirm before removing tracks from the iPod or repository\n"
"when syncing playlists"
@@ -482,55 +501,55 @@
"Confirmar antes de borrar pistas del iPod o del repositorio\n"
"al sincronizar las listas de reproducción"
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:114
msgid "Confirm lists of directories"
msgstr "Confirmar la lista de directorios"
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:115
msgid "Contacts sync command:"
msgstr "Programa de sincronización de contactos:"
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:116
msgid "Containing Displayed Tracks"
msgstr "Conteniendo pistas mostradas"
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:117
msgid "Containing Selected Tracks"
msgstr "Conteniendo pistas seleccionadas"
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:118
msgid "Conversion Progress Display"
msgstr "Mostrar el progreso de la conversión"
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:119
msgid "Cover"
msgstr "Portada"
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:120
msgid "Create New Playlist"
msgstr "Crear nueva lista de reproducción"
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:121
msgid "Create Repository"
msgstr "Crear repositorio"
-#: ../data/gtkpod.glade.h:123
+#: ../data/gtkpod.glade.h:122
msgid "Create _Playlist File"
msgstr "Crear lista de re_producción"
-#: ../data/gtkpod.glade.h:124
+#: ../data/gtkpod.glade.h:123
msgid "Credits"
msgstr "Créditos"
-#: ../data/gtkpod.glade.h:125
+#: ../data/gtkpod.glade.h:124
msgid "Currently only rating is supported."
msgstr "De momento sólo se puede puntuar."
-#: ../data/gtkpod.glade.h:126
+#: ../data/gtkpod.glade.h:125
msgid "Delete repository"
msgstr "Borrar repositorio"
-#: ../data/gtkpod.glade.h:127
+#: ../data/gtkpod.glade.h:126
msgid ""
"Delete tracks that are no longer present from the\n"
"iPod or repository"
@@ -538,19 +557,19 @@
"Borrar del iPod o del repositorio las pistas\n"
" que ya no se encuentran presentes"
-#: ../data/gtkpod.glade.h:129
+#: ../data/gtkpod.glade.h:128
msgid "Deleted tracks"
msgstr "Pistas borradas"
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:129
msgid "Descending"
msgstr "Descendente"
-#: ../data/gtkpod.glade.h:131
+#: ../data/gtkpod.glade.h:130
msgid "Details"
msgstr "Detalles"
-#: ../data/gtkpod.glade.h:133
+#: ../data/gtkpod.glade.h:132
#, no-c-format
msgid ""
"Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -567,7 +586,7 @@
"número de CD: %C, año: %Y, nombre original (necesita el fichero de "
"información extendida): %o, el carácter '%': %%."
-#: ../data/gtkpod.glade.h:135
+#: ../data/gtkpod.glade.h:134
#, no-c-format
msgid ""
"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -585,7 +604,7 @@
"información extendida): %o, lista de reproducción actual: %p, el caracter "
"'%': %%."
-#: ../data/gtkpod.glade.h:137
+#: ../data/gtkpod.glade.h:136
#, no-c-format
msgid ""
"Determines the name of the file with the cover art. You can separate several "
@@ -602,7 +621,7 @@
"de información extendida): %o, nombre de fichero sin extensión: %O, actual "
"lista de reproducción: %p, el carácter '%': %%."
-#: ../data/gtkpod.glade.h:138
+#: ../data/gtkpod.glade.h:137
msgid ""
"Directories to sync with are determined from the filenames of the tracks in "
"the playlist."
@@ -610,62 +629,58 @@
"Los directorios con los que sincronizar son determinados mediante los "
"nombres de fichero de las pistas en la lista de reproducción."
-#: ../data/gtkpod.glade.h:139
-msgid "Dirs"
-msgstr "Directorios"
-
-#: ../data/gtkpod.glade.h:140
+#: ../data/gtkpod.glade.h:138
msgid "Display a list of tracks that could actually be updated."
msgstr "Mostrar las pistas que pueden ser actualizadas."
-#: ../data/gtkpod.glade.h:141
+#: ../data/gtkpod.glade.h:139
msgid "Display a list of tracks that could not be updated."
msgstr "Mostrar las pistas que no pueden ser actualizadas."
-#: ../data/gtkpod.glade.h:142
+#: ../data/gtkpod.glade.h:140
msgid "Display conversion log"
msgstr "Mostar el registro de conversión"
-#: ../data/gtkpod.glade.h:143
+#: ../data/gtkpod.glade.h:141
msgid "Display info about detected duplicates"
msgstr "Mostar información sobre los ficheros duplicados detectados"
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:142
msgid "Display info about non-updated tracks"
msgstr "Mostrar información sobre las pistas no actualizadas"
-#: ../data/gtkpod.glade.h:145
+#: ../data/gtkpod.glade.h:143
msgid "Display info about updated tracks"
msgstr "Mostrar información sobre las pistas actualizadas"
-#: ../data/gtkpod.glade.h:146
+#: ../data/gtkpod.glade.h:144
msgid "Display messages and warnings at startup"
msgstr "Mostrar mensajes y avisos al inicio"
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:145
msgid ""
"Display the list of duplicates that have been detected after adding files."
msgstr ""
"Mostrar la lista de ficheros duplicados que han sido detectados al añadir "
"ficheros."
-#: ../data/gtkpod.glade.h:148
+#: ../data/gtkpod.glade.h:146
msgid "Display toolbar..."
msgstr "Mostrar barra de herramientas..."
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:147
msgid "Display tooltips in main window"
msgstr "Mostrar sugerencias en la ventana principal"
-#: ../data/gtkpod.glade.h:150
+#: ../data/gtkpod.glade.h:148
msgid "Display tooltips in prefs window"
msgstr "Mostrar sugerencias en la ventana de preferencias"
-#: ../data/gtkpod.glade.h:151
+#: ../data/gtkpod.glade.h:149
msgid "Display tracks that match the criteria entered above."
msgstr "Mostrar las pistas que concuerden con el criterio de búsqueda."
-#: ../data/gtkpod.glade.h:152
+#: ../data/gtkpod.glade.h:150
msgid ""
"Displayed\n"
"Tracks"
@@ -673,73 +688,77 @@
"Pistas\n"
"mostradas"
-#: ../data/gtkpod.glade.h:154
+#: ../data/gtkpod.glade.h:152
+#, fuzzy
+msgid "Displayed:"
+msgstr "_Mostrar"
+
+#: ../data/gtkpod.glade.h:153
msgid "Don't allow file duplication"
msgstr "No permitir ficheros duplicados"
-#: ../data/gtkpod.glade.h:155
+#: ../data/gtkpod.glade.h:154
msgid "Don't automatically sync on startup"
msgstr "No sincronizar automáticamente al inicio"
-#: ../data/gtkpod.glade.h:156
-msgid "Download Cover"
-msgstr "Descargar carátula"
-
-#: ../data/gtkpod.glade.h:157
+#: ../data/gtkpod.glade.h:155
msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
msgstr ""
"El reconocimiento de duplicados está basado en una función de resumen sha1 "
"(modificada) sobre el fichero."
-#: ../data/gtkpod.glade.h:158
+#: ../data/gtkpod.glade.h:156
msgid "Edit Repository/iPod Options"
msgstr "Editar opciones del iPod/repositorio"
-#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:659
+#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
msgid "Edit Smart Playlist"
msgstr "Editar lista de reproducción inteligente."
-#: ../data/gtkpod.glade.h:160 ../src/context_menus.c:746
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
msgid "Edit Track Details"
msgstr "Editar detalles de la pista"
-#: ../data/gtkpod.glade.h:161
+#: ../data/gtkpod.glade.h:159
msgid "Edit _Preferences"
msgstr "Editar _preferencias"
-#: ../data/gtkpod.glade.h:162
+#: ../data/gtkpod.glade.h:160
msgid "Effective free space"
msgstr "Espacio disponible"
-#: ../data/gtkpod.glade.h:163
+#: ../data/gtkpod.glade.h:161
msgid "Empty Playlist"
msgstr "Lista de reproducción vacÃa"
-#: ../data/gtkpod.glade.h:164
+#: ../data/gtkpod.glade.h:162
msgid "Exclude file mask(s)"
msgstr "Mascara(s) de exclusión de ficheros"
-#: ../data/gtkpod.glade.h:165
+#: ../data/gtkpod.glade.h:163
+#, fuzzy
+msgid "Export can be continued at a later time if canceled."
+msgstr ""
+"Pulsar boton para cancelar.\n"
+"La exportación podrá continuar más tarde."
+
+#: ../data/gtkpod.glade.h:164
msgid "File size"
msgstr "Tamaño de fichero"
-#: ../data/gtkpod.glade.h:166
+#: ../data/gtkpod.glade.h:165
msgid "File size (deleted)"
msgstr "Tamaño de fichero (borrado)"
-#: ../data/gtkpod.glade.h:167
+#: ../data/gtkpod.glade.h:166
msgid "File size (non-transferred)"
msgstr "Tamaño de fichero (no transferido)"
-#: ../data/gtkpod.glade.h:168
+#: ../data/gtkpod.glade.h:167
msgid "Filename Format: "
msgstr "Formato de nombre de fichero:"
-#: ../data/gtkpod.glade.h:169
-msgid "Files"
-msgstr "Ficheros"
-
-#: ../data/gtkpod.glade.h:170
+#: ../data/gtkpod.glade.h:168
msgid ""
"Find orphan files (files with no track info in DB) and dangling tracks "
"(tracks with no corresponding files on iPod)"
@@ -748,16 +767,16 @@
"de datos) y pistas pendientes (pistas sin sus correspondientes ficheros en "
"el iPod)"
-#: ../data/gtkpod.glade.h:171
+#: ../data/gtkpod.glade.h:169
#, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
msgstr "Intentar primero <i>folder.jpg</i>, después <i><artist>.jpg</i>"
-#: ../data/gtkpod.glade.h:172
+#: ../data/gtkpod.glade.h:170
msgid "Flac with :"
msgstr "Flac con:"
-#: ../data/gtkpod.glade.h:174
+#: ../data/gtkpod.glade.h:172
#, no-c-format
msgid ""
"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
@@ -766,7 +785,7 @@
"Por ejemplo, 'xmms %s' limpiará la actual lista de reproducción, añadirá las "
"pistas seleccionadas y comenzará su reproducción."
-#: ../data/gtkpod.glade.h:176
+#: ../data/gtkpod.glade.h:174
#, no-c-format
msgid ""
"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
@@ -775,16 +794,16 @@
"Por ejemplo, 'xmms -e %s' añadirá las pistas seleccionadas al final de la "
"actual lista de reproducción de xmms."
-#: ../data/gtkpod.glade.h:177 ../src/display_sorttabs.c:2957
+#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
msgid "Genre"
msgstr "Género"
-#: ../data/gtkpod.glade.h:178
+#: ../data/gtkpod.glade.h:176
msgid "Group artists on compilation CDs"
msgstr "Agrupar los artistas en los CDs generados"
-#: ../data/gtkpod.glade.h:179
+#: ../data/gtkpod.glade.h:177
msgid ""
"Highly recommended for faster import when taking advantage of the "
"duplication recognition. Also, having the PC filenames allows writing "
@@ -799,12 +818,12 @@
"de ficheros (cambiar las entradas \"transferred=\" en la copia de seguridad "
"de la base de datos)."
-#: ../data/gtkpod.glade.h:180 ../src/context_menus.c:682
-#: ../src/context_menus.c:700 ../src/context_menus.c:824
+#: ../data/gtkpod.glade.h:178 ../src/context_menus.c:685
+#: ../src/context_menus.c:703 ../src/context_menus.c:820
msgid "I'm sure"
msgstr "Estoy seguro"
-#: ../data/gtkpod.glade.h:181
+#: ../data/gtkpod.glade.h:179
msgid ""
"If available, the local copy of the track is referenced in the playlist. "
"Otherwise the file on the iPod is used."
@@ -812,13 +831,13 @@
"En caso de estar disponible se usará en la lista de reproducción la copia "
"local de la pista, sino se usará el fichero del iPod."
-#: ../data/gtkpod.glade.h:182
+#: ../data/gtkpod.glade.h:180
msgid "If both options are selected, embedded APIC data takes precedence."
msgstr ""
"Si están seleccionadas ambas opciones, la información empotrada APIC tiene "
"preferencia."
-#: ../data/gtkpod.glade.h:183
+#: ../data/gtkpod.glade.h:181
msgid ""
"If checked, sorting will be case sensitive. Please note that case sensitive "
"sorting will not work well with most charsets."
@@ -827,7 +846,7 @@
"Tenga en cuenta que una ordenación de este tipo no funciona bien con todos "
"los juegos de caracteres."
-#: ../data/gtkpod.glade.h:184
+#: ../data/gtkpod.glade.h:182
msgid ""
"If the filename (full path) of an existing track matches that of a track to "
"be added, this option allows you to update the information about the "
@@ -841,12 +860,12 @@
"fichero no ha cambiado y está seleccionada la opción 'No permitir ficheros "
"duplicados' más arriba."
-#: ../data/gtkpod.glade.h:185
+#: ../data/gtkpod.glade.h:183
msgid "If you check this, gtkpod will descend into subdirectories recursively."
msgstr ""
"Con esta opción, gtkpod descenderá recursivamente en los subdirectorios."
-#: ../data/gtkpod.glade.h:186
+#: ../data/gtkpod.glade.h:184
msgid ""
"If you check this, information (cover art and meta information) changed for "
"this track will be copied to all other selected tracks as well. Use with "
@@ -856,7 +875,7 @@
"pista que se modifique será copiada a la vez a todas las otras pistas "
"seleccionadas. Usar con precaución."
-#: ../data/gtkpod.glade.h:187
+#: ../data/gtkpod.glade.h:185
msgid ""
"If you don't select the master playlist automatically, the initial database "
"import is much faster because the display dosn't have to be updated."
@@ -865,7 +884,7 @@
"importación inicial de la base de datos es mucho más rápida porque no es "
"necesario actualizar la pantalla."
-#: ../data/gtkpod.glade.h:188
+#: ../data/gtkpod.glade.h:186
msgid ""
"If you select several tracks in the track list and edit a tag of the first "
"track, the tags in the other tracks are updated as well."
@@ -874,13 +893,13 @@
"en una de las pistas, el atributo también es actualizado en el resto de las "
"pistas seleccionadas."
-#: ../data/gtkpod.glade.h:189
+#: ../data/gtkpod.glade.h:187
msgid "Ignore these words when at the beginning of the following fields:"
msgstr ""
"Ignorar estas palabras cuando se encuentren al principio de los siguientes "
"campos:"
-#: ../data/gtkpod.glade.h:190
+#: ../data/gtkpod.glade.h:188
msgid ""
"In order to save the displayed track order to the iPod choose 'Save "
"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
@@ -889,11 +908,11 @@
"de las pistas mostradas del menú 'Editar' o seleccionar 'Guardar "
"automáticamente' más abajo."
-#: ../data/gtkpod.glade.h:191
+#: ../data/gtkpod.glade.h:189
msgid "Initialize iPod"
msgstr "Inicializar iPod"
-#: ../data/gtkpod.glade.h:192
+#: ../data/gtkpod.glade.h:190
msgid ""
"Insert before\n"
"Insert after"
@@ -901,67 +920,71 @@
"Insertar antes\n"
"Insertar después"
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:192
msgid "Keeps all compilation CDs grouped together in the artists sort tab."
msgstr "Mantiene agrupados en la pestaña de artistas todos los CDs generados."
-#: ../data/gtkpod.glade.h:195
+#: ../data/gtkpod.glade.h:193
msgid "Live _updating"
msgstr "Act_ualización directa"
-#: ../data/gtkpod.glade.h:196
+#: ../data/gtkpod.glade.h:194
msgid "Load iPod(s)"
msgstr "Cargar iPod(s)"
-#: ../data/gtkpod.glade.h:197
+#: ../data/gtkpod.glade.h:195
msgid "Lower Margin"
msgstr "Margen inferior"
-#: ../data/gtkpod.glade.h:198
+#: ../data/gtkpod.glade.h:196
msgid "M4A with :"
msgstr "M4A con:"
-#: ../data/gtkpod.glade.h:199
+#: ../data/gtkpod.glade.h:197
msgid "MP3 with :"
msgstr "MP3 con:"
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:198
msgid "Match al_l of the following"
msgstr "Encontrar todo _lo siguiente"
-#: ../data/gtkpod.glade.h:201
+#: ../data/gtkpod.glade.h:199
msgid "Match an_y of the following"
msgstr "Encontrar algo de lo siguiente (_y)"
-#: ../data/gtkpod.glade.h:202
+#: ../data/gtkpod.glade.h:200
msgid "Match only _checked tracks"
msgstr "Encontrar sólo pistas verifi_cadas"
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:201
msgid "Maximum number of background threads:"
msgstr "Número máximo de hilos en segundo plano."
-#: ../data/gtkpod.glade.h:204
+#: ../data/gtkpod.glade.h:202
msgid "Maximum size of cache directory (in GB):"
msgstr "Tamaño máximo del directorio de cache (en GiB):"
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:203
msgid "Model:"
msgstr "Modelo:"
-#: ../data/gtkpod.glade.h:206 ../src/display_tracks.c:1993
+#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
msgid "Modified"
msgstr "Modificado"
-#: ../data/gtkpod.glade.h:207
+#: ../data/gtkpod.glade.h:205
msgid "Most Recently Played Tracks"
msgstr "Pistas más recientemente escuchadas"
-#: ../data/gtkpod.glade.h:208
+#: ../data/gtkpod.glade.h:206
+msgid "Move selected attributes to the displayed list"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:207
msgid "Music Root:"
msgstr "Directorio raÃz de la música:"
-#: ../data/gtkpod.glade.h:209
+#: ../data/gtkpod.glade.h:208
msgid ""
"Music files can have images embedded in the APIC tag. Currently this is only "
"supported for MP3 files."
@@ -969,31 +992,34 @@
"Los ficheros de música pueden tener imágenes empotradas en la etiqueta APIC. "
"Actualmente sólo soportado para ficheros MP3."
-#: ../data/gtkpod.glade.h:210
+#: ../data/gtkpod.glade.h:209
msgid "Never show this dialogue again"
msgstr "No volver a mostrar este diálogo"
-#: ../data/gtkpod.glade.h:211
-msgid "New PL"
+#: ../data/gtkpod.glade.h:210 ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66 ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93 ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428 ../src/misc_playlist.c:430
+msgid "New Playlist"
msgstr "Nueva lista de reproducción"
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:211
msgid "No lower margin"
msgstr "Sin margen inferior"
-#: ../data/gtkpod.glade.h:213
+#: ../data/gtkpod.glade.h:212
msgid "No upper margin"
msgstr "Sin margen superior"
-#: ../data/gtkpod.glade.h:214
+#: ../data/gtkpod.glade.h:213
msgid "Non-transferred tracks"
msgstr "Pistas no transferidas"
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:214
msgid "None"
msgstr "Ninguno"
-#: ../data/gtkpod.glade.h:216
+#: ../data/gtkpod.glade.h:215
msgid ""
"Normally the charset specified when first importing the track will be used "
"for the filename. If you set this option you can set a different charset "
@@ -1010,7 +1036,7 @@
"iTunes'). Las pistas importadas con versiones previas a la 0.51 no tienen "
"almacenado el juego de caracteres."
-#: ../data/gtkpod.glade.h:217
+#: ../data/gtkpod.glade.h:216
msgid ""
"Normally the charset specified when first importing the track will be used "
"to update the track information. If you have chosen a wrong charset when "
@@ -1028,7 +1054,7 @@
"datos iTunes' mas abajo). Las pistas importadas con versiones previas a la "
"0.51 no tienen almacenado el juego de caracteres."
-#: ../data/gtkpod.glade.h:218
+#: ../data/gtkpod.glade.h:217
msgid ""
"Normally the charset specified when first importing the track will be used "
"to write the tags. If you have chosen a wrong charset when first importing a "
@@ -1048,7 +1074,7 @@
"caracteres almacenado, el juego de caracteres usado será el especificado en "
"el apartado de 'Entrada/Salida'."
-#: ../data/gtkpod.glade.h:219
+#: ../data/gtkpod.glade.h:218
msgid ""
"Normally, if a track is no longer present in the sync directory, it will be "
"removed from the playlist, but not from the iPod or local repository.\n"
@@ -1069,24 +1095,24 @@
"debe estar seleccionada, porque borrar de la lista de reproducción maestra "
"significa borrar del iPod."
-#: ../data/gtkpod.glade.h:222
+#: ../data/gtkpod.glade.h:221
msgid "Notes sync command:"
msgstr "Programa de sincronización de notas:"
-#: ../data/gtkpod.glade.h:223
+#: ../data/gtkpod.glade.h:222
msgid "Number of playlists"
msgstr "Número de listas de reproducción"
-#: ../data/gtkpod.glade.h:224
+#: ../data/gtkpod.glade.h:223
msgid "Number of tracks"
msgstr "Número de pistas"
-#: ../data/gtkpod.glade.h:225
+#: ../data/gtkpod.glade.h:224
msgid "Number of tracks in generated playlists:"
msgstr ""
"Número de pistas en las listas de reproducción generadas automáticamente:"
-#: ../data/gtkpod.glade.h:226
+#: ../data/gtkpod.glade.h:225
msgid ""
"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
@@ -1095,61 +1121,66 @@
"'Mejor puntuadas' y 'Más recientemente reproducidas' generadas "
"automáticamente. Elegir '0' para suprimir el lÃmite."
-#: ../data/gtkpod.glade.h:227
+#: ../data/gtkpod.glade.h:226
msgid "Ogg with :"
msgstr "Ogg con:"
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:227
msgid "On startup automatically sync with playlist directories"
msgstr ""
"Sincronizar automáticamente con los directorios de las listas de "
"reproducción en el inicio."
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:228
msgid "On startup automatically sync with the following directory"
msgstr "Sincronizar automáticamente al inicio con el siguiente directorio"
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:229
msgid "On startup automatically update (Live Playlist)"
msgstr "Actualizar automáticamente en el inicio (listas de reproducción vivas)"
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:230
msgid "One for each Album"
msgstr "Una para cada álbum"
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:231
msgid "One for each Artist"
msgstr "Una para cada artista"
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:232
msgid "One for each Composer"
msgstr "Una para cada compositor"
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:233
msgid "One for each Genre"
msgstr "Una para cada género"
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:234
msgid "One for each Rating"
msgstr "Una para cada puntuación"
-#: ../data/gtkpod.glade.h:236
+#: ../data/gtkpod.glade.h:235
msgid "One for each Year"
msgstr "Una para cada año"
-#: ../data/gtkpod.glade.h:237
+#: ../data/gtkpod.glade.h:236
msgid "Overwrite tags that are already set"
msgstr "Sobreescribir atributos ya establecidos"
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:237
msgid "Password:"
msgstr "Contraseña:"
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:238
msgid "Path:"
msgstr "Ruta:"
-#: ../data/gtkpod.glade.h:240
+#: ../data/gtkpod.glade.h:239
+#, fuzzy
+msgid "Photo Window"
+msgstr "Ventana de _información"
+
+#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
msgid "Play time"
msgstr "Tiempo de reproducción"
@@ -1158,120 +1189,109 @@
msgid "Playcount"
msgstr "Contador"
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:1990
+#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
msgid "Played"
msgstr "Reproducido"
-#: ../data/gtkpod.glade.h:243 ../src/display_spl.c:105
-msgid "Playlist"
-msgstr "Lista de reproducción"
-
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:243
msgid "Playlist name:"
msgstr "Nombre de la lista de reproducción:"
-#: ../data/gtkpod.glade.h:245
+#: ../data/gtkpod.glade.h:244
msgid "Playlist type:"
msgstr "Tipo de lista de reproducción:"
-#: ../data/gtkpod.glade.h:246 ../src/display_playlists.c:2176
+#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
msgid "Playlists"
msgstr "Listas de reproducción"
-#: ../data/gtkpod.glade.h:247
+#: ../data/gtkpod.glade.h:246
msgid "Please refer to the notice below."
msgstr "Leer nota inferior"
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:247
msgid "Please specify a time interval"
msgstr "Especificar un intervalo de tiempo"
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:248
msgid "Preferences"
msgstr "Preferencias"
+#: ../data/gtkpod.glade.h:249
+msgid "Progress Information"
+msgstr "Información del progreso"
+
#: ../data/gtkpod.glade.h:250
-msgid ""
-"Press button to abort.\n"
-"Export can be continued at a later time."
+msgid "R_ename Album"
msgstr ""
-"Pulsar boton para cancelar.\n"
-"La exportación podrá continuar más tarde."
-#: ../data/gtkpod.glade.h:252
-msgid "Previous"
-msgstr "Previo"
-
-#: ../data/gtkpod.glade.h:253
-msgid "Progress Information"
-msgstr "Información del progreso"
-
-#: ../data/gtkpod.glade.h:254
+#: ../data/gtkpod.glade.h:251
msgid "Random Playlist from Displayed Tracks"
msgstr "Lista de reproducción aleatoria de las pistas mostradas"
-#: ../data/gtkpod.glade.h:255
+#: ../data/gtkpod.glade.h:252
msgid "Randomize Current Playlist"
msgstr "Lista de reproducción actual aleatoria"
-#: ../data/gtkpod.glade.h:256 ../src/display_spl.c:101
+#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
#: ../src/misc_conversion.c:78
msgid "Rating"
msgstr "Puntuación"
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:254
msgid "Read coverart from embedded APIC data"
msgstr "Leer carátula de la información empotrada APIC"
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:255
msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
msgstr ""
"Leer atributos del contenido del fichero (p.e: atributos ID3 en ficheros MP3)"
-#: ../data/gtkpod.glade.h:259
-msgid "Remove Cover Art"
-msgstr "Borrar portada"
+#: ../data/gtkpod.glade.h:256
+#, fuzzy
+msgid "Remove selected attributes from the displayed list"
+msgstr "Pistas seleccionadas de la lista de reproducción"
-#: ../data/gtkpod.glade.h:260
+#: ../data/gtkpod.glade.h:257
msgid "Repository Options"
msgstr "Opciones de repositorio"
-#: ../data/gtkpod.glade.h:261
+#: ../data/gtkpod.glade.h:258
msgid "Repository name:"
msgstr "Nombre del repositorio:"
-#: ../data/gtkpod.glade.h:262
+#: ../data/gtkpod.glade.h:259
msgid "Repository type:"
msgstr "Tipo de repositorio:"
-#: ../data/gtkpod.glade.h:263
+#: ../data/gtkpod.glade.h:260
msgid "Root directory of mserv database (trackinfo root)."
msgstr ""
"Directorio raÃz de la base de datos mserv (raÃz de la información sobre las "
"pistas)."
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:261
msgid "Rules"
msgstr "Reglas"
-#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:808
+#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
msgid "Save Changes"
msgstr "Guardar cambios"
-#: ../data/gtkpod.glade.h:266
+#: ../data/gtkpod.glade.h:263
#, fuzzy
msgid "Scrobble Tracks?"
msgstr "Scrobble Tracks?"
-#: ../data/gtkpod.glade.h:267
+#: ../data/gtkpod.glade.h:264
msgid "Select '-1' for no upper limit."
msgstr "Seleccionar '-1' para eliminar el lÃmite superior."
-#: ../data/gtkpod.glade.h:268
+#: ../data/gtkpod.glade.h:265
msgid "Select '0' for no lower limit."
msgstr "Seleccionar '0' para eliminar el lÃmite inferior."
-#: ../data/gtkpod.glade.h:269
+#: ../data/gtkpod.glade.h:266
msgid ""
"Selected\n"
"Playlist"
@@ -1279,7 +1299,7 @@
"Lista de reproducción\n"
"seleccionada"
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:268
msgid ""
"Selected\n"
"Tracks"
@@ -1287,90 +1307,98 @@
"Pistas\n"
"seleccionadas"
+#: ../data/gtkpod.glade.h:270
+#, fuzzy
+msgid "Selected Filter Tab Entry from Database"
+msgstr "Borrar selección de la base de datos"
+
+#: ../data/gtkpod.glade.h:271
+#, fuzzy
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "Borrar selección del disco duro"
+
+#: ../data/gtkpod.glade.h:272
+#, fuzzy
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "Pestaña seleccionada de la lista de reproducción"
+
#: ../data/gtkpod.glade.h:273
-msgid "Selected Tab _Entry"
-msgstr "_Entrada de pestaña seleccionada"
+#, fuzzy
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "Borrar selección del iPod"
#: ../data/gtkpod.glade.h:274
-msgid "Selected _Playlist"
-msgstr "_Lista de reproducción seleccionada"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from Database"
+msgstr ""
+"Lista de reproducción seleccionada incluyendo pistas de la base de datos"
#: ../data/gtkpod.glade.h:275
-msgid "Selected _Tracks"
-msgstr "_Pistas seleccionadas"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "Lista de reproducción seleccionada incluyendo pistas del disco duro"
#: ../data/gtkpod.glade.h:276
-msgid "Selected filter tab entry from database"
-msgstr "Borrar selección de la base de datos"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "Lista de reproducción seleccionada incluyendo pistas del iPod"
#: ../data/gtkpod.glade.h:277
-msgid "Selected filter tab entry from harddisk"
-msgstr "Borrar selección del disco duro"
+msgid "Selected Tab _Entry"
+msgstr "_Entrada de pestaña seleccionada"
#: ../data/gtkpod.glade.h:278
-msgid "Selected filter tab entry from iPod"
-msgstr "Borrar selección del iPod"
+#, fuzzy
+msgid "Selected Tracks from Database"
+msgstr "Pistas seleccionadas de la base de datos"
#: ../data/gtkpod.glade.h:279
-msgid "Selected filter tab entry from playlist"
-msgstr "Pestaña seleccionada de la lista de reproducción"
+#, fuzzy
+msgid "Selected Tracks from Hard Disk"
+msgstr "Pistas seleccionadas del disco duro"
#: ../data/gtkpod.glade.h:280
-msgid "Selected playlist"
-msgstr "Lista de reproducción seleccionada"
+#, fuzzy
+msgid "Selected Tracks from Playlist"
+msgstr "Pistas seleccionadas de la lista de reproducción"
#: ../data/gtkpod.glade.h:281
-msgid "Selected playlist including tracks from database"
-msgstr ""
-"Lista de reproducción seleccionada incluyendo pistas de la base de datos"
+#, fuzzy
+msgid "Selected Tracks from iPod"
+msgstr "Pistas seleccionadas del iPod"
#: ../data/gtkpod.glade.h:282
-msgid "Selected playlist including tracks from harddisk"
-msgstr "Lista de reproducción seleccionada incluyendo pistas del disco duro"
+msgid "Selected _Playlist"
+msgstr "_Lista de reproducción seleccionada"
#: ../data/gtkpod.glade.h:283
-msgid "Selected playlist including tracks from iPod"
-msgstr "Lista de reproducción seleccionada incluyendo pistas del iPod"
+msgid "Selected _Tracks"
+msgstr "_Pistas seleccionadas"
#: ../data/gtkpod.glade.h:284
-msgid "Selected tracks from database"
-msgstr "Pistas seleccionadas de la base de datos"
+msgid "Selected playlist"
+msgstr "Lista de reproducción seleccionada"
#: ../data/gtkpod.glade.h:285
-msgid "Selected tracks from harddisk"
-msgstr "Pistas seleccionadas del disco duro"
-
-#: ../data/gtkpod.glade.h:286
-msgid "Selected tracks from iPod"
-msgstr "Pistas seleccionadas del iPod"
-
-#: ../data/gtkpod.glade.h:287
-msgid "Selected tracks from playlist"
-msgstr "Pistas seleccionadas de la lista de reproducción"
-
-#: ../data/gtkpod.glade.h:288
msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
msgstr ""
"Lista de máscaras de exclusión de ficheros separadas por punto y coma. p.e: "
"'*.mp3'"
-#: ../data/gtkpod.glade.h:289
-msgid "Set Cover Art from File"
+#: ../data/gtkpod.glade.h:286
+#, fuzzy
+msgid "Set Cover Art from _File"
msgstr "Usar fichero para configurar la carátula"
-#: ../data/gtkpod.glade.h:290
-msgid "Set Cover Art from Web"
-msgstr "Usar la web para configurar la carátula"
-
-#: ../data/gtkpod.glade.h:291
+#: ../data/gtkpod.glade.h:287
msgid "Set mountpoint or edit repository options"
msgstr "Configurar el punto de montaje o editar las opciones de repositorio"
-#: ../data/gtkpod.glade.h:292
+#: ../data/gtkpod.glade.h:288
msgid "Set options for Calendar/Contacts/Notes"
msgstr "Configurar opciones para Calendario/Contactos/Notas"
-#: ../data/gtkpod.glade.h:293
+#: ../data/gtkpod.glade.h:289
msgid ""
"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
@@ -1381,7 +1409,7 @@
"normalización serán calculados y escritos a los ficheros .m4a y m4b que no "
"los tengan usando este comando."
-#: ../data/gtkpod.glade.h:294
+#: ../data/gtkpod.glade.h:290
msgid ""
"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for mp3 files "
@@ -1392,15 +1420,15 @@
"normalización serán calculados y escritos a los ficheros mp3 que no los "
"tengan usando este comando."
-#: ../data/gtkpod.glade.h:295
+#: ../data/gtkpod.glade.h:291
msgid "Set this to your last.fm password"
msgstr "Poner aquà la contraseña de last.fm"
-#: ../data/gtkpod.glade.h:296
+#: ../data/gtkpod.glade.h:292
msgid "Set this to your last.fm username"
msgstr "Poner aquà el nombre de usuario de last.fm"
-#: ../data/gtkpod.glade.h:297
+#: ../data/gtkpod.glade.h:293
msgid ""
"Set to 0 to effectively disable caching (a maximum of one track will be "
"cached at a time)."
@@ -1408,7 +1436,7 @@
"Poner a 0 para desactivar el caché (un máximo de una pista será cacheada "
"cada vez)."
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:294
msgid ""
"Set to 0 to use as many background threads as CPUs are available on your "
"system."
@@ -1416,44 +1444,44 @@
"Poner a 0 para usar tantos hilos en segundo plano como CPUs disponibles en "
"el sistema."
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:295
msgid "Show information about problems when accessing mserv"
msgstr "Mostrar errores en el acceso a mserv"
-#: ../data/gtkpod.glade.h:300
+#: ../data/gtkpod.glade.h:296
msgid "Show summary of sync result"
msgstr "Mostrar resumen del resultado de la sincronización"
-#: ../data/gtkpod.glade.h:301 ../src/misc_playlist.c:96
+#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
#: ../src/repository.c:1356
msgid "Smart Playlist"
msgstr "Lista de reproducción inteligente"
-#: ../data/gtkpod.glade.h:302
+#: ../data/gtkpod.glade.h:298
msgid "Sort tracks according to: "
msgstr "Ordenar pistas respecto a:"
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:299
msgid "Sorting Options"
msgstr "Opciones de ordenamiento"
-#: ../data/gtkpod.glade.h:304
+#: ../data/gtkpod.glade.h:300
msgid "Sorting case sensitive"
msgstr "Ordenamiento distinguiendo mayúsculas y minúsculas"
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:301
msgid "Sorttab: "
msgstr "Pestaña:"
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:302
msgid "Sorttabs"
msgstr "Orden de pestañas"
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:303
msgid "Source:"
msgstr "Fuente:"
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:305
#, no-c-format
msgid ""
"Specify exact path including command line options. '%i' will be replaced "
@@ -1463,39 +1491,39 @@
"intérprete de órdenes. '%i' será reemplazado con el directorio de montaje "
"del iPod."
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:306
msgid "Specify interval"
msgstr "Especificar intervalo"
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:307
msgid "Start display automatically"
msgstr "Mostrar automáticamente"
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:308
msgid "Synchronise Contacts, Calendar and Notes"
msgstr "Sincronizar contactos, calendarios y notas"
-#: ../data/gtkpod.glade.h:313
+#: ../data/gtkpod.glade.h:309
msgid "Synchronize All"
msgstr "Sincronizar todo"
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:310
msgid "Synchronize Calendar"
msgstr "Sincronizar calendario"
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:311
msgid "Synchronize Contacts"
msgstr "Sincronizar contactos"
-#: ../data/gtkpod.glade.h:316
+#: ../data/gtkpod.glade.h:312
msgid "Synchronize Notes"
msgstr "Sincronizar notas"
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:313
msgid "Template for info field: "
msgstr "Plantilla para el campo de información:"
-#: ../data/gtkpod.glade.h:318
+#: ../data/gtkpod.glade.h:314
msgid ""
"The local copy of the track is referenced in the playlist. If the track is "
"not available locally, an error message is displayed."
@@ -1503,7 +1531,7 @@
"La copia local de la pista se usará en la lista de reproducción. Si la pista "
"no está disponible localmente, se producirá un error."
-#: ../data/gtkpod.glade.h:319
+#: ../data/gtkpod.glade.h:315
msgid ""
"The output of the background conversion scripts is copied below. Each page "
"of the notebook corresponds to one background thread."
@@ -1511,7 +1539,7 @@
"La salida de los guiones de conversión en segundo plano es mostrada abajo. "
"Cada página del libro de notas corresponde a un hilo en segundo plano."
-#: ../data/gtkpod.glade.h:320
+#: ../data/gtkpod.glade.h:316
msgid ""
"The tags are written to the files on your harddrive and on the iPod (if "
"available)."
@@ -1519,15 +1547,15 @@
"Los atributos son escritos a los ficheros del disco duro y del iPod (si está "
"disponible)."
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:317
msgid "The track on the iPod is referenced in the playlist file."
msgstr "La pista del iPod será usada en la lista de reproducción."
-#: ../data/gtkpod.glade.h:322
+#: ../data/gtkpod.glade.h:318
msgid "This is the same option as in 'Edit/Delete Confirmation'"
msgstr "Esta es la misma opcion que en 'Confirmar Editar/Borrar'"
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:319
msgid ""
"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
"uses unicode to store the tags, so you won't have to worry about charsets "
@@ -1542,20 +1570,20 @@
"en ASCII. Los atributos ID·v2.2/4 también serán escritos si se encuentran "
"previamente en el fichero a escribir."
-#: ../data/gtkpod.glade.h:324
+#: ../data/gtkpod.glade.h:320
msgid "This option will be re-activated when you upgrade gtkpod."
msgstr "Esta opción se reactivará al acualizar gtkpod."
-#: ../data/gtkpod.glade.h:325
+#: ../data/gtkpod.glade.h:321
msgid "Time:"
msgstr "Tiempo:"
-#: ../data/gtkpod.glade.h:326 ../src/display_sorttabs.c:2963
+#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
msgid "Title"
msgstr "TÃtulo"
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:323
msgid ""
"Total\n"
"(iPod)"
@@ -1563,7 +1591,7 @@
"Total\n"
"(iPod)"
-#: ../data/gtkpod.glade.h:329
+#: ../data/gtkpod.glade.h:325
msgid ""
"Total\n"
"(local)"
@@ -1571,15 +1599,15 @@
"Total\n"
"(local)"
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:327
msgid "Tracks"
msgstr "Pistas"
-#: ../data/gtkpod.glade.h:332
+#: ../data/gtkpod.glade.h:328
msgid "Tracks Most Often Listened To"
msgstr "Pistas escuchadas más a menudo"
-#: ../data/gtkpod.glade.h:333
+#: ../data/gtkpod.glade.h:329
msgid ""
"Tracks can be transferred in the background as soon as they are added to an "
"iPod repository. Otherwise they will be transferred when ejecting the "
@@ -1589,23 +1617,23 @@
"repositorio del iPod. En caso contrario serán transferidas al expulsar el "
"iPod, sin hacer modificaciones hasta entonces."
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:330
msgid "Tracks in Selected Tab _Entry"
msgstr "Pistas en la pestaña s_eleccionada"
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:331
msgid "Tracks in Selected _Playlist"
msgstr "Pistas en la lista de re_producción seleccionada"
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:332
msgid "Transfer tracks to the iPod in the background"
msgstr "Transferir pistas al iPod en segundo plano"
-#: ../data/gtkpod.glade.h:337
+#: ../data/gtkpod.glade.h:333
msgid "Translators"
msgstr "Traductores"
-#: ../data/gtkpod.glade.h:338
+#: ../data/gtkpod.glade.h:334
msgid ""
"Try to load contents of all connected iPods. For each iPod a separate "
"repository must be set up."
@@ -1613,53 +1641,58 @@
"Intentar cargar los contenidos de todos los iPods. Debe configurarse un "
"repositorio individual para cada iPod."
-#: ../data/gtkpod.glade.h:339
+#: ../data/gtkpod.glade.h:335
+#, fuzzy
+msgid "Undo _Track"
+msgstr "_Deshacer pista"
+
+#: ../data/gtkpod.glade.h:336
msgid "Update _mserv Data from File"
msgstr "Actualizar datos de _mserv desde fichero"
-#: ../data/gtkpod.glade.h:340
+#: ../data/gtkpod.glade.h:337
msgid "Update/Sync all playlists now"
msgstr "Actualizar/sincronizar ahora todas las listas de reproducción."
-#: ../data/gtkpod.glade.h:341
+#: ../data/gtkpod.glade.h:338
msgid "Update/Sync playlist now"
msgstr "Actualizar/sincronizar ahora las listas de reproducción"
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:339
msgid "Upper margin"
msgstr "Margen superior"
-#: ../data/gtkpod.glade.h:343
+#: ../data/gtkpod.glade.h:340
msgid "Use 'Multi-Edit' also for title field"
msgstr "Usar 'Multi-Edición' también para el campo tÃtulo"
-#: ../data/gtkpod.glade.h:344
+#: ../data/gtkpod.glade.h:341
msgid "Use 'Multi-Edit' for tracks selections"
msgstr "Usar 'Multi-Edición' en la selección de las pistas"
-#: ../data/gtkpod.glade.h:345
+#: ../data/gtkpod.glade.h:342
#, fuzzy
-msgid "Use <i><Album>.jpg</i> in the parent directory"
+msgid "Use <i><Album>.jpg</i> in the parent directory"
msgstr "Usar <i><Ãlbum>.jpg</i> en el directorio padre"
-#: ../data/gtkpod.glade.h:346
+#: ../data/gtkpod.glade.h:343
#, fuzzy
-msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
msgstr "Usar <i><Ãlbum>.jpg</i>, <i><Ãlbum>.png</i>..."
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:344
msgid "Use <i>folder.jpg</i> as cover art."
msgstr "Usar <i>folder.jpg</i> como carátula."
-#: ../data/gtkpod.glade.h:348
+#: ../data/gtkpod.glade.h:345
msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
msgstr "Usar <i>folder.jpg</i>, <i>folder.png</i>..."
-#: ../data/gtkpod.glade.h:349
+#: ../data/gtkpod.glade.h:346
msgid "Use mserv database to fill additional information"
msgstr "Usar la base de datos mserv para rellenar la información adicional"
-#: ../data/gtkpod.glade.h:350
+#: ../data/gtkpod.glade.h:347
msgid ""
"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
"for this filename."
@@ -1668,7 +1701,7 @@
"Sincronizar')\n"
"para este nombre de fichero."
-#: ../data/gtkpod.glade.h:352
+#: ../data/gtkpod.glade.h:349
msgid ""
"Use selected encoding (on the 'General' page)\n"
"when writing tags"
@@ -1676,28 +1709,28 @@
"Usar la condificación seleccionada (en la pestaña 'General')\n"
"al escribir los atributos"
-#: ../data/gtkpod.glade.h:354
+#: ../data/gtkpod.glade.h:351
msgid "Use selected encoding also when updating or syncing tracks"
msgstr ""
"Usar la codificación seleccionada también al actualizar o sincronizar las "
"pistas"
-#: ../data/gtkpod.glade.h:355
+#: ../data/gtkpod.glade.h:352
msgid "Use this template to parse filename for tag information:"
msgstr ""
"Usar esta plantilla para analizar sintácticamente el nombre de fichero para "
"la información de los atributos."
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:353
msgid "Username to be used for mserv database lookup."
msgstr ""
"Nombre de usuario que se usará en la búsqueda de la base de datos mserv."
-#: ../data/gtkpod.glade.h:357
+#: ../data/gtkpod.glade.h:354
msgid "Username:"
msgstr "Nombre de usuario:"
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:355
msgid ""
"Usually you don't want to set the title of several tracks to the same text. "
"This option might avoid unwanted results (especially since there is no "
@@ -1707,11 +1740,16 @@
"texto. Esta opción evita resultados no deseados (especialmente al no "
"disponer de la opción 'deshacer')"
-#: ../data/gtkpod.glade.h:359
+#: ../data/gtkpod.glade.h:356
+#, fuzzy
+msgid "View Full Size"
+msgstr "Ver carátula a tamaño completo"
+
+#: ../data/gtkpod.glade.h:357
msgid "WAV with :"
msgstr "WAV con:"
-#: ../data/gtkpod.glade.h:360
+#: ../data/gtkpod.glade.h:358
msgid ""
"When adding dirs/files, update information of\n"
"existing tracks with identical filenames"
@@ -1719,7 +1757,7 @@
"Actualizar la información de las pistas existentes al añadir directorios/"
"ficheros con el mismo nombre"
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:360
msgid ""
"When copying from iPod no check is performed on whether the destination file "
"exists. Enabling this option will make gtkpod check whether the length of "
@@ -1731,11 +1769,11 @@
"origen. Si son iguales, el fichero será ignorado permitiendo una rápida "
"sincronización de los contenidos del iPod."
-#: ../data/gtkpod.glade.h:363
+#: ../data/gtkpod.glade.h:361
msgid "When syncing playlists"
msgstr "Al sincronizar listas de reproducción"
-#: ../data/gtkpod.glade.h:364
+#: ../data/gtkpod.glade.h:362
msgid ""
"Will show a list of tracks removed and a list of tracks newly added or "
"updated."
@@ -1743,15 +1781,15 @@
"Se mostrará una lista de las pistas eliminadas y una lista de las pistas "
"añadidas o actualizadas."
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:363
msgid "Write ID3 tags to disk when modified in gtkpod"
msgstr "Escribir los atributos ID3 al disco cuando se modifiquen en gtkpod"
-#: ../data/gtkpod.glade.h:366
+#: ../data/gtkpod.glade.h:364
msgid "Write all changes made to the disk and the iPod(s)."
msgstr "Escribir todos los cambios hechos al disco y al/los iPod(s)."
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:365
msgid ""
"Write extended information (PC filenames, SHA1 hashes,\n"
"encoding...). Recommended."
@@ -1759,7 +1797,7 @@
"Escribir la información extendida (nombre de fichero en PC,\n"
"función resumen SHA1, codificación). Recomendado."
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:367
msgid ""
"You can also use the table headers, but this allows you to sort according to "
"a column that is not displayed."
@@ -1767,70 +1805,81 @@
"También se pueden usar las cabeceras de la tabla,pero esto le permite "
"ordenar respecto a columnas no mostradas."
+#: ../data/gtkpod.glade.h:368
+#, fuzzy
+msgid "_About gtkpod"
+msgstr "Sobre gtkpod"
+
+#: ../data/gtkpod.glade.h:369
+#, fuzzy
+msgid "_Add Album"
+msgstr "Ãlbum"
+
#: ../data/gtkpod.glade.h:370
-msgid "_About"
-msgstr "_Sobre"
+msgid "_Add Image"
+msgstr ""
#: ../data/gtkpod.glade.h:371
+#, fuzzy
+msgid "_Album"
+msgstr "Ãlbum"
+
+#: ../data/gtkpod.glade.h:372
msgid "_All Tracks"
msgstr "Tod_as las pistas"
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:373
msgid "_Arrange Sort Tabs"
msgstr "_Ordenar pestañas"
-#: ../data/gtkpod.glade.h:373
+#: ../data/gtkpod.glade.h:374
msgid "_Check iPod's Files"
msgstr "_Comprobar ficheros del iPod"
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:375
msgid "_Conversion Log"
msgstr "Registro de _conversión"
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:376
msgid "_Create Playlists"
msgstr "_Crear lista de reproducción"
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:377
msgid "_Create iPod's Directories"
msgstr "_Crear estructura de directorios del iPod"
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:378
msgid "_Delete"
msgstr "_Borrar"
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:379
msgid "_Display"
msgstr "_Mostrar"
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:380
msgid "_Displayed Tracks"
msgstr "Pistas mostra_das"
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:381
msgid "_Edit"
msgstr "_Editar"
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:382
msgid "_Encoding (ID3, files):"
msgstr "Codificación(ID3, fich_eros):"
-#: ../data/gtkpod.glade.h:382
+#: ../data/gtkpod.glade.h:383
msgid "_Enqueue"
msgstr "_Encolar"
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:384
msgid "_Export Tracks from Database"
msgstr "_Exportar pistas de la base de datos"
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:385
msgid "_File"
msgstr "_Fichero"
-#: ../data/gtkpod.glade.h:385
-msgid "_Find New"
-msgstr "_Encontrar nuevo"
-
#: ../data/gtkpod.glade.h:386
msgid "_General"
msgstr "_General"
@@ -1844,126 +1893,140 @@
msgstr "_Ignorar reglas"
#: ../data/gtkpod.glade.h:389
+msgid "_Image"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:390
msgid "_Info Window"
msgstr "Ventana de _información"
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:391
msgid "_Last.FM"
msgstr "_Last.FM"
-#: ../data/gtkpod.glade.h:391
+#: ../data/gtkpod.glade.h:392
msgid "_Less Sort Tabs"
msgstr "M_enos pestañas"
-#: ../data/gtkpod.glade.h:392
+#: ../data/gtkpod.glade.h:393
msgid "_Limit to"
msgstr "_Limitar a"
-#: ../data/gtkpod.glade.h:393
+#: ../data/gtkpod.glade.h:394
msgid "_Load iPod(s)"
msgstr "Cargar _iPod(s)"
-#: ../data/gtkpod.glade.h:394
+#: ../data/gtkpod.glade.h:395
msgid "_Local"
msgstr "_Local"
-#: ../data/gtkpod.glade.h:395
+#: ../data/gtkpod.glade.h:396
msgid "_M3U"
msgstr "_M3U"
-#: ../data/gtkpod.glade.h:396
+#: ../data/gtkpod.glade.h:397
+msgid "_Misc."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:398
msgid "_More Sort Tabs"
msgstr "_Mas pestañas"
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:399
msgid "_Newly Added Tracks"
msgstr "Pistas añadidas recie_ntemente"
-#: ../data/gtkpod.glade.h:398
+#: ../data/gtkpod.glade.h:400
msgid "_Normalize Volume"
msgstr "_Normalizar el volumen"
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:401
msgid "_Number of sort tabs:"
msgstr "_Número de pestañas:"
-#: ../data/gtkpod.glade.h:400
-msgid "_Other"
-msgstr "_Otro"
-
-#: ../data/gtkpod.glade.h:401
+#: ../data/gtkpod.glade.h:402
msgid "_PLS"
msgstr "_PLS"
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
msgid "_Play Now"
msgstr "Re_producir"
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
msgid "_Podcasts"
msgstr "_Podcasts"
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:405
msgid "_Prefer Local"
msgstr "_Preferir local"
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:406
+#, fuzzy
+msgid "_Remove Album"
+msgstr "Ãlbum"
+
+#: ../data/gtkpod.glade.h:407
+#, fuzzy
+msgid "_Remove Cover Art"
+msgstr "Borrar portada"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:409
msgid "_Save Changes"
msgstr "_Guardar cambios"
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:410
msgid "_Save Displayed Track Order"
msgstr "Guardar orden de pista_s mostrado"
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:411
msgid "_Sorting"
msgstr "_Ordenar"
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:412
msgid "_Synchronize Playlist with Dir(s)"
msgstr "_Sincronizar la lista de reproducción con el/los directorio(s)"
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:413
msgid "_Toolbar"
msgstr "Barra de _Herramientas"
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:414
msgid "_Tools"
msgstr "_Herramientas"
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:415
msgid "_Tooltips"
msgstr "_Sugerencias"
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:416
msgid "_Track Info"
msgstr "_Información de la pista"
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:417
msgid "_Undo All"
msgstr "_Deshacer Todo"
-#: ../data/gtkpod.glade.h:414
-msgid "_Undo Track"
-msgstr "_Deshacer pista"
-
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:418
msgid "_Update Tracks from File"
msgstr "Act_ualizar pistas desde fichero"
-#: ../data/gtkpod.glade.h:416
+#: ../data/gtkpod.glade.h:419
msgid "_Video"
msgstr "_VÃdeo"
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:420
msgid "_View"
msgstr "_Ver"
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:421
msgid "_iPod"
msgstr "_iPod"
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:423
#, no-c-format
msgid ""
"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
@@ -1977,28 +2040,28 @@
"concuerde con el nombre de fichero será usada. Ejemplo: '%a - %A/%T %t.mp3;%"
"t.wav'."
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:424
msgid "folder"
msgstr "folder"
-#: ../data/gtkpod.glade.h:422
+#: ../data/gtkpod.glade.h:425
msgid "folder.jpg"
msgstr "folder.jpg"
-#: ../data/gtkpod.glade.h:424
+#: ../data/gtkpod.glade.h:427
#, no-c-format
msgid "folder.jpg;%a.jpg"
msgstr "folder.jpg;%a.jpg"
-#: ../data/gtkpod.glade.h:425
+#: ../data/gtkpod.glade.h:428
msgid "gtkpod"
msgstr "gtkpod"
-#: ../data/gtkpod.glade.h:426
+#: ../data/gtkpod.glade.h:429
msgid "gtkpod Info"
msgstr "Información sobre gtkpod"
-#: ../data/gtkpod.glade.h:427
+#: ../data/gtkpod.glade.h:430
msgid ""
"gtkpod expects the ID3 tags and the filenames to be in the encoding "
"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
@@ -2009,12 +2072,12 @@
"'Añadir ficheros' y 'Añadir directorios'. El juego de caracteres del sistema "
"es el de la localización en uso."
-#: ../data/gtkpod.glade.h:428
+#: ../data/gtkpod.glade.h:431
msgid "gtkpod options"
msgstr "Opciones de gtkpod"
#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
-#: ../data/gtkpod.glade.h:430
+#: ../data/gtkpod.glade.h:433
msgid ""
"iPod\n"
"Local Repository (Standard)\n"
@@ -2024,34 +2087,53 @@
"Repositorio local (Standard)\n"
"Repositorio local (Podcasts)\n"
-#: ../data/gtkpod.glade.h:434
+#: ../data/gtkpod.glade.h:437
msgid "iPod mountpoint:"
msgstr "Punto de montaje del iPod:"
-#: ../data/gtkpod.glade.h:435
+#: ../data/gtkpod.glade.h:438
msgid "iTunesDB backup:"
msgstr "Copia de seguridad de iTunesDB:"
-#: ../data/gtkpod.glade.h:436
-msgid "label"
-msgstr "etiqueta"
-
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:439
msgid "mserv Root:"
msgstr "Directorio raÃz de mserv:"
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:440
msgid "mserv database lookup will be done for music in this directory."
msgstr "La base de datos mserv buscará música en este directorio."
-#: ../data/gtkpod.glade.h:439 ../src/details.c:1175
+#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
msgid "n/a"
msgstr "no disponible"
-#: ../data/gtkpod.glade.h:440
+#: ../data/gtkpod.glade.h:442
msgid "special_sorttab -- Don't translate!"
msgstr ""
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr ""
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr ""
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+
+#: ../src/autodetection.c:416
+#, fuzzy
+msgid "New iPod"
+msgstr "Nueva lista de reproducción"
+
#: ../src/charset.c:53
msgid "Arabic (IBM-864)"
msgstr "Ãrabe (IBM-864)"
@@ -2271,143 +2353,153 @@
msgid "Confirmation Dialogue"
msgstr "Diálogo de confirmación"
-#: ../src/context_menus.c:359
+#: ../src/context_menus.c:362
#, c-format
msgid "Copied \"%s\" playlist to %s"
msgstr "Copiada la lista de reproducción \"%s\" a %s"
-#: ../src/context_menus.c:398
+#: ../src/context_menus.c:401
#, c-format
msgid "Copied %d track to '%s'"
msgid_plural "Copied %d tracks to '%s'"
msgstr[0] "Copiada %d pista a '%s'"
msgstr[1] "Copiadas %d pistas a '%s'"
-#: ../src/context_menus.c:426
+#: ../src/context_menus.c:429
#, c-format
msgid "Copied '%s' playlist to '%s' in '%s'"
msgstr "Copiada la lista de reproducción '%s' a '%s' en '%s'"
-#: ../src/context_menus.c:459
+#: ../src/context_menus.c:462
#, c-format
msgid "Copied %d track to '%s' in '%s'"
msgid_plural "Copied %d tracks to %s in '%s'"
msgstr[0] "Copiada %d pista a '%s' en '%s'"
msgstr[1] "Copiadas %d pistas a '%s' en '%s'"
-#: ../src/context_menus.c:619 ../src/tools.c:854
+#: ../src/context_menus.c:622 ../src/tools.c:854
msgid "Play Now"
msgstr "Reproducir"
-#: ../src/context_menus.c:625 ../src/tools.c:867
+#: ../src/context_menus.c:628 ../src/tools.c:867
msgid "Enqueue"
msgstr "Encolar"
-#: ../src/context_menus.c:631
+#: ../src/context_menus.c:634
msgid "Copy Tracks to Filesystem"
msgstr "Copiar pistas al sistema de ficheros"
-#: ../src/context_menus.c:638 ../src/file_export.c:1085
+#: ../src/context_menus.c:641 ../src/file_export.c:1085
msgid "Create Playlist File"
msgstr "Crear lista de reproducción"
-#: ../src/context_menus.c:645
+#: ../src/context_menus.c:648
msgid "Create new Playlist"
msgstr "Crear nueva lista de reproducción"
-#: ../src/context_menus.c:652
+#: ../src/context_menus.c:655
msgid "Update Tracks from File"
msgstr "Actualizar pistas desde fichero"
-#: ../src/context_menus.c:666
+#: ../src/context_menus.c:669
msgid "Sync Playlist with Dir(s)"
msgstr "Sincronizar la lista de reproducción con el/los directorio(s)"
-#: ../src/context_menus.c:676
+#: ../src/context_menus.c:679
msgid "Remove All Tracks from iPod"
msgstr "Borrar todas las pistas del iPod"
-#: ../src/context_menus.c:694
+#: ../src/context_menus.c:697
msgid "Remove All Podcasts from iPod"
msgstr "Borrar todos los podcasts del iPod"
-#: ../src/context_menus.c:709
+#: ../src/context_menus.c:712
msgid "Delete Including Tracks"
msgstr "Borrar incluyendo pistas"
-#: ../src/context_menus.c:717
+#: ../src/context_menus.c:720
msgid "Delete But Keep Tracks"
msgstr "Borrar manteniendo las pistas"
-#: ../src/context_menus.c:725
+#: ../src/context_menus.c:728
msgid "Edit iPod Properties"
msgstr "Editar las propiedades del iPod"
-#: ../src/context_menus.c:732
+#: ../src/context_menus.c:735
msgid "Edit Repository Properties"
msgstr "Editar las propiedades del repositorio"
-#: ../src/context_menus.c:739
+#: ../src/context_menus.c:742
msgid "Edit Playlist Properties"
msgstr "Editar propiedades de la lista de reproducción"
-#: ../src/context_menus.c:767
+#: ../src/context_menus.c:770
msgid "View Full Size Artwork"
msgstr "Ver carátula a tamaño completo"
-#: ../src/context_menus.c:774
+#: ../src/context_menus.c:777
msgid "Select Cover From File"
msgstr "Seleccionar carátula desde fichero"
-#: ../src/context_menus.c:781
-msgid "Find Cover on Web"
-msgstr "Encontrar carátula en la web"
-
-#: ../src/context_menus.c:794
+#: ../src/context_menus.c:790
msgid "Load iPod"
msgstr "Cargar iPod"
-#: ../src/context_menus.c:801
+#: ../src/context_menus.c:797
msgid "Eject iPod"
msgstr "Expulsar iPod"
-#: ../src/context_menus.c:818
+#: ../src/context_menus.c:814
msgid "Remove All Tracks from Database"
msgstr "Borrar todas las pistas de la base de datos"
-#: ../src/context_menus.c:833
+#: ../src/context_menus.c:829
msgid "Delete Including Tracks (Harddisk)"
msgstr "Borrar incluyendo pistas (disco duro)"
-#: ../src/context_menus.c:841
+#: ../src/context_menus.c:837
msgid "Delete Including Tracks (Database)"
msgstr "Borrar incluyendo pistas (base de datos)"
-#: ../src/context_menus.c:849
+#: ../src/context_menus.c:845
msgid "Delete From iPod"
msgstr "Borrar del iPod"
-#: ../src/context_menus.c:857
+#: ../src/context_menus.c:853
msgid "Delete From Playlist"
msgstr "Borrar de la lista de reproducción"
-#: ../src/context_menus.c:865
+#: ../src/context_menus.c:861
msgid "Delete From Harddisk"
msgstr "Borrar del disco duro"
-#: ../src/context_menus.c:873
+#: ../src/context_menus.c:869
msgid "Delete From Database"
msgstr "Borrar de la base de datos"
-#: ../src/context_menus.c:881
+#: ../src/context_menus.c:877
msgid "Alphabetize"
msgstr "Orden alfabético"
-#: ../src/context_menus.c:949 ../src/context_menus.c:998
+#: ../src/context_menus.c:895
+#, fuzzy
+msgid "Remove Album"
+msgstr "Ãlbum"
+
+#: ../src/context_menus.c:905
+#, fuzzy
+msgid "Remove Photo"
+msgstr "Borrar portada"
+
+#: ../src/context_menus.c:922
+msgid "Rename Album"
+msgstr ""
+
+#: ../src/context_menus.c:981 ../src/context_menus.c:1030
msgid "Copy selected playlist to..."
msgstr "Copiar la lista de reproducción seleccionada a..."
-#: ../src/context_menus.c:1051
+#: ../src/context_menus.c:1083
msgid "Copy selected track(s) to..."
msgstr "Copiar las pistas seleccionadas a..."
@@ -2416,47 +2508,109 @@
msgid "Date format error: unrecognized character: '%s'\n"
msgstr "Error en el formato de la fecha: carácter desconocido:'%s'\n"
-#: ../src/details.c:700
+#: ../src/details.c:82
+#, fuzzy
+msgid "Audio/Video"
+msgstr "VÃdeo musical"
+
+#: ../src/details.c:83
+msgid "Audio"
+msgstr ""
+
+#: ../src/details.c:84
+#, fuzzy
+msgid "Video"
+msgstr "_VÃdeo"
+
+#: ../src/details.c:85
+#, fuzzy
+msgid "Podcast"
+msgstr "Podcasts"
+
+#: ../src/details.c:86
+#, fuzzy
+msgid "Video Podcast"
+msgstr "Podcasts"
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr ""
+
+#: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
+msgid "Music Video"
+msgstr "VÃdeo musical"
+
+#: ../src/details.c:89 ../src/display_spl.c:107 ../src/display_spl.c:210
+#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
+#, fuzzy
+msgid "TV Show"
+msgstr "TV Show"
+
+#: ../src/details.c:90
+#, fuzzy
+msgid "TV Show & Music Video"
+msgstr "VÃdeo musical"
+
+#: ../src/details.c:836
#, c-format
msgid "%s (image data corrupted or unreadable)"
msgstr "%s (imagen corrupta o no legible)"
-#: ../src/details.c:1246
+#: ../src/details.c:973
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr ""
+
+#: ../src/details.c:1418
msgid "<b>n/a</b>"
msgstr "<b>no disponible</b>"
-#: ../src/display.c:647
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr ""
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr ""
+
+#: ../src/display.c:490
+#, c-format
+msgid "<b>Image Dimensions: %s</b>"
+msgstr ""
+
+#: ../src/display.c:744
msgid "Edit selected entry of which sort tab?"
msgstr "¿De qué pestaña desea editar la entrada seleccionada?"
#. no entry selected
-#: ../src/display.c:654 ../src/misc_confirm.c:435 ../src/misc_track.c:2059
+#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
msgid "No entry selected."
msgstr "No se ha seleccionado ninguna entrada"
-#: ../src/display.c:813 ../src/display.c:1133 ../src/display.c:1189
-#: ../src/display.c:1243 ../src/display.c:1298 ../src/display.c:1559
+#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
+#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
#, c-format
msgid "No entry selected in Sort Tab %d"
msgstr "No se ha seleccionado ninguna entrada en la pestaña %d"
-#: ../src/display.c:852
+#: ../src/display.c:949
msgid "Remove entry of which sort tab from database?"
msgstr "¿De qué pestaña desea borrar su entrada en la base de datos?"
-#: ../src/display.c:860
+#: ../src/display.c:957
msgid "Remove tracks in selected entry of which filter tab from the iPod?"
msgstr "¿De qué pestaña desea borrar la entrada en el iPod?"
-#: ../src/display.c:882
+#: ../src/display.c:979
msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
msgstr "¿De qué pestaña desea borrar la entrada en el disco duro?"
-#: ../src/display.c:912
+#: ../src/display.c:1009
msgid "Remove tracks in selected entry of which filter tab from playlist?"
msgstr "¿De qué pestaña desea borrar la entrada en la lista de reproducción?"
-#: ../src/display.c:939 ../src/display.c:977
+#: ../src/display.c:1036 ../src/display.c:1074
#, c-format
msgid ""
"iPod at '%s' is not loaded.\n"
@@ -2465,78 +2619,172 @@
"El iPod de '%s' no está cargado.\n"
"Por favor, cargar primero."
-#: ../src/display.c:1014 ../src/display.c:1041
+#: ../src/display.c:1111 ../src/display.c:1138
msgid "Update selected entry of which sort tab?"
msgstr "¿De qué pestaña desea actualizar la entrada seleccionada?"
-#: ../src/display.c:1127
+#: ../src/display.c:1224
msgid "Export selected entry of which sort tab?"
msgstr "¿De qué pestaña desea exportar su selección?"
-#: ../src/display.c:1183
+#: ../src/display.c:1280
msgid "Create playlist file from selected entry of which sort tab?"
msgstr "¿De qué pestaña desea crear la lista de reproducción con su selección?"
-#: ../src/display.c:1237
+#: ../src/display.c:1334
msgid "Play tracks in selected entry of which sort tab?"
msgstr "¿De qué pestaña desea reproducir las pistas seleccionadas?"
-#: ../src/display.c:1292
+#: ../src/display.c:1389
msgid "Enqueue tracks in selected entry of which sort tab?"
msgstr "¿De qué pestaña desea encolar las pistas seleccionadas?"
-#: ../src/display.c:1549
+#: ../src/display.c:1646
msgid "Normalize tracks in selected entry of which sort tab?"
msgstr ""
"¿De qué pestaña desea normalizar el volumen de las pistas seleccionadas?"
-#: ../src/display_coverart.c:1714
+#: ../src/display_coverart.c:1713
msgid "Failed to remove the album from the album hash store."
msgstr "Fallo al borrar el álbum de la lista de resúmenes de álbumes."
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr ""
+
#: ../src/display_itdb.c:376
#, c-format
msgid "Failed to set cover art: '%s'\n"
msgstr "Error al configurar la carátula: '%s'\n"
-#: ../src/display_itdb.c:851 ../src/display_itdb.c:984
+#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
msgid "Local"
msgstr "Local"
#. add podcast playlist
-#: ../src/display_itdb.c:859 ../src/display_itdb.c:982
-#: ../src/display_itdb.c:1010
+#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
+#: ../src/display_itdb.c:1025
msgid "Podcasts"
msgstr "Podcasts"
-#: ../src/display_itdb.c:868 ../src/display_itdb.c:986
+#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
#: ../src/repository.c:1186
msgid "iPod"
msgstr "iPod"
-#: ../src/display_itdb.c:1069
+#: ../src/display_itdb.c:1084
#, c-format
msgid "Increased playcount for '%s'"
msgstr "Contador incrementado en '%s'"
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr ""
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr ""
+
+#: ../src/display_photo.c:238
+msgid "Could not access the iPod's photo database."
+msgstr ""
+
+#: ../src/display_photo.c:441
+#, fuzzy
+msgid "Photo Albums"
+msgstr "Ãlbum"
+
+#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+msgid "<Unnamed>"
+msgstr ""
+
+#: ../src/display_photo.c:939
+msgid "The Photo Library album cannot be removed"
+msgstr ""
+
+#: ../src/display_photo.c:961
+#, fuzzy
+msgid "Do you want to remove the album's photos too?"
+msgstr "¿Desea realmente borrar todos los podcasts del iPod?"
+
+#: ../src/display_photo.c:967
+msgid "Yes. Do Not Display Again"
+msgstr ""
+
+#: ../src/display_photo.c:1038
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr ""
+
+#: ../src/display_photo.c:1053
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr ""
+
+#: ../src/display_photo.c:1128
+msgid "New Photo Album Name"
+msgstr ""
+
+#: ../src/display_photo.c:1129
+#, fuzzy
+msgid "Please enter a new name for the photo album"
+msgstr "Introducir el nombre de la nueva lista de reproducción"
+
+#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+msgid "An album with that name already exists."
+msgstr ""
+
+#: ../src/display_photo.c:1210
+#, fuzzy
+msgid "New Photo Album"
+msgstr "Ãlbum"
+
+#: ../src/display_photo.c:1211
+#, fuzzy
+msgid "Please enter a name for the new photo album"
+msgstr "Introducir el nombre de la nueva lista de reproducción"
+
+#: ../src/display_photo.c:1232
+msgid "The new album failed to be created."
+msgstr ""
+
+#: ../src/display_photo.c:1256
+#, fuzzy
+msgid "Add Image to iPod"
+msgstr "Añadir nuevo repositorio/iPod"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1311
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr ""
+
+#: ../src/display_photo.c:1699
+#, c-format
+msgid "<No members>\n"
+msgstr ""
+
#. give a notice on the statusbar -- otherwise the user
#. * will never know why the drag is not possible
-#: ../src/display_playlists.c:500 ../src/display_playlists.c:542
+#: ../src/display_playlists.c:516 ../src/display_playlists.c:558
msgid "Error: drag from iPod not possible in offline mode."
msgstr "Error: arrastrar desde el iPod no es posible en el modo desconectado"
-#: ../src/display_playlists.c:569 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
#, c-format
msgid "Copied one track"
msgid_plural "Copied %d tracks"
msgstr[0] "Copiada una pista"
msgstr[1] "Copiadas %d pistas"
-#: ../src/display_playlists.c:849 ../src/display_playlists.c:861
+#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
msgid "Can't reorder sorted treeview."
msgstr "No se puede reordenar una vista en árbol ya ordenada"
-#: ../src/display_playlists.c:938
+#: ../src/display_playlists.c:954
#, c-format
msgid ""
"This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2546,6 +2794,14 @@
"Este tipo DND (%d) todavÃa no está soportado. Si piensa que implementarlo "
"puede ser útil, por favor, contacte con el autor.\n"
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr ""
+
#: ../src/display_sorttabs.c:473
msgid "'Played' condition ignored because of error."
msgstr "Ignorada la condición de «reproducido» debido a un error"
@@ -2558,32 +2814,32 @@
msgid "'Added' condition ignored because of error."
msgstr "Ignorada la condición de «añadido» debido a un error"
-#: ../src/display_sorttabs.c:1563 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
msgid "All"
msgstr "Todo"
-#: ../src/display_sorttabs.c:1589
+#: ../src/display_sorttabs.c:1588
msgid "Compilations"
msgstr "Compilaciones"
-#: ../src/display_sorttabs.c:2960
+#: ../src/display_sorttabs.c:2988
msgid "Comp."
msgstr "Comp."
-#: ../src/display_sorttabs.c:2966 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2002 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
msgid "Year"
msgstr "Año"
-#: ../src/display_sorttabs.c:2969
+#: ../src/display_sorttabs.c:2997
msgid "Special"
msgstr "Especial"
-#: ../src/display_sorttabs.c:3230
+#: ../src/display_sorttabs.c:3245
msgid "Last Played"
msgstr "Última reproducción"
-#: ../src/display_sorttabs.c:3231
+#: ../src/display_sorttabs.c:3246
msgid "Last Modified"
msgstr "Última modificación"
@@ -2607,7 +2863,7 @@
msgid "Hz"
msgstr "Hz"
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:777
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
msgid "MB"
msgstr "MB"
@@ -2640,10 +2896,6 @@
msgid "Size"
msgstr "Tamaño"
-#: ../src/display_spl.c:94 ../src/display_tracks.c:1984
-msgid "Time"
-msgstr "Duración"
-
#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
msgid "Comment"
msgstr "Comentario"
@@ -2672,17 +2924,15 @@
msgid "Grouping"
msgstr "Agrupando"
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "Lista de reproducción"
+
#: ../src/display_spl.c:106
#, fuzzy
msgid "Video Kind"
msgstr "Video Kind"
-#: ../src/display_spl.c:107 ../src/display_spl.c:210 ../src/display_spl.c:219
-#: ../src/misc_conversion.c:101
-#, fuzzy
-msgid "TV Show"
-msgstr "TV Show"
-
#: ../src/display_spl.c:108
msgid "Season number"
msgstr "Número de temporada"
@@ -2777,7 +3027,7 @@
msgid "hours"
msgstr "horas"
-#: ../src/display_spl.c:182 ../src/info.c:777
+#: ../src/display_spl.c:182 ../src/info.c:780
msgid "GB"
msgstr "GiB"
@@ -2837,29 +3087,18 @@
msgid "Movie"
msgstr "PelÃcula"
-#: ../src/display_spl.c:209 ../src/display_spl.c:218
-msgid "Music Video"
-msgstr "VÃdeo musical"
-
-#: ../src/display_spl.c:1162 ../src/display_spl.c:1177
+#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
msgid "to"
msgstr "a"
-#: ../src/display_spl.c:1455
+#: ../src/display_spl.c:1485
msgid "-"
msgstr "-"
-#: ../src/display_spl.c:1470
+#: ../src/display_spl.c:1500
msgid "+"
msgstr "+"
-#: ../src/display_spl.c:1689 ../src/misc_playlist.c:66
-#: ../src/misc_playlist.c:68 ../src/misc_playlist.c:93
-#: ../src/misc_playlist.c:95 ../src/misc_playlist.c:428
-#: ../src/misc_playlist.c:430
-msgid "New Playlist"
-msgstr "Nueva lista de reproducción"
-
#: ../src/display_tracks.c:281
#, c-format
msgid "Moved one track"
@@ -2867,7 +3106,7 @@
msgstr[0] "Movida una pista"
msgstr[1] "Movidas %d pistas"
-#: ../src/display_tracks.c:1717
+#: ../src/display_tracks.c:1810
#, c-format
msgid ""
"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -2880,46 +3119,66 @@
"volver al estado anterior.\n"
"\n"
-#: ../src/display_tracks.c:1962
+#: ../src/display_tracks.c:2069
msgid "Rtng"
msgstr "Puntuación"
-#: ../src/display_tracks.c:1965
+#: ../src/display_tracks.c:2072
msgid "#"
msgstr "#"
-#: ../src/display_tracks.c:1968
+#: ../src/display_tracks.c:2075
msgid "CD"
msgstr "CD"
-#: ../src/display_tracks.c:1971
+#: ../src/display_tracks.c:2078
msgid "ID"
msgstr "ID"
-#: ../src/display_tracks.c:1974
+#: ../src/display_tracks.c:2081
msgid "Trnsfrd"
msgstr "Transferido"
-#: ../src/display_tracks.c:1978
+#: ../src/display_tracks.c:2085
msgid "Cmpl"
msgstr "Cmpl"
-#: ../src/display_tracks.c:1987
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "Duración"
+
+#: ../src/display_tracks.c:2094
msgid "Plycnt"
msgstr "Contador"
-#: ../src/display_tracks.c:1999
+#: ../src/display_tracks.c:2106
msgid "Released"
msgstr "Liberado"
-#: ../src/display_tracks.c:2005
+#: ../src/display_tracks.c:2112
msgid "Vol."
msgstr "Vol."
-#: ../src/display_tracks.c:2008
+#: ../src/display_tracks.c:2115
msgid "Sndchk."
msgstr "Control de sonido"
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr ""
+
+#: ../src/fetchcover.c:371
+#, c-format
+msgid ""
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
+"\n"
+"- Clicking Yes will overwrite the existing file, possibly associating\n"
+" other music files in the same directory with this coverart file.\n"
+"- Clicking No will save the file with a unique file name.\n"
+"- Clicking Cancel will abort the fetchcover operation."
+msgstr ""
+
#: ../src/file.c:236
#, c-format
msgid ""
@@ -2938,14 +3197,11 @@
"'%s' no es una lista de reproducción conocida.\n"
"\n"
-#: ../src/file.c:283
+#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/wavfile.c:107
#, c-format
-msgid ""
-"Cannot open '%s' for reading.\n"
-"\n"
-msgstr ""
-"No se puede leer '%s'.\n"
-"\n"
+msgid "Could not open '%s' for reading.\n"
+msgstr "No se ha podido abrir '%s' para su lectura.\n"
#: ../src/file.c:369
#, c-format
@@ -2963,41 +3219,41 @@
msgid "Unknown token '%s' in template '%s'\n"
msgstr "Testigo '%s' desconocido en la plantilla '%s'\n"
-#: ../src/file.c:890
+#: ../src/file.c:923
#, c-format
msgid "Local filename not valid (%s)"
msgstr "Nombre de fichero local no válido (%s)"
-#: ../src/file.c:949
+#: ../src/file.c:982
#, c-format
msgid "No information found for user '%s' in '%s'"
msgstr "No se ha encontrado información para el usuario '%s' en '%s'"
-#: ../src/file.c:958
+#: ../src/file.c:991
#, c-format
msgid "mserv data file (%s) not available for track (%s)"
msgstr "fichero de datos mserv (%s) no disponible para la pista (%s)"
-#: ../src/file.c:966
+#: ../src/file.c:999
#, c-format
msgid "Track (%s) not in mserv music root directory (%s)"
msgstr "La pista (%s) no está en el directorio raÃz mserv (%s)"
-#: ../src/file.c:1090
+#: ../src/file.c:1123
#, c-format
msgid ""
"The following track could not be processed (file does not exist): '%s'\n"
msgstr ""
"La siguiente pista no pudo ser procesada (no existe el fichero): '%s'\n"
-#: ../src/file.c:1169
+#: ../src/file.c:1209
#, c-format
msgid "The following track could not be processed (filetype unknown): '%s'\n"
msgstr ""
"La siguiente pista no pudo ser procesada (tipo de fichero desconocido): '%"
"s'\n"
-#: ../src/file.c:1262
+#: ../src/file.c:1307
#, c-format
msgid ""
"The following track could not be processed (filetype is known but analysis "
@@ -3006,33 +3262,33 @@
"La siguiente pista no pudo ser procesada (se ha reconocido el tipo de "
"fichero, pero ha fallado el análisis): '%s'\n"
-#: ../src/file.c:1292 ../src/file.c:1346
+#: ../src/file.c:1337 ../src/file.c:1391
msgid "Nothing to update"
msgstr "Nada que actualizar"
-#: ../src/file.c:1313
+#: ../src/file.c:1358
#, c-format
msgid "Updating %s"
msgstr "Actualizando %s"
-#: ../src/file.c:1327
+#: ../src/file.c:1372
msgid "Updated selected tracks with info from file."
msgstr "Actualizadas las pistas seleccionadas con la información del fichero."
-#: ../src/file.c:1361
+#: ../src/file.c:1406
#, c-format
msgid "Retrieving mserv data %s"
msgstr "Recibiendo datos mserv %s"
-#: ../src/file.c:1366
+#: ../src/file.c:1411
msgid "no filename available"
msgstr "Ningún nombre de fichero disponible"
-#: ../src/file.c:1371
+#: ../src/file.c:1416
msgid "Updated selected tracks with data from mserv."
msgstr "Actualizadas las pistas seleccionadas con la información de mserv"
-#: ../src/file.c:1392
+#: ../src/file.c:1437
#, c-format
msgid "The following track could not be updated"
msgid_plural "The following %d tracks could not be updated"
@@ -3041,11 +3297,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1398
+#: ../src/file.c:1443
msgid "Failed Track Update"
msgstr "Error al actualizar la pista"
-#: ../src/file.c:1456
+#: ../src/file.c:1501
#, c-format
msgid "The following track has been updated"
msgid_plural "The following %d tracks have been updated"
@@ -3054,11 +3310,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1462
+#: ../src/file.c:1507
msgid "Successful Track Update"
msgstr "Actualización exitosa de la pista"
-#: ../src/file.c:1521
+#: ../src/file.c:1566
#, c-format
msgid "No mserv information could be retrieved for the following track"
msgid_plural ""
@@ -3069,49 +3325,50 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1527
+#: ../src/file.c:1572
msgid "mserv data retrieval problem"
msgstr "Problema al recoger datos mserv"
-#: ../src/file.c:1616
+#: ../src/file.c:1661
msgid "no local filename available, file on the iPod will be used instead"
msgstr ""
"No está disponible el nombre local, se usará el nombre del iPod en su lugar"
-#: ../src/file.c:1622
+#: ../src/file.c:1667
msgid "no local filename available and copy on iPod cannot be found"
msgstr ""
"No está disponible el nombre local y no se encuentra la copia en el iPod"
-#: ../src/file.c:1626 ../src/file.c:1644
+#: ../src/file.c:1671 ../src/file.c:1689
msgid "no local filename available"
msgstr "No se encuentra disponible el nombre de fichero local"
-#: ../src/file.c:1634
+#: ../src/file.c:1679
msgid "local file could not be found, file on the iPod will be used instead"
msgstr ""
"No se encuentra el fichero local, se usará el fichero del iPod en su lugar"
-#: ../src/file.c:1640
+#: ../src/file.c:1685
msgid "local file as well as copy on the iPod cannot be found"
msgstr "No se encuentran ni el fichero local ni la copia del iPod"
#. update not successful -- log this track for later display
-#: ../src/file.c:1728
-msgid "update failed (format no supported?)"
+#: ../src/file.c:1788
+#, fuzzy
+msgid "update failed (format not supported?)"
msgstr "Error al actualizar (¿formato no soportado?)"
-#: ../src/file.c:1813
+#: ../src/file.c:1873 ../src/misc_playlist.c:916
#, c-format
msgid "Processing '%s'..."
msgstr "Procesando '%s'..."
-#: ../src/file.c:1819
-#, c-format
-msgid "File skipped. match exclude masks: '%s'\n"
-msgstr "Fichero ignorado. Concuerda con máscaras de exclusión: '%s'\n"
+#: ../src/file.c:1879
+#, fuzzy, c-format
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "Ignorando '%s' porque es un directorio.\n"
-#: ../src/file.c:1939 ../src/misc_track.c:1694 ../src/misc_track.c:1799
+#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
#, c-format
msgid ""
"Podcast already present: '%s'\n"
@@ -3120,7 +3377,7 @@
"Podcast ya almacenado: '%s'\n"
"\n"
-#: ../src/file.c:2004
+#: ../src/file.c:2064
#, c-format
msgid ""
"Writing to video files not yet supported (%s).\n"
@@ -3129,35 +3386,35 @@
"Escribir a ficheros de video no está todavÃa soportado (%s). \n"
"\n"
-#: ../src/file.c:2056 ../src/file.c:2070
+#: ../src/file.c:2116 ../src/file.c:2130
#, c-format
msgid "Couldn't change tags of file: %s\n"
msgstr "No se pueden modificar las etiquetas del fichero: %s\n"
-#: ../src/file.c:2172
+#: ../src/file.c:2232
#, c-format
msgid "Could not open '%s' for reading and writing.\n"
msgstr "No se puede abrir '%s' para lectura escritura.\n"
-#: ../src/file.c:2179
+#: ../src/file.c:2239
#, c-format
msgid "Could not obtain lock on '%s'.\n"
msgstr "No se pudo bloquear '%s'.\n"
#. error!
-#: ../src/file.c:2196 ../src/file.c:2205 ../src/file.c:2216 ../src/file.c:2226
+#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
#, c-format
msgid "Malformed line in '%s': %s\n"
msgstr "Linea incorrecta en '%s':%s\n"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:2255
+#: ../src/file.c:2315
msgid "Remove offline playcounts?"
msgstr "¿Borrar cuenta reproducciones no en linea?"
#. title
-#: ../src/file.c:2256
+#: ../src/file.c:2316
msgid ""
"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
"remove them from the offline playcount file, 'Cancel' to keep them."
@@ -3166,12 +3423,12 @@
"la base de datos de iTunes. Pulsa «Aceptar» para borrarlas del contador de "
"modo desconectado, o «Cancelar» para mantenerlas."
-#: ../src/file.c:2273
+#: ../src/file.c:2333
#, c-format
msgid "Error writing to '%s'.\n"
msgstr "Error al escribir a '%s'.\n"
-#: ../src/file.c:2330 ../src/tools.c:271
+#: ../src/file.c:2390 ../src/tools.c:270
#, c-format
msgid ""
"Normalization failed: file type not supported (%s).\n"
@@ -3180,7 +3437,7 @@
"Error al normalizar: tipo de fichero no soportado (%s)\n"
"\n"
-#: ../src/file.c:2346 ../src/tools.c:288
+#: ../src/file.c:2406 ../src/tools.c:287
#, c-format
msgid ""
"Normalization failed: file not available (%s).\n"
@@ -3206,25 +3463,25 @@
msgid "Active threads: %d. Scheduled tracks: %d."
msgstr "Hilos activos: %d. Pistas planificadas: %d."
-#: ../src/file_convert.c:1061
+#: ../src/file_convert.c:1071
#, c-format
msgid "Original filename not available for '%s.'\n"
msgstr "Nombre de fichero original no disponible para '%s'.\n"
-#: ../src/file_convert.c:1076
+#: ../src/file_convert.c:1086
#, c-format
msgid "Filename '%s' is no longer valid for '%s'.\n"
msgstr "El nombre de fichero '%s' ha dejado de ser válido para '%s'.\n"
-#: ../src/file_convert.c:1127
+#: ../src/file_convert.c:1137
msgid "Ogg Vorbis"
msgstr "Ogg Vorbis"
-#: ../src/file_convert.c:1133
+#: ../src/file_convert.c:1143
msgid "FLAC"
msgstr "FLAC"
-#: ../src/file_convert.c:1188
+#: ../src/file_convert.c:1198
#, c-format
msgid ""
"Files of type '%s' are not supported by the iPod. Please go to the "
@@ -3234,17 +3491,17 @@
"Los ficheros del tipo '%s' no están soportados por el iPod. Por favor, vaya "
"a preferencias para especificar un guión de conversión adecuado para '%s'.\n"
-#: ../src/file_convert.c:1274
+#: ../src/file_convert.c:1284
msgid "No information available"
msgstr "Información no disponible"
-#: ../src/file_convert.c:1313
+#: ../src/file_convert.c:1323
#, c-format
msgid "Could not create '%s'. Filetype conversion will not work.\n"
msgstr ""
"No se ha podido crear '%s'. La conversión de tipo de fichero no funcionará.\n"
-#: ../src/file_convert.c:1631 ../src/file_convert.c:3040
+#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
#, c-format
msgid ""
"Transfer of '%s' failed. %s\n"
@@ -3253,7 +3510,7 @@
"Ha fallado la transferencia de '%s'. %s\n"
"\n"
-#: ../src/file_convert.c:2035 ../src/file_convert.c:2313
+#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
#, c-format
msgid ""
"Conversion of '%s' failed: '%s'.\n"
@@ -3262,7 +3519,7 @@
"Ha fallado la conversión de '%s': '%s'\n"
"\n"
-#: ../src/file_convert.c:2050
+#: ../src/file_convert.c:2062
#, c-format
msgid ""
"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
@@ -3272,10 +3529,10 @@
"d.\n"
"\n"
-#: ../src/file_convert.c:2079
-#, c-format
+#: ../src/file_convert.c:2091
+#, fuzzy, c-format
msgid ""
-"Conversion of '%s' failed: '%s %s' did not return filename extension as "
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
"expected.\n"
"\n"
msgstr ""
@@ -3283,17 +3540,17 @@
"fichero como era esperado.\n"
"\n"
-#: ../src/file_convert.c:2155
-#, c-format
+#: ../src/file_convert.c:2167
+#, fuzzy, c-format
msgid ""
-"Covnersion of '%s' failed: Could not access original file '%s' (%s).\n"
+"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
"\n"
msgstr ""
"Ha fallado la conversión de '%s': No se ha podido acceder al fichero "
"original '%s' (%s).\n"
"\n"
-#: ../src/file_convert.c:2210
+#: ../src/file_convert.c:2222
#, c-format
msgid ""
"Conversion of '%s' failed: Could not create directory '%s'.\n"
@@ -3302,7 +3559,7 @@
"Ha fallado la extensión de '%s': No se ha podido crear el directorio '%s'.\n"
"\n"
-#: ../src/file_convert.c:2344
+#: ../src/file_convert.c:2356
#, c-format
msgid ""
"Conversion of '%s' failed: '%s' returned exit status %d.\n"
@@ -3311,7 +3568,7 @@
"Ha fallado la conversión de '%s': %s ha devuelto el estado de salida %d.\n"
"\n"
-#: ../src/file_convert.c:2383
+#: ../src/file_convert.c:2395
#, c-format
msgid ""
"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -3340,22 +3597,17 @@
msgid "Error copying '%s' to '%s' (%s)\n"
msgstr "Error copiando '%s' a '%s' (%s)\n"
-#: ../src/file_export.c:217
-#, c-format
-msgid "Unable to open '%s' for reading\n"
-msgstr "Imposible abrir '%s' para lectura\n"
-
#: ../src/file_export.c:327
#, c-format
msgid "Could find file for '%s' on the iPod\n"
msgstr "No se encuentra el fichero de '%s' en el iPod\n"
#. create the dialog window
-#: ../src/file_export.c:395 ../src/tools.c:361
+#: ../src/file_export.c:395 ../src/tools.c:360
msgid "Information"
msgstr "Información"
-#: ../src/file_export.c:406 ../src/tools.c:373
+#: ../src/file_export.c:406 ../src/tools.c:372
msgid "Press button to abort."
msgstr "Pulsar botón para cancelar."
@@ -3375,7 +3627,7 @@
msgstr[0] "Copiada %d de %d pista."
msgstr[1] "Copiadas %d de %d pistas."
-#: ../src/file_export.c:505 ../src/tools.c:519
+#: ../src/file_export.c:505 ../src/tools.c:518
#, c-format
msgid "%d%% (%d:%02d:%02d left)"
msgstr "%d%% (%d:%02d:%02d restantes)"
@@ -3437,26 +3689,27 @@
"No se puede abrir '%s' para escritura (%s).\n"
"\n"
-#: ../src/file_itunesdb.c:127
+#: ../src/file_itunesdb.c:129
#, c-format
msgid "Matching SHA1 checksum for file %d/%d"
msgstr ""
"Buscando concordancias de la suma de comprobación SHA1 para el fichero %d/%d"
-#: ../src/file_itunesdb.c:234
-msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
-msgstr "No se puede abrir \"iTunesDB.ext\" para leer información extendida.\n"
+#: ../src/file_itunesdb.c:236
+#, fuzzy, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "No es posible abrir \"%s\" para escribir la información extendida.\n"
-#: ../src/file_itunesdb.c:241
+#: ../src/file_itunesdb.c:243
msgid "Could not create hash value from itunesdb\n"
msgstr "No se puede crear valor de resumen (hash) de la base de datos iTunes\n"
-#: ../src/file_itunesdb.c:255
+#: ../src/file_itunesdb.c:259
#, c-format
msgid "Error while reading extended info: %s\n"
msgstr "Error al leer la información extendida: %s\n"
-#: ../src/file_itunesdb.c:272
+#: ../src/file_itunesdb.c:276
#, c-format
msgid ""
"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -3470,7 +3723,7 @@
"Esto puede durar bastante tiempo.\n"
"\n"
-#: ../src/file_itunesdb.c:284
+#: ../src/file_itunesdb.c:288
#, c-format
msgid ""
"%s:\n"
@@ -3479,7 +3732,7 @@
"%s:\n"
"Esperado \"itunesdb_hash=\" , pero encontrado:\"%s\"\n"
-#: ../src/file_itunesdb.c:344
+#: ../src/file_itunesdb.c:348
#, c-format
msgid ""
"%s:\n"
@@ -3488,7 +3741,7 @@
"%s:\n"
"Error de formato: %s\n"
-#: ../src/file_itunesdb.c:387
+#: ../src/file_itunesdb.c:393
msgid ""
"No SHA1 checksums on individual tracks are available.\n"
"\n"
@@ -3505,7 +3758,7 @@
"programas que no sean gtkpod.\n"
"\n"
-#: ../src/file_itunesdb.c:451
+#: ../src/file_itunesdb.c:457
msgid ""
"Extended info will not be used. If you have non-transferred tracks,\n"
"these will be lost.\n"
@@ -3513,15 +3766,15 @@
"La información extendida no será usada. Las pistas no transferidas serán "
"perdidas.\n"
-#: ../src/file_itunesdb.c:459
+#: ../src/file_itunesdb.c:465
msgid "Offline iPod database successfully imported"
msgstr "Base de datos del iPod en modo desconectado importada con éxito."
-#: ../src/file_itunesdb.c:462
+#: ../src/file_itunesdb.c:468
msgid "Local database successfully imported"
msgstr "Base de datos local importada con éxito."
-#: ../src/file_itunesdb.c:470
+#: ../src/file_itunesdb.c:476
#, c-format
msgid ""
"Offline iPod database import failed: '%s'\n"
@@ -3531,7 +3784,7 @@
"s'\n"
"\n"
-#: ../src/file_itunesdb.c:474
+#: ../src/file_itunesdb.c:480
#, c-format
msgid ""
"Local database import failed: '%s'\n"
@@ -3540,7 +3793,7 @@
"Error en la importación de la base de datos local: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:481
+#: ../src/file_itunesdb.c:487
msgid ""
"Offline iPod database import failed: \n"
"\n"
@@ -3548,7 +3801,7 @@
"Error en la importación de la base de datos del iPod en modo desconectado:\n"
"\n"
-#: ../src/file_itunesdb.c:484
+#: ../src/file_itunesdb.c:490
msgid ""
"Local database import failed: \n"
"\n"
@@ -3556,7 +3809,7 @@
"Error en la importación de la base de datos local:\n"
"\n"
-#: ../src/file_itunesdb.c:491
+#: ../src/file_itunesdb.c:497
#, c-format
msgid ""
"'%s' does not exist. Import aborted.\n"
@@ -3565,15 +3818,15 @@
"'%s' no existe. Importación cancelada.\n"
"\n"
-#: ../src/file_itunesdb.c:514
+#: ../src/file_itunesdb.c:520
msgid "Extended info will not be used.\n"
msgstr "La información extendida no será usada.\n"
-#: ../src/file_itunesdb.c:521
+#: ../src/file_itunesdb.c:527
msgid "iPod Database Successfully Imported"
msgstr "Base de datos del iPod importada con éxito"
-#: ../src/file_itunesdb.c:528
+#: ../src/file_itunesdb.c:534
#, c-format
msgid ""
"iPod Database Import Failed: '%s'\n"
@@ -3582,7 +3835,7 @@
"Error en la importación de la base de datos del iPod:'%s'\n"
"\n"
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:540
msgid ""
"iPod Database Import Failed.\n"
"\n"
@@ -3590,7 +3843,7 @@
"Error en la importación de la base de datos del iPod.\n"
"\n"
-#: ../src/file_itunesdb.c:543
+#: ../src/file_itunesdb.c:549
#, c-format
msgid ""
"'%s' (or similar) does not exist. Import aborted.\n"
@@ -3599,7 +3852,7 @@
"'%s' (o similar) no existe. Importación cancelada.\n"
"\n"
-#: ../src/file_itunesdb.c:859
+#: ../src/file_itunesdb.c:865
#, c-format
msgid ""
"Could not find iPod directory structure at '%s'.\n"
@@ -3614,30 +3867,30 @@
"\n"
"¿Quieres crear la estructura de directorios ahora?\n"
-#: ../src/file_itunesdb.c:1140
+#: ../src/file_itunesdb.c:1180
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
msgstr "No es posible abrir \"%s\" para escribir la información extendida.\n"
-#: ../src/file_itunesdb.c:1155
+#: ../src/file_itunesdb.c:1195
msgid "Aborted writing of extended info.\n"
msgstr "Cancelada la escritura de la información extendida.\n"
-#: ../src/file_itunesdb.c:1356
+#: ../src/file_itunesdb.c:1397
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: ../src/file_itunesdb.c:1370
+#: ../src/file_itunesdb.c:1411
#, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left)"
msgstr "%d%% (%d/%d %d:%02d:%02d restantes)"
-#: ../src/file_itunesdb.c:1412
+#: ../src/file_itunesdb.c:1463
msgid "Status: Deleting File"
msgstr "Estado: borrando fichero"
-#: ../src/file_itunesdb.c:1473
+#: ../src/file_itunesdb.c:1524
#, c-format
msgid ""
"Could not remove the following file: '%s'\n"
@@ -3646,7 +3899,7 @@
"No se ha podido borrar el siguiente fichero: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:1581
+#: ../src/file_itunesdb.c:1632
msgid ""
"The following track could not be converted successfully:\n"
"\n"
@@ -3660,7 +3913,7 @@
"Las siguientes pistas no han podido ser convertidas:\n"
"\n"
-#: ../src/file_itunesdb.c:1591
+#: ../src/file_itunesdb.c:1642
msgid ""
"The following track could not be transferred successfully:\n"
"\n"
@@ -3678,12 +3931,12 @@
#. modal,
#. gint id,
#. gboolean modal,
-#: ../src/file_itunesdb.c:1600 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
msgid "Warning"
msgstr "Atención"
#. title
-#: ../src/file_itunesdb.c:1601
+#: ../src/file_itunesdb.c:1652
msgid ""
"The iPod could not be ejected. Please fix the problems mentioned below and "
"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
@@ -3693,19 +3946,22 @@
"muestran a continuación y expulse el iPod de nuevo. Pulsando OK las pistas "
"que han fallado serán re-añadidas para su conversión y transferencia."
-#: ../src/file_itunesdb.c:1663
+#: ../src/file_itunesdb.c:1715
+#, c-format
msgid "Status: Copying track"
msgstr "Estado: copiando pista"
-#: ../src/file_itunesdb.c:1669
+#: ../src/file_itunesdb.c:1721
+#, c-format
msgid "Status: Waiting for conversion to complete"
msgstr "Estado: esperando a que finalice al conversión"
-#: ../src/file_itunesdb.c:1673
+#: ../src/file_itunesdb.c:1725
+#, c-format
msgid "Status: Finished transfer"
msgstr "Estado: transferencia finalizada"
-#: ../src/file_itunesdb.c:1714
+#: ../src/file_itunesdb.c:1770
#, c-format
msgid ""
"One track could not be transferred because your iPod is full. Either delete "
@@ -3722,7 +3978,7 @@
"%d pistas no han podido ser transferidas porque el iPod está lleno. Borre "
"algunas pistas o haga espacio en el iPod antes de expulsarlo de nuevo."
-#: ../src/file_itunesdb.c:1792
+#: ../src/file_itunesdb.c:1852
#, c-format
msgid ""
"You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -3739,7 +3995,7 @@
"cancela, se podrá importar la base de datos iTunes antes de usar de nuevo "
"esta función.\n"
-#: ../src/file_itunesdb.c:1827
+#: ../src/file_itunesdb.c:1887
msgid ""
"iPod directory structure must be present before synching to the iPod can be "
"performed.\n"
@@ -3747,77 +4003,100 @@
"La estructura de directorios del iPod debe estar creada antes de que se "
"pueda sincronizar con el iPod.\n"
-#: ../src/file_itunesdb.c:1836
+#: ../src/file_itunesdb.c:1896
msgid "Some tracks could not be deleted from the iPod. Export aborted!"
msgstr ""
"No ha sido posible borrar algunas pistas del iPod. ¡La exportación ha sido "
"cancelada!"
-#: ../src/file_itunesdb.c:1854
-msgid "Now writing database. Please wait..."
+#: ../src/file_itunesdb.c:1914
+#, fuzzy, c-format
+msgid "Now writing database '%s'. Please wait..."
msgstr "Escribiendo la base de datos. Espere, por favor."
-#: ../src/file_itunesdb.c:1901
+#: ../src/file_itunesdb.c:1963
#, c-format
msgid "Extended information file not deleted: '%s'"
msgstr "El fichero de información extendida '%s' no ha sido borrado."
-#: ../src/file_itunesdb.c:1987
+#: ../src/file_itunesdb.c:2070
#, c-format
msgid "%s: Database saved"
msgstr "Guardada la base de datos: %s"
-#: ../src/file_itunesdb.c:1991
+#: ../src/file_itunesdb.c:2074
#, c-format
msgid "%s: Changes saved"
msgstr "%s: Cambios guardados"
-#: ../src/fileselection.c:128
+#: ../src/fileselection.c:129
msgid "Successfully added files"
msgstr "Ficheros añadidos con éxito."
-#: ../src/fileselection.c:130
+#: ../src/fileselection.c:131
msgid "Some files were not added successfully"
msgstr "Algunos ficheros no han sido añadidos con exito"
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:160
-msgid "Add Files"
+#: ../src/fileselection.c:164 ../src/fileselection.c:305
+#: ../src/fileselection.c:792
+msgid "Please select a playlist or repository before adding tracks."
+msgstr ""
+
+#: ../src/fileselection.c:175 ../src/fileselection.c:314
+#: ../src/fileselection.c:803
+msgid "Please load the iPod before adding tracks."
+msgstr ""
+
+#: ../src/fileselection.c:185
+#, fuzzy, c-format
+msgid "Add files to '%s'"
msgstr "Añadir ficheros"
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:253
-msgid "Add Playlists"
-msgstr "Añadir listas de reproducción"
+#: ../src/fileselection.c:189
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr ""
+#. Create window title
+#: ../src/fileselection.c:322
+#, fuzzy, c-format
+msgid "Add playlist files to '%s'"
+msgstr "Añadir lista de reproducción desde fichero"
+
#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:300
+#: ../src/fileselection.c:378
msgid "Set Cover"
msgstr "Configurar portada"
-#: ../src/fileselection.c:721
-msgid "Select directory to add recursively"
-msgstr "Seleccionar directorio para añadir recursivamente"
+#: ../src/fileselection.c:816
+#, fuzzy, c-format
+msgid "Add directories to '%s'"
+msgstr "Añadir directorios recursivamente"
-#: ../src/fileselection.c:992
+#: ../src/fileselection.c:820
+#, fuzzy, c-format
+msgid "Add directories to '%s/%s'"
+msgstr "Añadir directorios recursivamente"
+
+#: ../src/fileselection.c:1097
msgid "Ok"
msgstr "Aceptar"
-#: ../src/fileselection.c:1001
+#: ../src/fileselection.c:1106
msgid "Cancel"
msgstr "Cancelar"
-#: ../src/flacfile.c:33
+#: ../src/flacfile.c:62
#, c-format
msgid "'%s' does not appear to be an FLAC audio file.\n"
msgstr "'%s' no parece ser un fichero de audio FLAC.\n"
-#: ../src/flacfile.c:52
+#: ../src/flacfile.c:78
#, c-format
msgid "Error retrieving tags for '%s'.\n"
msgstr "Error al recuperar las etiquetas de '%s'.\n"
-#: ../src/flacfile.c:119
+#: ../src/flacfile.c:165
#, c-format
msgid ""
"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
@@ -3826,7 +4105,7 @@
"Error en la importación de '%s': FLAC no están soportados sin la biblioteca "
"FLAC. gtkpod debe estar compilado junto con la biblioteca FLAC.\n"
-#: ../src/flacfile.c:125
+#: ../src/flacfile.c:171
#, c-format
msgid ""
"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
@@ -3899,54 +4178,54 @@
msgid "n/c"
msgstr "n/c"
-#: ../src/info.c:388 ../src/info.c:835
+#: ../src/info.c:388 ../src/info.c:838
msgid "offline"
msgstr "modo desconectado"
-#: ../src/info.c:483
+#: ../src/info.c:486
#, c-format
msgid " P:%d T:%d/%d"
msgstr " P:%d T:%d/%d"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "B"
msgstr "B"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "kB"
msgstr "KiB"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "TB"
msgstr "TiB"
-#: ../src/info.c:820
+#: ../src/info.c:823
#, c-format
msgid " %s Free"
msgstr " %s Libre"
-#: ../src/info.c:825
+#: ../src/info.c:828
#, c-format
msgid " %s Pending"
msgstr " %s Pendiente"
-#: ../src/info.c:830
+#: ../src/info.c:833
msgid " disconnected"
msgstr " desconectado"
-#: ../src/info.c:881
+#: ../src/info.c:884
msgid "No database or playlist selected"
msgstr "No se ha seleccionado ninguna base de datos o lista de reproducción"
-#: ../src/info.c:886
+#: ../src/info.c:889
msgid "No tracks selected"
msgstr "No se ha seleccionado ninguna pista"
-#: ../src/info.c:891
+#: ../src/info.c:894
msgid "No playlist selected"
msgstr "No se ha seleccionado ninguna lista de reproducción"
-#: ../src/info.c:896
+#: ../src/info.c:899
msgid "No iPod or iPod playlist selected"
msgstr "No se ha seleccionado ningún iPod o lista de reproducción del iPod."
@@ -3973,21 +4252,19 @@
msgid "<b>Please select your iPod model at </b><i>%s</i>"
msgstr "<b>Por favor, seleccionar el modelo de iPod en </b><i>%s</i>"
-#: ../src/misc.c:86
-#, c-format
+#: ../src/ipod_init.c:463
msgid ""
-"gtkpod Version %s: Cross-Platform Multi-Lingual Interface to Apple's iPod"
-"(tm)."
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
msgstr ""
-"gtkpod versión %s: Interfaz multi-plataforma y multi-idioma para iPods Apple."
-#: ../src/misc.c:90
+#: ../src/misc.c:70
+#, fuzzy
msgid ""
-"(C) 2002 - 2007\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
"Corey Donohoe (atmos at atmos dot org)\n"
-"\n"
-"\n"
msgstr ""
"(C) 2002 - 2007\n"
"Jorg Schuler (jcsjcs en users punto sourceforge punto net)\n"
@@ -3995,330 +4272,409 @@
"\n"
"\n"
-#: ../src/misc.c:96
+#: ../src/misc.c:74
+#, fuzzy
msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-msgstr ""
-"Este programa es software libre. Puede redistribuirlo y/o modificarlo bajo "
-"los términos de la Licencia Pública General de GNU según es publicada por la "
-"Free Software Foundation, bien de la versión 2 de dicha Licencia o bien "
-"(según su elección) de cualquier versión posterior.\n"
-"\n"
-"Este programa se distribuye con la esperanza de que sea útil, pero SIN "
-"NINGUNA GARANTÃA, incluso sin la garantÃa MERCANTIL implÃcita o sin "
-"garantizar la CONVENIENCIA PARA UN PROPÓSITO PARTICULAR. Véase la Licencia "
-"Pública General de GNU para más detalles.\n"
-"\n"
-"DeberÃa haber recibido una copia de la Licencia Pública General junto con "
-"este programa. Si no ha sido asÃ, escriba a la Free Software Foundation, "
-"Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-
-#: ../src/misc.c:104
-msgid ""
"Patches were supplied by the following people (list may be incomplete -- "
"please contact me)\n"
-"\n"
msgstr ""
"Los parches fueron proveÃdos por: (la lista puede estar incompleta-- por "
"favor, contactar conmigo)\n"
"\n"
-#: ../src/misc.c:106
-msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)\n"
+#: ../src/misc.c:75
+#, fuzzy
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
msgstr ""
"Ramesh Dharan: Multi-Edición (editar etiquetas de varias pistas al al vez)\n"
-#: ../src/misc.c:108
-msgid "Hiroshi Kawashima: Japanese charset autodetecion feature\n"
+#: ../src/misc.c:76
+#, fuzzy
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
msgstr ""
"Hiroshi Kawashima: Función de autodetección del juego de caracteres "
"japonés.\n"
-#: ../src/misc.c:110
-msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c\n"
+#: ../src/misc.c:77
+#, fuzzy
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
msgstr ""
"Adrian Ulrich: paso del código de las listas de reproducción de mktunes.pl a "
"itunesdb.c\n"
-#: ../src/misc.c:112
+#: ../src/misc.c:78
+#, fuzzy
msgid ""
"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
-"newlines at the end\n"
+"newlines at the end"
msgstr ""
"Walter Bell: manejo correcto de URIs DND con la presencia de \"caracteres de "
"escape\" y/o \"cr/nueva linea\" al final\n"
-#: ../src/misc.c:114
-msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod\n"
+#: ../src/misc.c:79
+#, fuzzy
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
msgstr ""
"Sam Clegg: Nombre de ficheros definidos por el usuario al exportar pistas "
"desde el iPod\n"
-#: ../src/misc.c:116
-msgid "Chris Cutler: automatic creation of various playlist types\n"
+#: ../src/misc.c:80
+#, fuzzy
+msgid "Chris Cutler: automatic creation of various playlist types"
msgstr ""
"Chris Cutler: creación automática de varios tipos de listas de reproducción\n"
-#: ../src/misc.c:118
+#: ../src/misc.c:81
+#, fuzzy
msgid ""
"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
-"dialogue during sync\n"
+"dialogue during sync"
msgstr ""
"Graeme Wilford: lectura y escritura del compositor de etiquetas ID3, "
"diálogo de progreso durante la sincronización\n"
-#: ../src/misc.c:120
+#: ../src/misc.c:82
+#, fuzzy
msgid ""
"Edward Matteucci: debugging, special playlist creation, most of the volume "
-"normalizing code\n"
+"normalizing code"
msgstr ""
"Edward Matteucci: depuración, creación de listas de reproducción especiales, "
"mayor parte del código de normalización del volumen\n"
-#: ../src/misc.c:122
-msgid "Jens Lautenbach: some optical improvements\n"
+#: ../src/misc.c:83
+#, fuzzy
+msgid "Jens Lautenbach: some optical improvements"
msgstr "Jens Lautenbach: algunas mejoras visuales\n"
-#: ../src/misc.c:124
-msgid "Alex Tribble: iPod eject patch\n"
+#: ../src/misc.c:84
+#, fuzzy
+msgid "Alex Tribble: iPod eject patch"
msgstr "Alex Tribble: parche de expulsion del iPod mediante \"eject\"\n"
-#: ../src/misc.c:126
-msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling\n"
+#: ../src/misc.c:85
+#, fuzzy
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
msgstr "Yaroslav Halchenko: manejo de pistas en estado huérfano y pendiente\n"
-#: ../src/misc.c:128
+#: ../src/misc.c:86
+#, fuzzy
msgid ""
-"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes\n"
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
msgstr ""
"Andrew Huntwork: Corrección de la distinción de mayúsculas y minúsculas en "
"los nombres de fichero y otras correcciones varias\n"
-#: ../src/misc.c:130
+#: ../src/misc.c:87
+#, fuzzy
msgid ""
"Ero Carrera: Filename validation and quick sync when copying tracks from the "
-"iPod\n"
+"iPod"
msgstr ""
"Ero Carrera: Validación de los nombres de fichero y sincronización rápida al "
"copiar pistas desde el iPod\n"
-#: ../src/misc.c:132
-msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume\n"
+#: ../src/misc.c:88
+#, fuzzy
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
msgstr ""
"Jens Taprogge: Soporte de la etiqueta de reproducción de ganancia de LAME "
"para normalizar el volumen\n"
-#: ../src/misc.c:134
-msgid "Armando Atienza: Support with external playcounts\n"
+#: ../src/misc.c:89
+#, fuzzy
+msgid "Armando Atienza: Support with external playcounts"
msgstr "Armando Atienza: Soporte para contadores externos\n"
-#: ../src/misc.c:136
-msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)\n"
+#: ../src/misc.c:90
+#, fuzzy
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
msgstr "D.L. Sharp: Soporte para ficheros m4b (audio libros AAC )\n"
-#: ../src/misc.c:138
-msgid "Jim Hall: Decent INSTALL file\n"
+#: ../src/misc.c:91
+#, fuzzy
+msgid "Jim Hall: Decent INSTALL file"
msgstr "Jim Hall: Fichero INSTALL decente\n"
-#: ../src/misc.c:140
+#: ../src/misc.c:92
+#, fuzzy
msgid ""
"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
-"contacts to the iPod\n"
+"contacts to the iPod"
msgstr ""
"Juergen Helmers, Markus Gaugusch: guiones de conversión para sincronizar "
"calendario/contactos al iPod\n"
#. J"urgen!
-#: ../src/misc.c:142
-msgid "Flavio Stanchina: bugfixes\n"
+#: ../src/misc.c:93
+#, fuzzy
+msgid "Flavio Stanchina: bugfixes"
msgstr "Flavio Stanchina: corrección de errores\n"
-#: ../src/misc.c:144
+#: ../src/misc.c:94
+#, fuzzy
msgid ""
"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title\n"
+"the title"
msgstr ""
"Chris Micacchi: Ignorar artÃculos al principio de los tÃtulos al ordenar\n"
-#: ../src/misc.c:146
-msgid "Steve Jay: use statvfs() instead of df (better portability, faster)\n"
+#: ../src/misc.c:95
+#, fuzzy
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
msgstr ""
"Steve Jay: uso de statvfs() en vez de df (mejor portabilidad, más rápido)\n"
-#: ../src/misc.c:149
+#: ../src/misc.c:97
+#, fuzzy
msgid ""
"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
-"tags\n"
+"tags"
msgstr ""
"Christoph Kunz: resolución de los problemas de compatibilidad en la "
"escritura de la etiquetas de tipo mp3 id3v2.4\n"
-#: ../src/misc.c:152
+#: ../src/misc.c:99
+#, fuzzy
msgid ""
"James Liggett:\n"
-" replacement of old GTK file selection dialogs with new GTK filechooser "
+"replacement of old GTK file selection dialogs with new GTK filechooser "
"dialogs\n"
-" refactored user preferences system.\n"
+"refactored user preferences system."
msgstr ""
"James Liggett:\n"
" reemplazo de los antiguos diálogos GTK de selección de ficheros por "
"los nuevos GTK\n"
" rehecho el sistema de preferencias del usuario.\n"
-#: ../src/misc.c:157
-msgid "Daniel Kercher: sync scripts for abook and webcalendar\n"
+#: ../src/misc.c:103
+#, fuzzy
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
msgstr "Daniel Kercher: guiones de sincronización para abook y webcalendar\n"
-#: ../src/misc.c:160
-msgid "Clinton Gormley: sync scripts for thunderbird\n"
+#: ../src/misc.c:105
+#, fuzzy
+msgid "Clinton Gormley: sync scripts for thunderbird"
msgstr "Clinton Gormley: guión de sincronización para thunderbird\n"
-#: ../src/misc.c:163
-msgid "Sebastien Beridot: sync script for ldif addressbook format\n"
+#: ../src/misc.c:107
+#, fuzzy
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
msgstr ""
"Sebastien Beridot: guión de sincronización para formato de contactos ldif\n"
-#: ../src/misc.c:166
-msgid "Sebastian Scherer: sync script for kNotes\n"
+#: ../src/misc.c:109
+#, fuzzy
+msgid "Sebastian Scherer: sync script for kNotes"
msgstr "Sebastian Scherer: guión de sincronización para kNotes\n"
-#: ../src/misc.c:169
-msgid "Nick Piper: sync script for Palm, type-ahead search\n"
+#: ../src/misc.c:111
+#, fuzzy
+msgid "Nick Piper: sync script for Palm, type-ahead search"
msgstr "Nick Piper: guión de sincronización para Palm, búsqueda type-ahead\n"
-#: ../src/misc.c:172
-msgid "Uwe Hermann: help with support for iPod Video\n"
+#: ../src/misc.c:113
+#, fuzzy
+msgid "Uwe Hermann: help with support for iPod Video"
msgstr "Uwe Hermann: ayuda con el soporte para el iPod Video\n"
-#: ../src/misc.c:175
+#: ../src/misc.c:115
+#, fuzzy
msgid ""
"Iain Benson: support for compilation tag in mp3 files and separate display "
-"of compilations in the sort tab.\n"
+"of compilations in the sort tab."
msgstr ""
"Iain Benson: soporte para compilar etiquetas en ficheros mp3 y visualización "
"separada de las compilaciones en las pestañas.\n"
-#: ../src/misc.c:177
+#: ../src/misc.c:116
+#, fuzzy
msgid ""
"Nicolas Chariot: icons of buttons\n"
"\n"
-"\n"
msgstr ""
"Nicolas Chariot: botones de los iconos\n"
"\n"
"\n"
-#: ../src/misc.c:181
-msgid "This program borrows code from the following projects:\n"
+#: ../src/misc.c:118
+#, fuzzy
+msgid "This program borrows code from the following projects:"
msgstr "Este programa usa código de los siguientes proyectos:\n"
-#: ../src/misc.c:183
+#: ../src/misc.c:119
+#, fuzzy
msgid ""
-" gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB "
-"(http://www.gnu.org/software/gnupod/)\n"
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
msgstr ""
" gnutools: (mktunes.pl, portado a C) lectura y escritura de la base de "
"datos iTunes (http://www.gnu.org/software/gnupod/)\n"
-#: ../src/misc.c:185
+#: ../src/misc.c:120
+#, fuzzy
msgid ""
-" iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some "
-"code for smart playlists is based on his C++-classes.\n"
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
msgstr ""
" iPod.cpp, iPod.h de Samuel Wood (sam punto wood en gmail punto com): "
"parte del código de las listas de reproducción inteligentes está basado en "
"sus clases C++.\n"
-#: ../src/misc.c:187
-msgid " mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)\n"
+#: ../src/misc.c:121
+#, fuzzy
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
msgstr ""
" mp3info: detección de la duración de los mp3 (http://ibiblio.org/"
"mp3info/)\n"
-#: ../src/misc.c:189
-msgid ""
-" xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)\n"
+#: ../src/misc.c:122
+#, fuzzy
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
msgstr ""
" xmms: exploración de directorios, detección de la duración de los "
"mp3 (http://www.xmms.org)\n"
-#: ../src/misc.c:192
-msgid ""
-"The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"
+#: ../src/misc.c:124
+#, fuzzy
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
msgstr ""
"El interfaz gráfico ha sido creado con la ayuda de glade-2 (http://glade."
"gnome.org/).\n"
-#: ../src/misc.c:207
-msgid "French: David Le Brun (david at dyn-ns dot net)\n"
+#: ../src/misc.c:128
+#, fuzzy
+msgid "French: David Le Brun (david at dyn-ns dot net)"
msgstr "Francés: David Le Brun (david en dyn-ns punto net)\n"
-#: ../src/misc.c:209
-msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+#: ../src/misc.c:129
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr ""
+
+#: ../src/misc.c:130
+#, fuzzy
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
msgstr "Alemán: Jorg Schuler (jcsjcs en users punto sourceforge punto net)\n"
-#: ../src/misc.c:211
-msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)\n"
+#: ../src/misc.c:131
+msgid "German: Kai-Ove"
+msgstr ""
+
+#: ../src/misc.c:132
+#, fuzzy
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
msgstr "Hebreo: Assaf Gillat (gillata en gmail punto com)\n"
-#: ../src/misc.c:213
+#: ../src/misc.c:133
+#, fuzzy
msgid ""
-"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net)\n"
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
msgstr ""
"Italiano: Edward Matteucci (edward_matteucc en users punto sourceforge "
"punto net)\n"
-#: ../src/misc.c:215
-msgid "Japanese: Ayako Sano\n"
+#: ../src/misc.c:134
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr ""
+
+#: ../src/misc.c:135
+#, fuzzy
+msgid "Japanese: Ayako Sano"
msgstr "Japonés: Ayako Sano\n"
-#: ../src/misc.c:217
-msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
+#: ../src/misc.c:136
+#, fuzzy
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
msgstr ""
"Japonés: Kentaro Fukuchi (fukuchi en users punto sourceforge punto net)\n"
-#: ../src/misc.c:219
-msgid "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
+#: ../src/misc.c:137
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr ""
+
+#: ../src/misc.c:138
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr ""
+
+#: ../src/misc.c:139
+#, fuzzy
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
msgstr "Sueco: Stefan Asserhall (stefan asserhall en comhem punto se)\n"
-#: ../src/misc.c:975
+#: ../src/misc.c:144
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+msgstr ""
+"Este programa es software libre. Puede redistribuirlo y/o modificarlo bajo "
+"los términos de la Licencia Pública General de GNU según es publicada por la "
+"Free Software Foundation, bien de la versión 2 de dicha Licencia o bien "
+"(según su elección) de cualquier versión posterior.\n"
+"\n"
+"Este programa se distribuye con la esperanza de que sea útil, pero SIN "
+"NINGUNA GARANTÃA, incluso sin la garantÃa MERCANTIL implÃcita o sin "
+"garantizar la CONVENIENCIA PARA UN PROPÓSITO PARTICULAR. Véase la Licencia "
+"Pública General de GNU para más detalles.\n"
+"\n"
+"DeberÃa haber recibido una copia de la Licencia Pública General junto con "
+"este programa. Si no ha sido asÃ, escriba a la Free Software Foundation, "
+"Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+"\n"
+
+#: ../src/misc.c:159
+#, fuzzy
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+msgstr ""
+"(C) 2002 - 2007\n"
+"Jorg Schuler (jcsjcs en users punto sourceforge punto net)\n"
+"Corey Donohoe (atmos en atmos punto org)\n"
+"\n"
+"\n"
+
+#: ../src/misc.c:167
+#, fuzzy
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr ""
+"gtkpod versión %s: Interfaz multi-plataforma y multi-idioma para iPods Apple."
+
+#: ../src/misc.c:934
#, c-format
msgid "Could not process '%s' (no filename available)"
msgstr "No se puede procesar '%s' (ningún nombre de fichero disponible)"
-#: ../src/misc.c:1129
+#: ../src/misc.c:1088
#, c-format
msgid "Unknown token '%%%c' in template '%s'"
msgstr "Testigo desconocido '%%%c' en la plantilla '%s'"
-#: ../src/misc.c:1212
+#: ../src/misc.c:1171
#, c-format
msgid "Template ('%s') does not match file type '%s'\n"
msgstr "La plantilla ('%s') no concuerda con el tipo de fichero '%s'\n"
-#: ../src/misc.c:1298
+#: ../src/misc.c:1257
#, c-format
msgid "Error creating %s: %s\n"
msgstr "Error al crear %s: %s\n"
-#: ../src/misc.c:1777
+#: ../src/misc.c:1691
#, c-format
msgid ""
"Writing preferences file '%s' failed (%s).\n"
@@ -4327,11 +4683,11 @@
"Fallo al escribir el fichero de preferencias '%s' (%s).\n"
"\n"
-#: ../src/misc.c:1779
+#: ../src/misc.c:1693
msgid "unspecified error"
msgstr "error no especificado"
-#: ../src/misc.c:1787
+#: ../src/misc.c:1701
#, c-format
msgid ""
"Writing preferences to the iPod (%s) failed: could not get path to Control "
@@ -4476,6 +4832,7 @@
msgstr "Todas las %d pistas han sido borradas del iPod"
#: ../src/misc_confirm.c:541
+#, c-format
msgid "Removed all podcasts from the iPod"
msgstr "Todos los podcasts han sido borrados del iPod"
@@ -4507,22 +4864,24 @@
msgstr "Borradas todas las %d pistas de la base de datos"
#: ../src/misc_confirm.c:695
+#, c-format
msgid "Are you sure you want to remove all tracks from your iPod?"
msgstr "¿Desea realmente borrar todas las pistas del iPod?"
#: ../src/misc_confirm.c:700
+#, c-format
msgid "Are you sure you want to remove all podcasts from your iPod?"
msgstr "¿Desea realmente borrar todos los podcasts del iPod?"
#: ../src/misc_confirm.c:708
-#, c-format
+#, fuzzy, c-format
msgid ""
"Are you sure you want to delete playlist '%s' and the following track "
-"completely from your ipod? The number of playlists this track is a member of "
+"completely from your iPod? The number of playlists this track is a member of "
"is indicated in parentheses."
msgid_plural ""
"Are you sure you want to delete playlist '%s' and the following tracks "
-"completely from your ipod? The number of playlists the tracks are member of "
+"completely from your iPod? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
"¿Desea realmente borrar la lista de reproducción '%s' y la siguiente pista "
@@ -4558,6 +4917,7 @@
"estas pistas está indicado entre paréntesis."
#: ../src/misc_confirm.c:753
+#, c-format
msgid "Are you sure you want to remove all tracks from the database?"
msgstr "¿Está seguro de querer borrar todas las pistas de la base de datos?"
@@ -4712,57 +5072,93 @@
msgid "Episode Nr"
msgstr "Episodio Nº"
-#: ../src/misc_conversion.c:118
+#: ../src/misc_conversion.c:106
+#, fuzzy
+msgid "Album Artist"
+msgstr "Artista del álbum"
+
+#: ../src/misc_conversion.c:107
+#, fuzzy
+msgid "Sort Artist"
+msgstr "Artista"
+
+#: ../src/misc_conversion.c:108
+#, fuzzy
+msgid "Sort Title"
+msgstr "SubtÃtulo"
+
+#: ../src/misc_conversion.c:109
+#, fuzzy
+msgid "Sort Album"
+msgstr "Ãlbum"
+
+#. 50
+#: ../src/misc_conversion.c:110
+#, fuzzy
+msgid "Sort Album Artist"
+msgstr "Artista del álbum"
+
+#: ../src/misc_conversion.c:111
+#, fuzzy
+msgid "Sort Composer"
+msgstr "Compositor"
+
+#: ../src/misc_conversion.c:112
+#, fuzzy
+msgid "Sort TV Show"
+msgstr "TV Show"
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr ""
+
+#: ../src/misc_conversion.c:126
msgid "Name of file on PC, if available"
msgstr "Nombre del fichero en el PC, si está disponible"
-#: ../src/misc_conversion.c:119
+#: ../src/misc_conversion.c:127
msgid "Name of file on the iPod"
msgstr "Nombre del fichero en el iPod"
#. 10
-#: ../src/misc_conversion.c:121
+#: ../src/misc_conversion.c:129
msgid "Track Nr. and total number of tracks on CD"
msgstr "Número de pista y número total de pistas en el CD"
-#: ../src/misc_conversion.c:122
+#: ../src/misc_conversion.c:130
msgid "Whether the file has already been transferred to the iPod or not"
msgstr "Si el fichero ha sido transferido al iPod o no"
-#: ../src/misc_conversion.c:128
-msgid ""
-"Supposedly something that tells the iPod to increase or decrease the "
-"playback speed"
+#: ../src/misc_conversion.c:136
+msgid "Beats per minute"
msgstr ""
-"Supuestamente, algo que le dice al iPod que incremente o reduzca la "
-"velocidad de reproducción"
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:137
msgid "Number of times the track has been played"
msgstr "Número de veces que la pista ha sido reproducida"
-#: ../src/misc_conversion.c:131
+#: ../src/misc_conversion.c:138
msgid "Star rating from 0 to 5"
msgstr "Puntuación de estrellas del 0 al 5"
-#: ../src/misc_conversion.c:132
+#: ../src/misc_conversion.c:139
msgid "Date and time track has been added"
msgstr "Fecha y hora en la que la pista ha sido añadida"
#. 20
-#: ../src/misc_conversion.c:133
+#: ../src/misc_conversion.c:140
msgid "Date and time track has last been played"
msgstr "Fecha y hora en la que la pista ha sido reproducida por última vez"
-#: ../src/misc_conversion.c:134
+#: ../src/misc_conversion.c:141
msgid "Date and time track has last been modified"
msgstr "Fecha y hora en la que la pista ha sido modificada por última vez"
-#: ../src/misc_conversion.c:135
+#: ../src/misc_conversion.c:142
msgid "Manual volume adjust"
msgstr "Ajuste manual del volumen"
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:143
msgid ""
"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
"the iPod"
@@ -4771,47 +5167,55 @@
"el control de volumen en el iPod"
#. 25
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:146
msgid "CD Nr. and total number of CDS in set"
msgstr "Número de CD y número total de CDS en conjunto"
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:149
msgid ""
"The category (e.g. 'Technology' or 'Music') where the podcast was located."
msgstr ""
"La categorÃa (p.e. 'TecnologÃa' o 'Música') en la que el podcast estaba "
"ubicado."
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:150
msgid "Accessible by selecting the center button on the iPod."
msgstr "Accesible al seleccionar el botón central en el iPod"
-#: ../src/misc_conversion.c:147
+#: ../src/misc_conversion.c:154
msgid "Release date (for podcasts displayed next to the title on the iPod)"
msgstr ""
"Fecha de publicación (para podcasts. Mostrada junto al tÃtulo en el iPod)"
-#: ../src/misc_conversion.c:713
+#. 50
+#: ../src/misc_conversion.c:168 ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170 ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172 ../src/misc_conversion.c:173
+#, fuzzy
+msgid "Used for sorting on the iPod"
+msgstr "Nombre del fichero en el iPod"
+
+#: ../src/misc_conversion.c:735
#, c-format
msgid "The URI '%s' is not an absolute URI using the file scheme"
msgstr "Usando el esquema del fichero, el URI '%s' no es un URI absoluto"
-#: ../src/misc_conversion.c:723
+#: ../src/misc_conversion.c:745
#, c-format
msgid "The local file URI '%s' may not include a '#'"
msgstr "El URI de fichero local '%s' no puede contener '#'"
-#: ../src/misc_conversion.c:740
+#: ../src/misc_conversion.c:762
#, c-format
msgid "The URI '%s' is invalid"
msgstr "El URI '%s' no es válido"
-#: ../src/misc_conversion.c:752
+#: ../src/misc_conversion.c:774
#, c-format
msgid "The hostname of the URI '%s' is invalid"
msgstr "El nombre de máquina del URI '%s' no es válido"
-#: ../src/misc_conversion.c:768
+#: ../src/misc_conversion.c:790
#, c-format
msgid "The URI '%s' contains invalidly escaped characters"
msgstr "El URI '%s' contiene caracteres de escape no válidos"
@@ -4882,6 +5286,7 @@
msgstr "La más escuchada (%d)"
#: ../src/misc_playlist.c:584
+#, c-format
msgid "Never Listened"
msgstr "Nunca escuchada"
@@ -4926,11 +5331,6 @@
"Las pistas pendientes sin su correspondiente fichero en el PC han sido "
"eliminadas."
-#: ../src/misc_playlist.c:916
-#, c-format
-msgid "Processing '%s'"
-msgstr "Procesando '%s'"
-
#: ../src/misc_playlist.c:943
msgid "Dangling tracks with files on PC were handled."
msgstr ""
@@ -5070,76 +5470,76 @@
msgid "Duplicate detection"
msgstr "Detección de duplicados"
-#: ../src/misc_track.c:1269
+#: ../src/misc_track.c:1339
msgid "Local Database"
msgstr "Base de datos local"
#. artwork is set
-#: ../src/misc_track.c:1280
+#: ../src/misc_track.c:1350
msgid "Embedded or filename was lost"
msgstr "Se ha perdido el nombre de fichero o el empotrado."
-#: ../src/misc_track.c:1284
+#: ../src/misc_track.c:1354
msgid "Artwork not set"
msgstr "Carátula no configurada."
-#: ../src/misc_track.c:1737
+#: ../src/misc_track.c:1816
#, c-format
msgid "Could not find source file for '%s'. Track not copied."
msgstr "No se ha podido encontrar el fichero fuente de '%s'. Pista no copiada."
-#: ../src/misc_track.c:1973
+#: ../src/misc_track.c:2052
#, c-format
msgid "drag and drop: ignored '%s'\n"
msgstr "Operación de arrastrar y soltar ignorada '%s'\n"
-#: ../src/mp3file.c:1282
+#: ../src/mp3file.c:1336
#, c-format
msgid "Error setting ID3 field: %s\n"
msgstr "Error al rellenar campo ID3: %s\n"
-#: ../src/mp3file.c:1306 ../src/mp3file.c:1399 ../src/mp3file.c:1548
-#: ../src/mp3file.c:2186
+#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
#, c-format
msgid "ERROR while opening file: '%s' (%s).\n"
msgstr "Error al abrir el fichero: '%s' (%s).\n"
-#: ../src/mp3file.c:1619
+#: ../src/mp3file.c:1688
#, c-format
msgid "ERROR while writing tag to file: '%s' (%s).\n"
msgstr "Error al escribir etiqueta al fichero: '%s' (%s).\n"
#. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2352
+#: ../src/mp3file.c:2770
#, c-format
msgid "File \"%s\" has zero play length. Ignoring.\n"
msgstr ""
"El fichero \"%s\" tiene una duración de reproducción nula. Será ignorado.\n"
-#: ../src/mp4file.c:227 ../src/mp4file.c:359
+#: ../src/mp4file.c:243 ../src/mp4file.c:404
#, c-format
msgid "'%s' does not appear to be a mp4 audio or video file.\n"
msgstr "'%s' no parece ser un fichero de audio o vÃdeo mp4.\n"
-#: ../src/mp4file.c:237 ../src/mp4file.c:369
+#: ../src/mp4file.c:253 ../src/mp4file.c:414
#, c-format
msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
msgstr ""
"No se ha podido abrir '%s' para su lectura o el fichero no es de tipo mp4.\n"
-#: ../src/mp4file.c:478
+#: ../src/mp4file.c:529
#, c-format
msgid "'%s' does not appear to be a mp4 audio file.\n"
msgstr "'%s' no parece ser un fichero de audio mp4.\n"
-#: ../src/mp4file.c:489
+#: ../src/mp4file.c:540
#, c-format
msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
msgstr ""
"No se ha podido abrir '%s' para su escritura o el fichero no es de tipo "
"mp4.\n"
-#: ../src/mp4file.c:502
+#: ../src/mp4file.c:553
#, c-format
msgid ""
"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5149,7 +5549,7 @@
"biblioteca mp4v2. gtkpod debe estar compilado junto con la biblioteca "
"mp4v2.\n"
-#: ../src/mp4file.c:508
+#: ../src/mp4file.c:559
#, c-format
msgid ""
"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5160,7 +5560,7 @@
"están soportados sin la biblioteca mp4v2. gtkpod debe estar compilado junto "
"con la biblioteca mp4v2.\n"
-#: ../src/mp4file.c:514
+#: ../src/mp4file.c:565
#, c-format
msgid ""
"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5171,17 +5571,12 @@
"no están soportados sin la biblioteca mp4v2. gtkpod debe estar compilado "
"junto con la biblioteca mp4v2.\n"
-#: ../src/oggfile.c:62 ../src/wavfile.c:107
-#, c-format
-msgid "Could not open '%s' for reading.\n"
-msgstr "No se ha podido abrir '%s' para su lectura.\n"
-
#: ../src/oggfile.c:73
#, c-format
msgid "'%s' does not appear to be an ogg audio file.\n"
msgstr "'%s' no parece ser un fichero de audio ogg.\n"
-#: ../src/oggfile.c:150
+#: ../src/oggfile.c:154
#, c-format
msgid ""
"Import of '%s' failed: ogg not supported without the ogg library. You must "
@@ -5190,7 +5585,7 @@
"Error en la importación de '%s': ogg no está soportado sin la biblioteca "
"ogg. gtkpod debe estar compilado junto con la biblioteca ogg.\n"
-#: ../src/oggfile.c:156
+#: ../src/oggfile.c:160
#, c-format
msgid ""
"ogg metadata update for '%s' failed: ogg not supported without the ogg "
@@ -5199,91 +5594,91 @@
"Error al actualizar los metadatos ogg para '%s': ogg no está soportado sin "
"la biblioteca ogg. gtkpod debe estar compilado junto con la biblioteca ogg.\n"
-#: ../src/prefs.c:356
+#: ../src/prefs.c:357
#, c-format
msgid "gtkpod version %s usage:\n"
msgstr "Uso de gtkpod versión %s:\n"
-#: ../src/prefs.c:357
+#: ../src/prefs.c:358
msgid " -h, --help: display this message\n"
msgstr " -h, --help: muestra este mensaje\n"
-#: ../src/prefs.c:358
+#: ../src/prefs.c:359
msgid " -p <file>: increment playcount for file by one\n"
msgstr " -p <fichero>: incrementa el contador del fichero en uno\n"
-#: ../src/prefs.c:359
+#: ../src/prefs.c:360
msgid " --hash <file>:print gtkpod hash for file\n"
msgstr " --hash <file>:muestra la suma de resumen de gtkpod para el fichero\n"
-#: ../src/prefs.c:360
+#: ../src/prefs.c:361
msgid " -m path: define the mountpoint of your iPod\n"
msgstr " -m ruta: define el punto de montaje del iPod\n"
-#: ../src/prefs.c:361
+#: ../src/prefs.c:362
msgid " --mountpoint: same as '-m'.\n"
msgstr " --mountpoint: igual que '-m'.\n"
-#: ../src/prefs.c:362
+#: ../src/prefs.c:363
msgid " -a: import database automatically after start.\n"
msgstr ""
" -a: importa automáticamente la base de datos al arrancar.\n"
-#: ../src/prefs.c:363
+#: ../src/prefs.c:364
msgid " --auto: same as '-a'.\n"
msgstr " --auto: igual que '-a'.\n"
-#: ../src/prefs.c:560
+#: ../src/prefs.c:561
#, c-format
msgid "Couldn't create ~/.gtkpod\n"
msgstr "No se ha podido crear ~/.gtkpod\n"
-#: ../src/prefs_window.c:134
+#: ../src/prefs_window.c:133
msgid "Please select command for 'Play Now'"
msgstr "Seleccionar programa para 'Reproducir'"
-#: ../src/prefs_window.c:135
+#: ../src/prefs_window.c:134
msgid "Please select command for 'Enqueue'"
msgstr "Seleccionar programa para 'Encolar'"
-#: ../src/prefs_window.c:136
+#: ../src/prefs_window.c:135
msgid "Please select the mp3gain executable"
msgstr "Seleccionar el ejecutable mp3gain"
-#: ../src/prefs_window.c:137
+#: ../src/prefs_window.c:136
msgid "Please select the aacgain executable"
msgstr "Seleccionar el ejecutable aacgain"
-#: ../src/prefs_window.c:138
+#: ../src/prefs_window.c:137
msgid "Select the mserv music root directory"
msgstr "Seleccionar el directorio raÃz de música de mserv"
-#: ../src/prefs_window.c:139
+#: ../src/prefs_window.c:138
msgid "Select the mserv trackinfo root directory"
msgstr ""
"Seleccionar el directorio raÃz de la información de las pistas de mserv"
-#: ../src/prefs_window.c:140
+#: ../src/prefs_window.c:139
msgid "Select the ogg/vorbis converter command"
msgstr "Seleccionar el comando de conversión a ogg/vorbis."
-#: ../src/prefs_window.c:141
+#: ../src/prefs_window.c:140
msgid "Select the flac converter command"
msgstr "Seleccionar el comando de conversión a flac."
-#: ../src/prefs_window.c:142
+#: ../src/prefs_window.c:141
msgid "Select the m4a converter command."
msgstr "Seleccionar el comando de conversión a m4a."
-#: ../src/prefs_window.c:143
+#: ../src/prefs_window.c:142
msgid "Select the mp3 converter command."
msgstr "Seleccionar el comando de conversión a mp3."
-#: ../src/prefs_window.c:144
+#: ../src/prefs_window.c:143
msgid "Select the wav converter command."
msgstr "Seleccionar el comando de conversión a wav."
-#: ../src/prefs_window.c:211 ../src/repository.c:662
+#: ../src/prefs_window.c:201 ../src/repository.c:662
#, c-format
msgid ""
"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
@@ -5294,11 +5689,11 @@
"guión o mejorar uno existente, por favor, envielo a jcsjcs en users."
"sourceforge.net para añadirlo en la siguiente publicación.</i>"
-#: ../src/prefs_window.c:986 ../src/prefs_window.c:1004
+#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
msgid "Preferences not updated"
msgstr "Preferencias no actualizadas"
-#: ../src/prefs_window.c:1013
+#: ../src/prefs_window.c:1232
msgid "Preferences applied"
msgstr "Preferencias actualizadas"
@@ -5403,7 +5798,7 @@
msgid "Sync summary"
msgstr "Sincronizar resumen"
-#: ../src/tools.c:119
+#: ../src/tools.c:118
#, c-format
msgid ""
"Could not find '%s'.\n"
@@ -5417,7 +5812,7 @@
"sistema.\n"
"\n"
-#: ../src/tools.c:204
+#: ../src/tools.c:203
#, c-format
msgid ""
"Execution of '%s' failed.\n"
@@ -5426,7 +5821,7 @@
"Error al ejecutar '%s'.\n"
"\n"
-#: ../src/tools.c:249
+#: ../src/tools.c:248
#, c-format
msgid ""
"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
@@ -5435,7 +5830,7 @@
"No se ha normalizado '%s'. Configurar la ruta de mp3gain en el apartado "
"'Herramientas' del diálogo de edición de preferencias.\n"
-#: ../src/tools.c:259
+#: ../src/tools.c:258
#, c-format
msgid ""
"Did not normalize '%s'. Set aacgain path in the Tools section of the "
@@ -5444,24 +5839,24 @@
"No se ha normalizado '%s'. Configurar la ruta de aacgain en el apartado "
"'Herramientas' del diálogo de edición de preferencias.\n"
-#: ../src/tools.c:386
+#: ../src/tools.c:385
msgid "Normalizing..."
msgstr "Normalizando..."
-#: ../src/tools.c:436
+#: ../src/tools.c:435
#, c-format
msgid "%s - %s"
msgstr "%s - %s"
-#: ../src/tools.c:462
+#: ../src/tools.c:461
msgid "Aborting..."
msgstr "Cancelando..."
-#: ../src/tools.c:466
+#: ../src/tools.c:465
msgid "Will abort after current mp3gain process ends."
msgstr "Se cancelará al termino del actual proceso de mp3gain."
-#: ../src/tools.c:492
+#: ../src/tools.c:491
#, c-format
msgid ""
"'%s-%s' (%s) could not be normalized.\n"
@@ -5470,14 +5865,14 @@
"'%s-%s' (%s) no se ha podido normalizar.\n"
"\n"
-#: ../src/tools.c:531
+#: ../src/tools.c:530
#, c-format
msgid "Normalized %d of %d tracks."
msgid_plural "Normalized %d of %d tracks."
msgstr[0] "Normalizada %d de %d pista."
msgstr[1] "Normalizadas %d de %d pistas."
-#: ../src/tools.c:634
+#: ../src/tools.c:633
msgid ""
"Please specify the command to be called on the 'Tools' section of the "
"preferences dialog.\n"
@@ -5485,7 +5880,7 @@
"Seleccionar el programa a ser ejecutado en la sección de 'Herramientas' del "
"diálogo de edición de preferencias.\n"
-#: ../src/tools.c:646
+#: ../src/tools.c:645
#, c-format
msgid ""
"Could not find the command '%s'.\n"
@@ -5523,6 +5918,103 @@
msgid "%s does not appear to be a supported wav file.\n"
msgstr "%s no parece ser un fichero wav soportado.\n"
+#, fuzzy
+#~ msgid "<b>Resolution:</b>"
+#~ msgstr "<b>Sugerencias</b>"
+
+#~ msgid "label"
+#~ msgstr "etiqueta"
+
+#~ msgid ""
+#~ "Cannot open '%s' for reading.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No se puede leer '%s'.\n"
+#~ "\n"
+
+#~ msgid "Unable to open '%s' for reading\n"
+#~ msgstr "Imposible abrir '%s' para lectura\n"
+
+#~ msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
+#~ msgstr ""
+#~ "No se puede abrir \"iTunesDB.ext\" para leer información extendida.\n"
+
+#~ msgid "Add _Directory"
+#~ msgstr "Añadir _directorio"
+
+#~ msgid "Dirs"
+#~ msgstr "Directorios"
+
+#~ msgid "Files"
+#~ msgstr "Ficheros"
+
+#~ msgid "New PL"
+#~ msgstr "Nueva lista de reproducción"
+
+#~ msgid "_About"
+#~ msgstr "_Sobre"
+
+#~ msgid "Download Cover"
+#~ msgstr "Descargar carátula"
+
+#, fuzzy
+#~ msgid "Find _New"
+#~ msgstr "_Encontrar nuevo"
+
+#, fuzzy
+#~ msgid "Set Cover Art from _Web"
+#~ msgstr "Usar la web para configurar la carátula"
+
+#, fuzzy
+#~ msgid "_Previous"
+#~ msgstr "Previo"
+
+#~ msgid "Find Cover on Web"
+#~ msgstr "Encontrar carátula en la web"
+
+#~ msgid ""
+#~ "Audio/Video\n"
+#~ "Audio\n"
+#~ "Video\n"
+#~ "Podcast\n"
+#~ "Video Podcast\n"
+#~ "Audiobook\n"
+#~ "Music Video\n"
+#~ "TV Show\n"
+#~ "TV Show & Music Video\n"
+#~ msgstr ""
+#~ "Audio/VÃdeo\n"
+#~ "Audio\n"
+#~ "VÃdeo\n"
+#~ "Podcast\n"
+#~ "Podcast de vÃdeo\n"
+#~ "Audiolibro\n"
+#~ "VÃdeo musical\n"
+#~ "TV Show\n"
+#~ "TV Show & VÃdeo musical\n"
+
+#~ msgid "_Other"
+#~ msgstr "_Otro"
+
+#~ msgid "File skipped. match exclude masks: '%s'\n"
+#~ msgstr "Fichero ignorado. Concuerda con máscaras de exclusión: '%s'\n"
+
+#~ msgid "Add Playlists"
+#~ msgstr "Añadir listas de reproducción"
+
+#~ msgid "Select directory to add recursively"
+#~ msgstr "Seleccionar directorio para añadir recursivamente"
+
+#~ msgid ""
+#~ "Supposedly something that tells the iPod to increase or decrease the "
+#~ "playback speed"
+#~ msgstr ""
+#~ "Supuestamente, algo que le dice al iPod que incremente o reduzca la "
+#~ "velocidad de reproducción"
+
+#~ msgid "Processing '%s'"
+#~ msgstr "Procesando '%s'"
+
#~ msgid "label21"
#~ msgstr "etiqueta21"
Modified: gtkpod/branches/etch-bpo/po/fr.po
===================================================================
--- gtkpod/branches/etch-bpo/po/fr.po 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/fr.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,5 +1,5 @@
# French language translation for gtkpod
-# Copyright (C) 2005-2006 Eric Lassauge
+# Copyright (C) 2005-2007 Eric Lassauge
# Eric Lassauge <lassauge at users.sf.net>, 2006.
# Copyright (C) 2003 David Le Brun
# David Le Brun <david at dyn-ns.net>, 2003.
@@ -7,11 +7,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gtkpod 0.94\n"
+"Project-Id-Version: gtkpod 0.99\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-14 22:57+0900\n"
-"PO-Revision-Date: 2007-01-08 21:37+0900\n"
-"Last-Translator: Eric Lassauge <lassauge at users.sf.net>\n"
+"POT-Creation-Date: 2007-12-13 18:36-0500\n"
+"PO-Revision-Date: 2007-07-03 16:28+0100\n"
+"Last-Translator: Éric Lassauge <rpmfarm at free.fr>\n"
"Language-Team: FR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,16 @@
"Plural-Forms: nplurals=2; plural=n>1;\n"
#: ../data/gtkpod.desktop.in.h:1
-#, fuzzy
msgid "GtkPod"
-msgstr "gtkpod"
+msgstr "GtkPod"
#: ../data/gtkpod.desktop.in.h:2
msgid "Manage music and video on an Apple iPod"
-msgstr ""
+msgstr "Gérer musiques et vidéos sur un iPod Apple"
#: ../data/gtkpod.desktop.in.h:3
msgid "iPod Manager"
-msgstr ""
+msgstr "Gestionnaire iPod"
#: ../data/gtkpod.glade.h:1
msgid " "
@@ -74,11 +73,11 @@
#: ../data/gtkpod.glade.h:11
msgid "'aacgain' executable:"
-msgstr "Chemin de l'exécutable «aacgain» :"
+msgstr "Chemin de l'exécutable « aacgain » :"
#: ../data/gtkpod.glade.h:12
msgid "'mp3gain' executable:"
-msgstr "Chemin de l'exécutable «mp3gain» :"
+msgstr "Chemin de l'exécutable « mp3gain » :"
#: ../data/gtkpod.glade.h:13
msgid "(Checked)"
@@ -86,23 +85,23 @@
#: ../data/gtkpod.glade.h:14
msgid "...as icons"
-msgstr "...avec seulement les icônes"
+msgstr "…avec seulement les icônes"
#: ../data/gtkpod.glade.h:15
msgid "...as text"
-msgstr "...avec seulement les libellés"
+msgstr "…avec seulement les libellés"
#: ../data/gtkpod.glade.h:16
msgid "...both as icons and text"
-msgstr "...avec les icônes et libellés"
+msgstr "…avec les icônes et libellés"
#: ../data/gtkpod.glade.h:17
msgid "...entry 'All' in sort tab..."
-msgstr "...onglet «Tous» dans la zone de tri..."
+msgstr "…onglet « Tous » dans la zone de tri…"
#: ../data/gtkpod.glade.h:18
msgid "...master playlist"
-msgstr "...liste de lecture principale"
+msgstr "…liste de lecture principale"
#: ../data/gtkpod.glade.h:20
#, no-c-format
@@ -139,21 +138,19 @@
#: ../data/gtkpod.glade.h:28
msgid "<"
-msgstr ""
+msgstr "<"
#: ../data/gtkpod.glade.h:29
-#, fuzzy
msgid "<b>Account Information</b>"
-msgstr "<b>Confirmation de suppression</b>"
+msgstr "<b>Informations du compte</b>"
#: ../data/gtkpod.glade.h:30
msgid "<b>Adding/Updating/Syncing</b>"
msgstr "<b>Ajout/Mise à jour/Synchronisation</b>"
#: ../data/gtkpod.glade.h:31
-#, fuzzy
msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Barre d'outils</b>"
+msgstr "<b>Audioscrobbler</b>"
#: ../data/gtkpod.glade.h:32
msgid "<b>Auto-Generated Playlists</b>"
@@ -161,7 +158,7 @@
#: ../data/gtkpod.glade.h:33
msgid "<b>Automatically select...</b>"
-msgstr "<b>Sélection automatique...</b>"
+msgstr "<b>Sélection automatique…</b>"
#: ../data/gtkpod.glade.h:34
msgid "<b>Calendar/Contacts/Notes</b>"
@@ -176,74 +173,74 @@
msgstr "<b>Confirmation de suppression</b>"
#: ../data/gtkpod.glade.h:37
-msgid "<b>Displayed Track Attributes</b>"
-msgstr "<b>Attributs des morceaux affichés</b>"
-
-#: ../data/gtkpod.glade.h:38
msgid "<b>Examples</b>"
msgstr "<b>Exemples</b>"
-#: ../data/gtkpod.glade.h:39
+#: ../data/gtkpod.glade.h:38
msgid "<b>Ignore Frequent Words</b>"
msgstr "<b>Ignorer les mots courants</b>"
-#: ../data/gtkpod.glade.h:40
+#: ../data/gtkpod.glade.h:39
msgid "<b>Misc</b>"
msgstr "<b>Divers</b>"
-#: ../data/gtkpod.glade.h:41
+#: ../data/gtkpod.glade.h:40
msgid "<b>Mountpoint and individual repository/playlist options</b>"
msgstr "<b>Point de montage et options pour dépots/listes</b>"
-#: ../data/gtkpod.glade.h:42
-#, fuzzy
+#: ../data/gtkpod.glade.h:41
msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Confirmation de suppression</b>"
+msgstr "<b>Conversion au fil de l'eau</b>"
-#: ../data/gtkpod.glade.h:43
+#: ../data/gtkpod.glade.h:42
msgid "<b>Play</b>"
msgstr "<b>Jouer</b>"
-#: ../data/gtkpod.glade.h:44
+#: ../data/gtkpod.glade.h:43
msgid "<b>Playlists</b>"
msgstr "<b>Listes</b>"
-#: ../data/gtkpod.glade.h:45
+#: ../data/gtkpod.glade.h:44
msgid "<b>Please select mountpoint and your iPod model</b>"
msgstr "<b>Sélectionnez le point de montage et le modèle de votre iPod</b>"
-#: ../data/gtkpod.glade.h:46
+#: ../data/gtkpod.glade.h:45
msgid "<b>Repositories</b>"
msgstr "<b>Dépots</b>"
-#: ../data/gtkpod.glade.h:47
+#: ../data/gtkpod.glade.h:46
msgid "<b>Sort Order</b>"
msgstr "<b>Ordre de tri</b>"
-#: ../data/gtkpod.glade.h:48
+#: ../data/gtkpod.glade.h:47
msgid "<b>Sort Tabs</b>"
msgstr "<b>Zones de tri</b>"
-#: ../data/gtkpod.glade.h:49
+#: ../data/gtkpod.glade.h:48
msgid "<b>Sync</b>"
msgstr "<b>Synchroniser</b>"
-#: ../data/gtkpod.glade.h:50
+#: ../data/gtkpod.glade.h:49
msgid "<b>Synchronization</b>"
msgstr "<b>Synchronisation</b>"
-#: ../data/gtkpod.glade.h:51
+#: ../data/gtkpod.glade.h:50
msgid "<b>Tag Reading</b>"
msgstr "<b>Lecture des attributs</b>"
-#: ../data/gtkpod.glade.h:52
+#: ../data/gtkpod.glade.h:51
msgid "<b>Toolbar</b>"
msgstr "<b>Barre d'outils</b>"
-#: ../data/gtkpod.glade.h:53
+#: ../data/gtkpod.glade.h:52
msgid "<b>Tooltips</b>"
msgstr "<b>Infobulles</b>"
+#: ../data/gtkpod.glade.h:53
+#, fuzzy
+msgid "<b>Track Attributes</b>"
+msgstr "<b>Attributs des morceaux affichés</b>"
+
#: ../data/gtkpod.glade.h:54
msgid "<b>Track Editing</b>"
msgstr "<b>Édition de morceau</b>"
@@ -258,7 +255,7 @@
#: ../data/gtkpod.glade.h:57
msgid ">"
-msgstr ""
+msgstr ">"
#: ../data/gtkpod.glade.h:58
msgid "About gtkpod"
@@ -269,94 +266,123 @@
msgstr "Ajouter récursivement des répertoires."
#: ../data/gtkpod.glade.h:60
+#, fuzzy
+msgid "Add Files"
+msgstr "Ajouter des _fichiers"
+
+#: ../data/gtkpod.glade.h:61
msgid "Add Files or Directories"
msgstr "Ajouter des fichiers ou répertoires."
-#: ../data/gtkpod.glade.h:61
-msgid "Add _Directory"
-msgstr "Ajouter un _répertoire"
+#: ../data/gtkpod.glade.h:62
+#, fuzzy
+msgid "Add Fol_der"
+msgstr "Ajouter des _fichiers"
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:63
+#, fuzzy
+msgid "Add Folder"
+msgstr "Ajouter des _fichiers"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Image_s"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:65
+#, fuzzy
+msgid "Add Images from a Directory"
+msgstr "Ajouter des fichiers ou répertoires."
+
+#: ../data/gtkpod.glade.h:66
+#, fuzzy
+msgid "Add Playlist"
+msgstr "Ajouter une _liste de lecture"
+
+#: ../data/gtkpod.glade.h:67
msgid "Add _Files"
msgstr "Ajouter des _fichiers"
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:68
msgid "Add _Playlist"
msgstr "Ajouter une _liste de lecture"
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:69
msgid "Add coverart from file using the following template"
msgstr ""
"Ajouter la pochette depuis un fichier en utilisant l'expression suivante"
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:70
msgid "Add directories recursively"
msgstr "Ajouter les répertoires récursivement"
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:71
msgid "Add new repository/iPod"
-msgstr "Ajouter un nouvel iPod/dépot"
+msgstr "Ajouter un nouvel iPod/dépôt"
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:72
msgid "Add playlist from file"
-msgstr "Ajouter une liste de lecture depuis un fichier."
+msgstr "Ajouter une liste de lecture depuis un fichier"
-#: ../data/gtkpod.glade.h:68 ../src/display_sorttabs.c:3232
-#: ../src/display_tracks.c:1996
+#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
msgid "Added"
msgstr "Ajouté"
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:74
msgid "Advanced Sorting Options"
msgstr "Options de tri avancées"
#. 0
-#: ../data/gtkpod.glade.h:70 ../src/display_sorttabs.c:2954
+#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
msgid "Album"
msgstr "Album"
-#: ../data/gtkpod.glade.h:71
-#, fuzzy
+#: ../data/gtkpod.glade.h:76
msgid "Album Art"
-msgstr "Album"
+msgstr "Affichage pochette"
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:77
msgid "All (AND)"
msgstr "Et"
-#: ../data/gtkpod.glade.h:73
+#: ../data/gtkpod.glade.h:78
msgid "All Tracks Never Listened To"
msgstr "Contenant les morceaux qui n'ont jamais été écoutés"
-#: ../data/gtkpod.glade.h:74
+#: ../data/gtkpod.glade.h:79
msgid "All Tracks Played Since Last Time"
msgstr "Contenant les morceaux joués depuis la dernière fois"
-#: ../data/gtkpod.glade.h:75
+#: ../data/gtkpod.glade.h:80
msgid "All Tracks not Listed in any Playlist"
msgstr "Contenant tous les morceaux qui n'appartiennent à aucune liste"
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:81
msgid "Also include tracks never played in \"Best Rated\" playlist"
msgstr ""
"Inclure aussi les morceaux qui n'ont jamais été joués dans la liste de \n"
"lecture des morceaux les mieux notés"
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:82
msgid "Always write ID3v2.4 tags (only applies to MP3)"
msgstr "Toujours écrire les attributs ID3v2.4 (s'applique seulement aux MP3)"
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:83
msgid "Any (OR)"
msgstr "Ou"
-#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2951
+#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
msgid "Artist"
msgstr "Artiste"
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:85
+#, fuzzy
+msgid "Artwork Preview"
+msgstr "Chemin de la pochette"
+
+#: ../data/gtkpod.glade.h:86
msgid ""
"As a last resort set the following tags to the\n"
"filename if they are (still) empty:"
@@ -364,82 +390,72 @@
"Mettre un attribut par défaut au cas où les attributs restent\n"
"vides après l'extraction à partir du nom de fichier :"
-#: ../data/gtkpod.glade.h:82
+#: ../data/gtkpod.glade.h:88
msgid "Ascending"
msgstr "Croissant"
-#: ../data/gtkpod.glade.h:83
-msgid ""
-"Audio/Video\n"
-"Audio\n"
-"Video\n"
-"Podcast\n"
-"Video Podcast\n"
-"Audiobook\n"
-"Music Video\n"
-"TV Show\n"
-"TV Show & Music Video\n"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:93
+#: ../data/gtkpod.glade.h:89
msgid "Auto Store"
msgstr "Sauver automatiquement"
-#: ../data/gtkpod.glade.h:94
+#: ../data/gtkpod.glade.h:90
msgid ""
"Automatically start displaying tracks that match the criteria entered above. "
"If not selected, you must press 'Display' to start displaying."
msgstr ""
"Affiche automatiquement les morceaux qui correspondent aux critères saisis."
-"En désactivant cette option, vous devrez appuyer sur «Afficher»."
+"En désactivant cette option, vous devrez appuyer sur « Afficher »."
-#: ../data/gtkpod.glade.h:95
+#: ../data/gtkpod.glade.h:91
+msgid "Available:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:92
msgid "Before removing playlists or tracks from a playlist"
msgstr "Avant de supprimer les listes ou morceaux d'une liste de lecture"
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:93
msgid "Before removing tracks from the harddisk"
msgstr "Avant de supprimer complètement les morceaux du disque dur"
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:94
msgid "Before removing tracks from the iPod"
msgstr "Avant de supprimer complètement les morceaux de l'iPod"
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:95
msgid "Before removing tracks from the local database"
msgstr ""
"Avant de supprimer complètement les morceaux de la base de données locale"
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:96
msgid "Best Rated Tracks"
msgstr "Contenant les morceaux les mieux notés"
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:97
msgid "Browse"
msgstr "Parcourir"
-#: ../data/gtkpod.glade.h:101
-#, fuzzy
+#: ../data/gtkpod.glade.h:98
msgid "Cache directory:"
-msgstr "Ajouter un _répertoire"
+msgstr "Dossier de cache :"
-#: ../data/gtkpod.glade.h:102
+#: ../data/gtkpod.glade.h:99
msgid "Calendar"
msgstr "Calendrier"
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:100
msgid "Calendar sync command:"
msgstr "Commande pour la synchronisation du calendrier :"
-#: ../data/gtkpod.glade.h:104
+#: ../data/gtkpod.glade.h:101
msgid "Call automatically when synchronizing iTunesDB"
msgstr "Exécuter en même temps que la synchronisation de la base iTunesDB"
-#: ../data/gtkpod.glade.h:105
+#: ../data/gtkpod.glade.h:102
msgid "Category: "
msgstr "Catégorie : "
-#: ../data/gtkpod.glade.h:106
+#: ../data/gtkpod.glade.h:103
msgid ""
"Change all tracks\n"
"simultaneously"
@@ -447,107 +463,112 @@
"Changer tous les morceaux\n"
"simultanément"
-#: ../data/gtkpod.glade.h:108
+#: ../data/gtkpod.glade.h:105
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:107
msgid "Check for existing files when copying from iPod."
msgstr ""
"Contrôler l'existence des fichiers lors de la copie à partir de l'iPod."
-#: ../data/gtkpod.glade.h:109
+#: ../data/gtkpod.glade.h:108
msgid "Command for 'Enqueue':"
-msgstr "Ligne de commande pour «Ajouter à la file d'attente» :"
+msgstr "Ligne de commande pour « Ajouter à la file d'attente » :"
-#: ../data/gtkpod.glade.h:110
+#: ../data/gtkpod.glade.h:109
msgid "Command for 'Play now':"
-msgstr "Ligne de commande pour «Jouer maintenant» :"
+msgstr "Ligne de commande pour « Jouer maintenant » :"
#. 5
-#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
#: ../src/misc_conversion.c:65
msgid "Composer"
msgstr "Compositeur"
-#: ../data/gtkpod.glade.h:112
+#: ../data/gtkpod.glade.h:111
msgid "Confirm before removing tracks from the iPod or repository"
-msgstr "Confirmer avant de supprimer les morceaux de l'iPod ou du dépot"
+msgstr "Confirmer avant de supprimer les morceaux de l'iPod ou du dépôt"
-#: ../data/gtkpod.glade.h:113
+#: ../data/gtkpod.glade.h:112
msgid ""
"Confirm before removing tracks from the iPod or repository\n"
"when syncing playlists"
msgstr ""
-"Confirmer avant de supprimer les morceaux de l'iPod ou du dépot\n"
+"Confirmer avant de supprimer les morceaux de l'iPod ou du dépôt\n"
"lors de la synchronisation des listes"
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:114
msgid "Confirm lists of directories"
msgstr "Confirmer la liste des répertoires"
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:115
msgid "Contacts sync command:"
msgstr "Commande pour la synchronisation des contacts :"
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:116
msgid "Containing Displayed Tracks"
msgstr "Contenant les morceaux affichés"
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:117
msgid "Containing Selected Tracks"
msgstr "Contenant les morceaux sélectionnés"
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:118
msgid "Conversion Progress Display"
-msgstr ""
+msgstr "Afficher une boîte de dialogue de barre de progression"
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:119
msgid "Cover"
msgstr "Pochette"
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:120
msgid "Create New Playlist"
msgstr "Créer une nouvelle liste de lecture."
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:121
msgid "Create Repository"
msgstr "Créer un dépot"
-#: ../data/gtkpod.glade.h:123
+#: ../data/gtkpod.glade.h:122
msgid "Create _Playlist File"
-msgstr "Créer un _fichier de liste"
+msgstr "Créer un fichier de _liste"
-#: ../data/gtkpod.glade.h:124
+#: ../data/gtkpod.glade.h:123
msgid "Credits"
msgstr "Crédits"
-#: ../data/gtkpod.glade.h:125
+#: ../data/gtkpod.glade.h:124
msgid "Currently only rating is supported."
msgstr "Actuellement, seule la notation est supportée."
-#: ../data/gtkpod.glade.h:126
+#: ../data/gtkpod.glade.h:125
msgid "Delete repository"
msgstr "Supprimer le dépot"
-#: ../data/gtkpod.glade.h:127
-#, fuzzy
+#: ../data/gtkpod.glade.h:126
msgid ""
"Delete tracks that are no longer present from the\n"
"iPod or repository"
msgstr ""
"Effacer les morceaux qui ne sont plus présents\n"
-"dans l'iPod ou le dépot"
+"dans l'iPod ou le dépôt"
-#: ../data/gtkpod.glade.h:129
+#: ../data/gtkpod.glade.h:128
msgid "Deleted tracks"
msgstr "Morceaux supprimés"
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:129
msgid "Descending"
msgstr "Décroissant"
-#: ../data/gtkpod.glade.h:131
+#: ../data/gtkpod.glade.h:130
msgid "Details"
msgstr "Détails"
-#: ../data/gtkpod.glade.h:133
+#: ../data/gtkpod.glade.h:132
#, no-c-format
msgid ""
"Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -564,7 +585,7 @@
"G, N° de piste: %T, N° de CD: %C, année: %Y, le nom de fichier original "
"(nécessite le fichier d'infos étendues): %o, le caractère '%': %%."
-#: ../data/gtkpod.glade.h:135
+#: ../data/gtkpod.glade.h:134
#, no-c-format
msgid ""
"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -581,7 +602,7 @@
"genre: %G, N° de piste: %T, N° de CD: %C, année: %Y, le nom de fichier "
"original (nécessite le fichier d'infos étendues): %o, le caractère '%': %%."
-#: ../data/gtkpod.glade.h:137
+#: ../data/gtkpod.glade.h:136
#, no-c-format
msgid ""
"Determines the name of the file with the cover art. You can separate several "
@@ -598,7 +619,7 @@
"étendues): %o, le nom de fichier original sans extension: %O, la liste "
"courante: %p, le caractère '%': %%."
-#: ../data/gtkpod.glade.h:138
+#: ../data/gtkpod.glade.h:137
msgid ""
"Directories to sync with are determined from the filenames of the tracks in "
"the playlist."
@@ -606,60 +627,56 @@
"Répertoires à synchroniser déterminés par les noms de fichier des morceaux "
"de la liste de lecture."
-#: ../data/gtkpod.glade.h:139
-msgid "Dirs"
-msgstr "Répertoires"
-
-#: ../data/gtkpod.glade.h:140
+#: ../data/gtkpod.glade.h:138
msgid "Display a list of tracks that could actually be updated."
msgstr "Afficher la liste des morceaux qui peuvent être mis à jour."
-#: ../data/gtkpod.glade.h:141
+#: ../data/gtkpod.glade.h:139
msgid "Display a list of tracks that could not be updated."
msgstr "Afficher la liste des morceaux qui ne peuvent pas être mis à jour."
-#: ../data/gtkpod.glade.h:142
+#: ../data/gtkpod.glade.h:140
msgid "Display conversion log"
-msgstr ""
+msgstr "Afficher les traces des conversions"
-#: ../data/gtkpod.glade.h:143
+#: ../data/gtkpod.glade.h:141
msgid "Display info about detected duplicates"
msgstr "Afficher les infos au sujet des doublons"
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:142
msgid "Display info about non-updated tracks"
msgstr "Afficher les infos des morceaux qui n'ont pas été mis à jour"
-#: ../data/gtkpod.glade.h:145
+#: ../data/gtkpod.glade.h:143
msgid "Display info about updated tracks"
msgstr "Afficher les infos des morceaux mis à jour"
-#: ../data/gtkpod.glade.h:146
+#: ../data/gtkpod.glade.h:144
msgid "Display messages and warnings at startup"
msgstr "Afficher les messages et avertissements au démarrage"
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:145
msgid ""
"Display the list of duplicates that have been detected after adding files."
msgstr "Afficher la liste des doublons détectés lors de l'ajout de fichier."
-#: ../data/gtkpod.glade.h:148
+#: ../data/gtkpod.glade.h:146
msgid "Display toolbar..."
-msgstr "Afficher la barre d'outils..."
+msgstr "Afficher la barre d'outils…"
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:147
msgid "Display tooltips in main window"
msgstr "Afficher les infobulles dans la fenêtre principale"
-#: ../data/gtkpod.glade.h:150
+#: ../data/gtkpod.glade.h:148
msgid "Display tooltips in prefs window"
msgstr "Afficher les infobulles dans la fenêtre des préférences"
-#: ../data/gtkpod.glade.h:151
+#: ../data/gtkpod.glade.h:149
msgid "Display tracks that match the criteria entered above."
msgstr "Afficher les morceaux qui correspondent aux critères saisis."
-#: ../data/gtkpod.glade.h:152
+#: ../data/gtkpod.glade.h:150
msgid ""
"Displayed\n"
"Tracks"
@@ -667,74 +684,74 @@
"Morceaux\n"
"Affichés"
-#: ../data/gtkpod.glade.h:154
+#: ../data/gtkpod.glade.h:152
+#, fuzzy
+msgid "Displayed:"
+msgstr "_Affichage"
+
+#: ../data/gtkpod.glade.h:153
msgid "Don't allow file duplication"
msgstr "Ne pas autoriser de doublons de fichiers"
-#: ../data/gtkpod.glade.h:155
+#: ../data/gtkpod.glade.h:154
msgid "Don't automatically sync on startup"
msgstr "Ne pas synchroniser automatiquement au démarrage"
-#: ../data/gtkpod.glade.h:156
-msgid "Download Cover"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:157
-#, fuzzy
+#: ../data/gtkpod.glade.h:155
msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
msgstr ""
-"La détection de doublons est basée sur la somme de contrôle md5 des fichiers."
+"La détection de doublons est basée sur la somme de contrôle sha1 des "
+"fichiers."
-#: ../data/gtkpod.glade.h:158
+#: ../data/gtkpod.glade.h:156
msgid "Edit Repository/iPod Options"
msgstr "Editer les _options du dépot/iPod"
-#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:659
+#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
msgid "Edit Smart Playlist"
msgstr "Éditer la liste intelligente"
-#: ../data/gtkpod.glade.h:160 ../src/context_menus.c:746
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
msgid "Edit Track Details"
msgstr "Editer les _détails du morceau"
-#: ../data/gtkpod.glade.h:161
+#: ../data/gtkpod.glade.h:159
msgid "Edit _Preferences"
msgstr "_Préférences"
-#: ../data/gtkpod.glade.h:162
+#: ../data/gtkpod.glade.h:160
msgid "Effective free space"
msgstr "Espace libre effectif"
-#: ../data/gtkpod.glade.h:163
+#: ../data/gtkpod.glade.h:161
msgid "Empty Playlist"
msgstr "Vide"
-#: ../data/gtkpod.glade.h:164
+#: ../data/gtkpod.glade.h:162
msgid "Exclude file mask(s)"
msgstr "Masque(s) d'exclusion de fichiers :"
-#: ../data/gtkpod.glade.h:165
+#: ../data/gtkpod.glade.h:163
+msgid "Export can be continued at a later time if canceled."
+msgstr "L'export peut être repris plus tard après l'annulation."
+
+#: ../data/gtkpod.glade.h:164
msgid "File size"
msgstr "Taille des fichiers"
-#: ../data/gtkpod.glade.h:166
+#: ../data/gtkpod.glade.h:165
msgid "File size (deleted)"
msgstr "Taille des fichiers (supprimés)"
-#: ../data/gtkpod.glade.h:167
+#: ../data/gtkpod.glade.h:166
msgid "File size (non-transferred)"
msgstr "Taille des fichiers (non transférés)"
-#: ../data/gtkpod.glade.h:168
+#: ../data/gtkpod.glade.h:167
msgid "Filename Format: "
msgstr "Format du nom des fichiers : "
-#: ../data/gtkpod.glade.h:169
-msgid "Files"
-msgstr "Fichiers"
-
-#: ../data/gtkpod.glade.h:170
-#, fuzzy
+#: ../data/gtkpod.glade.h:168
msgid ""
"Find orphan files (files with no track info in DB) and dangling tracks "
"(tracks with no corresponding files on iPod)"
@@ -742,44 +759,43 @@
"Trouver les fichiers orphelins (fichiers sans entrée dans la base iTunesDB) "
"et les morceaux fictifs (morceaux sans fichier correspondant sur l'iPod)."
-#: ../data/gtkpod.glade.h:171
+#: ../data/gtkpod.glade.h:169
#, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
msgstr "Essaye <i>répertoire.jpg</i>, puis <i><artiste>.jpg</i>"
-#: ../data/gtkpod.glade.h:172
+#: ../data/gtkpod.glade.h:170
msgid "Flac with :"
-msgstr ""
+msgstr "FLAC avec :"
-#: ../data/gtkpod.glade.h:174
+#: ../data/gtkpod.glade.h:172
#, no-c-format
msgid ""
"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
"tracks and start playing."
msgstr ""
-"Par exemple «xmms %s» videra la liste de lecture actuelle de xmms, ajoutera "
-"les morceaux sélectionnés et commencera la lecture."
+"Par exemple « xmms %s » videra la liste de lecture actuelle de xmms, "
+"ajoutera les morceaux sélectionnés et commencera la lecture."
-#: ../data/gtkpod.glade.h:176
+#: ../data/gtkpod.glade.h:174
#, no-c-format
msgid ""
"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
"current playlist."
msgstr ""
-"Par exemple «xmms -e %s» ajoutera à la liste de lecture de xmms les morceaux "
-"sélectionnés."
+"Par exemple « xmms -e %s » ajoutera à la liste de lecture de xmms les "
+"morceaux sélectionnés."
-#: ../data/gtkpod.glade.h:177 ../src/display_sorttabs.c:2957
+#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
msgid "Genre"
msgstr "Genre"
-#: ../data/gtkpod.glade.h:178
+#: ../data/gtkpod.glade.h:176
msgid "Group artists on compilation CDs"
msgstr "Grouper les artistes pour les CDs de compilation"
-#: ../data/gtkpod.glade.h:179
-#, fuzzy
+#: ../data/gtkpod.glade.h:177
msgid ""
"Highly recommended for faster import when taking advantage of the "
"duplication recognition. Also, having the PC filenames allows writing "
@@ -790,14 +806,15 @@
"Cette option est plus que recommandée pour des raisons de performance lors "
"de l'import en prenant en compte les doublons. De plus, cela permet de "
"mettre à jour les attributs ID3 des fichiers sur disque, et de restaurer le "
-"contenu de votre iPod en cas de corruption du système de fichiers."
+"contenu de votre iPod en cas de corruption du système de fichiers (change "
+"l'entrée « transferred= » dans la sauvegarde de la base de données)."
-#: ../data/gtkpod.glade.h:180 ../src/context_menus.c:682
-#: ../src/context_menus.c:700 ../src/context_menus.c:824
+#: ../data/gtkpod.glade.h:178 ../src/context_menus.c:685
+#: ../src/context_menus.c:703 ../src/context_menus.c:820
msgid "I'm sure"
msgstr "Je suis sûr"
-#: ../data/gtkpod.glade.h:181
+#: ../data/gtkpod.glade.h:179
msgid ""
"If available, the local copy of the track is referenced in the playlist. "
"Otherwise the file on the iPod is used."
@@ -805,13 +822,13 @@
"Si possible, c'est la copie locale du fichier qui est référencée dans la "
"liste. Autrement, le fichier de l'iPod est utilisé."
-#: ../data/gtkpod.glade.h:182
+#: ../data/gtkpod.glade.h:180
msgid "If both options are selected, embedded APIC data takes precedence."
msgstr ""
"Si les deux options sont validées, les données APIC sont utilisées en "
"priorité."
-#: ../data/gtkpod.glade.h:183
+#: ../data/gtkpod.glade.h:181
msgid ""
"If checked, sorting will be case sensitive. Please note that case sensitive "
"sorting will not work well with most charsets."
@@ -819,7 +836,7 @@
"En cochant cette option, le tri tiendra compte de la casse (minuscule/"
"majuscule). Le tri dépend du jeu de caractères."
-#: ../data/gtkpod.glade.h:184
+#: ../data/gtkpod.glade.h:182
msgid ""
"If the filename (full path) of an existing track matches that of a track to "
"be added, this option allows you to update the information about the "
@@ -833,13 +850,13 @@
"différente de l'option ci-dessus : les doublons sont des fichiers "
"strictement identiques (même taille, mêmes tags)"
-#: ../data/gtkpod.glade.h:185
+#: ../data/gtkpod.glade.h:183
msgid "If you check this, gtkpod will descend into subdirectories recursively."
msgstr ""
"Si vous cochez cette case, gtkpod analysera les sous-répertoires "
"récursivement."
-#: ../data/gtkpod.glade.h:186
+#: ../data/gtkpod.glade.h:184
msgid ""
"If you check this, information (cover art and meta information) changed for "
"this track will be copied to all other selected tracks as well. Use with "
@@ -849,7 +866,7 @@
"modifiées pour ce morceau seront copiées également pour tous les morceaux "
"sélectionnés. A utiliser avec précaution."
-#: ../data/gtkpod.glade.h:187
+#: ../data/gtkpod.glade.h:185
msgid ""
"If you don't select the master playlist automatically, the initial database "
"import is much faster because the display dosn't have to be updated."
@@ -858,7 +875,7 @@
"l'import initial sera beaucoup plus rapide car l'affichage n'aura pas à être "
"mis à jour à chaque morceau."
-#: ../data/gtkpod.glade.h:188
+#: ../data/gtkpod.glade.h:186
msgid ""
"If you select several tracks in the track list and edit a tag of the first "
"track, the tags in the other tracks are updated as well."
@@ -866,24 +883,24 @@
"Si vous sélectionnez plusieures chansons et éditez un attribut du premier "
"morceau les attributs des autres morceaux seront également mis à jour."
-#: ../data/gtkpod.glade.h:189
+#: ../data/gtkpod.glade.h:187
msgid "Ignore these words when at the beginning of the following fields:"
msgstr "Ignorer ces mots au début des champs suivants :"
-#: ../data/gtkpod.glade.h:190
+#: ../data/gtkpod.glade.h:188
msgid ""
"In order to save the displayed track order to the iPod choose 'Save "
"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
msgstr ""
"Afin de trier par ordre alphabétique sur l'iPod, vous devez cliquer sur le "
-"menu «Édition» puis «Sauver l'ordre de tri des morceaux affichés» ou "
-"l'option «Sauver automatiquement» ci-dessus."
+"menu « Édition » puis « Sauver l'ordre de tri des morceaux affichés » ou "
+"l'option « Sauver automatiquement » ci-dessus."
-#: ../data/gtkpod.glade.h:191
+#: ../data/gtkpod.glade.h:189
msgid "Initialize iPod"
msgstr "Initialiser l'iPod"
-#: ../data/gtkpod.glade.h:192
+#: ../data/gtkpod.glade.h:190
msgid ""
"Insert before\n"
"Insert after"
@@ -891,67 +908,71 @@
"Insérer avant\n"
"Insérer après"
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:192
msgid "Keeps all compilation CDs grouped together in the artists sort tab."
msgstr "Garder les CDs de compilation groupés dans la zone de tri Artistes"
-#: ../data/gtkpod.glade.h:195
+#: ../data/gtkpod.glade.h:193
msgid "Live _updating"
msgstr "Mise à jour automatique"
-#: ../data/gtkpod.glade.h:196
+#: ../data/gtkpod.glade.h:194
msgid "Load iPod(s)"
msgstr "Charger _iPod(s)"
-#: ../data/gtkpod.glade.h:197
+#: ../data/gtkpod.glade.h:195
msgid "Lower Margin"
msgstr "Borne inférieure"
-#: ../data/gtkpod.glade.h:198
+#: ../data/gtkpod.glade.h:196
msgid "M4A with :"
-msgstr ""
+msgstr "M4A avec :"
-#: ../data/gtkpod.glade.h:199
+#: ../data/gtkpod.glade.h:197
msgid "MP3 with :"
-msgstr ""
+msgstr "MP3 avec :"
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:198
msgid "Match al_l of the following"
msgstr "Répondant à _toutes"
-#: ../data/gtkpod.glade.h:201
+#: ../data/gtkpod.glade.h:199
msgid "Match an_y of the following"
msgstr "Répondant à _quelques"
-#: ../data/gtkpod.glade.h:202
+#: ../data/gtkpod.glade.h:200
msgid "Match only _checked tracks"
msgstr "Seulement les morceaux _cochés"
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:201
msgid "Maximum number of background threads:"
-msgstr ""
+msgstr "Nombre maximum de threads en arrière-plan :"
-#: ../data/gtkpod.glade.h:204
+#: ../data/gtkpod.glade.h:202
msgid "Maximum size of cache directory (in GB):"
-msgstr ""
+msgstr "Taille maximale du dossier cache (en Go)Â :"
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:203
msgid "Model:"
msgstr "Modèle :"
-#: ../data/gtkpod.glade.h:206 ../src/display_tracks.c:1993
+#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
msgid "Modified"
msgstr "Modifié le"
-#: ../data/gtkpod.glade.h:207
+#: ../data/gtkpod.glade.h:205
msgid "Most Recently Played Tracks"
msgstr "Contenant les morceaux dernièrement joués"
-#: ../data/gtkpod.glade.h:208
+#: ../data/gtkpod.glade.h:206
+msgid "Move selected attributes to the displayed list"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:207
msgid "Music Root:"
msgstr "Racine musique :"
-#: ../data/gtkpod.glade.h:209
+#: ../data/gtkpod.glade.h:208
msgid ""
"Music files can have images embedded in the APIC tag. Currently this is only "
"supported for MP3 files."
@@ -959,31 +980,34 @@
"Les fichiers de musique peuvent avoir des images dans le tag APIC. Pour "
"l'instant ceci est uniquement vrai pour les fichiers MP3."
-#: ../data/gtkpod.glade.h:210
+#: ../data/gtkpod.glade.h:209
msgid "Never show this dialogue again"
msgstr "Ne plus afficher ce message"
+#: ../data/gtkpod.glade.h:210 ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66 ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93 ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428 ../src/misc_playlist.c:430
+msgid "New Playlist"
+msgstr "Nouvelle liste de lecture"
+
#: ../data/gtkpod.glade.h:211
-msgid "New PL"
-msgstr "Nouvelle liste"
-
-#: ../data/gtkpod.glade.h:212
msgid "No lower margin"
msgstr "Pas de borne inférieure"
-#: ../data/gtkpod.glade.h:213
+#: ../data/gtkpod.glade.h:212
msgid "No upper margin"
msgstr "Pas de borne supérieure"
-#: ../data/gtkpod.glade.h:214
+#: ../data/gtkpod.glade.h:213
msgid "Non-transferred tracks"
msgstr "Morceaux non transférés"
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:214
msgid "None"
msgstr "Aucun"
-#: ../data/gtkpod.glade.h:216
+#: ../data/gtkpod.glade.h:215
msgid ""
"Normally the charset specified when first importing the track will be used "
"for the filename. If you set this option you can set a different charset "
@@ -1000,7 +1024,7 @@
"n'utilisaient pas ce fichier. Ce sera le jeu de caractère spécifié ici qui "
"sera utilisé en cas de mise à jour de ces morceaux."
-#: ../data/gtkpod.glade.h:217
+#: ../data/gtkpod.glade.h:216
msgid ""
"Normally the charset specified when first importing the track will be used "
"to update the track information. If you have chosen a wrong charset when "
@@ -1019,7 +1043,7 @@
"fichier. Ce sera le jeu de caractères spécifié ici qui sera utilisé en cas "
"de mise à jour de ces morceaux."
-#: ../data/gtkpod.glade.h:218
+#: ../data/gtkpod.glade.h:217
msgid ""
"Normally the charset specified when first importing the track will be used "
"to write the tags. If you have chosen a wrong charset when first importing a "
@@ -1038,7 +1062,7 @@
"fichier. Ce sera le jeu spécifié ici qui sera utilisé en cas de mise à jour "
"de ces morceaux."
-#: ../data/gtkpod.glade.h:219
+#: ../data/gtkpod.glade.h:218
msgid ""
"Normally, if a track is no longer present in the sync directory, it will be "
"removed from the playlist, but not from the iPod or local repository.\n"
@@ -1059,23 +1083,23 @@
"option si vous voulez que des morceaux soient effacés, car enlever de la "
"liste principale signifie effacer de l'iPod."
-#: ../data/gtkpod.glade.h:222
+#: ../data/gtkpod.glade.h:221
msgid "Notes sync command:"
msgstr "Commande pour la synchronisation des notes :"
-#: ../data/gtkpod.glade.h:223
+#: ../data/gtkpod.glade.h:222
msgid "Number of playlists"
msgstr "Nombre de listes de lecture"
-#: ../data/gtkpod.glade.h:224
+#: ../data/gtkpod.glade.h:223
msgid "Number of tracks"
msgstr "Nombre de morceaux"
-#: ../data/gtkpod.glade.h:225
+#: ../data/gtkpod.glade.h:224
msgid "Number of tracks in generated playlists:"
msgstr "Nombre de morceaux dans les listes de lecture générées :"
-#: ../data/gtkpod.glade.h:226
+#: ../data/gtkpod.glade.h:225
msgid ""
"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
@@ -1083,61 +1107,66 @@
"Nombre de morceaux dans les listes de lecture générées automatiquement."
"Mettre '0' pour ne pas spécifier de limite."
-#: ../data/gtkpod.glade.h:227
+#: ../data/gtkpod.glade.h:226
msgid "Ogg with :"
-msgstr ""
+msgstr "Ogg avec :"
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:227
msgid "On startup automatically sync with playlist directories"
msgstr ""
"Au démarrage synchroniser automatiquement avec les répertoires de liste de "
"lecture"
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:228
msgid "On startup automatically sync with the following directory"
msgstr "Au démarrage synchroniser automatiquement avec le répertoire suivant"
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:229
msgid "On startup automatically update (Live Playlist)"
msgstr "Au démarrage synchroniser automatiquement (liste dynamique)"
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:230
msgid "One for each Album"
msgstr "Par album"
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:231
msgid "One for each Artist"
msgstr "Par artiste"
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:232
msgid "One for each Composer"
msgstr "Par compositeur"
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:233
msgid "One for each Genre"
msgstr "Par genre"
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:234
msgid "One for each Rating"
msgstr "Par note"
-#: ../data/gtkpod.glade.h:236
+#: ../data/gtkpod.glade.h:235
msgid "One for each Year"
msgstr "Par année"
-#: ../data/gtkpod.glade.h:237
+#: ../data/gtkpod.glade.h:236
msgid "Overwrite tags that are already set"
msgstr "Écraser les attributs déjà présents"
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:237
msgid "Password:"
-msgstr ""
+msgstr "Mot de passe :"
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:238
msgid "Path:"
msgstr "Chemin :"
-#: ../data/gtkpod.glade.h:240
+#: ../data/gtkpod.glade.h:239
+#, fuzzy
+msgid "Photo Window"
+msgstr "_Fenêtre d'infos"
+
+#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
msgid "Play time"
msgstr "Durée"
@@ -1146,120 +1175,107 @@
msgid "Playcount"
msgstr "Cpt. lecture"
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:1990
+#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
msgid "Played"
msgstr "Joué le"
-#: ../data/gtkpod.glade.h:243 ../src/display_spl.c:105
-msgid "Playlist"
-msgstr "Liste de lecture"
-
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:243
msgid "Playlist name:"
msgstr "Nom de la liste :"
-#: ../data/gtkpod.glade.h:245
+#: ../data/gtkpod.glade.h:244
msgid "Playlist type:"
msgstr "Type de liste :"
-#: ../data/gtkpod.glade.h:246 ../src/display_playlists.c:2176
+#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
msgid "Playlists"
msgstr "Listes de lecture"
-#: ../data/gtkpod.glade.h:247
+#: ../data/gtkpod.glade.h:246
msgid "Please refer to the notice below."
msgstr "Référez vous à la règle ci-dessous."
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:247
msgid "Please specify a time interval"
msgstr "Spécifiez un intervalle de temps"
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:248
msgid "Preferences"
msgstr "Préférences"
+#: ../data/gtkpod.glade.h:249
+msgid "Progress Information"
+msgstr "Afficher des informations de progression"
+
#: ../data/gtkpod.glade.h:250
-msgid ""
-"Press button to abort.\n"
-"Export can be continued at a later time."
+msgid "R_ename Album"
msgstr ""
-"Appuyer sur le bouton pour Interrompre.\n"
-"L'export peut être repris plus tard."
-#: ../data/gtkpod.glade.h:252
-msgid "Previous"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:253
-#, fuzzy
-msgid "Progress Information"
-msgstr "Information"
-
-#: ../data/gtkpod.glade.h:254
+#: ../data/gtkpod.glade.h:251
msgid "Random Playlist from Displayed Tracks"
msgstr "Contenant les morceaux affichés aléatoirement"
-#: ../data/gtkpod.glade.h:255
+#: ../data/gtkpod.glade.h:252
msgid "Randomize Current Playlist"
msgstr "Mélanger l'ordre de la liste de lecture actuelle"
-#: ../data/gtkpod.glade.h:256 ../src/display_spl.c:101
+#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
#: ../src/misc_conversion.c:78
msgid "Rating"
msgstr "Note"
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:254
msgid "Read coverart from embedded APIC data"
msgstr "Lire la pochette depuis les données APIC"
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:255
msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
msgstr ""
"Lire les attributs à partir du contenu des fichiers (attributs ID3 dans les "
"fichiers)"
-#: ../data/gtkpod.glade.h:259
-msgid "Remove Cover Art"
-msgstr "Supprimer la pochette"
+#: ../data/gtkpod.glade.h:256
+#, fuzzy
+msgid "Remove selected attributes from the displayed list"
+msgstr "Morceaux sélectionnés de la liste de lecture"
-#: ../data/gtkpod.glade.h:260
+#: ../data/gtkpod.glade.h:257
msgid "Repository Options"
msgstr "Options du dépot"
-#: ../data/gtkpod.glade.h:261
+#: ../data/gtkpod.glade.h:258
msgid "Repository name:"
msgstr "Nom du dépot :"
-#: ../data/gtkpod.glade.h:262
+#: ../data/gtkpod.glade.h:259
msgid "Repository type:"
msgstr "Type de dépot :"
-#: ../data/gtkpod.glade.h:263
+#: ../data/gtkpod.glade.h:260
msgid "Root directory of mserv database (trackinfo root)."
msgstr "Rép. de la base mserv (infos)."
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:261
msgid "Rules"
msgstr "Règles"
-#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:808
+#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
msgid "Save Changes"
msgstr "Enregistrer"
-#: ../data/gtkpod.glade.h:266
-#, fuzzy
+#: ../data/gtkpod.glade.h:263
msgid "Scrobble Tracks?"
-msgstr "Morceaux sélec_tionnés"
+msgstr "« scrobbling » des morceaux ?"
-#: ../data/gtkpod.glade.h:267
+#: ../data/gtkpod.glade.h:264
msgid "Select '-1' for no upper limit."
msgstr "Choisissez «-1» pour aucune limite supérieure."
-#: ../data/gtkpod.glade.h:268
+#: ../data/gtkpod.glade.h:265
msgid "Select '0' for no lower limit."
msgstr "Choisissez «0» pour aucune limite inférieure."
-#: ../data/gtkpod.glade.h:269
+#: ../data/gtkpod.glade.h:266
msgid ""
"Selected\n"
"Playlist"
@@ -1267,7 +1283,7 @@
"Liste de lecture\n"
"Sélectionnée"
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:268
msgid ""
"Selected\n"
"Tracks"
@@ -1275,212 +1291,218 @@
"Morceaux\n"
"Sélectionnés"
+#: ../data/gtkpod.glade.h:270
+#, fuzzy
+msgid "Selected Filter Tab Entry from Database"
+msgstr "Zone de tri sélectionnée de la base de données"
+
+#: ../data/gtkpod.glade.h:271
+#, fuzzy
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "Zone de tri sélectionnée du disque dur"
+
+#: ../data/gtkpod.glade.h:272
+#, fuzzy
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "Zone de tri sélectionnée de la liste de lecture"
+
#: ../data/gtkpod.glade.h:273
-msgid "Selected Tab _Entry"
-msgstr "Zon_e de tri sélectionnée"
+#, fuzzy
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "Zone de tri sélectionnée de l'iPod"
#: ../data/gtkpod.glade.h:274
-msgid "Selected _Playlist"
-msgstr "_Liste de lecture sélectionnée"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from Database"
+msgstr ""
+"Liste de lecture sélectionnée incluant des morceaux de la base de données"
#: ../data/gtkpod.glade.h:275
-msgid "Selected _Tracks"
-msgstr "Morceaux sélec_tionnés"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "Liste de lecture sélectionnée incluant des morceaux du disque dur"
#: ../data/gtkpod.glade.h:276
-msgid "Selected filter tab entry from database"
-msgstr "Zone de tri sélectionnée de la base de données"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "Liste de lecture sélectionnée incluant des morceaux de l'iPod"
#: ../data/gtkpod.glade.h:277
-msgid "Selected filter tab entry from harddisk"
-msgstr "Zone de tri sélectionnée du disque dur"
+msgid "Selected Tab _Entry"
+msgstr "Zon_e de tri sélectionnée"
#: ../data/gtkpod.glade.h:278
-msgid "Selected filter tab entry from iPod"
-msgstr "Zone de tri sélectionnée de l'iPod"
+#, fuzzy
+msgid "Selected Tracks from Database"
+msgstr "Morceaux sélectionnés de la base de données"
#: ../data/gtkpod.glade.h:279
-msgid "Selected filter tab entry from playlist"
-msgstr "Zone de tri sélectionnée de la liste de lecture"
+#, fuzzy
+msgid "Selected Tracks from Hard Disk"
+msgstr "Morceaux sélectionnés du disque dur"
#: ../data/gtkpod.glade.h:280
-msgid "Selected playlist"
-msgstr "_Liste de lecture sélectionnée"
+#, fuzzy
+msgid "Selected Tracks from Playlist"
+msgstr "Morceaux sélectionnés de la liste de lecture"
#: ../data/gtkpod.glade.h:281
-msgid "Selected playlist including tracks from database"
-msgstr ""
-"Liste de lecture sélectionnée incluant des morceaux de la base de données"
+#, fuzzy
+msgid "Selected Tracks from iPod"
+msgstr "Morceaux sélectionnés de l'iPod"
#: ../data/gtkpod.glade.h:282
-msgid "Selected playlist including tracks from harddisk"
-msgstr "Liste de lecture sélectionnée incluant des morceaux du disque dur"
+msgid "Selected _Playlist"
+msgstr "_Liste de lecture sélectionnée"
#: ../data/gtkpod.glade.h:283
-msgid "Selected playlist including tracks from iPod"
-msgstr "Liste de lecture sélectionnée incluant des morceaux de l'iPod"
+msgid "Selected _Tracks"
+msgstr "Morceaux sélec_tionnés"
#: ../data/gtkpod.glade.h:284
-msgid "Selected tracks from database"
-msgstr "Morceaux sélectionnés de la base de données"
+msgid "Selected playlist"
+msgstr "_Liste de lecture sélectionnée"
#: ../data/gtkpod.glade.h:285
-msgid "Selected tracks from harddisk"
-msgstr "Morceaux sélectionnés du disque dur"
+msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
+msgstr ""
+"Liste de fichiers à exclure séparés par des points-virgules, par exemple « *."
+"mp3 »"
#: ../data/gtkpod.glade.h:286
-msgid "Selected tracks from iPod"
-msgstr "Morceaux sélectionnés de l'iPod"
+msgid "Set Cover Art from _File"
+msgstr "Pochette à partir du _fichier"
#: ../data/gtkpod.glade.h:287
-msgid "Selected tracks from playlist"
-msgstr "Morceaux sélectionnés de la liste de lecture"
-
-#: ../data/gtkpod.glade.h:288
-#, fuzzy
-msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
-msgstr ""
-"Liste de fichiers à exclure séparés par des points-virgules, par exemple «*."
-"mp3»"
-
-#: ../data/gtkpod.glade.h:289
-#, fuzzy
-msgid "Set Cover Art from File"
-msgstr "Modifier la pochette"
-
-#: ../data/gtkpod.glade.h:290
-#, fuzzy
-msgid "Set Cover Art from Web"
-msgstr "Modifier la pochette"
-
-#: ../data/gtkpod.glade.h:291
msgid "Set mountpoint or edit repository options"
msgstr "Définir le point de montage ou éditer les options du dépot"
-#: ../data/gtkpod.glade.h:292
+#: ../data/gtkpod.glade.h:288
msgid "Set options for Calendar/Contacts/Notes"
msgstr "Options pour Calendrier/Contacts/Notes"
-#: ../data/gtkpod.glade.h:293
+#: ../data/gtkpod.glade.h:289
msgid ""
"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
"files will be calculated and written to your music file using this command."
msgstr ""
-"Choisissez «aacgain -q -k» pour la fonctionnalité «Normaliser le volume» du "
-"menu Outils. Si ceci est validé, les données manquantes de normalisation des "
-"fichiers .m4a et .m4b seront calculées et ajoutées aux fichiers avec cette "
-"commande."
+"Choisissez « aacgain -q -k » pour la fonctionnalité « Normaliser le volume » "
+"du menu Outils. Si ceci est validé, les données manquantes de normalisation "
+"des fichiers .m4a et .m4b seront calculées et ajoutées aux fichiers avec "
+"cette commande."
-#: ../data/gtkpod.glade.h:294
+#: ../data/gtkpod.glade.h:290
msgid ""
"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for mp3 files "
"will be calculated and written to your mp3 file using this command."
msgstr ""
-"Choisissez «mp3gain -q -k» pour la fonctionnalité «Normaliser le volume» du "
-"menu Outils. Si ceci est validé, les données manquantes de normalisation des "
-"fichiers MP3 seront calculées et ajoutées aux fichiers avec cette commande."
+"Choisissez « mp3gain -q -k » pour la fonctionnalité « Normaliser le volume » "
+"du menu Outils. Si ceci est validé, les données manquantes de normalisation "
+"des fichiers MP3 seront calculées et ajoutées aux fichiers avec cette "
+"commande."
-#: ../data/gtkpod.glade.h:295
+#: ../data/gtkpod.glade.h:291
msgid "Set this to your last.fm password"
-msgstr ""
+msgstr "Remplir avec le mot de passe last.fm"
-#: ../data/gtkpod.glade.h:296
+#: ../data/gtkpod.glade.h:292
msgid "Set this to your last.fm username"
-msgstr ""
+msgstr "Remplir avec le nom d'utilisateur last.fm"
-#: ../data/gtkpod.glade.h:297
+#: ../data/gtkpod.glade.h:293
msgid ""
"Set to 0 to effectively disable caching (a maximum of one track will be "
"cached at a time)."
msgstr ""
+"Mettre à 0 pour inhiber le cache (un morceau au maximum dans le cache)."
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:294
msgid ""
"Set to 0 to use as many background threads as CPUs are available on your "
"system."
-msgstr ""
+msgstr "Mettre à 0 pour utiliser autant de « threads » que possible."
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:295
msgid "Show information about problems when accessing mserv"
msgstr "Afficher les informations sur les problèmes liés à mserv"
-#: ../data/gtkpod.glade.h:300
+#: ../data/gtkpod.glade.h:296
msgid "Show summary of sync result"
msgstr "Montrer le résumé du résultat de la synchronisation"
-#: ../data/gtkpod.glade.h:301 ../src/misc_playlist.c:96
+#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
#: ../src/repository.c:1356
msgid "Smart Playlist"
msgstr "Intelligente"
-#: ../data/gtkpod.glade.h:302
+#: ../data/gtkpod.glade.h:298
msgid "Sort tracks according to: "
msgstr "Trier les morceaux suivant :"
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:299
msgid "Sorting Options"
msgstr "Options de tri"
-#: ../data/gtkpod.glade.h:304
+#: ../data/gtkpod.glade.h:300
msgid "Sorting case sensitive"
msgstr "Trier en tenant compte de la casse"
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:301
msgid "Sorttab: "
msgstr "Zone de tri :"
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:302
msgid "Sorttabs"
msgstr "Zones de tri :"
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:303
msgid "Source:"
msgstr "Source :"
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:305
#, no-c-format
msgid ""
"Specify exact path including command line options. '%i' will be replaced "
"with the mount point of the iPod."
msgstr ""
-"Indiquer le chemin exact ainsi que les paramètres de ligne de commande. «%i» "
-"sera remplacé par le point de montage de l'iPod."
+"Indiquer le chemin exact ainsi que les paramètres de ligne de commande. « %"
+"i » sera remplacé par le point de montage de l'iPod."
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:306
msgid "Specify interval"
msgstr "Spécifier un intervalle"
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:307
msgid "Start display automatically"
msgstr "Afficher automatiquement"
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:308
msgid "Synchronise Contacts, Calendar and Notes"
msgstr "Synchroniser le calendrier, contacts et notes"
-#: ../data/gtkpod.glade.h:313
+#: ../data/gtkpod.glade.h:309
msgid "Synchronize All"
msgstr "Tout synchroniser"
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:310
msgid "Synchronize Calendar"
msgstr "Synchroniser le calendrier"
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:311
msgid "Synchronize Contacts"
msgstr "Synchroniser les contacts"
-#: ../data/gtkpod.glade.h:316
+#: ../data/gtkpod.glade.h:312
msgid "Synchronize Notes"
msgstr "Synchroniser les notes"
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:313
msgid "Template for info field: "
msgstr "Modèle pour le champ d'info :"
-#: ../data/gtkpod.glade.h:318
+#: ../data/gtkpod.glade.h:314
msgid ""
"The local copy of the track is referenced in the playlist. If the track is "
"not available locally, an error message is displayed."
@@ -1488,14 +1510,15 @@
"Le fichier local du morceau est référencé dans la liste. Si le fichier "
"n'existe pas, un message d'erreur est affiché."
-#: ../data/gtkpod.glade.h:319
+#: ../data/gtkpod.glade.h:315
msgid ""
"The output of the background conversion scripts is copied below. Each page "
"of the notebook corresponds to one background thread."
msgstr ""
+"La sortie du script de conversion est donnée ci-dessous. Chaque onglet "
+"correspond à une tâche d'arrière-plan."
-#: ../data/gtkpod.glade.h:320
-#, fuzzy
+#: ../data/gtkpod.glade.h:316
msgid ""
"The tags are written to the files on your harddrive and on the iPod (if "
"available)."
@@ -1503,16 +1526,16 @@
"Les attributs ID3 seront écrits dans les fichiers sur votre disque et l'iPod "
"(si disponible)."
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:317
msgid "The track on the iPod is referenced in the playlist file."
msgstr ""
"Le morceau de l'iPod est référencé dans le fichier de liste de lecture."
-#: ../data/gtkpod.glade.h:322
+#: ../data/gtkpod.glade.h:318
msgid "This is the same option as in 'Edit/Delete Confirmation'"
-msgstr "C'est la même option que dans «Édition/Confirmation de suppression»"
+msgstr "C'est la même option que dans « Édition/Confirmation de suppression »"
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:319
msgid ""
"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
"uses unicode to store the tags, so you won't have to worry about charsets "
@@ -1524,20 +1547,20 @@
"ce que vous n'ayez pas à gérer vous même les jeux de caractères. gtkpod "
"utilise UTF8 afin de ne pas augmenter la taille des attributs en ASCII."
-#: ../data/gtkpod.glade.h:324
+#: ../data/gtkpod.glade.h:320
msgid "This option will be re-activated when you upgrade gtkpod."
-msgstr "Cette option se réactivera quans vous mettrez à jour gtkpod"
+msgstr "Cette option se réactivera quand vous mettrez à jour gtkpod"
-#: ../data/gtkpod.glade.h:325
+#: ../data/gtkpod.glade.h:321
msgid "Time:"
msgstr "Heure :"
-#: ../data/gtkpod.glade.h:326 ../src/display_sorttabs.c:2963
+#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
msgid "Title"
msgstr "Titre"
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:323
msgid ""
"Total\n"
"(iPod)"
@@ -1545,7 +1568,7 @@
"Total\n"
"(iPod)"
-#: ../data/gtkpod.glade.h:329
+#: ../data/gtkpod.glade.h:325
msgid ""
"Total\n"
"(local)"
@@ -1553,38 +1576,43 @@
"Total\n"
"(local)"
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:327
msgid "Tracks"
msgstr "Morceaux"
-#: ../data/gtkpod.glade.h:332
+#: ../data/gtkpod.glade.h:328
msgid "Tracks Most Often Listened To"
msgstr "Contenant les morceaux les plus écoutés"
-#: ../data/gtkpod.glade.h:333
+#: ../data/gtkpod.glade.h:329
msgid ""
"Tracks can be transferred in the background as soon as they are added to an "
"iPod repository. Otherwise they will be transferred when ejecting the "
"contents of the iPod completely unchanged until then."
msgstr ""
+"Les morceaux seront copiés en tâche de fond dès qu'ils sont ajoutés au dépôt "
+"d'un iPod. Dans le cas contraire ils seront copiés uniquement à l'éjection "
+"du iPod."
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:330
msgid "Tracks in Selected Tab _Entry"
msgstr "Morceaux dans la Zon_e de tri sélectionnée"
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:331
msgid "Tracks in Selected _Playlist"
msgstr "Morceaux de la _Liste de lecture sélectionnée"
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:332
msgid "Transfer tracks to the iPod in the background"
msgstr ""
+"Confirmer avant de supprimer les morceaux de l'iPod ou du dépot\n"
+"lors de la synchronisation des listes"
-#: ../data/gtkpod.glade.h:337
+#: ../data/gtkpod.glade.h:333
msgid "Translators"
msgstr "Traducteurs"
-#: ../data/gtkpod.glade.h:338
+#: ../data/gtkpod.glade.h:334
msgid ""
"Try to load contents of all connected iPods. For each iPod a separate "
"repository must be set up."
@@ -1592,89 +1620,92 @@
"Essaye de charger le contenu des iPods connectés. Pour chaque iPod un dépot "
"différent doit être créé."
-#: ../data/gtkpod.glade.h:339
+#: ../data/gtkpod.glade.h:335
+msgid "Undo _Track"
+msgstr "Annuler pour le _Morceau"
+
+#: ../data/gtkpod.glade.h:336
msgid "Update _mserv Data from File"
msgstr "Mettre à jour les données _mserv à partir des fichiers"
-#: ../data/gtkpod.glade.h:340
+#: ../data/gtkpod.glade.h:337
msgid "Update/Sync all playlists now"
msgstr "Mettre à jour/Synchroniser toutes les listes"
-#: ../data/gtkpod.glade.h:341
+#: ../data/gtkpod.glade.h:338
msgid "Update/Sync playlist now"
msgstr "Mettre à jour/Synchroniser"
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:339
msgid "Upper margin"
msgstr "Borne supérieure"
-#: ../data/gtkpod.glade.h:343
+#: ../data/gtkpod.glade.h:340
msgid "Use 'Multi-Edit' also for title field"
-msgstr "Utiliser «Édition multiple» aussi pour les titres"
+msgstr "Utiliser « Édition multiple » également pour les titres"
-#: ../data/gtkpod.glade.h:344
+#: ../data/gtkpod.glade.h:341
msgid "Use 'Multi-Edit' for tracks selections"
-msgstr "Utiliser «Édition multiple» pour les morceaux sélectionnés"
+msgstr "Utiliser « Édition multiple » pour les morceaux sélectionnés"
-#: ../data/gtkpod.glade.h:345
+#: ../data/gtkpod.glade.h:342
#, fuzzy
-msgid "Use <i><Album>.jpg</i> in the parent directory"
+msgid "Use <i><Album>.jpg</i> in the parent directory"
msgstr "Utilise <i><Album>.jpg</i> dans le répertoire parent"
-#: ../data/gtkpod.glade.h:346
+#: ../data/gtkpod.glade.h:343
#, fuzzy
-msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
-msgstr "Utilise <i><Album>.jpg</i>; <i><Album>.png</i>Â ..."
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+msgstr "Utilise <i><Album>.jpg</i>; <i><Album>.png</i>…"
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:344
msgid "Use <i>folder.jpg</i> as cover art."
msgstr "Utilise <i>répertoire.jpg</i> pour la pochette."
-#: ../data/gtkpod.glade.h:348
+#: ../data/gtkpod.glade.h:345
msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
-msgstr "Utilise <i>répertoire.jpg</i>, <i>répertoire.png</i> ..."
+msgstr "Utilise <i>répertoire.jpg</i>, <i>répertoire.png</i>…"
-#: ../data/gtkpod.glade.h:349
+#: ../data/gtkpod.glade.h:346
msgid "Use mserv database to fill additional information"
msgstr "Utiliser la base mserv pour remplir les autres informations"
-#: ../data/gtkpod.glade.h:350
+#: ../data/gtkpod.glade.h:347
msgid ""
"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
"for this filename."
msgstr ""
"Utilise le jeu de caractère sélectionné pour ce fichier\n"
-"(voir la section ci-dessus : «Ajout/Mise à jour/Synchronisation»)."
+"(voir la section ci-dessus : « Ajout/Mise à jour/Synchronisation »)."
-#: ../data/gtkpod.glade.h:352
+#: ../data/gtkpod.glade.h:349
msgid ""
"Use selected encoding (on the 'General' page)\n"
"when writing tags"
msgstr ""
-"Utiliser le jeu de caractère sélectionné (dans l'onglet «Général») pour "
+"Utiliser le jeu de caractère sélectionné (dans l'onglet « Général ») pour "
"l'écriture des attributs"
-#: ../data/gtkpod.glade.h:354
-#, fuzzy
+#: ../data/gtkpod.glade.h:351
msgid "Use selected encoding also when updating or syncing tracks"
msgstr ""
"Le jeu de caractères sélectionné sera utilisé pour\n"
"la mise à jour ou la synchronisation des morceaux"
-#: ../data/gtkpod.glade.h:355
+#: ../data/gtkpod.glade.h:352
msgid "Use this template to parse filename for tag information:"
msgstr ""
"Utiliser ce masque pour générer les attributs à partir du nom de fichier :"
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:353
msgid "Username to be used for mserv database lookup."
msgstr "Utilisateur pour se connecter à la base mserv."
-#: ../data/gtkpod.glade.h:357
+#: ../data/gtkpod.glade.h:354
msgid "Username:"
msgstr "Utilisateur :"
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:355
msgid ""
"Usually you don't want to set the title of several tracks to the same text. "
"This option might avoid unwanted results (especially since there is no "
@@ -1683,11 +1714,16 @@
"Généralement, vous ne devriez pas avoir à utiliser cette option, car elle "
"peut avoir des effets inattendus (pas d'annulation possible)."
-#: ../data/gtkpod.glade.h:359
+#: ../data/gtkpod.glade.h:356
+#, fuzzy
+msgid "View Full Size"
+msgstr "Voir les pochettes en taille réelle"
+
+#: ../data/gtkpod.glade.h:357
msgid "WAV with :"
-msgstr ""
+msgstr "WAV avec :"
-#: ../data/gtkpod.glade.h:360
+#: ../data/gtkpod.glade.h:358
msgid ""
"When adding dirs/files, update information of\n"
"existing tracks with identical filenames"
@@ -1695,7 +1731,7 @@
"Lors de l'ajout de fichiers/répertoires, mettre à jour\n"
"les informations des morceaux existants avec les doublons"
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:360
msgid ""
"When copying from iPod no check is performed on whether the destination file "
"exists. Enabling this option will make gtkpod check whether the length of "
@@ -1708,11 +1744,11 @@
"du fichier sur l'iPod. En ce cas, le fichier n'est pas recopié pour "
"accélérer la synchronisation du contenu de l'iPod."
-#: ../data/gtkpod.glade.h:363
+#: ../data/gtkpod.glade.h:361
msgid "When syncing playlists"
msgstr "Lors de la synchronisation des listes"
-#: ../data/gtkpod.glade.h:364
+#: ../data/gtkpod.glade.h:362
msgid ""
"Will show a list of tracks removed and a list of tracks newly added or "
"updated."
@@ -1720,26 +1756,25 @@
"Montrer la liste des morceaux supprimés et une liste des morceaux récemment "
"ajoutés ou modifiés."
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:363
msgid "Write ID3 tags to disk when modified in gtkpod"
msgstr ""
"Écrire les attributs ID3 sur le disque lors de leur modification dans gtkpod"
-#: ../data/gtkpod.glade.h:366
+#: ../data/gtkpod.glade.h:364
msgid "Write all changes made to the disk and the iPod(s)."
msgstr ""
-"Ecrire toutes les modifications faites dans le disque et le(s) iPod(s)."
+"Écrire toutes les modifications faites dans le disque et le(s) iPod(s)."
-#: ../data/gtkpod.glade.h:367
-#, fuzzy
+#: ../data/gtkpod.glade.h:365
msgid ""
"Write extended information (PC filenames, SHA1 hashes,\n"
"encoding...). Recommended."
msgstr ""
"Écrire les infos supplémentaires (noms de fichiers PC,\n"
-"somme de contrôle MD5, jeu de caractères). Recommandé."
+"somme de contrôle SHA1, jeu de caractères…). Recommandé."
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:367
msgid ""
"You can also use the table headers, but this allows you to sort according to "
"a column that is not displayed."
@@ -1747,70 +1782,81 @@
"Vous pouvez aussi utiliser le tableau des entêtes, mais cela permet de trier "
"sur une colonne qui n'est pas affichée."
+#: ../data/gtkpod.glade.h:368
+#, fuzzy
+msgid "_About gtkpod"
+msgstr "A propos de gtkpod"
+
+#: ../data/gtkpod.glade.h:369
+#, fuzzy
+msgid "_Add Album"
+msgstr "Album"
+
#: ../data/gtkpod.glade.h:370
-msgid "_About"
-msgstr "A _propos"
+msgid "_Add Image"
+msgstr ""
#: ../data/gtkpod.glade.h:371
+#, fuzzy
+msgid "_Album"
+msgstr "Album"
+
+#: ../data/gtkpod.glade.h:372
msgid "_All Tracks"
msgstr "_Tous les morceaux"
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:373
msgid "_Arrange Sort Tabs"
msgstr "_Organiser les zones de tri"
-#: ../data/gtkpod.glade.h:373
+#: ../data/gtkpod.glade.h:374
msgid "_Check iPod's Files"
msgstr "_Contrôler les fichiers de l'iPod"
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:375
msgid "_Conversion Log"
-msgstr ""
+msgstr "_Trace des conversions"
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:376
msgid "_Create Playlists"
msgstr "_Créer une liste de lecture"
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:377
msgid "_Create iPod's Directories"
msgstr "_Créer les répertoires système de l'iPod"
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:378
msgid "_Delete"
msgstr "_Effacer"
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:379
msgid "_Display"
msgstr "_Affichage"
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:380
msgid "_Displayed Tracks"
msgstr "Morceaux _affichés"
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:381
msgid "_Edit"
msgstr "_Édition"
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:382
msgid "_Encoding (ID3, files):"
msgstr "Jeu de caractères (ID3, fichiers) :"
-#: ../data/gtkpod.glade.h:382
+#: ../data/gtkpod.glade.h:383
msgid "_Enqueue"
msgstr "_Ajouter à la file d'attente"
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:384
msgid "_Export Tracks from Database"
msgstr "E_xporter les morceaux de la base de données"
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:385
msgid "_File"
msgstr "_Fichier"
-#: ../data/gtkpod.glade.h:385
-msgid "_Find New"
-msgstr ""
-
#: ../data/gtkpod.glade.h:386
msgid "_General"
msgstr "_Général"
@@ -1824,128 +1870,139 @@
msgstr "Ne respectant _pas"
#: ../data/gtkpod.glade.h:389
+msgid "_Image"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:390
msgid "_Info Window"
msgstr "_Fenêtre d'infos"
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:391
msgid "_Last.FM"
-msgstr ""
+msgstr "_Last.FM"
-#: ../data/gtkpod.glade.h:391
+#: ../data/gtkpod.glade.h:392
msgid "_Less Sort Tabs"
msgstr "_Supprimer une zone de tri"
-#: ../data/gtkpod.glade.h:392
+#: ../data/gtkpod.glade.h:393
msgid "_Limit to"
msgstr "_Limiter à "
-#: ../data/gtkpod.glade.h:393
+#: ../data/gtkpod.glade.h:394
msgid "_Load iPod(s)"
msgstr "_Chargement iPod(s)"
-#: ../data/gtkpod.glade.h:394
+#: ../data/gtkpod.glade.h:395
msgid "_Local"
msgstr "_Locale"
-#: ../data/gtkpod.glade.h:395
+#: ../data/gtkpod.glade.h:396
msgid "_M3U"
msgstr "_M3U"
-#: ../data/gtkpod.glade.h:396
+#: ../data/gtkpod.glade.h:397
+msgid "_Misc."
+msgstr "_Divers"
+
+#: ../data/gtkpod.glade.h:398
msgid "_More Sort Tabs"
msgstr "_Ajouter une zone de tri"
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:399
msgid "_Newly Added Tracks"
msgstr "_Nouveaux morceaux ajoutés"
-#: ../data/gtkpod.glade.h:398
+#: ../data/gtkpod.glade.h:400
msgid "_Normalize Volume"
msgstr "_Normaliser le volume"
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:401
msgid "_Number of sort tabs:"
msgstr "_Nombre de zones de tri :"
-#: ../data/gtkpod.glade.h:400
-msgid "_Other"
-msgstr "_Autre"
-
-#: ../data/gtkpod.glade.h:401
+#: ../data/gtkpod.glade.h:402
msgid "_PLS"
msgstr "_PLS"
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
msgid "_Play Now"
msgstr "_Jouer maintenant"
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
msgid "_Podcasts"
-msgstr ""
+msgstr "_Podcasts"
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:405
msgid "_Prefer Local"
msgstr "Locale de _préférence"
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:406
+#, fuzzy
+msgid "_Remove Album"
+msgstr "Trier par Album"
+
+#: ../data/gtkpod.glade.h:407
+msgid "_Remove Cover Art"
+msgstr "_Supprimer la pochette"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:409
msgid "_Save Changes"
msgstr "_Enregistrer les modifications"
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:410
msgid "_Save Displayed Track Order"
msgstr "_Sauver l'ordre de tri des morceaux affichés"
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:411
msgid "_Sorting"
msgstr "_Tri"
-#: ../data/gtkpod.glade.h:408
-#, fuzzy
+#: ../data/gtkpod.glade.h:412
msgid "_Synchronize Playlist with Dir(s)"
-msgstr "Sync les listes avec le(s) répertoire(s)"
+msgstr "_Sync les listes avec le(s) répertoire(s)"
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:413
msgid "_Toolbar"
msgstr "_Barre d'outils"
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:414
msgid "_Tools"
msgstr "_Outils"
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:415
msgid "_Tooltips"
msgstr "_Infobulles"
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:416
msgid "_Track Info"
msgstr "Infos du _Morceau"
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:417
msgid "_Undo All"
msgstr "Annuler _Tout"
-#: ../data/gtkpod.glade.h:414
-msgid "_Undo Track"
-msgstr "Annuler pour le _Morceau"
-
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:418
msgid "_Update Tracks from File"
msgstr "_Mettre à jour les morceaux à partir des fichiers"
-#: ../data/gtkpod.glade.h:416
-#, fuzzy
+#: ../data/gtkpod.glade.h:419
msgid "_Video"
-msgstr "_Affichage"
+msgstr "_Vidéo"
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:420
msgid "_View"
msgstr "_Affichage"
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:421
msgid "_iPod"
msgstr "_iPod"
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:423
#, no-c-format
msgid ""
"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
@@ -1958,44 +2015,44 @@
"séparer plusieurs masques par un ';'. Le premier masque concordant sera "
"utilisé. Exemple : «%a - %A/%T %t.mp3;%t.wav»."
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:424
msgid "folder"
msgstr "répertoire"
-#: ../data/gtkpod.glade.h:422
+#: ../data/gtkpod.glade.h:425
msgid "folder.jpg"
msgstr "répertoire.jpg"
-#: ../data/gtkpod.glade.h:424
+#: ../data/gtkpod.glade.h:427
#, no-c-format
msgid "folder.jpg;%a.jpg"
msgstr "répertoire.jpg;%a.jpg"
-#: ../data/gtkpod.glade.h:425
+#: ../data/gtkpod.glade.h:428
msgid "gtkpod"
msgstr "gtkpod"
-#: ../data/gtkpod.glade.h:426
+#: ../data/gtkpod.glade.h:429
msgid "gtkpod Info"
msgstr "Infos gtkpod"
-#: ../data/gtkpod.glade.h:427
+#: ../data/gtkpod.glade.h:430
msgid ""
"gtkpod expects the ID3 tags and the filenames to be in the encoding "
"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
"operation. 'System Charset' is the charset used by your current locale."
msgstr ""
"gtkpod utilisera le jeu de caractères spécifié ici pour les attributs ID3 et "
-"les fichiers. Vous pouvez le modifier entre chaque opération d'ajout. «Jeu "
-"de caractères du système» est le jeu de caractère défini par les locales de "
+"les fichiers. Vous pouvez le modifier entre chaque opération d'ajout. « Jeu "
+"de caractères du système » est le jeu de caractère défini par les locales de "
"votre système."
-#: ../data/gtkpod.glade.h:428
+#: ../data/gtkpod.glade.h:431
msgid "gtkpod options"
msgstr "Options gtkpod"
#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
-#: ../data/gtkpod.glade.h:430
+#: ../data/gtkpod.glade.h:433
msgid ""
"iPod\n"
"Local Repository (Standard)\n"
@@ -2005,35 +2062,53 @@
"Dépot local (standard)\n"
"Dépot local (Podcasts)\n"
-#: ../data/gtkpod.glade.h:434
+#: ../data/gtkpod.glade.h:437
msgid "iPod mountpoint:"
msgstr "Point de montage de l'iPod :"
-#: ../data/gtkpod.glade.h:435
+#: ../data/gtkpod.glade.h:438
msgid "iTunesDB backup:"
msgstr "Sauvegarde iTunesDBÂ :"
-#: ../data/gtkpod.glade.h:436
-#, fuzzy
-msgid "label"
-msgstr "label21"
-
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:439
msgid "mserv Root:"
msgstr "Racine mserv :"
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:440
msgid "mserv database lookup will be done for music in this directory."
msgstr "La base mserv utilise ce répertoire pour chercher une musique."
-#: ../data/gtkpod.glade.h:439 ../src/details.c:1175
+#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
msgid "n/a"
msgstr "nd"
-#: ../data/gtkpod.glade.h:440
+#: ../data/gtkpod.glade.h:442
msgid "special_sorttab -- Don't translate!"
msgstr ""
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr ""
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr ""
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+
+#: ../src/autodetection.c:416
+#, fuzzy
+msgid "New iPod"
+msgstr "Nouvelle liste"
+
#: ../src/charset.c:53
msgid "Arabic (IBM-864)"
msgstr "Arabe (IBM-864)"
@@ -2252,279 +2327,434 @@
msgid "Confirmation Dialogue"
msgstr "Message de confirmation"
-#: ../src/context_menus.c:359
+#: ../src/context_menus.c:362
#, c-format
msgid "Copied \"%s\" playlist to %s"
-msgstr ""
+msgstr "Copie liste de lecture « %s » vers %s"
-#: ../src/context_menus.c:398
-#, fuzzy, c-format
+#: ../src/context_menus.c:401
+#, c-format
msgid "Copied %d track to '%s'"
msgid_plural "Copied %d tracks to '%s'"
-msgstr[0] "%d morceau copiés sur %d."
-msgstr[1] "%d morceaux copiés sur %d."
+msgstr[0] "Extraction de %d morceau %d vers « %s »"
+msgstr[1] "Extraction de %d morceaux vers « %s »"
-#: ../src/context_menus.c:426
+#: ../src/context_menus.c:429
#, c-format
msgid "Copied '%s' playlist to '%s' in '%s'"
-msgstr ""
+msgstr "Extraction liste de lecture « %s » vers « %s » dans « %s »"
-#: ../src/context_menus.c:459
-#, fuzzy, c-format
+#: ../src/context_menus.c:462
+#, c-format
msgid "Copied %d track to '%s' in '%s'"
msgid_plural "Copied %d tracks to %s in '%s'"
-msgstr[0] "%d morceau supprimé de la liste de lecture «%s»"
-msgstr[1] "%d morceaux supprimés de la liste de lecture «%s»"
+msgstr[0] "Extraction de %d morceau %d vers « %s » dans « %s »"
+msgstr[1] "Extraction de %d morceaux %d vers « %s » dans « %s »"
-#: ../src/context_menus.c:619 ../src/tools.c:854
+#: ../src/context_menus.c:622 ../src/tools.c:854
msgid "Play Now"
msgstr "Jouer maintenant"
-#: ../src/context_menus.c:625 ../src/tools.c:867
+#: ../src/context_menus.c:628 ../src/tools.c:867
msgid "Enqueue"
msgstr "Mettre dans la file d'attente"
-#: ../src/context_menus.c:631
+#: ../src/context_menus.c:634
msgid "Copy Tracks to Filesystem"
msgstr "Copier les morceaux vers le disque dur"
-#: ../src/context_menus.c:638 ../src/file_export.c:1085
+#: ../src/context_menus.c:641 ../src/file_export.c:1085
msgid "Create Playlist File"
msgstr "Créer un fichier de liste"
-#: ../src/context_menus.c:645
+#: ../src/context_menus.c:648
msgid "Create new Playlist"
msgstr "Créer une nouvelle liste"
-#: ../src/context_menus.c:652
+#: ../src/context_menus.c:655
msgid "Update Tracks from File"
msgstr "Mette à jour les morceaux depuis le fichier"
-#: ../src/context_menus.c:666
+#: ../src/context_menus.c:669
msgid "Sync Playlist with Dir(s)"
-msgstr "Sync les listes avec le(s) répertoire(s)"
+msgstr "Sync. les listes avec le(s) répertoire(s)"
-#: ../src/context_menus.c:676
+#: ../src/context_menus.c:679
msgid "Remove All Tracks from iPod"
msgstr "Supprimer tout les morceaux de l'iPod"
-#: ../src/context_menus.c:694
+#: ../src/context_menus.c:697
msgid "Remove All Podcasts from iPod"
msgstr "Supprimer tout les podcats de l'iPod"
-#: ../src/context_menus.c:709
+#: ../src/context_menus.c:712
msgid "Delete Including Tracks"
msgstr "Supprimer avec les morceaux inclus"
-#: ../src/context_menus.c:717
+#: ../src/context_menus.c:720
msgid "Delete But Keep Tracks"
msgstr "Supprimer mais garder les morceaux"
-#: ../src/context_menus.c:725
+#: ../src/context_menus.c:728
msgid "Edit iPod Properties"
msgstr "Editer les propriétes de l'iPod"
-#: ../src/context_menus.c:732
-#, fuzzy
+#: ../src/context_menus.c:735
msgid "Edit Repository Properties"
-msgstr "Editer les propriétes de l'iPod"
+msgstr "Éditer les propriétés du dépôt"
-#: ../src/context_menus.c:739
+#: ../src/context_menus.c:742
msgid "Edit Playlist Properties"
msgstr "Editer les propriétes de la liste de lecture"
-#: ../src/context_menus.c:767
+#: ../src/context_menus.c:770
msgid "View Full Size Artwork"
-msgstr ""
+msgstr "Voir les pochettes en taille réelle"
-#: ../src/context_menus.c:774
-#, fuzzy
+#: ../src/context_menus.c:777
msgid "Select Cover From File"
-msgstr "Supprimer de l'iPod"
+msgstr "Choisir la pochette à partir d'un fichier"
-#: ../src/context_menus.c:781
-msgid "Find Cover on Web"
-msgstr ""
-
-#: ../src/context_menus.c:794
+#: ../src/context_menus.c:790
msgid "Load iPod"
msgstr "Charger l'iPod"
-#: ../src/context_menus.c:801
+#: ../src/context_menus.c:797
msgid "Eject iPod"
msgstr "Ejecter l'iPod"
-#: ../src/context_menus.c:818
+#: ../src/context_menus.c:814
msgid "Remove All Tracks from Database"
msgstr "Supprimer tout les morceaux de la base de données"
-#: ../src/context_menus.c:833
+#: ../src/context_menus.c:829
msgid "Delete Including Tracks (Harddisk)"
msgstr "Supprimer avec les morceaux inclus (disque dur)"
-#: ../src/context_menus.c:841
+#: ../src/context_menus.c:837
msgid "Delete Including Tracks (Database)"
msgstr "Supprimer avec les morceaux inclus (base de données)"
-#: ../src/context_menus.c:849
+#: ../src/context_menus.c:845
msgid "Delete From iPod"
msgstr "Supprimer de l'iPod"
-#: ../src/context_menus.c:857
+#: ../src/context_menus.c:853
msgid "Delete From Playlist"
msgstr "Supprimer de la liste de lecture"
-#: ../src/context_menus.c:865
+#: ../src/context_menus.c:861
msgid "Delete From Harddisk"
msgstr "Supprimer du disque dur"
-#: ../src/context_menus.c:873
+#: ../src/context_menus.c:869
msgid "Delete From Database"
msgstr "Supprimer de la base de données"
-#: ../src/context_menus.c:881
+#: ../src/context_menus.c:877
msgid "Alphabetize"
msgstr "Trier"
-#: ../src/context_menus.c:949 ../src/context_menus.c:998
+#: ../src/context_menus.c:895
#, fuzzy
+msgid "Remove Album"
+msgstr "Trier par Album"
+
+#: ../src/context_menus.c:905
+#, fuzzy
+msgid "Remove Photo"
+msgstr "_Supprimer la pochette"
+
+#: ../src/context_menus.c:922
+msgid "Rename Album"
+msgstr ""
+
+#: ../src/context_menus.c:981 ../src/context_menus.c:1030
msgid "Copy selected playlist to..."
-msgstr "_Liste de lecture sélectionnée"
+msgstr "Copier la liste de lecture sélectionné vers …"
-#: ../src/context_menus.c:1051
-#, fuzzy
+#: ../src/context_menus.c:1083
msgid "Copy selected track(s) to..."
-msgstr "Morceaux supprimés"
+msgstr "Copier le(s) morceau(x) sélectionné(s) vers …"
#: ../src/date_parser.l:269
#, c-format
msgid "Date format error: unrecognized character: '%s'\n"
-msgstr "Erreur dans le format de date : caractère inconnu : «%s»\n"
+msgstr "Erreur dans le format de date : caractère inconnu : « %s »\n"
-#: ../src/details.c:700
+#: ../src/details.c:82
+msgid "Audio/Video"
+msgstr "Audio/Vidéo"
+
+#: ../src/details.c:83
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/details.c:84
+msgid "Video"
+msgstr "Vidéo"
+
+#: ../src/details.c:85
+msgid "Podcast"
+msgstr "Podcast"
+
+#: ../src/details.c:86
+msgid "Video Podcast"
+msgstr "Podcast vidéo"
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr "Livre Audio"
+
+#: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
+msgid "Music Video"
+msgstr "Vidéo musicale"
+
+#: ../src/details.c:89 ../src/display_spl.c:107 ../src/display_spl.c:210
+#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
+msgid "TV Show"
+msgstr "Émission télé"
+
+#: ../src/details.c:90
+msgid "TV Show & Music Video"
+msgstr "Émission télé & vidéo musicale"
+
+#: ../src/details.c:836
#, c-format
msgid "%s (image data corrupted or unreadable)"
-msgstr ""
+msgstr "%s (données de l'image corrompues ou invalides)"
-#: ../src/details.c:1246
+#: ../src/details.c:973
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr "Type de média %x inconnu\n"
+
+#: ../src/details.c:1418
msgid "<b>n/a</b>"
msgstr "<b>nd</b>"
-#: ../src/display.c:647
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr ""
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr ""
+
+#: ../src/display.c:490
+#, c-format
+msgid "<b>Image Dimensions: %s</b>"
+msgstr ""
+
+#: ../src/display.c:744
msgid "Edit selected entry of which sort tab?"
msgstr "Mettre à jour l'entrée sélectionnée de quelle zone de tri ?"
#. no entry selected
-#: ../src/display.c:654 ../src/misc_confirm.c:435 ../src/misc_track.c:2059
+#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
msgid "No entry selected."
msgstr "Aucun élément sélectionné."
-#: ../src/display.c:813 ../src/display.c:1133 ../src/display.c:1189
-#: ../src/display.c:1243 ../src/display.c:1298 ../src/display.c:1559
+#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
+#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
#, c-format
msgid "No entry selected in Sort Tab %d"
msgstr "Aucune entrée sélectionnée dans la zone de tri %d"
-#: ../src/display.c:852
+#: ../src/display.c:949
msgid "Remove entry of which sort tab from database?"
msgstr "Supprimer l'entrée de quelle zone de tri de la base de données ?"
-#: ../src/display.c:860
+#: ../src/display.c:957
msgid "Remove tracks in selected entry of which filter tab from the iPod?"
msgstr "Supprimer les morceaux de quelle zone de tri de l'iPod ?"
-#: ../src/display.c:882
+#: ../src/display.c:979
msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
msgstr "Supprimer les morceaux de quelle zone de tri du disque dur ?"
-#: ../src/display.c:912
-#, fuzzy
+#: ../src/display.c:1009
msgid "Remove tracks in selected entry of which filter tab from playlist?"
-msgstr "Supprimer les morceaux de quelle zone de tri de liste de lecture ?"
+msgstr "Supprimer les morceaux de quelle zone de tri de la liste de lecture ?"
-#: ../src/display.c:939 ../src/display.c:977
+#: ../src/display.c:1036 ../src/display.c:1074
#, c-format
msgid ""
"iPod at '%s' is not loaded.\n"
"Please load it first."
msgstr ""
-"L'iPod en «%s» n'est pas chargé.\n"
+"L'iPod en « %s » n'est pas chargé.\n"
"Charger d'abord."
-#: ../src/display.c:1014 ../src/display.c:1041
+#: ../src/display.c:1111 ../src/display.c:1138
msgid "Update selected entry of which sort tab?"
msgstr "Mettre à jour l'entrée sélectionnée de quelle zone de tri ?"
-#: ../src/display.c:1127
+#: ../src/display.c:1224
msgid "Export selected entry of which sort tab?"
msgstr "Exporter l'entrée sélectionnée de quelle zone de tri ?"
-#: ../src/display.c:1183
+#: ../src/display.c:1280
msgid "Create playlist file from selected entry of which sort tab?"
msgstr "Créer un fichier de liste à partir de quelle zone de tri ?"
-#: ../src/display.c:1237
+#: ../src/display.c:1334
msgid "Play tracks in selected entry of which sort tab?"
msgstr "Jouer les morceaux de l'entrée sélectionnée de quelle zone de tri ?"
-#: ../src/display.c:1292
+#: ../src/display.c:1389
msgid "Enqueue tracks in selected entry of which sort tab?"
msgstr ""
"Ajouter dans la file d'attente les morceaux de l'entrée sélectionnée de "
"quelle zone de tri ?"
-#: ../src/display.c:1549
+#: ../src/display.c:1646
msgid "Normalize tracks in selected entry of which sort tab?"
msgstr ""
"Normaliser les morceaux de l'entrée sélectionnée de quelle zone de tri ?"
-#: ../src/display_coverart.c:1714
+#: ../src/display_coverart.c:1713
msgid "Failed to remove the album from the album hash store."
+msgstr "Impossible d'enlever l'album de la table de hachage des albums."
+
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
msgstr ""
#: ../src/display_itdb.c:376
#, c-format
msgid "Failed to set cover art: '%s'\n"
-msgstr "Impossible d'écrire la pochette :«%s»\n"
+msgstr "Impossible d'écrire la pochette : « %s »\n"
-#: ../src/display_itdb.c:851 ../src/display_itdb.c:984
+#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
msgid "Local"
msgstr "Local"
#. add podcast playlist
-#: ../src/display_itdb.c:859 ../src/display_itdb.c:982
-#: ../src/display_itdb.c:1010
+#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
+#: ../src/display_itdb.c:1025
msgid "Podcasts"
-msgstr ""
+msgstr "Podcasts"
-#: ../src/display_itdb.c:868 ../src/display_itdb.c:986
+#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
#: ../src/repository.c:1186
msgid "iPod"
msgstr "iPod"
-#: ../src/display_itdb.c:1069
+#: ../src/display_itdb.c:1084
#, c-format
msgid "Increased playcount for '%s'"
-msgstr "Compteur de lecture incrémenté pour «%s»"
+msgstr "Compteur de lecture incrémenté pour « %s »"
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr ""
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr ""
+
+#: ../src/display_photo.c:238
+msgid "Could not access the iPod's photo database."
+msgstr ""
+
+#: ../src/display_photo.c:441
+#, fuzzy
+msgid "Photo Albums"
+msgstr "Trier par Album"
+
+#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+msgid "<Unnamed>"
+msgstr ""
+
+#: ../src/display_photo.c:939
+msgid "The Photo Library album cannot be removed"
+msgstr ""
+
+#: ../src/display_photo.c:961
+#, fuzzy
+msgid "Do you want to remove the album's photos too?"
+msgstr "Êtes-vous sûr de vouloir supprimer tous les podcasts de votre iPod ?"
+
+#: ../src/display_photo.c:967
+msgid "Yes. Do Not Display Again"
+msgstr ""
+
+#: ../src/display_photo.c:1038
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr ""
+
+#: ../src/display_photo.c:1053
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr ""
+
+#: ../src/display_photo.c:1128
+msgid "New Photo Album Name"
+msgstr ""
+
+#: ../src/display_photo.c:1129
+#, fuzzy
+msgid "Please enter a new name for the photo album"
+msgstr "Entrer le nom de la nouvelle liste de lecture"
+
+#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+msgid "An album with that name already exists."
+msgstr ""
+
+#: ../src/display_photo.c:1210
+#, fuzzy
+msgid "New Photo Album"
+msgstr "Trier par Album"
+
+#: ../src/display_photo.c:1211
+#, fuzzy
+msgid "Please enter a name for the new photo album"
+msgstr "Entrer le nom de la nouvelle liste de lecture"
+
+#: ../src/display_photo.c:1232
+msgid "The new album failed to be created."
+msgstr ""
+
+#: ../src/display_photo.c:1256
+#, fuzzy
+msgid "Add Image to iPod"
+msgstr "Ajouter un nouvel iPod/dépôt"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1311
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr ""
+
+#: ../src/display_photo.c:1699
+#, c-format
+msgid "<No members>\n"
+msgstr ""
+
#. give a notice on the statusbar -- otherwise the user
#. * will never know why the drag is not possible
-#: ../src/display_playlists.c:500 ../src/display_playlists.c:542
+#: ../src/display_playlists.c:516 ../src/display_playlists.c:558
msgid "Error: drag from iPod not possible in offline mode."
msgstr "Erreur : glisser-déposer depuis l'iPod impossible en mode hors-ligne."
-#: ../src/display_playlists.c:569 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
#, c-format
msgid "Copied one track"
msgid_plural "Copied %d tracks"
msgstr[0] "Un morceau copié"
msgstr[1] "%d morceaux copiés"
-#: ../src/display_playlists.c:849 ../src/display_playlists.c:861
+#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
msgid "Can't reorder sorted treeview."
msgstr "ImpossÃble de réorganiser la vue arborescente triée."
-#: ../src/display_playlists.c:938
+#: ../src/display_playlists.c:954
#, c-format
msgid ""
"This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2534,44 +2764,52 @@
"Ce type de glisser-déposer (%d) n'est pas (encore) supporté. Si vous vous "
"sentez prêt à l'implémenter, veuillez contacter l'auteur.\n"
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr ""
+
#: ../src/display_sorttabs.c:473
msgid "'Played' condition ignored because of error."
-msgstr "Condition «Joué le» ignorée à cause d'une erreur."
+msgstr "Condition « Joué le » ignorée à cause d'une erreur."
#: ../src/display_sorttabs.c:476
msgid "'Modified' condition ignored because of error."
-msgstr "Condition «Modifié le» ignorée à cause d'une erreur."
+msgstr "Condition « Modifié le » ignorée à cause d'une erreur."
#: ../src/display_sorttabs.c:479
msgid "'Added' condition ignored because of error."
-msgstr "Condition «Ajouté le» ignorée à cause d'une erreur."
+msgstr "Condition « Ajouté le » ignorée à cause d'une erreur."
-#: ../src/display_sorttabs.c:1563 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
msgid "All"
msgstr "Tous"
-#: ../src/display_sorttabs.c:1589
+#: ../src/display_sorttabs.c:1588
msgid "Compilations"
msgstr "Compilations"
-#: ../src/display_sorttabs.c:2960
+#: ../src/display_sorttabs.c:2988
msgid "Comp."
msgstr "Comp."
-#: ../src/display_sorttabs.c:2966 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2002 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
msgid "Year"
msgstr "Année"
-#: ../src/display_sorttabs.c:2969
+#: ../src/display_sorttabs.c:2997
msgid "Special"
msgstr "Spécial"
-#: ../src/display_sorttabs.c:3230
+#: ../src/display_sorttabs.c:3245
msgid "Last Played"
msgstr "Dernière fois joué"
-#: ../src/display_sorttabs.c:3231
+#: ../src/display_sorttabs.c:3246
msgid "Last Modified"
msgstr "Dernière fois modifié"
@@ -2595,7 +2833,7 @@
msgid "Hz"
msgstr "Hz"
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:777
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
msgid "MB"
msgstr "Mo"
@@ -2628,10 +2866,6 @@
msgid "Size"
msgstr "Taille"
-#: ../src/display_spl.c:94 ../src/display_tracks.c:1984
-msgid "Time"
-msgstr "Durée"
-
#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
msgid "Comment"
msgstr "Commentaire"
@@ -2660,33 +2894,29 @@
msgid "Grouping"
msgstr "Regroupement"
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "Liste de lecture"
+
#: ../src/display_spl.c:106
msgid "Video Kind"
-msgstr ""
+msgstr "Type de vidéo"
-#: ../src/display_spl.c:107 ../src/display_spl.c:210 ../src/display_spl.c:219
-#: ../src/misc_conversion.c:101
-msgid "TV Show"
-msgstr ""
-
#: ../src/display_spl.c:108
-#, fuzzy
msgid "Season number"
-msgstr "N° de disque"
+msgstr "Numéro de saison"
#: ../src/display_spl.c:109
msgid "Skip count"
-msgstr ""
+msgstr "Nombre de fois ignoré"
#: ../src/display_spl.c:110
-#, fuzzy
msgid "Last skipped"
-msgstr "Dernière fois joué"
+msgstr "Dernière fois ignoré"
#: ../src/display_spl.c:111
-#, fuzzy
msgid "Album artist"
-msgstr "artiste"
+msgstr "Artiste de l'album"
#: ../src/display_spl.c:117
msgid "contains"
@@ -2751,9 +2981,8 @@
msgstr "n'est pas rempli"
#: ../src/display_spl.c:171
-#, fuzzy
msgid "Not supported"
-msgstr "Jamais écoutés"
+msgstr "Non supporté"
#: ../src/display_spl.c:178
msgid "minutes"
@@ -2767,7 +2996,7 @@
msgid "hours"
msgstr "heures"
-#: ../src/display_spl.c:182 ../src/info.c:777
+#: ../src/display_spl.c:182 ../src/info.c:780
msgid "GB"
msgstr "Go"
@@ -2824,34 +3053,21 @@
msgstr "les moins bien notés"
#: ../src/display_spl.c:208 ../src/display_spl.c:217
-#, fuzzy
msgid "Movie"
-msgstr "Modifié le"
+msgstr "Film"
-#: ../src/display_spl.c:209 ../src/display_spl.c:218
-#, fuzzy
-msgid "Music Video"
-msgstr "Racine musique :"
-
-#: ../src/display_spl.c:1162 ../src/display_spl.c:1177
+#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
msgid "to"
msgstr "Ã "
-#: ../src/display_spl.c:1455
+#: ../src/display_spl.c:1485
msgid "-"
msgstr "-"
-#: ../src/display_spl.c:1470
+#: ../src/display_spl.c:1500
msgid "+"
msgstr "+"
-#: ../src/display_spl.c:1689 ../src/misc_playlist.c:66
-#: ../src/misc_playlist.c:68 ../src/misc_playlist.c:93
-#: ../src/misc_playlist.c:95 ../src/misc_playlist.c:428
-#: ../src/misc_playlist.c:430
-msgid "New Playlist"
-msgstr "Nouvelle liste de lecture"
-
#: ../src/display_tracks.c:281
#, c-format
msgid "Moved one track"
@@ -2859,7 +3075,7 @@
msgstr[0] "Un morceau déplacé"
msgstr[1] "%d morceaux déplacés"
-#: ../src/display_tracks.c:1717
+#: ../src/display_tracks.c:1810
#, c-format
msgid ""
"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -2872,53 +3088,82 @@
"précédent.\n"
"\n"
-#: ../src/display_tracks.c:1962
+#: ../src/display_tracks.c:2069
msgid "Rtng"
msgstr "Note"
-#: ../src/display_tracks.c:1965
+#: ../src/display_tracks.c:2072
msgid "#"
msgstr "N°"
-#: ../src/display_tracks.c:1968
+#: ../src/display_tracks.c:2075
msgid "CD"
msgstr "CD"
-#: ../src/display_tracks.c:1971
+#: ../src/display_tracks.c:2078
msgid "ID"
msgstr "Id"
-#: ../src/display_tracks.c:1974
+#: ../src/display_tracks.c:2081
msgid "Trnsfrd"
msgstr "Transféré"
-#: ../src/display_tracks.c:1978
+#: ../src/display_tracks.c:2085
msgid "Cmpl"
msgstr "Cmpl"
-#: ../src/display_tracks.c:1987
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "Durée"
+
+#: ../src/display_tracks.c:2094
msgid "Plycnt"
msgstr "Cpt. lect"
-#: ../src/display_tracks.c:1999
+#: ../src/display_tracks.c:2106
msgid "Released"
msgstr "Sortie"
-#: ../src/display_tracks.c:2005
+#: ../src/display_tracks.c:2112
msgid "Vol."
msgstr "Vol."
-#: ../src/display_tracks.c:2008
+#: ../src/display_tracks.c:2115
msgid "Sndchk."
msgstr "Ctrl. Son"
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr ""
+
+#: ../src/fetchcover.c:371
+#, fuzzy, c-format
+msgid ""
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
+"\n"
+"- Clicking Yes will overwrite the existing file, possibly associating\n"
+" other music files in the same directory with this coverart file.\n"
+"- Clicking No will save the file with a unique file name.\n"
+"- Clicking Cancel will abort the fetchcover operation."
+msgstr ""
+"Le fichier d'image %s existe déjà .\n"
+"Il peut être déjà associé avec d'autres morceaux de musique dans le "
+"dossier.\n"
+"\n"
+"- avec le bouton Oui le fichier sera écrasé, avec la possibilité d'avoir\n"
+" l'association de ce fichier de pochette avec d'autres morceaux\n"
+" de musique dans ce même dossier.\n"
+"- avec le bouton Non le fichier sera enregistré sous un nom unique.\n"
+"- avec le bouton Annuler l'opération de gestion de la pochette sera annulée."
+
#: ../src/file.c:236
#, c-format
msgid ""
"'%s' is a directory, not a playlist file.\n"
"\n"
msgstr ""
-"«%s» est un répertoire, pas un fichier de liste.\n"
+"« %s » est un répertoire, pas un fichier de liste.\n"
"\n"
#: ../src/file.c:266
@@ -2927,105 +3172,103 @@
"'%s' is a not a known playlist file.\n"
"\n"
msgstr ""
-"«%s» n'est pas un fichier connu de liste\n"
+"« %s » n'est pas un fichier de liste reconnu\n"
"\n"
-#: ../src/file.c:283
+#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/wavfile.c:107
#, c-format
-msgid ""
-"Cannot open '%s' for reading.\n"
-"\n"
-msgstr ""
-"Ne peut ouvrir en lecture le fichier «%s».\n"
-"\n"
+msgid "Could not open '%s' for reading.\n"
+msgstr "Ne peut ouvrir en lecture le fichier « %s ».\n"
#: ../src/file.c:369
#, c-format
msgid "Skipping '%s' because it is a directory.\n"
-msgstr "Saut de «%s» parce qu'il s'agit d'un répertoire.\n"
+msgstr "Saut de « %s » parce qu'il s'agit d'un répertoire.\n"
#: ../src/file.c:374
#, c-format
msgid "Skipping '%s' to avoid adding playlist file recursively\n"
msgstr ""
-"Saut de «%s» pour éviter d'ajouter une liste de lecture récursivement\n"
+"Saut de « %s » pour éviter d'ajouter une liste de lecture récursivement\n"
#: ../src/file.c:629
#, c-format
msgid "Unknown token '%s' in template '%s'\n"
-msgstr "Paramètre «%s» inconnu dans le modèle «%s»\n"
+msgstr "Paramètre « %s » inconnu dans le modèle « %s »\n"
-#: ../src/file.c:890
+#: ../src/file.c:923
#, c-format
msgid "Local filename not valid (%s)"
msgstr "Nom de fichier local invalide (%s)"
-#: ../src/file.c:949
+#: ../src/file.c:982
#, c-format
msgid "No information found for user '%s' in '%s'"
-msgstr "Aucune info pour l'utilisateur «%s» dans «%s»"
+msgstr "Aucune info pour l'utilisateur « %s » dans « %s »"
-#: ../src/file.c:958
+#: ../src/file.c:991
#, c-format
msgid "mserv data file (%s) not available for track (%s)"
msgstr "Fichier de données mserv (%s) non présent pour le morceau (%s)"
-#: ../src/file.c:966
+#: ../src/file.c:999
#, c-format
msgid "Track (%s) not in mserv music root directory (%s)"
msgstr "Morceau (%s) non présent dans le répertoire de musique mserv (%s)"
-#: ../src/file.c:1090
+#: ../src/file.c:1123
#, c-format
msgid ""
"The following track could not be processed (file does not exist): '%s'\n"
msgstr ""
-"Le morceau suivant ne peut pas être mis à jour (fichier inexistant) : «%s»\n"
+"Le morceau suivant ne peut pas être mis à jour (fichier inexistant) : « %"
+"s »\n"
-#: ../src/file.c:1169
+#: ../src/file.c:1209
#, c-format
msgid "The following track could not be processed (filetype unknown): '%s'\n"
msgstr ""
-"Le morceau suivant ne peut pas être mis à jour (type de fichier inconnu) : «%"
-"s»\n"
+"Le morceau suivant ne peut pas être mis à jour (type de fichier inconnu) : "
+"« %s »\n"
-#: ../src/file.c:1262
+#: ../src/file.c:1307
#, c-format
msgid ""
"The following track could not be processed (filetype is known but analysis "
"failed): '%s'\n"
msgstr ""
"Le morceau suivant ne peut pas être mis à jour (type de fichier connu mais "
-"échec de l'analyse) : «%s»\n"
+"échec de l'analyse) : « %s »\n"
-#: ../src/file.c:1292 ../src/file.c:1346
+#: ../src/file.c:1337 ../src/file.c:1391
msgid "Nothing to update"
msgstr "Rien à mettre à jour"
-#: ../src/file.c:1313
+#: ../src/file.c:1358
#, c-format
msgid "Updating %s"
msgstr "%s en cours de mise à jour"
-#: ../src/file.c:1327
+#: ../src/file.c:1372
msgid "Updated selected tracks with info from file."
msgstr "Les morceaux sélectionnés ont été mis à jour à partir des fichiers."
-#: ../src/file.c:1361
+#: ../src/file.c:1406
#, c-format
msgid "Retrieving mserv data %s"
msgstr "Récupération des données mserv %s"
-#: ../src/file.c:1366
+#: ../src/file.c:1411
msgid "no filename available"
msgstr "pas de nom de fichier disponible"
-#: ../src/file.c:1371
+#: ../src/file.c:1416
msgid "Updated selected tracks with data from mserv."
msgstr ""
"Les morceaux sélectionnés ont été mis à jour à partir des données mserv."
-#: ../src/file.c:1392
+#: ../src/file.c:1437
#, c-format
msgid "The following track could not be updated"
msgid_plural "The following %d tracks could not be updated"
@@ -3034,11 +3277,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1398
+#: ../src/file.c:1443
msgid "Failed Track Update"
msgstr "Échec de la mise à jour du morceau"
-#: ../src/file.c:1456
+#: ../src/file.c:1501
#, c-format
msgid "The following track has been updated"
msgid_plural "The following %d tracks have been updated"
@@ -3047,11 +3290,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1462
+#: ../src/file.c:1507
msgid "Successful Track Update"
msgstr "Morceau mis à jour"
-#: ../src/file.c:1521
+#: ../src/file.c:1566
#, c-format
msgid "No mserv information could be retrieved for the following track"
msgid_plural ""
@@ -3062,57 +3305,57 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1527
+#: ../src/file.c:1572
msgid "mserv data retrieval problem"
msgstr "problème de récupération des données mserv"
-#: ../src/file.c:1616
+#: ../src/file.c:1661
msgid "no local filename available, file on the iPod will be used instead"
msgstr ""
"pas de nom de fichier local disponible, les fichiers de l'iPod seront "
"utilisés"
-#: ../src/file.c:1622
+#: ../src/file.c:1667
msgid "no local filename available and copy on iPod cannot be found"
msgstr "pas de nom de fichier local disponible ainsi que de copie sur le iPod"
-#: ../src/file.c:1626 ../src/file.c:1644
+#: ../src/file.c:1671 ../src/file.c:1689
msgid "no local filename available"
msgstr "pas de nom de fichier disponible"
-#: ../src/file.c:1634
+#: ../src/file.c:1679
msgid "local file could not be found, file on the iPod will be used instead"
msgstr "fichier local introuvable, le fichier de l'iPod sera utilisé"
-#: ../src/file.c:1640
+#: ../src/file.c:1685
msgid "local file as well as copy on the iPod cannot be found"
msgstr "fichier local et copie sur le iPod introuvables"
#. update not successful -- log this track for later display
-#: ../src/file.c:1728
-msgid "update failed (format no supported?)"
-msgstr "echec de la mise à jour (format non supporté ?)"
+#: ../src/file.c:1788
+msgid "update failed (format not supported?)"
+msgstr "échec de la mise à jour (format non supporté ?)"
-#: ../src/file.c:1813
+#: ../src/file.c:1873 ../src/misc_playlist.c:916
#, c-format
msgid "Processing '%s'..."
-msgstr "Traitement de «%s» ..."
+msgstr "Traitement de « %s » …"
-#: ../src/file.c:1819
+#: ../src/file.c:1879
#, c-format
-msgid "File skipped. match exclude masks: '%s'\n"
-msgstr "Fichier sauté. Correspond au masque d'exclusion : «%s»\n"
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "Saut de « %s » parce qu'il correspond à un masque d'exclusion.\n"
-#: ../src/file.c:1939 ../src/misc_track.c:1694 ../src/misc_track.c:1799
+#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
#, c-format
msgid ""
"Podcast already present: '%s'\n"
"\n"
msgstr ""
-"Podcast déjà présent : «%s»\n"
+"Podcast déjà présent : « %s »\n"
"\n"
-#: ../src/file.c:2004
+#: ../src/file.c:2064
#, c-format
msgid ""
"Writing to video files not yet supported (%s).\n"
@@ -3121,35 +3364,35 @@
"L'écriture de fichiers vidéo n'est pas encore supportée (%s).\n"
"\n"
-#: ../src/file.c:2056 ../src/file.c:2070
+#: ../src/file.c:2116 ../src/file.c:2130
#, c-format
msgid "Couldn't change tags of file: %s\n"
-msgstr "Impossible de changer les attributs du fichier : %s\n"
+msgstr "Impossible de changer les attributs du fichier : « %s »\n"
-#: ../src/file.c:2172
+#: ../src/file.c:2232
#, c-format
msgid "Could not open '%s' for reading and writing.\n"
-msgstr "Impossible d'ouvrir en lecture/écriture le fichier «%s».\n"
+msgstr "Impossible d'ouvrir en lecture/écriture le fichier « %s ».\n"
-#: ../src/file.c:2179
+#: ../src/file.c:2239
#, c-format
msgid "Could not obtain lock on '%s'.\n"
-msgstr "Impossible de verrouiller «%s».\n"
+msgstr "Impossible de verrouiller « %s ».\n"
#. error!
-#: ../src/file.c:2196 ../src/file.c:2205 ../src/file.c:2216 ../src/file.c:2226
+#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
#, c-format
msgid "Malformed line in '%s': %s\n"
-msgstr "Ligne incomplète dans «%s» : %s\n"
+msgstr "Ligne incomplète dans « %s » : %s\n"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:2255
+#: ../src/file.c:2315
msgid "Remove offline playcounts?"
msgstr "Supprimer les compteurs de lecture hors-ligne ?"
#. title
-#: ../src/file.c:2256
+#: ../src/file.c:2316
msgid ""
"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
"remove them from the offline playcount file, 'Cancel' to keep them."
@@ -3157,19 +3400,19 @@
"Certains morceaux joués hors-ligne ne peuvent être trouvés dans iTunesDB.\n"
"OK pour les supprimer du fichier de compteur de lecture hors-ligne ?"
-#: ../src/file.c:2273
+#: ../src/file.c:2333
#, c-format
msgid "Error writing to '%s'.\n"
-msgstr "Erreur d'écriture du fichier «%s».\n"
+msgstr "Erreur d'écriture du fichier « %s ».\n"
-#: ../src/file.c:2330 ../src/tools.c:271
+#: ../src/file.c:2390 ../src/tools.c:270
#, c-format
msgid ""
"Normalization failed: file type not supported (%s).\n"
"\n"
msgstr "Échec de la normalisation : type de fichier non supporté (%s).\n"
-#: ../src/file.c:2346 ../src/tools.c:288
+#: ../src/file.c:2406 ../src/tools.c:287
#, c-format
msgid ""
"Normalization failed: file not available (%s).\n"
@@ -3178,165 +3421,177 @@
#: ../src/file_convert.c:316
msgid "Summary status of conversion processes"
-msgstr ""
+msgstr "État de la conversion"
#: ../src/file_convert.c:564
msgid "active"
-msgstr ""
+msgstr "actif"
#: ../src/file_convert.c:569
msgid "inactive"
-msgstr ""
+msgstr "inactif"
#: ../src/file_convert.c:580
#, c-format
msgid "Active threads: %d. Scheduled tracks: %d."
-msgstr ""
+msgstr "threads actifs : %d. Morceaux prévus : %d."
-#: ../src/file_convert.c:1061
-#, fuzzy, c-format
+#: ../src/file_convert.c:1071
+#, c-format
msgid "Original filename not available for '%s.'\n"
-msgstr "Échec de la normalisation : fichier non disponible (%s).\n"
+msgstr "Nom de fichier original introuvable pour « %s ».\n"
-#: ../src/file_convert.c:1076
+#: ../src/file_convert.c:1086
#, c-format
msgid "Filename '%s' is no longer valid for '%s'.\n"
-msgstr ""
+msgstr "Le nom de fichier « %s » n'est plus valide pour « %s ».\n"
-#: ../src/file_convert.c:1127
+#: ../src/file_convert.c:1137
msgid "Ogg Vorbis"
-msgstr ""
+msgstr "Ogg Vorbis"
-#: ../src/file_convert.c:1133
+#: ../src/file_convert.c:1143
msgid "FLAC"
-msgstr ""
+msgstr "Audio FLAC"
-#: ../src/file_convert.c:1188
+#: ../src/file_convert.c:1198
#, c-format
msgid ""
"Files of type '%s' are not supported by the iPod. Please go to the "
"Preferences to set up and turn on a suitable conversion script for '%s'.\n"
"\n"
msgstr ""
+"Les fichiers de type « %s » ne sont pas reconnus par le iPod. Allez dans les "
+"préférences pour configurer un script de conversion adéquat pour « %s ».\n"
+"\n"
-#: ../src/file_convert.c:1274
-#, fuzzy
+#: ../src/file_convert.c:1284
msgid "No information available"
-msgstr "pas de nom de fichier disponible"
+msgstr "Pas d'information disponible."
-#: ../src/file_convert.c:1313
+#: ../src/file_convert.c:1323
#, c-format
msgid "Could not create '%s'. Filetype conversion will not work.\n"
-msgstr ""
+msgstr "Impossible de créer « %s ». La conversion ne fonctionnera pas.\n"
-#: ../src/file_convert.c:1631 ../src/file_convert.c:3040
-#, fuzzy, c-format
+#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#, c-format
msgid ""
"Transfer of '%s' failed. %s\n"
"\n"
msgstr ""
-"Échec de l'exécution de «%s».\n"
+"Échec du transfert de « %s ». %s\n"
"\n"
-#: ../src/file_convert.c:2035 ../src/file_convert.c:2313
-#, fuzzy, c-format
+#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#, c-format
msgid ""
"Conversion of '%s' failed: '%s'.\n"
"\n"
msgstr ""
-"Échec de l'exécution de «%s».\n"
+"Échec de la conversion de « %s » : « %s ».\n"
"\n"
-#: ../src/file_convert.c:2050
+#: ../src/file_convert.c:2062
#, c-format
msgid ""
"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
"\n"
msgstr ""
+"Échec de la conversion de « %s » : « %s %s » a un code de retour de %d.\n"
+"\n"
-#: ../src/file_convert.c:2079
-#, c-format
+#: ../src/file_convert.c:2091
+#, fuzzy, c-format
msgid ""
-"Conversion of '%s' failed: '%s %s' did not return filename extension as "
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
"expected.\n"
"\n"
msgstr ""
+"Échec de la conversion de « %s » : « %s %s » n'a pas retourné une extension "
+"de fichier comme attendu.\n"
+"\n"
-#: ../src/file_convert.c:2155
+#: ../src/file_convert.c:2167
#, c-format
msgid ""
-"Covnersion of '%s' failed: Could not access original file '%s' (%s).\n"
+"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
"\n"
msgstr ""
+"Échec de la conversion de « %s » : impossible d'accéder au fichier original "
+"« %s » (%s).\n"
+"\n"
-#: ../src/file_convert.c:2210
+#: ../src/file_convert.c:2222
#, c-format
msgid ""
"Conversion of '%s' failed: Could not create directory '%s'.\n"
"\n"
msgstr ""
+"Échec de la conversion de « %s » : impossible de créer le répertoire « %"
+"s ».\n"
+"\n"
-#: ../src/file_convert.c:2344
+#: ../src/file_convert.c:2356
#, c-format
msgid ""
"Conversion of '%s' failed: '%s' returned exit status %d.\n"
"\n"
msgstr ""
+"Échec de la conversion de « %s » : « %s » a un code de retour de %d.\n"
+"\n"
-#: ../src/file_convert.c:2383
+#: ../src/file_convert.c:2395
#, c-format
msgid ""
"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
"\n"
msgstr ""
+"Échec de la conversion de « %s » : fichier résultat « %s » introuvable.\n"
+"\n"
#: ../src/file_export.c:182
#, c-format
msgid "Skipping existing file with same length: '%s'\n"
-msgstr "Saut du fichier existant de même taille : «%s»\n"
+msgstr "Saut du fichier existant de même taille : « %s »\n"
#: ../src/file_export.c:190
#, c-format
msgid "Overwriting existing file: '%s'\n"
-msgstr "Ecrasement du fichier existant : «%s»\n"
+msgstr "Écrasement du fichier existant : « %s »\n"
#: ../src/file_export.c:207
#, c-format
msgid "Error copying '%s' to '%s': Permission Error (%s)\n"
-msgstr "Impossible de copier «%s» vers «%s» : Autorisation refusée (%s)\n"
+msgstr "Impossible de copier « %s » vers « %s » : Autorisation refusée (%s)\n"
#: ../src/file_export.c:209
#, c-format
msgid "Error copying '%s' to '%s' (%s)\n"
-msgstr "Impossible de copier «%s» vers «%s» (%s)\n"
+msgstr "Impossible de copier « %s » vers « %s » (%s)\n"
-#: ../src/file_export.c:217
-#, c-format
-msgid "Unable to open '%s' for reading\n"
-msgstr "Impossible d'ouvrir le fichier «%s» en lecture\n"
-
#: ../src/file_export.c:327
#, c-format
msgid "Could find file for '%s' on the iPod\n"
-msgstr "Impossible de trouver le fichier pour «%s» sur l'iPod\n"
+msgstr "Impossible de trouver le fichier pour « %s » sur l'iPod\n"
#. create the dialog window
-#: ../src/file_export.c:395 ../src/tools.c:361
+#: ../src/file_export.c:395 ../src/tools.c:360
msgid "Information"
msgstr "Information"
-#: ../src/file_export.c:406 ../src/tools.c:373
+#: ../src/file_export.c:406 ../src/tools.c:372
msgid "Press button to abort."
msgstr "Appuyer sur le bouton pour interrompre"
#: ../src/file_export.c:419
msgid "copying..."
-msgstr "copie ..."
+msgstr "copie …"
#: ../src/file_export.c:476
#, c-format
msgid "Failed to write '%s-%s'\n"
-msgstr "Impossible d'écrire «%s-%s»\n"
+msgstr "Impossible d'écrire « %s-%s »\n"
#: ../src/file_export.c:489
#, c-format
@@ -3345,7 +3600,7 @@
msgstr[0] "%d morceau copiés sur %d."
msgstr[1] "%d morceaux copiés sur %d."
-#: ../src/file_export.c:505 ../src/tools.c:519
+#: ../src/file_export.c:505 ../src/tools.c:518
#, c-format
msgid "%d%% (%d:%02d:%02d left)"
msgstr "%d%% (%d:%02d:%02d restant)"
@@ -3402,51 +3657,51 @@
msgid ""
"Could not open '%s' for writing (%s).\n"
"\n"
-msgstr "Ne peut ouvrir le fichier «%s» en lecture (%s).\n"
+msgstr "Ne peut ouvrir le fichier « %s » en lecture (%s).\n"
-#: ../src/file_itunesdb.c:127
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:129
+#, c-format
msgid "Matching SHA1 checksum for file %d/%d"
-msgstr "Correspondance des sommes de contrôles MD5 pour le fichier %d/%d"
+msgstr "Correspondance des sommes de contrôles SHA1 pour le fichier %d/%d"
-#: ../src/file_itunesdb.c:234
-msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
-msgstr ""
-"Ne peut ouvrir le fichier «iTunesDB.ext» pour lire les infos étendues.\n"
+#: ../src/file_itunesdb.c:236
+#, fuzzy, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "Ne peut ouvrir en écriture le fichier d'infos étendues « %s ».\n"
-#: ../src/file_itunesdb.c:241
+#: ../src/file_itunesdb.c:243
msgid "Could not create hash value from itunesdb\n"
msgstr "Ne peut pas créer de hachage à partir de itunesdb\n"
-#: ../src/file_itunesdb.c:255
+#: ../src/file_itunesdb.c:259
#, c-format
msgid "Error while reading extended info: %s\n"
msgstr "Erreur lors de la lecture des infos étendues : %s\n"
-#: ../src/file_itunesdb.c:272
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:276
+#, c-format
msgid ""
"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
"gtkpod will try to match the information using SHA1 checksums. This may take "
"a long time.\n"
"\n"
msgstr ""
-"La base iTunesDB «%s» ne correspond pas au hachage MD5 des infos étendues du "
-"fichier «%s».\n"
+"La base iTunesDB « %s » ne correspond pas à la somme de contrôle des infos "
+"étendues du fichier « %s ».\n"
"gtkpod essaiera de faire concorder l'information en utilisant les sommes de "
-"contrôle MD5. Cela peut prendre du temps.\n"
+"contrôle SHA1. Cela peut prendre du temps.\n"
"\n"
-#: ../src/file_itunesdb.c:284
+#: ../src/file_itunesdb.c:288
#, c-format
msgid ""
"%s:\n"
"Expected \"itunesdb_hash=\" but got:\"%s\"\n"
msgstr ""
"%s :\n"
-"«itunesdb_hash=» attendue mais réception de : «%s»\n"
+"« itunesdb_hash= » attendue mais réception de : « %s »\n"
-#: ../src/file_itunesdb.c:344
+#: ../src/file_itunesdb.c:348
#, c-format
msgid ""
"%s:\n"
@@ -3455,8 +3710,7 @@
"%s :\n"
"Erreur de format : %s\n"
-#: ../src/file_itunesdb.c:387
-#, fuzzy
+#: ../src/file_itunesdb.c:393
msgid ""
"No SHA1 checksums on individual tracks are available.\n"
"\n"
@@ -3465,14 +3719,14 @@
"than gtkpod.\n"
"\n"
msgstr ""
-"Pas de sommes de contrôle MD5 disponibles pour les morceaux.\n"
+"Pas de sommes de contrôle SHA1 disponibles pour les morceaux.\n"
"\n"
"Pour éviter cette situation dans le futur, activez la détection des doublons "
-"(afin de générer les sommes de contrôle MD5) ou bien éviter d'utiliser votre "
-"iPod avec d'autres programmes que gtkpod.\n"
+"(afin de générer les sommes de contrôle SHA1) ou bien évitez d'utiliser "
+"votre iPod avec d'autres programmes que gtkpod.\n"
"\n"
-#: ../src/file_itunesdb.c:451
+#: ../src/file_itunesdb.c:457
msgid ""
"Extended info will not be used. If you have non-transferred tracks,\n"
"these will be lost.\n"
@@ -3480,35 +3734,35 @@
"Les infos étendues ne seront pas utilisées. Si vous avez des morceaux non,\n"
"transférés, elles seront perdues.\n"
-#: ../src/file_itunesdb.c:459
+#: ../src/file_itunesdb.c:465
msgid "Offline iPod database successfully imported"
msgstr ""
"La base de données de l'iPod (mode déconnecté) a été importée avec succès"
-#: ../src/file_itunesdb.c:462
+#: ../src/file_itunesdb.c:468
msgid "Local database successfully imported"
msgstr "La base de données locale a été importée avec succès"
# y, c-format
-#: ../src/file_itunesdb.c:470
+#: ../src/file_itunesdb.c:476
#, c-format
msgid ""
"Offline iPod database import failed: '%s'\n"
"\n"
msgstr ""
-"Échec de l'import de la base de l'iPod en mode déconnecté : «%s»\n"
+"Échec de l'import de la base de l'iPod en mode déconnecté : « %s »\n"
"\n"
-#: ../src/file_itunesdb.c:474
+#: ../src/file_itunesdb.c:480
#, c-format
msgid ""
"Local database import failed: '%s'\n"
"\n"
msgstr ""
-"Échec de l'import de la base de données locale : «%s»\n"
+"Échec de l'import de la base de données locale : « %s »\n"
"\n"
-#: ../src/file_itunesdb.c:481
+#: ../src/file_itunesdb.c:487
msgid ""
"Offline iPod database import failed: \n"
"\n"
@@ -3516,7 +3770,7 @@
"Échec de l'import de la base de données de l'iPod en mode déconnecté : \n"
"\n"
-#: ../src/file_itunesdb.c:484
+#: ../src/file_itunesdb.c:490
msgid ""
"Local database import failed: \n"
"\n"
@@ -3524,33 +3778,33 @@
"Échec de l'import de la base données locale : \n"
"\n"
-#: ../src/file_itunesdb.c:491
+#: ../src/file_itunesdb.c:497
#, c-format
msgid ""
"'%s' does not exist. Import aborted.\n"
"\n"
msgstr ""
-"«%s» n'existe pas. Import annulé.\n"
+"« %s » n'existe pas. Import annulé.\n"
"\n"
-#: ../src/file_itunesdb.c:514
+#: ../src/file_itunesdb.c:520
msgid "Extended info will not be used.\n"
msgstr "Les infos étendues ne seront pas utilisées.\n"
-#: ../src/file_itunesdb.c:521
+#: ../src/file_itunesdb.c:527
msgid "iPod Database Successfully Imported"
msgstr "La base de l'iPod a été importée avec succès"
-#: ../src/file_itunesdb.c:528
+#: ../src/file_itunesdb.c:534
#, c-format
msgid ""
"iPod Database Import Failed: '%s'\n"
"\n"
msgstr ""
-"Échec de l'import de la base de l'iPod : «%s»\n"
+"Échec de l'import de la base de l'iPod : « %s »\n"
"\n"
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:540
msgid ""
"iPod Database Import Failed.\n"
"\n"
@@ -3558,16 +3812,16 @@
"Échec de l'import de la base de l'iPod.\n"
"\n"
-#: ../src/file_itunesdb.c:543
+#: ../src/file_itunesdb.c:549
#, c-format
msgid ""
"'%s' (or similar) does not exist. Import aborted.\n"
"\n"
msgstr ""
-"«%s» (ou similaire) n'existe pas. Import annulé.\n"
+"« %s » (ou similaire) n'existe pas. Import annulé.\n"
"\n"
-#: ../src/file_itunesdb.c:859
+#: ../src/file_itunesdb.c:865
#, c-format
msgid ""
"Could not find iPod directory structure at '%s'.\n"
@@ -3576,91 +3830,98 @@
"\n"
"Do you want to create the directory structure now?\n"
msgstr ""
-"Impossible de trouver les répertoires système de l'iPod dans «%s».\n"
-"Si vous êtes certain que le iPod est correctement monté en «%s», gtkpod peut "
-"créer ces répertoires pour vous.\n"
+"Impossible de trouver les répertoires système de l'iPod dans « %s ».\n"
+"Si vous êtes certain que le iPod est correctement monté en « %s », gtkpod "
+"peut créer ces répertoires pour vous.\n"
-#: ../src/file_itunesdb.c:1140
+#: ../src/file_itunesdb.c:1180
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
-msgstr "Ne peut ouvrir en écriture le fichier d'infos étendues «%s».\n"
+msgstr "Ne peut ouvrir en écriture le fichier d'infos étendues « %s ».\n"
-#: ../src/file_itunesdb.c:1155
+#: ../src/file_itunesdb.c:1195
msgid "Aborted writing of extended info.\n"
msgstr "Écriture des infos étendues interrompue.\n"
-#: ../src/file_itunesdb.c:1356
+#: ../src/file_itunesdb.c:1397
#, c-format
msgid "%d%%"
-msgstr ""
+msgstr "%d%%"
-#: ../src/file_itunesdb.c:1370
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1411
+#, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left)"
msgstr "%d%% (%d:%02d:%02d restant)"
-#: ../src/file_itunesdb.c:1412
+#: ../src/file_itunesdb.c:1463
msgid "Status: Deleting File"
-msgstr ""
+msgstr "État : suppression de fichier"
-#: ../src/file_itunesdb.c:1473
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1524
+#, c-format
msgid ""
"Could not remove the following file: '%s'\n"
"\n"
-msgstr "Ne peut ouvrir le fichier «%s» en lecture (%s).\n"
+msgstr ""
+"Impossible de supprimer le fichier : « %s »\n"
+"\n"
-#: ../src/file_itunesdb.c:1581
-#, fuzzy
+#: ../src/file_itunesdb.c:1632
msgid ""
"The following track could not be converted successfully:\n"
"\n"
msgid_plural ""
"The following tracks could not be converted successfully:\n"
"\n"
-msgstr[0] "Le morceau suivant ne peut pas être mis à jour."
-msgstr[1] "Les %d morceaux suivants ne peuvent pas être mis à jour."
+msgstr[0] "Le morceau suivant ne peut pas être converti :\n"
+msgstr[1] "Les morceaux suivants ne peuvent pas être converti :\n"
-#: ../src/file_itunesdb.c:1591
-#, fuzzy
+#: ../src/file_itunesdb.c:1642
msgid ""
"The following track could not be transferred successfully:\n"
"\n"
msgid_plural ""
"The following tracks could not be transferred successfully:\n"
"\n"
-msgstr[0] "Le morceau suivant ne peut pas être mis à jour."
-msgstr[1] "Les %d morceaux suivants ne peuvent pas être mis à jour."
+msgstr[0] "Le morceau suivant ne peut pas être transféré :\n"
+msgstr[1] "Les morceaux suivants ne peuvent pas être transféré :\n"
#. ID
#. modal,
#. gint id,
#. gboolean modal,
-#: ../src/file_itunesdb.c:1600 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
msgid "Warning"
msgstr "Attention"
#. title
-#: ../src/file_itunesdb.c:1601
+#: ../src/file_itunesdb.c:1652
msgid ""
"The iPod could not be ejected. Please fix the problems mentioned below and "
"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
"for conversion and transfer."
msgstr ""
+"Impossible d'éjecter le iPod. Veuillez résoudre les problèmes indiqués ci-"
+"dessous avant d'éjecter de nouveau le iPod. Avec le bouton « OK » la "
+"conversion et le transfert des morceaux qui ont eu des problèmes sera re-"
+"planifiée."
-#: ../src/file_itunesdb.c:1663
+#: ../src/file_itunesdb.c:1715
+#, c-format
msgid "Status: Copying track"
-msgstr ""
+msgstr "État : copie de morceau"
-#: ../src/file_itunesdb.c:1669
+#: ../src/file_itunesdb.c:1721
+#, c-format
msgid "Status: Waiting for conversion to complete"
-msgstr ""
+msgstr "État : attente de la fin de la conversion"
-#: ../src/file_itunesdb.c:1673
+#: ../src/file_itunesdb.c:1725
+#, c-format
msgid "Status: Finished transfer"
-msgstr ""
+msgstr "État : fin du transfert"
-#: ../src/file_itunesdb.c:1714
+#: ../src/file_itunesdb.c:1770
#, c-format
msgid ""
"One track could not be transferred because your iPod is full. Either delete "
@@ -3671,9 +3932,13 @@
"some tracks or otherwise create space on the iPod before ejecting the iPod "
"again."
msgstr[0] ""
+"Un morceau n'a pas pu être transféré car le iPod est plein. Éliminez "
+"quelques morceaux ou faites de la place avant de l'éjecter de nouveau."
msgstr[1] ""
+"%d morceaux n'ont pas pu être transféré car le iPod est plein. Éliminez "
+"quelques morceaux ou faites de la place avant de l'éjecter de nouveau."
-#: ../src/file_itunesdb.c:1792
+#: ../src/file_itunesdb.c:1852
#, c-format
msgid ""
"You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -3683,14 +3948,14 @@
"cancel, you can import the existing database before calling this function "
"again.\n"
msgstr ""
-"Vous n'avez pas importé la base iTunesDB («%s») existante. C'est souvent une "
-"erreur et cela impliquera la perte de la base existante.\n"
+"Vous n'avez pas importé la base iTunesDB (« %s ») existante. C'est souvent "
+"une erreur et cela impliquera la perte de la base existante.\n"
"\n"
"Appuyer sur «OK» pour continuer ou «Annuler» pour interrompre. Si vous "
"annulez, vous pouvez importer la base existante avant d'appeler de nouveau "
"cette fonction.\n"
-#: ../src/file_itunesdb.c:1827
+#: ../src/file_itunesdb.c:1887
msgid ""
"iPod directory structure must be present before synching to the iPod can be "
"performed.\n"
@@ -3698,123 +3963,146 @@
"Les répertoires systèmes de l'iPod doivent exister avant de pouvoir "
"synchroniser l'iPod.\n"
-#: ../src/file_itunesdb.c:1836
+#: ../src/file_itunesdb.c:1896
msgid "Some tracks could not be deleted from the iPod. Export aborted!"
msgstr "Des morceaux ne peuvent pas être supprimés de l'iPod. Export annulé !"
-#: ../src/file_itunesdb.c:1854
-msgid "Now writing database. Please wait..."
-msgstr "Écriture de la base iTunesDB. Veuillez patienter ..."
+#: ../src/file_itunesdb.c:1914
+#, c-format
+msgid "Now writing database '%s'. Please wait..."
+msgstr "Écriture de la base « %s ». Veuillez patienter …"
-#: ../src/file_itunesdb.c:1901
+#: ../src/file_itunesdb.c:1963
#, c-format
msgid "Extended information file not deleted: '%s'"
-msgstr "Fichier d'infos étendues non supprimé : «%s»"
+msgstr "Fichier d'infos étendues non supprimé : « %s »"
-#: ../src/file_itunesdb.c:1987
+#: ../src/file_itunesdb.c:2070
#, c-format
msgid "%s: Database saved"
msgstr "%s : Base de l'iPod sauvegardée"
-#: ../src/file_itunesdb.c:1991
+#: ../src/file_itunesdb.c:2074
#, c-format
msgid "%s: Changes saved"
msgstr "%s : Modifications sauvegardées"
-#: ../src/fileselection.c:128
+#: ../src/fileselection.c:129
msgid "Successfully added files"
msgstr "Les fichiers ont bien été ajoutés"
-#: ../src/fileselection.c:130
+#: ../src/fileselection.c:131
msgid "Some files were not added successfully"
msgstr "Echec de l'ajout de quelques fichiers"
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:160
-msgid "Add Files"
-msgstr "Ajouter des fichiers"
+#: ../src/fileselection.c:164 ../src/fileselection.c:305
+#: ../src/fileselection.c:792
+msgid "Please select a playlist or repository before adding tracks."
+msgstr "Choisir une liste de lecture ou un dépôt avant d'ajouter des morceaux."
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:253
-msgid "Add Playlists"
-msgstr "Ajouter des listes de lecture"
+#: ../src/fileselection.c:175 ../src/fileselection.c:314
+#: ../src/fileselection.c:803
+msgid "Please load the iPod before adding tracks."
+msgstr "Charger le iPod avant d'ajouter des morceaux."
+#: ../src/fileselection.c:185
+#, c-format
+msgid "Add files to '%s'"
+msgstr "Ajoute des fichiers à « %s »"
+
+#: ../src/fileselection.c:189
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr "Ajoute des fichiers à « %s/%s »"
+
+#. Create window title
+#: ../src/fileselection.c:322
+#, c-format
+msgid "Add playlist files to '%s'"
+msgstr "Ajouter les fichiers de liste de lecture à « %s »"
+
#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:300
+#: ../src/fileselection.c:378
msgid "Set Cover"
msgstr "Modifier la pochette"
-#: ../src/fileselection.c:721
-msgid "Select directory to add recursively"
-msgstr "Sélectionner un répertoire à ajouter récursivement"
+#: ../src/fileselection.c:816
+#, c-format
+msgid "Add directories to '%s'"
+msgstr "Ajouter les dossier à « %s »"
-#: ../src/fileselection.c:992
+#: ../src/fileselection.c:820
+#, c-format
+msgid "Add directories to '%s/%s'"
+msgstr "Ajouter les dossiers à « %s/%s »"
+
+#: ../src/fileselection.c:1097
msgid "Ok"
msgstr "Ok"
-#: ../src/fileselection.c:1001
+#: ../src/fileselection.c:1106
msgid "Cancel"
msgstr "Annuler"
-#: ../src/flacfile.c:33
-#, fuzzy, c-format
+#: ../src/flacfile.c:62
+#, c-format
msgid "'%s' does not appear to be an FLAC audio file.\n"
-msgstr "«%s» n'est pas un fichier audio mp4.\n"
+msgstr "« %s » n'est pas un fichier audio FLAC.\n"
-#: ../src/flacfile.c:52
-#, fuzzy, c-format
+#: ../src/flacfile.c:78
+#, c-format
msgid "Error retrieving tags for '%s'.\n"
-msgstr "Erreur d'écriture du fichier «%s».\n"
+msgstr "Échec de la récupération des attributs de « %s ».\n"
-#: ../src/flacfile.c:119
-#, fuzzy, c-format
+#: ../src/flacfile.c:165
+#, c-format
msgid ""
"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
"compile the gtkpod source together with the FLAC library.\n"
msgstr ""
-"Echec de l'import de «%s» : pas de support des formats m4a/m4p. Vous devez "
-"compiler gtkpod avec la bibliothèque mp4v2.\n"
+"Échec de l'import de « %s » : pas de support des formats FLAC. Vous devez "
+"compiler gtkpod avec la bibliothèque FLAC.\n"
-#: ../src/flacfile.c:125
-#, fuzzy, c-format
+#: ../src/flacfile.c:171
+#, c-format
msgid ""
"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
"library. You must compile the gtkpod source together with the FLAC library.\n"
msgstr ""
-"Echec de la mise à jour des données m4a/m4p pour «%s» : pas de support des "
-"formats m4a/m4p. Vous devez compiler gtkpod avec la bibliothèque mp4v2.\n"
+"Échec de la mise à jour des données FLAC pour « %s » : pas de support des "
+"formats FLAC. Vous devez compiler gtkpod avec la bibliothèque FLAC.\n"
#: ../src/getopt.c:681
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s : option «%s» ambigüe\n"
+msgstr "%s : option « %s » ambiguë\n"
#: ../src/getopt.c:706
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s : l'option «--%s» n'autorise pas d'argument\n"
+msgstr "%s : l'option « --%s » n'autorise pas d'argument\n"
#: ../src/getopt.c:711
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s : l'option «%c%s» n'autorise pas d'argument\n"
+msgstr "%s : l'option « %c%s » n'autorise pas d'argument\n"
#: ../src/getopt.c:729 ../src/getopt.c:902
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s : l'option «%s» nécessite un argument\n"
+msgstr "%s : l'option « %s » nécessite un argument\n"
#. --option
#: ../src/getopt.c:758
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s : option «--%s» non reconnue\n"
+msgstr "%s : option « --%s » non reconnue\n"
#. +option or -option
#: ../src/getopt.c:762
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s : option «%c%s» non reconnue\n"
+msgstr "%s : option « %c%s » non reconnue\n"
#. 1003.2 specifies the format of this message.
#: ../src/getopt.c:788
@@ -3836,455 +4124,536 @@
#: ../src/getopt.c:868
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s : l'option «-W %s» est ambigüe\n"
+msgstr "%s : l'option « -W %s » est ambiguë\n"
#: ../src/getopt.c:886
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s : l'option «-W %s» n'autorise pas d'argument\n"
+msgstr "%s : l'option « -W %s » n'autorise pas d'argument\n"
#: ../src/info.c:383
msgid "n/c"
msgstr "n/d"
-#: ../src/info.c:388 ../src/info.c:835
+#: ../src/info.c:388 ../src/info.c:838
msgid "offline"
msgstr "déconnecté"
-#: ../src/info.c:483
+#: ../src/info.c:486
#, c-format
msgid " P:%d T:%d/%d"
msgstr "LÂ :%d MÂ :%d/%d"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "B"
msgstr "o"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "kB"
msgstr "ko"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "TB"
msgstr "To"
-#: ../src/info.c:820
+#: ../src/info.c:823
#, c-format
msgid " %s Free"
msgstr " %s de libre"
-#: ../src/info.c:825
+#: ../src/info.c:828
#, c-format
msgid " %s Pending"
msgstr " %s en cours"
-#: ../src/info.c:830
+#: ../src/info.c:833
msgid " disconnected"
msgstr "déconnecté"
-#: ../src/info.c:881
+#: ../src/info.c:884
msgid "No database or playlist selected"
msgstr "Aucune base de donnée ou liste de lecture sélectionnée"
-#: ../src/info.c:886
+#: ../src/info.c:889
msgid "No tracks selected"
msgstr "Aucun morceau sélectionné"
-#: ../src/info.c:891
+#: ../src/info.c:894
msgid "No playlist selected"
msgstr "Aucune liste de lecture sélectionnée"
-#: ../src/info.c:896
+#: ../src/info.c:899
msgid "No iPod or iPod playlist selected"
msgstr "Aucun iPod ou liste de lecture sélectionné(e)"
#. Strings used several times
#: ../src/ipod_init.c:48
msgid "Select or enter your model"
-msgstr ""
+msgstr "Choisir ou entrer le modèle"
#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
msgid "Select mountpoint"
msgstr "Point de montage de l'iPod :"
#: ../src/ipod_init.c:359
-#, fuzzy, c-format
+#, c-format
msgid "Error initialising iPod: %s\n"
-msgstr "Erreur d'écriture du fichier «%s».\n"
+msgstr "Erreur d'initialisation du iPod : %s\n"
#: ../src/ipod_init.c:366
msgid "Error initialising iPod, unknown error\n"
-msgstr ""
+msgstr "Erreur d'initialisation du iPod, erreur inconnue\n"
#: ../src/ipod_init.c:422
-#, fuzzy, c-format
+#, c-format
msgid "<b>Please select your iPod model at </b><i>%s</i>"
-msgstr "<b>Sélectionnez le point de montage et le modèle de votre iPod</b>"
+msgstr "<b>Sélectionnez le modèle de votre iPod dans</b><i>%s</i>"
-#: ../src/misc.c:86
-#, c-format
+#: ../src/ipod_init.c:463
msgid ""
-"gtkpod Version %s: Cross-Platform Multi-Lingual Interface to Apple's iPod"
-"(tm)."
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
msgstr ""
-"gtkpod Version %s : Interface multilingue et multi-plateforme pour l'iPod® "
-"d'Apple."
+"Impossible de détecter le modèle sélectionné. Ceci peut être du à une erreur "
+"ou une incompatibilité dans GTK+ ou GLADE.\n"
+"\n"
-#: ../src/misc.c:90
+#: ../src/misc.c:70
#, fuzzy
msgid ""
-"(C) 2002 - 2007\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
"Corey Donohoe (atmos at atmos dot org)\n"
-"\n"
-"\n"
msgstr ""
-"© 2002 - 2005\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
"Corey Donohoe (atmos at atmos dot org)\n"
"\n"
"\n"
-#: ../src/misc.c:96
+#: ../src/misc.c:74
+#, fuzzy
msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-
-#: ../src/misc.c:104
-msgid ""
"Patches were supplied by the following people (list may be incomplete -- "
"please contact me)\n"
-"\n"
msgstr ""
"Les personnes suivantes ont fournis des corrections ou évolutions (liste "
"peut-être incomplète - veuillez me contacter)\n"
"\n"
-#: ../src/misc.c:106
-msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)\n"
+#: ../src/misc.c:75
+#, fuzzy
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
msgstr ""
-"Ramesh Dharan : 'Édition multiple' (édition de tags de plusieurs fichiers en "
-"même temps)\n"
+"Ramesh Dharan : « Édition multiple » (édition des attributs de plusieurs "
+"fichiers en même temps)\n"
-#: ../src/misc.c:108
-msgid "Hiroshi Kawashima: Japanese charset autodetecion feature\n"
+#: ../src/misc.c:76
+#, fuzzy
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
msgstr ""
"Hiroshi Kawashima : détection automatique du type de jeu de caractères "
"japonais\n"
-#: ../src/misc.c:110
-msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c\n"
+#: ../src/misc.c:77
+#, fuzzy
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
msgstr ""
"Adrian Ulrich : portage du code de liste de lecture à partir de mktunes.pl\n"
-#: ../src/misc.c:112
+#: ../src/misc.c:78
+#, fuzzy
msgid ""
"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
-"newlines at the end\n"
+"newlines at the end"
msgstr ""
"Walter Bell : correction de la manipulation des URIs avec des caractères "
"d'échappement\n"
-#: ../src/misc.c:114
-msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod\n"
+#: ../src/misc.c:79
+#, fuzzy
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
msgstr ""
"Sam Clegg : définition par un masque des noms de fichier à l'export de "
"morceaux\n"
-#: ../src/misc.c:116
-msgid "Chris Cutler: automatic creation of various playlist types\n"
+#: ../src/misc.c:80
+#, fuzzy
+msgid "Chris Cutler: automatic creation of various playlist types"
msgstr "Chris Cutler : création automatique de divers listes de lecture\n"
-#: ../src/misc.c:118
+#: ../src/misc.c:81
+#, fuzzy
msgid ""
"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
-"dialogue during sync\n"
+"dialogue during sync"
msgstr ""
-"Graeme Wilford : lecture et écriture des tags 'Compositeur', barre de "
-"progression durant les synchro\n"
+"Graeme Wilford : lecture et écriture des attributs « Compositeur », barre "
+"de progression durant les synchro.\n"
-#: ../src/misc.c:120
+#: ../src/misc.c:82
+#, fuzzy
msgid ""
"Edward Matteucci: debugging, special playlist creation, most of the volume "
-"normalizing code\n"
+"normalizing code"
msgstr ""
-"Edward Matteucci : debogage, création de liste de lectures, majeure partie "
-"de la normalisation du volume\n"
+"Edward Matteucci : mise au point, création de liste de lectures, majeure "
+"partie de la normalisation du volume\n"
-#: ../src/misc.c:122
-msgid "Jens Lautenbach: some optical improvements\n"
+#: ../src/misc.c:83
+#, fuzzy
+msgid "Jens Lautenbach: some optical improvements"
msgstr "Jens Lautenbach : améliorations esthétiques de l'interface\n"
-#: ../src/misc.c:124
-msgid "Alex Tribble: iPod eject patch\n"
+#: ../src/misc.c:84
+#, fuzzy
+msgid "Alex Tribble: iPod eject patch"
msgstr "Alex Tribble : éjection de l'iPod\n"
-#: ../src/misc.c:126
-msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling\n"
+#: ../src/misc.c:85
+#, fuzzy
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
msgstr ""
"Yaroslav Halchenko : gestion des fichiers orphelins et morceaux fictifs\n"
-#: ../src/misc.c:128
+#: ../src/misc.c:86
+#, fuzzy
msgid ""
-"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes\n"
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
msgstr ""
"Andrew Huntwork : gestion de la casse des noms de fichier et correctifs\n"
-#: ../src/misc.c:130
+#: ../src/misc.c:87
+#, fuzzy
msgid ""
"Ero Carrera: Filename validation and quick sync when copying tracks from the "
-"iPod\n"
+"iPod"
msgstr ""
-"Ero Carrera : Validation du nom de fichier et synchro rapide lors de la "
+"Ero Carrera : Validation du nom de fichier et synchro. rapide lors de la "
"copie de l'iPod\n"
-#: ../src/misc.c:132
-msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume\n"
+#: ../src/misc.c:88
+#, fuzzy
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
msgstr ""
-"Jens Taprogge : Support du tag 'replay gain' de LAME pour normaliser le "
-"volume\n"
+"Jens Taprogge : Support de l'attribut « replay gain » de LAME pour "
+"normaliser le volume\n"
-#: ../src/misc.c:134
-msgid "Armando Atienza: Support with external playcounts\n"
+#: ../src/misc.c:89
+#, fuzzy
+msgid "Armando Atienza: Support with external playcounts"
msgstr "Armando Atienza : Suppport pour les compteurs de lecture externes\n"
-#: ../src/misc.c:136
-msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)\n"
+#: ../src/misc.c:90
+#, fuzzy
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
msgstr "D.L. Sharp : Support des fichiers m4b\n"
-#: ../src/misc.c:138
-msgid "Jim Hall: Decent INSTALL file\n"
+#: ../src/misc.c:91
+#, fuzzy
+msgid "Jim Hall: Decent INSTALL file"
msgstr "Jim Hall : Fichier INSTALL décent\n"
-#: ../src/misc.c:140
+#: ../src/misc.c:92
+#, fuzzy
msgid ""
"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
-"contacts to the iPod\n"
+"contacts to the iPod"
msgstr ""
"Juergen Helmers, Markus Gaugusch : Scripts de conversion pour le calendrier/"
"contacts\n"
#. J"urgen!
-#: ../src/misc.c:142
-msgid "Flavio Stanchina: bugfixes\n"
+#: ../src/misc.c:93
+#, fuzzy
+msgid "Flavio Stanchina: bugfixes"
msgstr "Flavio Stanchina : correction de bogues\n"
-#: ../src/misc.c:144
+#: ../src/misc.c:94
+#, fuzzy
msgid ""
"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title\n"
+"the title"
msgstr "Chris Micacchi : lors du tri, gestion de 'the' au début du titre\n"
-#: ../src/misc.c:146
-msgid "Steve Jay: use statvfs() instead of df (better portability, faster)\n"
+#: ../src/misc.c:95
+#, fuzzy
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
msgstr "Steve Jay : utilisation de statvfs pour une meilleure portabilité\n"
-#: ../src/misc.c:149
+#: ../src/misc.c:97
+#, fuzzy
msgid ""
"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
-"tags\n"
+"tags"
msgstr "Christoph Kunz : compatibilité des adresses pour attributs id3v2.4\n"
-#: ../src/misc.c:152
+#: ../src/misc.c:99
+#, fuzzy
msgid ""
"James Liggett:\n"
-" replacement of old GTK file selection dialogs with new GTK filechooser "
+"replacement of old GTK file selection dialogs with new GTK filechooser "
"dialogs\n"
-" refactored user preferences system.\n"
+"refactored user preferences system."
msgstr ""
"James Ligget :\n"
" remplacement de l'ancien dialogue GTK de sélection de fichiers par le "
"nouveau\n"
" refonte de la gestion des préférences.\n"
-#: ../src/misc.c:157
-msgid "Daniel Kercher: sync scripts for abook and webcalendar\n"
+#: ../src/misc.c:103
+#, fuzzy
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
msgstr "Daniel Kercher : scripts de synchronisation abook et webcalendar\n"
-#: ../src/misc.c:160
-msgid "Clinton Gormley: sync scripts for thunderbird\n"
+#: ../src/misc.c:105
+#, fuzzy
+msgid "Clinton Gormley: sync scripts for thunderbird"
msgstr "Clinton Gormley : scripts de synchronisation pour thunderbird\n"
-#: ../src/misc.c:163
-msgid "Sebastien Beridot: sync script for ldif addressbook format\n"
+#: ../src/misc.c:107
+#, fuzzy
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
msgstr "Sebastien Beridot : script de synchronisation pour le format ldif\n"
-#: ../src/misc.c:166
-msgid "Sebastian Scherer: sync script for kNotes\n"
+#: ../src/misc.c:109
+#, fuzzy
+msgid "Sebastian Scherer: sync script for kNotes"
msgstr "Sebastian Scherer : script de synchronisation pour kNotes\n"
-#: ../src/misc.c:169
-msgid "Nick Piper: sync script for Palm, type-ahead search\n"
+#: ../src/misc.c:111
+#, fuzzy
+msgid "Nick Piper: sync script for Palm, type-ahead search"
msgstr "Nick Piper: script de synchronisation pour Palm\n"
-#: ../src/misc.c:172
-msgid "Uwe Hermann: help with support for iPod Video\n"
+#: ../src/misc.c:113
+#, fuzzy
+msgid "Uwe Hermann: help with support for iPod Video"
msgstr "Uwe Hermann: aide pour le support de l'iPod Vidéo\n"
-#: ../src/misc.c:175
+#: ../src/misc.c:115
+#, fuzzy
msgid ""
"Iain Benson: support for compilation tag in mp3 files and separate display "
-"of compilations in the sort tab.\n"
+"of compilations in the sort tab."
msgstr ""
"Iain Benson: support pour les attributs de compilation dans les fichiers MP3 "
"et l'affichage séparé des compilations dans la zone de tri.\n"
-#: ../src/misc.c:177
+#: ../src/misc.c:116
+#, fuzzy
msgid ""
"Nicolas Chariot: icons of buttons\n"
"\n"
-"\n"
msgstr ""
"Nicolas Chariot: icônes des boutons\n"
"\n"
"\n"
-#: ../src/misc.c:181
-msgid "This program borrows code from the following projects:\n"
+#: ../src/misc.c:118
+#, fuzzy
+msgid "This program borrows code from the following projects:"
msgstr "Ce programme emprunte du code aux projets suivants :\n"
-#: ../src/misc.c:183
+#: ../src/misc.c:119
+#, fuzzy
msgid ""
-" gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB "
-"(http://www.gnu.org/software/gnupod/)\n"
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
msgstr ""
" gnutools : (mktunes.pl porté en C) pour la lecture et écriture de "
"iTunesDB (http://www.gnu.org/software/gnupod/)\n"
-#: ../src/misc.c:185
+#: ../src/misc.c:120
+#, fuzzy
msgid ""
-" iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some "
-"code for smart playlists is based on his C++-classes.\n"
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
msgstr ""
" iPod.cpp, iPod.h par Samuel Wood (sam dot wood at gamil dot com)Â : "
"certaines parties de code des listes intelligentes sont basées sur ses "
"classes C++.\n"
-#: ../src/misc.c:187
-msgid " mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)\n"
+#: ../src/misc.c:121
+#, fuzzy
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
msgstr ""
" mp3info : détection de la durée du mp3 (http://ibiblio.org/mp3info/)\n"
-#: ../src/misc.c:189
-msgid ""
-" xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)\n"
+#: ../src/misc.c:122
+#, fuzzy
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
msgstr " xmms : explorateur, détection de la durée (http://www.xmms.org)\n"
-#: ../src/misc.c:192
-msgid ""
-"The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"
+#: ../src/misc.c:124
+#, fuzzy
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
msgstr ""
"L'interface utilisateur a été créée à l'aide de glade-2 (http://glade.gnome."
"org).\n"
-#: ../src/misc.c:207
-msgid "French: David Le Brun (david at dyn-ns dot net)\n"
+#: ../src/misc.c:128
+#, fuzzy
+msgid "French: David Le Brun (david at dyn-ns dot net)"
msgstr "Français : Eric Lassauge (lassauge at users dot sourceforge dot net)\n"
-#: ../src/misc.c:209
-msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+#: ../src/misc.c:129
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr ""
+
+#: ../src/misc.c:130
+#, fuzzy
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
msgstr "Allemand : Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
-#: ../src/misc.c:211
-msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)\n"
+#: ../src/misc.c:131
+msgid "German: Kai-Ove"
+msgstr ""
+
+#: ../src/misc.c:132
+#, fuzzy
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
msgstr "Hébreu : Assaf Gillat (gillata at gmail dot com)\n"
-#: ../src/misc.c:213
+#: ../src/misc.c:133
+#, fuzzy
msgid ""
-"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net)\n"
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
msgstr ""
"Italien : Edward Matteucci (edward_matteucc at users dot sourceforge dot "
"net)\n"
-#: ../src/misc.c:215
-msgid "Japanese: Ayako Sano\n"
+#: ../src/misc.c:134
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr ""
+
+#: ../src/misc.c:135
+#, fuzzy
+msgid "Japanese: Ayako Sano"
msgstr "Japonais : Ayako Sano\n"
-#: ../src/misc.c:217
-msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
+#: ../src/misc.c:136
+#, fuzzy
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
msgstr ""
"Japonais : Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
-#: ../src/misc.c:219
-msgid "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
+#: ../src/misc.c:137
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr ""
+
+#: ../src/misc.c:138
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr ""
+
+#: ../src/misc.c:139
+#, fuzzy
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
msgstr "Suèdois : Stefan Asserhall (stefan asserhall at comhem dot se)\n"
-#: ../src/misc.c:975
+#: ../src/misc.c:144
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
+"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+"\n"
+
+#: ../src/misc.c:159
+#, fuzzy
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+msgstr ""
+"© 2002 - 2007\n"
+"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+"Corey Donohoe (atmos at atmos dot org)\n"
+"\n"
+"\n"
+
+#: ../src/misc.c:167
+#, fuzzy
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr ""
+"gtkpod Version %s : Interface multilingue et multi-plateforme pour l'iPod® "
+"d'Apple."
+
+#: ../src/misc.c:934
#, c-format
msgid "Could not process '%s' (no filename available)"
-msgstr "Impossible de traiter «%s» (pas de nom de fichier disponible)"
+msgstr "Impossible de traiter « %s » (pas de nom de fichier disponible)"
-#: ../src/misc.c:1129
+#: ../src/misc.c:1088
#, c-format
msgid "Unknown token '%%%c' in template '%s'"
-msgstr "Paramêtre «%%%c» inconnu dans le modèle «%s»"
+msgstr "Paramètre « %%%c » inconnu dans le modèle « %s »"
-#: ../src/misc.c:1212
+#: ../src/misc.c:1171
#, c-format
msgid "Template ('%s') does not match file type '%s'\n"
-msgstr "Le modèle («%s») ne correspond pas au type de fichier «%s»\n"
+msgstr "Le modèle (« %s ») ne correspond pas au type de fichier « %s »\n"
-#: ../src/misc.c:1298
+#: ../src/misc.c:1257
#, c-format
msgid "Error creating %s: %s\n"
-msgstr "Erreur à la création de «%s» : %s\n"
+msgstr "Erreur à la création de « %s » : %s\n"
-#: ../src/misc.c:1777
-#, fuzzy, c-format
+#: ../src/misc.c:1691
+#, c-format
msgid ""
"Writing preferences file '%s' failed (%s).\n"
"\n"
msgstr ""
-"Échec de l'exécution de «%s».\n"
+"Échec de l'enregistrement du fichier de préférences « %s » (%s).\n"
"\n"
-#: ../src/misc.c:1779
+#: ../src/misc.c:1693
msgid "unspecified error"
-msgstr ""
+msgstr "Erreur non spécifiée"
-#: ../src/misc.c:1787
+#: ../src/misc.c:1701
#, c-format
msgid ""
"Writing preferences to the iPod (%s) failed: could not get path to Control "
"Directory.\n"
"\n"
msgstr ""
+"Échec de l'écriture des préférences dans le iPod (%s°) : impossible de "
+"trouver le répertoire « Control ».\n"
+"\n"
#. title
#: ../src/misc_confirm.c:71
-#, fuzzy
msgid "The following has occurred:"
-msgstr "Le problème suivant est survenu :"
+msgstr "L'erreur suivante est survenue  :"
#: ../src/misc_confirm.c:122
msgid ""
@@ -4316,9 +4685,9 @@
"Are you sure you want to remove the following tracks from the playlist \"%s"
"\"?"
msgstr[0] ""
-"Êtes-vous sûr de vouloir supprimer le morceau suivant de la liste \"%s\" ?"
+"Êtes-vous sûr de vouloir supprimer le morceau suivant de la liste « %s » ?"
msgstr[1] ""
-"Êtes-vous sûr de vouloir supprimer les morceaux suivants de la liste \"%s\" ?"
+"Êtes-vous sûr de vouloir supprimer les morceaux suivants de la liste « %s » ?"
#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
msgid "Remove Track From Playlist?"
@@ -4385,8 +4754,8 @@
#, c-format
msgid "Deleted %d track from playlist '%s'"
msgid_plural "Deleted %d tracks from playlist '%s'"
-msgstr[0] "%d morceau supprimé de la liste de lecture «%s»"
-msgstr[1] "%d morceaux supprimés de la liste de lecture «%s»"
+msgstr[0] "%d morceau supprimé de la liste de lecture « %s »"
+msgstr[1] "%d morceaux supprimés de la liste de lecture « %s »"
#: ../src/misc_confirm.c:285
#, c-format
@@ -4404,7 +4773,7 @@
#: ../src/misc_confirm.c:442
msgid "Cannot remove entry 'All'"
-msgstr "Ne peut supprimer l'entrée «Tous»"
+msgstr "Ne peut supprimer l'entrée « Tous »"
#: ../src/misc_confirm.c:536
#, c-format
@@ -4412,6 +4781,7 @@
msgstr "Suppression des %d morceaux de l'iPod"
#: ../src/misc_confirm.c:541
+#, c-format
msgid "Removed all podcasts from the iPod"
msgstr "Suppression de tous les podcasts de l'iPod"
@@ -4419,21 +4789,23 @@
#, c-format
msgid "Deleted playlist '%s' including %d member track"
msgid_plural "Deleted playlist '%s' including %d member tracks"
-msgstr[0] "Liste de lecture «%s» supprimée avec %d morceau"
-msgstr[1] "Liste de lecture «%s» supprimée avec %d morceaux"
+msgstr[0] "Liste de lecture « %s » supprimée avec %d morceau"
+msgstr[1] "Liste de lecture « %s » supprimée avec %d morceaux"
#. first use playlist name
#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
#, c-format
msgid "Deleted playlist '%s'"
-msgstr "Liste de lecture effacée «%s»"
+msgstr "Liste de lecture « %s » supprimée"
#: ../src/misc_confirm.c:600
#, c-format
msgid "Deleted playlist '%s' including %d member track on harddisk"
msgid_plural "Deleted playlist '%s' including %d member tracks on harddisk"
-msgstr[0] "Liste de lecture «%s» supprimée avec %d morceau sur le disque dur."
-msgstr[1] "Liste de lecture «%s» supprimée avec %d morceaux sur le disque dur."
+msgstr[0] ""
+"Liste de lecture « %s » supprimée avec %d morceau sur le disque dur."
+msgstr[1] ""
+"Liste de lecture « %s » supprimée avec %d morceaux sur le disque dur."
#: ../src/misc_confirm.c:617
#, c-format
@@ -4441,36 +4813,38 @@
msgstr "Suppression des %d morceaux de la base de données"
#: ../src/misc_confirm.c:695
+#, c-format
msgid "Are you sure you want to remove all tracks from your iPod?"
msgstr "Êtes-vous sûr de vouloir supprimer tous les morceaux de votre iPod ?"
#: ../src/misc_confirm.c:700
+#, c-format
msgid "Are you sure you want to remove all podcasts from your iPod?"
msgstr "Êtes-vous sûr de vouloir supprimer tous les podcasts de votre iPod ?"
#: ../src/misc_confirm.c:708
-#, c-format
+#, fuzzy, c-format
msgid ""
"Are you sure you want to delete playlist '%s' and the following track "
-"completely from your ipod? The number of playlists this track is a member of "
+"completely from your iPod? The number of playlists this track is a member of "
"is indicated in parentheses."
msgid_plural ""
"Are you sure you want to delete playlist '%s' and the following tracks "
-"completely from your ipod? The number of playlists the tracks are member of "
+"completely from your iPod? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
-"Êtes-vous sûr de vouloir supprimer la liste «%s» et le morceau suivant de "
+"Êtes-vous sûr de vouloir supprimer la liste « %s » et le morceau suivant de "
"votre iPod ? Le nombre de liste dont ce morceau fait partie est indiqué "
"entre parenthèses."
msgstr[1] ""
-"Êtes-vous sûr de vouloir supprimer la liste «%s» et les morceaux suivants de "
-"votre iPod ? Le nombre de liste dont ces morceaux font partie est indiqué "
+"Êtes-vous sûr de vouloir supprimer la liste « %s » et les morceaux suivants "
+"de votre iPod ? Le nombre de liste dont ces morceaux font partie est indiqué "
"entre parenthèses."
#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
#, c-format
msgid "Are you sure you want to delete the playlist '%s'?"
-msgstr "Êtes-vous sûr de vouloir supprimer la liste de lecture «%s» ?"
+msgstr "Êtes-vous sûr de vouloir supprimer la liste de lecture « %s » ?"
#: ../src/misc_confirm.c:745
#, c-format
@@ -4483,15 +4857,16 @@
"tracks from your harddisk? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
-"Êtes-vous sûr de vouloir supprimer la liste «%s» et le morceau suivant de "
+"Êtes-vous sûr de vouloir supprimer la liste « %s » et le morceau suivant de "
"votre disque dur ? Le nombre de liste dont ce morceau fait partie est "
"indiqué entre parenthèses."
msgstr[1] ""
-"Êtes-vous sûr de vouloir supprimer la liste «%s» et les morceaux suivants de "
-"votre disque dur ? Le nombre de liste dont ces morceaux font partie est "
+"Êtes-vous sûr de vouloir supprimer la liste « %s » et les morceaux suivants "
+"de votre disque dur ? Le nombre de liste dont ces morceaux font partie est "
"indiqué entre parenthèses."
#: ../src/misc_confirm.c:753
+#, c-format
msgid "Are you sure you want to remove all tracks from the database?"
msgstr ""
"Êtes-vous sûr de vouloir supprimer tous les morceaux de la base de données ?"
@@ -4507,13 +4882,13 @@
"tracks from the database? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
-"Êtes-vous sûr de vouloir supprimer la liste «%s» et le morceau suivant de "
+"Êtes-vous sûr de vouloir supprimer la liste « %s » et le morceau suivant de "
"votre base de données ? Le nombre de liste dont ce morceau fait partie est "
"indiqué entre parenthèses."
msgstr[1] ""
-"Êtes-vous sûr de vouloir supprimer la liste «%s» et les morceaux suivants de "
-"votre base de données ? Le nombre de liste dont ces morceaux font partie est "
-"indiqué entre parenthèses."
+"Êtes-vous sûr de vouloir supprimer la liste « %s » et les morceaux suivants "
+"de votre base de données ? Le nombre de liste dont ces morceaux font partie "
+"est indiqué entre parenthèses."
#: ../src/misc_confirm.c:841
msgid ""
@@ -4627,126 +5002,162 @@
#. 40
#: ../src/misc_conversion.c:100
msgid "Media Type"
-msgstr ""
+msgstr "Type de média"
#: ../src/misc_conversion.c:102
msgid "TV Episode"
-msgstr ""
+msgstr "Épisode télé"
#: ../src/misc_conversion.c:103
msgid "TV Network"
-msgstr ""
+msgstr "Réseau câblé"
#: ../src/misc_conversion.c:104
msgid "Season Nr"
-msgstr ""
+msgstr "N° de saison"
#. 45
#: ../src/misc_conversion.c:105
msgid "Episode Nr"
+msgstr "N° d'épisode"
+
+#: ../src/misc_conversion.c:106
+msgid "Album Artist"
+msgstr "Artiste de l'album"
+
+#: ../src/misc_conversion.c:107
+msgid "Sort Artist"
+msgstr "Trier par Artiste"
+
+#: ../src/misc_conversion.c:108
+msgid "Sort Title"
+msgstr "Trier par Titre"
+
+#: ../src/misc_conversion.c:109
+msgid "Sort Album"
+msgstr "Trier par Album"
+
+#. 50
+#: ../src/misc_conversion.c:110
+msgid "Sort Album Artist"
+msgstr "Trier par Artiste de l'album"
+
+#: ../src/misc_conversion.c:111
+msgid "Sort Composer"
+msgstr "Trier par Compositeur"
+
+#: ../src/misc_conversion.c:112
+msgid "Sort TV Show"
+msgstr "Trier les Émissions télé"
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
msgstr ""
-#: ../src/misc_conversion.c:118
+#: ../src/misc_conversion.c:126
msgid "Name of file on PC, if available"
msgstr "Nom du fichier sur le PC, si disponible"
-#: ../src/misc_conversion.c:119
+#: ../src/misc_conversion.c:127
msgid "Name of file on the iPod"
msgstr "Nom du fichier sur l'iPod"
#. 10
-#: ../src/misc_conversion.c:121
+#: ../src/misc_conversion.c:129
msgid "Track Nr. and total number of tracks on CD"
msgstr "N° de morceau et nombre total de morceaux du CD"
-#: ../src/misc_conversion.c:122
+#: ../src/misc_conversion.c:130
msgid "Whether the file has already been transferred to the iPod or not"
msgstr "Fichier déjà transféré sur l'iPod ou non"
-#: ../src/misc_conversion.c:128
-msgid ""
-"Supposedly something that tells the iPod to increase or decrease the "
-"playback speed"
-msgstr ""
-"Un réglage qui est supposé indiquer à l'iPod d'augmenter ou diminuer la "
-"vitesse de lecture"
+#: ../src/misc_conversion.c:136
+msgid "Beats per minute"
+msgstr "Battement Par Minute"
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:137
msgid "Number of times the track has been played"
msgstr "Nombre de fois où le fichier a été joué"
-#: ../src/misc_conversion.c:131
+#: ../src/misc_conversion.c:138
msgid "Star rating from 0 to 5"
msgstr "Notation en étoiles de 0 à 5"
-#: ../src/misc_conversion.c:132
+#: ../src/misc_conversion.c:139
msgid "Date and time track has been added"
msgstr "Date et heure de l'ajout du morceau"
#. 20
-#: ../src/misc_conversion.c:133
+#: ../src/misc_conversion.c:140
msgid "Date and time track has last been played"
msgstr "La dernière fois que le fichier a été joué"
-#: ../src/misc_conversion.c:134
+#: ../src/misc_conversion.c:141
msgid "Date and time track has last been modified"
msgstr "La dernière fois que le fichier a été modifié"
-#: ../src/misc_conversion.c:135
+#: ../src/misc_conversion.c:142
msgid "Manual volume adjust"
msgstr "Ajustement manuel du volume"
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:143
msgid ""
"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
"the iPod"
msgstr ""
-"Ajustement du volume en dB (replay gain) -- vous devez activer «Contrôle du "
-"son» sur l'iPod"
+"Ajustement du volume en dB (replay gain) -- vous devez activer « Contrôle du "
+"son » sur l'iPod"
#. 25
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:146
msgid "CD Nr. and total number of CDS in set"
msgstr "N° de CD et nombre total de CD"
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:149
msgid ""
"The category (e.g. 'Technology' or 'Music') where the podcast was located."
msgstr ""
-"La catégorie (par ex. «Technologie» ou «Musique») où se situe le podcast."
+"La catégorie (par ex. « Technologie » ou « Musique ») où se situe le podcast."
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:150
msgid "Accessible by selecting the center button on the iPod."
msgstr "Accessible en choisissant le bouton central de l'iPod."
-#: ../src/misc_conversion.c:147
+#: ../src/misc_conversion.c:154
msgid "Release date (for podcasts displayed next to the title on the iPod)"
msgstr "Date de sortie (pour les podcasts affiché à côté du titre sur l'iPod)"
-#: ../src/misc_conversion.c:713
+#. 50
+#: ../src/misc_conversion.c:168 ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170 ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172 ../src/misc_conversion.c:173
+msgid "Used for sorting on the iPod"
+msgstr "Utilisé pour trier sur l'iPod"
+
+#: ../src/misc_conversion.c:735
#, c-format
msgid "The URI '%s' is not an absolute URI using the file scheme"
-msgstr "L'URI «%s» n'est pas une URI absolue utilisant le schéma de fichier"
+msgstr "L'URI « %s » n'est pas une URI absolue utilisant le schéma de fichier"
-#: ../src/misc_conversion.c:723
+#: ../src/misc_conversion.c:745
#, c-format
msgid "The local file URI '%s' may not include a '#'"
-msgstr "L'URI de fichier local «%s» ne peut pas inclure un '#'"
+msgstr "L'URI de fichier local « %s » ne peut pas inclure un '#'"
-#: ../src/misc_conversion.c:740
+#: ../src/misc_conversion.c:762
#, c-format
msgid "The URI '%s' is invalid"
-msgstr "L'URI «%s» est invalide"
+msgstr "L'URI « %s » est invalide"
-#: ../src/misc_conversion.c:752
+#: ../src/misc_conversion.c:774
#, c-format
msgid "The hostname of the URI '%s' is invalid"
-msgstr "Le nom d'hôte de l'URI «%s» est invalide"
+msgstr "Le nom d'hôte de l'URI « %s » est invalide"
-#: ../src/misc_conversion.c:768
+#: ../src/misc_conversion.c:790
#, c-format
msgid "The URI '%s' contains invalidly escaped characters"
-msgstr "L'URI «%s» contient des caractères d'échappements invalides"
+msgstr "L'URI « %s » contient des caractères d'échappement invalides"
#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
#: ../src/misc_playlist.c:429
@@ -4798,8 +5209,8 @@
#, c-format
msgid "Created playlist '%s' with %d track."
msgid_plural "Created playlist '%s' with %d tracks."
-msgstr[0] "Liste de lecture «%s» créée avec %d morceau."
-msgstr[1] "Liste de lecture «%s» créée avec %d morceaux."
+msgstr[0] "Liste de lecture « %s » créée avec %d morceau."
+msgstr[1] "Liste de lecture « %s » créée avec %d morceaux."
#. n==0
#: ../src/misc_playlist.c:417
@@ -4812,6 +5223,7 @@
msgstr "Les plus écoutés (%d)"
#: ../src/misc_playlist.c:584
+#, c-format
msgid "Never Listened"
msgstr "Jamais écoutés"
@@ -4855,11 +5267,6 @@
msgstr ""
"Les morceaux fictifs sans fichier correspondant sur le PC ont été supprimés."
-#: ../src/misc_playlist.c:916
-#, c-format
-msgid "Processing '%s'"
-msgstr "Traitement de «%s»"
-
#: ../src/misc_playlist.c:943
msgid "Dangling tracks with files on PC were handled."
msgstr ""
@@ -4888,7 +5295,7 @@
#: ../src/misc_playlist.c:1033
msgid "Creating a tree of known files"
-msgstr "Création l'arborescence des fichiers reconnus"
+msgstr "Création de l'arborescence des fichiers reconnus"
#: ../src/misc_playlist.c:1077
msgid "Checking iPOD files against known files in DB"
@@ -4915,7 +5322,7 @@
#: ../src/misc_playlist.c:1175
#, c-format
msgid "Found %d orphaned and %d dangling files. Processing..."
-msgstr "%d orphelins et %d morceaux fictifs. Traitement en cours ..."
+msgstr "%d orphelins et %d morceaux fictifs. Traitement en cours …"
#: ../src/misc_playlist.c:1199
#, c-format
@@ -4999,230 +5406,224 @@
msgid "Duplicate detection"
msgstr "Détection de doublon"
-#: ../src/misc_track.c:1269
+#: ../src/misc_track.c:1339
msgid "Local Database"
msgstr "Base de données locale"
#. artwork is set
-#: ../src/misc_track.c:1280
+#: ../src/misc_track.c:1350
msgid "Embedded or filename was lost"
msgstr "nom de fichier perdu"
-#: ../src/misc_track.c:1284
+#: ../src/misc_track.c:1354
msgid "Artwork not set"
msgstr "Pochette non renseigné"
-#: ../src/misc_track.c:1737
-#, fuzzy, c-format
+#: ../src/misc_track.c:1816
+#, c-format
msgid "Could not find source file for '%s'. Track not copied."
-msgstr "Impossible de trouver le fichier pour «%s» sur l'iPod\n"
+msgstr "Impossible de trouver le fichier pour « %s ». Morceau pas copié."
-#: ../src/misc_track.c:1973
+#: ../src/misc_track.c:2052
#, c-format
msgid "drag and drop: ignored '%s'\n"
-msgstr "Glisser/déposer : «%s» ignoré\n"
+msgstr "Glisser/déposer : « %s » ignoré\n"
-#: ../src/mp3file.c:1282
+#: ../src/mp3file.c:1336
#, c-format
msgid "Error setting ID3 field: %s\n"
msgstr "Erreur en remplissant le champ ID3Â : %s\n"
-#: ../src/mp3file.c:1306 ../src/mp3file.c:1399 ../src/mp3file.c:1548
-#: ../src/mp3file.c:2186
+#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
#, c-format
msgid "ERROR while opening file: '%s' (%s).\n"
-msgstr "Erreur à l'ouverture du fichier : «%s» (%s).\n"
+msgstr "Erreur à l'ouverture du fichier : « %s » (%s).\n"
-#: ../src/mp3file.c:1619
+#: ../src/mp3file.c:1688
#, c-format
msgid "ERROR while writing tag to file: '%s' (%s).\n"
-msgstr "ERREUR à l'écriture de l'attribut dans le fichier : «%s» (%s).\n"
+msgstr "ERREUR à l'écriture de l'attribut dans le fichier : « %s » (%s).\n"
#. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2352
+#: ../src/mp3file.c:2770
#, c-format
msgid "File \"%s\" has zero play length. Ignoring.\n"
-msgstr "Le fichier «%s» à une durée de zéro. Ignoré.\n"
+msgstr "Le fichier « %s » à une durée de zéro. Ignoré.\n"
-#: ../src/mp4file.c:227 ../src/mp4file.c:359
-#, fuzzy, c-format
+#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#, c-format
msgid "'%s' does not appear to be a mp4 audio or video file.\n"
-msgstr "«%s» n'est pas un fichier audio mp4.\n"
+msgstr "« %s » n'est pas un fichier audio ou vidéo mp4.\n"
-#: ../src/mp4file.c:237 ../src/mp4file.c:369
+#: ../src/mp4file.c:253 ../src/mp4file.c:414
#, c-format
msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
-msgstr "Ne peut pas lire le fichier «%s» ou n'est pas un fichier mp4.\n"
+msgstr "Ne peut pas lire le fichier « %s » ou n'est pas un fichier mp4.\n"
-#: ../src/mp4file.c:478
+#: ../src/mp4file.c:529
#, c-format
msgid "'%s' does not appear to be a mp4 audio file.\n"
-msgstr "«%s» n'est pas un fichier audio mp4.\n"
+msgstr "« %s » n'est pas un fichier audio mp4.\n"
-#: ../src/mp4file.c:489
+#: ../src/mp4file.c:540
#, c-format
msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
-msgstr "Ne peut pas écrire le fichier «%s» ou n'est pas un fichier mp4.\n"
+msgstr "Ne peut pas écrire le fichier « %s » ou n'est pas un fichier mp4.\n"
-#: ../src/mp4file.c:502
+#: ../src/mp4file.c:553
#, c-format
msgid ""
"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
"You must compile the gtkpod source together with the mp4v2 library.\n"
msgstr ""
-"Echec de l'import de «%s» : pas de support des formats m4a/m4p. Vous devez "
+"Échec de l'import de « %s » : pas de support des formats m4a/m4p. Vous devez "
"compiler gtkpod avec la bibliothèque mp4v2.\n"
-#: ../src/mp4file.c:508
+#: ../src/mp4file.c:559
#, c-format
msgid ""
"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
"without the mp4v2 library. You must compile the gtkpod source together with "
"the mp4v2 library.\n"
msgstr ""
-"Echec de la mise à jour des données m4a/m4p pour «%s» : pas de support des "
+"Échec de la mise à jour des données m4a/m4p pour « %s » : pas de support des "
"formats m4a/m4p. Vous devez compiler gtkpod avec la bibliothèque mp4v2.\n"
-#: ../src/mp4file.c:514
+#: ../src/mp4file.c:565
#, c-format
msgid ""
"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
"without the mp4v2 library. You must compile the gtkpod source together with "
"the mp4v2 library.\n"
msgstr ""
-"Echec du contrôle du son m4a/m4p pour «%s» : pas de support des formats m4a/"
-"m4p. Vous devez compiler gtkpod avec la bibliothèque mp4v2.\n"
+"Échec du contrôle du son m4a/m4p pour « %s » : pas de support des formats "
+"m4a/m4p. Vous devez compiler gtkpod avec la bibliothèque mp4v2.\n"
-#: ../src/oggfile.c:62 ../src/wavfile.c:107
+#: ../src/oggfile.c:73
#, c-format
-msgid "Could not open '%s' for reading.\n"
-msgstr "Ne peut ouvrir en lecture le fichier «%s».\n"
-
-#: ../src/oggfile.c:73
-#, fuzzy, c-format
msgid "'%s' does not appear to be an ogg audio file.\n"
-msgstr "«%s» n'est pas un fichier audio mp4.\n"
+msgstr "« %s » n'est pas un fichier audio ogg.\n"
-#: ../src/oggfile.c:150
-#, fuzzy, c-format
+#: ../src/oggfile.c:154
+#, c-format
msgid ""
"Import of '%s' failed: ogg not supported without the ogg library. You must "
"compile the gtkpod source together with the ogg library.\n"
msgstr ""
-"Echec de l'import de «%s» : pas de support des formats m4a/m4p. Vous devez "
-"compiler gtkpod avec la bibliothèque mp4v2.\n"
+"Échec de l'import de « %s » : pas de support du format ogg. Vous devez "
+"compiler gtkpod avec la bibliothèque ogg.\n"
-#: ../src/oggfile.c:156
-#, fuzzy, c-format
+#: ../src/oggfile.c:160
+#, c-format
msgid ""
"ogg metadata update for '%s' failed: ogg not supported without the ogg "
"library. You must compile the gtkpod source together with the ogg library.\n"
msgstr ""
-"Echec de la mise à jour des données m4a/m4p pour «%s» : pas de support des "
-"formats m4a/m4p. Vous devez compiler gtkpod avec la bibliothèque mp4v2.\n"
+"Échec de la mise à jour des données ogg pour « %s » : pas de support du "
+"format ogg. Vous devez compiler gtkpod avec la bibliothèque ogg.\n"
-#: ../src/prefs.c:356
+#: ../src/prefs.c:357
#, c-format
msgid "gtkpod version %s usage:\n"
msgstr "gtkpod version %s utilisation :\n"
-#: ../src/prefs.c:357
+#: ../src/prefs.c:358
msgid " -h, --help: display this message\n"
msgstr " -h, --help : affiche ce message\n"
-#: ../src/prefs.c:358
-#, fuzzy
+#: ../src/prefs.c:359
msgid " -p <file>: increment playcount for file by one\n"
msgstr " -p <fichier> : incrémente le compteur de lecture du fichier\n"
-#: ../src/prefs.c:359
+#: ../src/prefs.c:360
msgid " --hash <file>:print gtkpod hash for file\n"
-msgstr ""
+msgstr " -- hash <fichier>Â : affiche la valeur de hachage pour les fichiers\n"
-#: ../src/prefs.c:360
+#: ../src/prefs.c:361
msgid " -m path: define the mountpoint of your iPod\n"
msgstr " -m chemin : définit le point de montage de votre iPod\n"
-#: ../src/prefs.c:361
+#: ../src/prefs.c:362
msgid " --mountpoint: same as '-m'.\n"
-msgstr " --mountpoint : identique à «-m».\n"
+msgstr " --mountpoint : identique à « -m ».\n"
-#: ../src/prefs.c:362
+#: ../src/prefs.c:363
msgid " -a: import database automatically after start.\n"
msgstr ""
" -a : importe les données de l'iPod automatiquement au "
"démarrage.\n"
-#: ../src/prefs.c:363
+#: ../src/prefs.c:364
msgid " --auto: same as '-a'.\n"
-msgstr " --auto : identique à «-a».\n"
+msgstr " --auto : identique à « -a ».\n"
-#: ../src/prefs.c:560
+#: ../src/prefs.c:561
#, c-format
msgid "Couldn't create ~/.gtkpod\n"
-msgstr ""
+msgstr "Impossible de créer « ~/.gtkpod »\n"
-#: ../src/prefs_window.c:134
+#: ../src/prefs_window.c:133
msgid "Please select command for 'Play Now'"
-msgstr "Ligne de commande pour «Jouer maintenant»"
+msgstr "Ligne de commande pour « Jouer maintenant »"
-#: ../src/prefs_window.c:135
+#: ../src/prefs_window.c:134
msgid "Please select command for 'Enqueue'"
-msgstr "Ligne de commande pour «Mettre dans la file d'attente»"
+msgstr "Ligne de commande pour « Mettre dans la file d'attente »"
-#: ../src/prefs_window.c:136
+#: ../src/prefs_window.c:135
msgid "Please select the mp3gain executable"
-msgstr "Chemin de l'exécutable «mp3gain»"
+msgstr "Chemin de l'exécutable « mp3gain »"
-#: ../src/prefs_window.c:137
+#: ../src/prefs_window.c:136
msgid "Please select the aacgain executable"
-msgstr "Chemin de l'exécutable «aacgain»"
+msgstr "Chemin de l'exécutable « aacgain »"
-#: ../src/prefs_window.c:138
+#: ../src/prefs_window.c:137
msgid "Select the mserv music root directory"
msgstr "Sélectionner le répertoire racine de musique mserv"
-#: ../src/prefs_window.c:139
+#: ../src/prefs_window.c:138
msgid "Select the mserv trackinfo root directory"
msgstr "Sélectionner le répertoire racine d'infos mserv"
-#: ../src/prefs_window.c:140
+#: ../src/prefs_window.c:139
msgid "Select the ogg/vorbis converter command"
-msgstr ""
+msgstr "Choisir la commande pour le convertisseur ogg/vorbis"
-#: ../src/prefs_window.c:141
+#: ../src/prefs_window.c:140
msgid "Select the flac converter command"
-msgstr ""
+msgstr "Ligne de commande pour la conversion FLAC"
-#: ../src/prefs_window.c:142
+#: ../src/prefs_window.c:141
msgid "Select the m4a converter command."
-msgstr ""
+msgstr "Ligne de commande pour la conversion M4a"
-#: ../src/prefs_window.c:143
+#: ../src/prefs_window.c:142
msgid "Select the mp3 converter command."
-msgstr ""
+msgstr "Ligne de commande pour la conversion MP3"
-#: ../src/prefs_window.c:144
+#: ../src/prefs_window.c:143
msgid "Select the wav converter command."
-msgstr ""
+msgstr "Ligne de commande pour la conversion Wav"
-#: ../src/prefs_window.c:211 ../src/repository.c:662
-#, fuzzy, c-format
+#: ../src/prefs_window.c:201 ../src/repository.c:662
+#, c-format
msgid ""
"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
"improve an existing one, please send it to jcsjcs at users.sourceforge.net "
"for inclusion into the next release.</i>"
msgstr ""
-"<i>Des scripts d'exemple sont présents dans le répertoire «%s». Si vous "
-"écrivez un nouveau script, veuillez s'il vous plait l'envoyer à jcsjcs at "
-"users.sourceforge.net afin qu'il soit ajouté dans les prochaines versions de "
+"<i>Des scripts d'exemple sont présents dans le répertoire « %s ». Si vous "
+"écrivez un nouveau script, veuillez s'il vous plaît l'envoyer à jcsjcs at "
+"users.sourceforge.net afin qu'il soit inclus dans les prochaines versions de "
"gtkpod.</i>"
-#: ../src/prefs_window.c:986 ../src/prefs_window.c:1004
+#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
msgid "Preferences not updated"
msgstr "Préférences non mises à jour"
-#: ../src/prefs_window.c:1013
+#: ../src/prefs_window.c:1232
msgid "Preferences applied"
msgstr "Préférences mises à jour"
@@ -5283,9 +5684,10 @@
msgstr "Le fichier est vide\n"
#: ../src/sha1.c:239
-#, fuzzy, c-format
+#, c-format
msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
-msgstr "Impossible d'ouvrir «%s» pour calculer la somme de contrôle MD5 : %s\n"
+msgstr ""
+"Impossible d'ouvrir « %s » pour calculer la somme de contrôle SHA1 : %s\n"
#: ../src/syncdir.c:237
#, c-format
@@ -5309,8 +5711,8 @@
#: ../src/syncdir.c:264
msgid "The following track has been removed from the repository:\n"
msgid_plural "The following tracks have been removed from the repository:\n"
-msgstr[0] "Le morceau suivant a été supprimé du dépot :\n"
-msgstr[1] "Les morceaux suivants ont été supprimés du dépot :\n"
+msgstr[0] "Le morceau suivant a été supprimé du dépôt :\n"
+msgstr[1] "Les morceaux suivants ont été supprimés du dépôt :\n"
#: ../src/syncdir.c:271
msgid "The following track has been removed from the playlist:\n"
@@ -5326,90 +5728,90 @@
msgid "Sync summary"
msgstr "Résumé de synchronisation"
-#: ../src/tools.c:119
-#, fuzzy, c-format
+#: ../src/tools.c:118
+#, c-format
msgid ""
"Could not find '%s'.\n"
"Please specifiy the exact path in the Tools section of the preference dialog "
"or install the program if it is not installed on your system.\n"
"\n"
msgstr ""
-"Impossible de trouver le fichier «%s».\n"
-"Veuillez donnerréciser le chemin exact dans l'onglet «Outils» de la fenêtre "
-"des préférences ou installez le programme sur votre système si nécessaire.\n"
+"Impossible de trouver le fichier « %s ».\n"
+"Veuillez préciser le chemin exact dans l'onglet « Outils » de la fenêtre des "
+"préférences ou installez le programme sur votre système si nécessaire.\n"
"\n"
-#: ../src/tools.c:204
+#: ../src/tools.c:203
#, c-format
msgid ""
"Execution of '%s' failed.\n"
"\n"
msgstr ""
-"Échec de l'exécution de «%s».\n"
+"Échec de l'exécution de « %s ».\n"
"\n"
-#: ../src/tools.c:249
+#: ../src/tools.c:248
#, c-format
msgid ""
"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
"preferences.\n"
msgstr ""
-"Impossible de normaliser le fichier «%s».\n"
-"Veuillez donner le chemin exact de mp3gain dans l'onglet «Outils» de la "
+"Impossible de normaliser le fichier « %s ».\n"
+"Veuillez donner le chemin exact de mp3gain dans l'onglet « Outils » de la "
"fenêtre des préférences.\n"
-#: ../src/tools.c:259
+#: ../src/tools.c:258
#, c-format
msgid ""
"Did not normalize '%s'. Set aacgain path in the Tools section of the "
"preferences.\n"
msgstr ""
-"Impossible de normaliser le fichier «%s».\n"
-"Veuillez donner le chemin exact de aacgain dans l'onglet «Outils» de la "
+"Impossible de normaliser le fichier « %s ».\n"
+"Veuillez donner le chemin exact de aacgain dans l'onglet « Outils » de la "
"fenêtre des préférences.\n"
-#: ../src/tools.c:386
+#: ../src/tools.c:385
msgid "Normalizing..."
-msgstr "Normalisation ..."
+msgstr "Normalisation …"
-#: ../src/tools.c:436
+#: ../src/tools.c:435
#, c-format
msgid "%s - %s"
msgstr "%s - %s"
-#: ../src/tools.c:462
+#: ../src/tools.c:461
msgid "Aborting..."
-msgstr "Annulation ..."
+msgstr "Annulation …"
-#: ../src/tools.c:466
+#: ../src/tools.c:465
msgid "Will abort after current mp3gain process ends."
msgstr "S'arrêtera après la fin du traitement courant de mp3gain."
-#: ../src/tools.c:492
+#: ../src/tools.c:491
#, c-format
msgid ""
"'%s-%s' (%s) could not be normalized.\n"
"\n"
msgstr ""
-"«%s-%s» (%s) ne peut pas être normalisé.\n"
+"« %s-%s » (%s) ne peut pas être normalisé.\n"
"\n"
-#: ../src/tools.c:531
+#: ../src/tools.c:530
#, c-format
msgid "Normalized %d of %d tracks."
msgid_plural "Normalized %d of %d tracks."
msgstr[0] "%d nouveau morceau normalisé sur %d."
msgstr[1] "%d nouveaux morceaux normalisés sur %d."
-#: ../src/tools.c:634
+#: ../src/tools.c:633
msgid ""
"Please specify the command to be called on the 'Tools' section of the "
"preferences dialog.\n"
msgstr ""
-"Veuillez renseigner la commande à appeler dans l'onglet «Outils» de la "
+"Veuillez renseigner la commande à appeler dans l'onglet « Outils » de la "
"fenêtre des préférences.\n"
-#: ../src/tools.c:646
+#: ../src/tools.c:645
#, c-format
msgid ""
"Could not find the command '%s'.\n"
@@ -5417,9 +5819,9 @@
"Please verify the setting in the 'Tools' section of the preferences dialog.\n"
"\n"
msgstr ""
-"Impossible de trouver la commande «%s».\n"
+"Impossible de trouver la commande « %s ».\n"
"\n"
-"Veuillez contrôler l'onglet «Outils» dans la fenêtre des préférences.\n"
+"Veuillez contrôler l'onglet « Outils » dans la fenêtre des préférences.\n"
"\n"
#: ../src/tools.c:687
@@ -5428,18 +5830,18 @@
"'%s' returned the following output:\n"
"%s\n"
msgstr ""
-"«%s» a retourné le résultat suivant :\n"
+"« %s » a retourné le résultat suivant :\n"
"%s\n"
#: ../src/tools.c:754
#, c-format
msgid "No command set for '%s'"
-msgstr "Aucune commande renseignée pour «%s»"
+msgstr "Aucune commande renseignée pour « %s »"
#: ../src/tools.c:774
#, c-format
msgid "Could not find command '%s' specified for '%s'"
-msgstr "Impossible d'exécuter la commande «%s» spécifiée pour «%s»"
+msgstr "Impossible d'exécuter la commande « %s » spécifiée pour « %s »"
#: ../src/wavfile.c:181
#, c-format
@@ -5447,74 +5849,64 @@
msgstr "%s ne semble pas être un format wav supporté.\n"
#, fuzzy
-#~ msgid "label21"
-#~ msgstr "label21"
+#~ msgid "<b>Resolution:</b>"
+#~ msgstr "<b>Infobulles</b>"
-#~ msgid "window1"
-#~ msgstr "window1"
+#~ msgid "label"
+#~ msgstr "étiquette"
-#~ msgid "<b>Import</b>"
-#~ msgstr "<b>Importer</b>"
+#~ msgid ""
+#~ "Cannot open '%s' for reading.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Ne peut ouvrir en lecture le fichier « %s ».\n"
+#~ "\n"
-#~ msgid "Automatically import iTunesDBs on startup"
+#~ msgid "Unable to open '%s' for reading\n"
+#~ msgstr "Impossible d'ouvrir le fichier « %s » en lecture\n"
+
+#~ msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
#~ msgstr ""
-#~ "Importer automatiquement les données de l'iPod au démarrage de gtkpod"
+#~ "Ne peut ouvrir le fichier « iTunesDB.ext » pour lire les infos étendues.\n"
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Fichier pixmap introuvable : %s"
+#~ msgid "Add _Directory"
+#~ msgstr "Ajouter un _répertoire"
-#~ msgid "_Synchronize Playlist"
-#~ msgstr "_Synchroniser la liste de lecture"
+#~ msgid "Dirs"
+#~ msgstr "Répertoires"
-#~ msgid "Stop Display Update"
-#~ msgstr "Annuler la mise à jour de l'affichage"
+#~ msgid "Files"
+#~ msgstr "Fichiers"
-#~ msgid "Stop"
-#~ msgstr "Interrompre"
+#~ msgid "New PL"
+#~ msgstr "Nouvelle liste"
-#~ msgid ""
-#~ "It is much faster to sort the display after all tracks have been added. "
-#~ "Some people might feel irritated by this behaviour and should uncheck "
-#~ "this option."
-#~ msgstr ""
-#~ "Il est plus rapide d'effectuer le tri après que tous les fichiers aient "
-#~ "été ajoutés. Certaines personnes peuvent être génées par ce comportement "
-#~ "et peuvent désactiver cette option."
+#~ msgid "_About"
+#~ msgstr "A _propos"
-#~ msgid ""
-#~ "Temporarily disable sorting when changing playlist\n"
-#~ "or tab entry (faster!)"
-#~ msgstr ""
-#~ "Bloquer le tri lors du changement de liste\n"
-#~ "ou d'onglet (plus rapide !)"
+#~ msgid "Download Cover"
+#~ msgstr "Télécharger la pochette"
-#~ msgid ""
-#~ "The display can be blocked after changing a selection. The display update "
-#~ "is faster, but you have to wait until it's finished. When using this "
-#~ "option, sorting is also temporarily disabled (see option above)."
-#~ msgstr ""
-#~ "L'application peut se trouver figée lors d'un changement de sélection. "
-#~ "L'affichage est plus rapide, mais vous devez attendre la fin de "
-#~ "l'opération. En activant l'option, le tri est désactivé temporairement "
-#~ "(voir ci-dessus)."
+#~ msgid "Find _New"
+#~ msgstr "Trouver des _Nouveaux"
-#~ msgid ""
-#~ "Block display when changing playlist or tab\n"
-#~ " entry (faster!)"
-#~ msgstr ""
-#~ "Bloquer l'affichage lors du changement de liste de lecture ou d'entrée\n"
-#~ "(plus rapide !)"
+#~ msgid "Set Cover Art from _Web"
+#~ msgstr "Pochette depuis le _Web"
-#~ msgid "deleting..."
-#~ msgstr "suppression ..."
+#~ msgid "_Previous"
+#~ msgstr "_Précédent"
-#~ msgid "preparing to copy..."
-#~ msgstr "préparation de la copie ..."
+#~ msgid "Find Cover on Web"
+#~ msgstr "Chercher la pochette sur le web"
-#~ msgid "Copied %d of %d new track."
-#~ msgid_plural "Copied %d of %d new tracks."
-#~ msgstr[0] "%d sur %d du nouveau morceau copié."
-#~ msgstr[1] "%d sur %d des nouveaux morceaux copiés."
+#, fuzzy
+#~ msgid "Failed to retrieve any images"
+#~ msgstr "Impossible d'écrire la pochette : « %s »\n"
-#~ msgid "Some tracks were not written to iPod. Export aborted!"
-#~ msgstr "Des morceaux n'ont pas été copiés sur l'iPod. Export annulé !"
+#, fuzzy
+#~ msgid ""
+#~ "This function is not available. You must compile the gtkpod source "
+#~ "together with the curl library."
+#~ msgstr ""
+#~ "Échec de l'import de « %s » : pas de support du format ogg. Vous devez "
+#~ "compiler gtkpod avec la bibliothèque ogg.\n"
Property changes on: gtkpod/branches/etch-bpo/po/fr.po
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/po/he.po
===================================================================
--- gtkpod/branches/etch-bpo/po/he.po 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/he.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -6,28 +6,29 @@
msgstr ""
"Project-Id-Version: gtkpod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-14 22:57+0900\n"
-"PO-Revision-Date: 2007-01-13 20:48+0200\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2007-12-13 18:36-0500\n"
+"PO-Revision-Date: 2007-12-16 22:15+0200\n"
+"Last-Translator: Assaf Gillat <gillata at gmail.com>\n"
"Language-Team: HEBREW <kde-il at yahoogroups.com>\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.9.1\n"
+"X-Poedit-Language: Hebrew\n"
+"X-Poedit-Country: ISRAEL\n"
#: ../data/gtkpod.desktop.in.h:1
-#, fuzzy
msgid "GtkPod"
-msgstr "gtkpod"
+msgstr "GtkPod"
#: ../data/gtkpod.desktop.in.h:2
msgid "Manage music and video on an Apple iPod"
-msgstr ""
+msgstr "× ×™×”×•×œ מוסיקה וויד×ו על × ×’×Ÿ ×”Ö¾iPod של Apple"
#: ../data/gtkpod.desktop.in.h:3
msgid "iPod Manager"
-msgstr ""
+msgstr "×ž× ×”×œ ×”Ö¾iPod"
#: ../data/gtkpod.glade.h:1
msgid " "
@@ -55,7 +56,7 @@
#: ../data/gtkpod.glade.h:7
msgid " Logic: "
-msgstr " לוגיקה:"
+msgstr " לוגיקה: "
#: ../data/gtkpod.glade.h:9
#, no-c-format
@@ -63,11 +64,8 @@
msgstr "%A"
#: ../data/gtkpod.glade.h:10
-msgid ""
-"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
-"finished."
-msgstr ""
-"×ª×‘× ×™×ª 'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' ×ו דומה. לחץ 'enter' בסיו×."
+msgid "'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished."
+msgstr "×ª×‘× ×™×ª 'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' ×ו דומה. לחץ 'enter' בסיו×."
#: ../data/gtkpod.glade.h:11
msgid "'aacgain' executable:"
@@ -136,21 +134,19 @@
#: ../data/gtkpod.glade.h:28
msgid "<"
-msgstr ""
+msgstr "<"
#: ../data/gtkpod.glade.h:29
-#, fuzzy
msgid "<b>Account Information</b>"
-msgstr "<b>×•×•×™×“×•× ×ž×—×™×§×”</b>"
+msgstr "<b>מידע חשבון</b>"
#: ../data/gtkpod.glade.h:30
msgid "<b>Adding/Updating/Syncing</b>"
msgstr "<b>הוספה/עדכון/×¡× ×›×¨×•×Ÿ</b>"
#: ../data/gtkpod.glade.h:31
-#, fuzzy
msgid "<b>Audioscrobbler</b>"
-msgstr "<b>סרגל כלי×</b>"
+msgstr "<b>Audioscrobbler</b>"
#: ../data/gtkpod.glade.h:32
msgid "<b>Auto-Generated Playlists</b>"
@@ -173,74 +169,73 @@
msgstr "<b>×•×•×™×“×•× ×ž×—×™×§×”</b>"
#: ../data/gtkpod.glade.h:37
-msgid "<b>Displayed Track Attributes</b>"
-msgstr "<b>מ××¤×™×™× ×™ רצועה × ×¨××™×</b>"
-
-#: ../data/gtkpod.glade.h:38
msgid "<b>Examples</b>"
msgstr "<b>דוגמ×ות</b>"
-#: ../data/gtkpod.glade.h:39
+#: ../data/gtkpod.glade.h:38
msgid "<b>Ignore Frequent Words</b>"
msgstr "<b>×”×ª×¢×œ× ×ž×ž×™×œ×™× ×ª×›×•×¤×•×ª</b>"
-#: ../data/gtkpod.glade.h:40
+#: ../data/gtkpod.glade.h:39
msgid "<b>Misc</b>"
msgstr "<b>×חר</b>"
-#: ../data/gtkpod.glade.h:41
+#: ../data/gtkpod.glade.h:40
msgid "<b>Mountpoint and individual repository/playlist options</b>"
msgstr "<b>×פשרויות ×¢×’×™× ×” ומ×גר/רשימת × ×™×’×•×Ÿ ×¤×¨×˜× ×™×ª</b>"
-#: ../data/gtkpod.glade.h:42
-#, fuzzy
+#: ../data/gtkpod.glade.h:41
msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>×•×•×™×“×•× ×ž×—×™×§×”</b>"
+msgstr "<b>המרה על המקו×</b>"
-#: ../data/gtkpod.glade.h:43
+#: ../data/gtkpod.glade.h:42
msgid "<b>Play</b>"
msgstr "<b>× ×’×Ÿ</b>"
-#: ../data/gtkpod.glade.h:44
+#: ../data/gtkpod.glade.h:43
msgid "<b>Playlists</b>"
msgstr "<b>רשימות השמעה</b>"
-#: ../data/gtkpod.glade.h:45
+#: ../data/gtkpod.glade.h:44
msgid "<b>Please select mountpoint and your iPod model</b>"
msgstr "<b>×× × ×‘×—×¨ × ×§×•×“×ª ×¢×’×™× ×” ו×ת ×”×“×’× ×©×œ ×”Ö¾iPod</b>"
-#: ../data/gtkpod.glade.h:46
+#: ../data/gtkpod.glade.h:45
msgid "<b>Repositories</b>"
msgstr "<b>מ×גרי×</b>"
-#: ../data/gtkpod.glade.h:47
+#: ../data/gtkpod.glade.h:46
msgid "<b>Sort Order</b>"
msgstr "<b>סדר מיון</b>"
-#: ../data/gtkpod.glade.h:48
+#: ../data/gtkpod.glade.h:47
msgid "<b>Sort Tabs</b>"
msgstr "<b>כרטיסיות מיון</b>"
-#: ../data/gtkpod.glade.h:49
+#: ../data/gtkpod.glade.h:48
msgid "<b>Sync</b>"
msgstr "<b>×¡× ×›×¨×•×Ÿ</b>"
-#: ../data/gtkpod.glade.h:50
+#: ../data/gtkpod.glade.h:49
msgid "<b>Synchronization</b>"
msgstr "<b>×¡× ×›×¨×•×Ÿ</b>"
-#: ../data/gtkpod.glade.h:51
+#: ../data/gtkpod.glade.h:50
msgid "<b>Tag Reading</b>"
msgstr "<b>קרי×ת תגיות</b>"
-#: ../data/gtkpod.glade.h:52
+#: ../data/gtkpod.glade.h:51
msgid "<b>Toolbar</b>"
msgstr "<b>סרגל כלי×</b>"
-#: ../data/gtkpod.glade.h:53
+#: ../data/gtkpod.glade.h:52
msgid "<b>Tooltips</b>"
msgstr "<b>תוויות מידע</b>"
+#: ../data/gtkpod.glade.h:53
+msgid "<b>Track Attributes</b>"
+msgstr "<b>מ××¤×™×™× ×™ רצועה</b>"
+
#: ../data/gtkpod.glade.h:54
msgid "<b>Track Editing</b>"
msgstr "<b>עריכת רצועות</b>"
@@ -255,7 +250,7 @@
#: ../data/gtkpod.glade.h:57
msgid ">"
-msgstr ""
+msgstr ">"
#: ../data/gtkpod.glade.h:58
msgid "About gtkpod"
@@ -266,91 +261,119 @@
msgstr "הוספת תיקיות רקורסיבית"
#: ../data/gtkpod.glade.h:60
+msgid "Add Files"
+msgstr "הוספת קבצי×"
+
+#: ../data/gtkpod.glade.h:61
msgid "Add Files or Directories"
msgstr "הוספת ×§×‘×¦×™× ×ו תיקיות"
-#: ../data/gtkpod.glade.h:61
-msgid "Add _Directory"
-msgstr "הוספת _תיקיות"
-
#: ../data/gtkpod.glade.h:62
+msgid "Add Fol_der"
+msgstr "הוספת _תיקייה"
+
+#: ../data/gtkpod.glade.h:63
+msgid "Add Folder"
+msgstr "הוספת תיקייה"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Image_s"
+msgstr "הוסף _×ª×ž×•× ×•×ª"
+
+#: ../data/gtkpod.glade.h:65
+msgid "Add Images from a Directory"
+msgstr "הוספת ×ª×ž×•× ×•×ª מתיקייה"
+
+#: ../data/gtkpod.glade.h:66
+msgid "Add Playlist"
+msgstr "הוספת רשימות השמעה"
+
+#: ../data/gtkpod.glade.h:67
msgid "Add _Files"
msgstr "הוספת _קבצי×"
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:68
msgid "Add _Playlist"
msgstr "הוספת _רשימות השמעה"
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:69
msgid "Add coverart from file using the following template"
msgstr "הוסף עטיפה מתוך קובץ תוך שימוש ×‘×ª×‘× ×™×ª הב××”"
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:70
msgid "Add directories recursively"
msgstr "הוספת תיקיות בצורה רקורסיבית"
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:71
msgid "Add new repository/iPod"
msgstr "הוסף מ×גר/iPod חדש"
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:72
msgid "Add playlist from file"
msgstr "הוספת רשימת השמעה מקובץ"
-#: ../data/gtkpod.glade.h:68 ../src/display_sorttabs.c:3232
-#: ../src/display_tracks.c:1996
+#: ../data/gtkpod.glade.h:73
+#: ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
msgid "Added"
msgstr "הוספו"
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:74
msgid "Advanced Sorting Options"
msgstr "×פשרויות מיון מתקדמות"
#. 0
-#: ../data/gtkpod.glade.h:70 ../src/display_sorttabs.c:2954
-#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
+#: ../data/gtkpod.glade.h:75
+#: ../src/display_sorttabs.c:2982
+#: ../src/display_spl.c:84
+#: ../src/misc_conversion.c:60
msgid "Album"
msgstr "כותר"
-#: ../data/gtkpod.glade.h:71
-#, fuzzy
+#: ../data/gtkpod.glade.h:76
msgid "Album Art"
-msgstr "כותר"
+msgstr "×”×ª×ž×•× ×•×ª של ×”×לבו×"
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:77
msgid "All (AND)"
msgstr "×•×’× (הכל)"
-#: ../data/gtkpod.glade.h:73
+#: ../data/gtkpod.glade.h:78
msgid "All Tracks Never Listened To"
msgstr "כל הרצועות ×©×ž×¢×•×œ× ×œ× ×”×©×ž×™×¢×• ×ותן"
-#: ../data/gtkpod.glade.h:74
+#: ../data/gtkpod.glade.h:79
msgid "All Tracks Played Since Last Time"
msgstr "כל הרצועות שהושמעו מ××– ×”×¤×¢× ×”××—×¨×•× ×”"
-#: ../data/gtkpod.glade.h:75
+#: ../data/gtkpod.glade.h:80
msgid "All Tracks not Listed in any Playlist"
msgstr "כל הרצועות ×©×œ× ×ž×•×¤×™×¢×•×ª ב××£ רשימת השמעה"
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:81
msgid "Also include tracks never played in \"Best Rated\" playlist"
msgstr "כלול ×’× ×¨×¦×•×¢×•×ª ×©×œ×¢×•×œ× ×œ× × ×•×’× ×• ברשימת השמעה \"הדירוג ×”×›×™ גבוה\""
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:82
msgid "Always write ID3v2.4 tags (only applies to MP3)"
msgstr "כתוב תמיד תגיות ID3v2.4 (תקף רק ל-MP3)"
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:83
msgid "Any (OR)"
msgstr "×ו (כל ×חד)"
-#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2951
-#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
+#: ../data/gtkpod.glade.h:84
+#: ../src/display_sorttabs.c:2979
+#: ../src/display_spl.c:85
+#: ../src/misc_conversion.c:61
msgid "Artist"
msgstr "×מן"
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:85
+msgid "Artwork Preview"
+msgstr "תצוגה מקדימה של ×”×ª×ž×•× ×•×ª"
+
+#: ../data/gtkpod.glade.h:86
msgid ""
"As a last resort set the following tags to the\n"
"filename if they are (still) empty:"
@@ -358,81 +381,67 @@
"בתור ×פשרות ××—×¨×•× ×” קבע ×ת התגיות ×œ×©× ×”×§×•×‘×¥\n"
"×× ×”×Ÿ (עדיין) ריקות:"
-#: ../data/gtkpod.glade.h:82
+#: ../data/gtkpod.glade.h:88
msgid "Ascending"
msgstr "עולה"
-#: ../data/gtkpod.glade.h:83
-msgid ""
-"Audio/Video\n"
-"Audio\n"
-"Video\n"
-"Podcast\n"
-"Video Podcast\n"
-"Audiobook\n"
-"Music Video\n"
-"TV Show\n"
-"TV Show & Music Video\n"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:93
+#: ../data/gtkpod.glade.h:89
msgid "Auto Store"
msgstr "שמירה ×וטומטית"
-#: ../data/gtkpod.glade.h:94
-msgid ""
-"Automatically start displaying tracks that match the criteria entered above. "
-"If not selected, you must press 'Display' to start displaying."
-msgstr ""
-"הצג ×וטומטית רצועות שמת×ימות ×œ×§×¨×™×˜×¨×™×•× ×™× ×”×ž×•×›× ×¡×™× ×œ×ž×¢×œ×”. ×× ×פשרות זו ×œ× "
-"× ×‘×—×¨×”, חובה עליך ללחוץ 'תצוגה' על ×ž× ×ª להר×ות ×ת הרצועות."
+#: ../data/gtkpod.glade.h:90
+msgid "Automatically start displaying tracks that match the criteria entered above. If not selected, you must press 'Display' to start displaying."
+msgstr "הצג ×וטומטית רצועות שמת×ימות ×œ×§×¨×™×˜×¨×™×•× ×™× ×”×ž×•×›× ×¡×™× ×œ×ž×¢×œ×”. ×× ×פשרות זו ×œ× × ×‘×—×¨×”, חובה עליך ללחוץ 'תצוגה' על ×ž× ×ª להר×ות ×ת הרצועות."
-#: ../data/gtkpod.glade.h:95
+#: ../data/gtkpod.glade.h:91
+msgid "Available:"
+msgstr "זמין:"
+
+#: ../data/gtkpod.glade.h:92
msgid "Before removing playlists or tracks from a playlist"
msgstr "×œ×¤× ×™ הסרת רשימות השמעה ×ו רצועות מרשימת השמעה"
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:93
msgid "Before removing tracks from the harddisk"
msgstr "×œ×¤× ×™ הסרת רצועות מהדיסק הקשיח"
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:94
msgid "Before removing tracks from the iPod"
msgstr "×œ×¤× ×™ הסרת רצועות מה-iPod"
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:95
msgid "Before removing tracks from the local database"
msgstr "×œ×¤× ×™ הסרת רצועות ממסד ×”× ×ª×•× ×™× ×”×ž×§×•×ž×™"
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:96
msgid "Best Rated Tracks"
msgstr "הרצועות המדורגות בר×ש"
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:97
msgid "Browse"
msgstr "סייר"
-#: ../data/gtkpod.glade.h:101
-#, fuzzy
+#: ../data/gtkpod.glade.h:98
msgid "Cache directory:"
-msgstr "הוספת _תיקיות"
+msgstr "תיקיית מטמון"
-#: ../data/gtkpod.glade.h:102
+#: ../data/gtkpod.glade.h:99
msgid "Calendar"
msgstr "יומן"
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:100
msgid "Calendar sync command:"
msgstr "פקודת ×¡× ×›×¨×•×Ÿ ליומן:"
-#: ../data/gtkpod.glade.h:104
+#: ../data/gtkpod.glade.h:101
msgid "Call automatically when synchronizing iTunesDB"
msgstr "×§×¨× ×וטומטית בזמן ×¡× ×›×¨×•×Ÿ iTunesDB"
-#: ../data/gtkpod.glade.h:105
+#: ../data/gtkpod.glade.h:102
msgid "Category: "
msgstr "קטגוריה:"
-#: ../data/gtkpod.glade.h:106
+#: ../data/gtkpod.glade.h:103
msgid ""
"Change all tracks\n"
"simultaneously"
@@ -440,29 +449,38 @@
"×©× ×” ×ת כל הרצועות\n"
"בבת ×חת"
-#: ../data/gtkpod.glade.h:108
+#: ../data/gtkpod.glade.h:105
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr ""
+"בדוק ×œ×¤× ×™ הסרת ×ª×ž×•× ×•×ª מ××œ×‘×•× ×”×ª×ž×•× ×•×ª ×”××\n"
+"×”× ×¦×¨×™×›×™× ×œ×”×ž×—×§ ממסד ×”× ×ª×•× ×™× ×©×œ ×”×ª×ž×•× ×•×ª."
+
+#: ../data/gtkpod.glade.h:107
msgid "Check for existing files when copying from iPod."
msgstr "בדוק ×§×‘×¦×™× ×§×™×™×ž×™× ×‘×–×ž×Ÿ העתקה מה-iPod."
-#: ../data/gtkpod.glade.h:109
+#: ../data/gtkpod.glade.h:108
msgid "Command for 'Enqueue':"
msgstr "פקודה עבור '×”×›× ×¡ לתור':"
-#: ../data/gtkpod.glade.h:110
+#: ../data/gtkpod.glade.h:109
msgid "Command for 'Play now':"
msgstr "פקודה עבור '× ×’×Ÿ עכשיו':"
#. 5
-#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:110
+#: ../src/display_spl.c:97
#: ../src/misc_conversion.c:65
msgid "Composer"
msgstr "יוצר"
-#: ../data/gtkpod.glade.h:112
+#: ../data/gtkpod.glade.h:111
msgid "Confirm before removing tracks from the iPod or repository"
msgstr "×שר ×œ×¤× ×™ הסרת רצועות מה-iPod ×ו המ×גר"
-#: ../data/gtkpod.glade.h:113
+#: ../data/gtkpod.glade.h:112
msgid ""
"Confirm before removing tracks from the iPod or repository\n"
"when syncing playlists"
@@ -470,183 +488,148 @@
"×שר ×œ×¤× ×™ הסרת רצועות מה־iPod ×ו המ×גר\n"
"בזמן ×¡× ×›×¨×•×Ÿ רשימות ההשמעה"
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:114
msgid "Confirm lists of directories"
msgstr "×•×•×“× ×¨×©×™×ž×” של תיקיות"
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:115
msgid "Contacts sync command:"
msgstr "פקודת ×¡× ×›×¨×•×Ÿ ל×× ×©×™ קשר:"
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:116
msgid "Containing Displayed Tracks"
msgstr "המכילה רצועות × ×¨×ות"
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:117
msgid "Containing Selected Tracks"
msgstr "המכילה רצועות × ×‘×—×¨×•×ª"
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:118
msgid "Conversion Progress Display"
-msgstr ""
+msgstr "תצוגת התקדמות עבור המרות"
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:119
msgid "Cover"
msgstr "עטיפה"
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:120
msgid "Create New Playlist"
msgstr "יצירת רשימת השמעה חדשה"
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:121
msgid "Create Repository"
msgstr "צור מ×גר"
-#: ../data/gtkpod.glade.h:123
+#: ../data/gtkpod.glade.h:122
msgid "Create _Playlist File"
msgstr "יצירת קובץ _רשימת השמעה"
-#: ../data/gtkpod.glade.h:124
+#: ../data/gtkpod.glade.h:123
msgid "Credits"
msgstr "קרדיט"
-#: ../data/gtkpod.glade.h:125
+#: ../data/gtkpod.glade.h:124
msgid "Currently only rating is supported."
msgstr "× ×›×•×Ÿ לעכשיו רק המדרוג × ×ª×ž×š."
-#: ../data/gtkpod.glade.h:126
+#: ../data/gtkpod.glade.h:125
msgid "Delete repository"
msgstr "מחק מהמ×גר"
-#: ../data/gtkpod.glade.h:127
-#, fuzzy
+#: ../data/gtkpod.glade.h:126
msgid ""
"Delete tracks that are no longer present from the\n"
"iPod or repository"
msgstr "מחק רצועות שכבר ×œ× ×§×™×™×ž×•×ª מה־iPod ×ו המ×גר"
-#: ../data/gtkpod.glade.h:129
+#: ../data/gtkpod.glade.h:128
msgid "Deleted tracks"
msgstr "רצועות × ×ž×—×§×•×ª"
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:129
msgid "Descending"
msgstr "יורד"
-#: ../data/gtkpod.glade.h:131
+#: ../data/gtkpod.glade.h:130
msgid "Details"
msgstr "פרטי×"
-#: ../data/gtkpod.glade.h:133
+#: ../data/gtkpod.glade.h:132
#, no-c-format
-msgid ""
-"Determines how the string for the info field should be constructed, e.g '%a/%"
-"A/%T - %t.mp3' or '%o'. You can separate several templates by semicolons -- "
-"gtkpod will determine which one to use by the filename extension given. "
-"Artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
-"nr: %C, year: %Y, original filename (requires extended information file): %"
-"o, the character '%': %%."
+msgid "Determines how the string for the info field should be constructed, e.g '%a/%A/%T - %t.mp3' or '%o'. You can separate several templates by semicolons -- gtkpod will determine which one to use by the filename extension given. Artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, year: %Y, original filename (requires extended information file): %o, the character '%': %%."
msgstr ""
"קובע ×יך מחרוזת המידע ×ª×‘× ×”, לדוגמה:\n"
"'%a/% A/%T - %t.mp3' or '%ס'\n"
-"×תה יכול להפריד מספר ×ª×‘× ×™×•×ª על ידי × ×§×•×“×”Ö¾×¤×¡×™×§. ×”×™×™×©×•× gtkpod יקבע ב××™×–×” ×ž×”× "
-"להשתמש על ידי הסיומת ×”× ×™×ª× ×ª.\n"
-"×מן: a%, כותר: A%, יוצר: c%, ×©× ×”×¨×¦×•×¢×”: t%, ×¡×’× ×•×Ÿ: G%, מספר רצועה: T%, מספר "
-"תקליטור: C%, ×©× ×”: Y%, ×©× ×ž×§×•×¨×™ (דרוש מידע מורחב): o%, הסימן '%': %%."
+"×תה יכול להפריד מספר ×ª×‘× ×™×•×ª על ידי × ×§×•×“×”Ö¾×¤×¡×™×§. ×”×™×™×©×•× gtkpod יקבע ב××™×–×” ×ž×”× ×œ×”×©×ª×ž×© על ידי הסיומת ×”× ×™×ª× ×ª.\n"
+"×מן: a%, כותר: A%, יוצר: c%, ×©× ×”×¨×¦×•×¢×”: t%, ×¡×’× ×•×Ÿ: G%, מספר רצועה: T%, מספר תקליטור: C%, ×©× ×”: Y%, ×©× ×ž×§×•×¨×™ (דרוש מידע מורחב): o%, הסימן '%': %%."
-#: ../data/gtkpod.glade.h:135
+#: ../data/gtkpod.glade.h:134
#, no-c-format
-msgid ""
-"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
-"mp3' or '%o'. You can separate several patterns by semicolons -- gtkpod "
-"will determine which one to use by the filename extension given. Artist: %a, "
-"album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, "
-"year: %Y, original filename (requires extended information file): %o, "
-"current playlist: %p, the character '%': %%."
+msgid "Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t.mp3' or '%o'. You can separate several patterns by semicolons -- gtkpod will determine which one to use by the filename extension given. Artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, year: %Y, original filename (requires extended information file): %o, current playlist: %p, the character '%': %%."
msgstr ""
"קובע ×ת ×©× ×”×¨×¦×•×¢×” ש×ותה תעתיק מה-iPod. לדוגמה:\n"
"'%a/%A/%T - %t.mp3' or '%o'.\n"
-"×תה יכול לציין מספר ×ª×‘× ×™×•×ª מופרדות על ידי × ×§×•×“×”Ö¾×¤×¡×™×§. ×”×™×™×©×•× gtkpod יקבע "
-"ב××™×–×” יעשה שימוש על ידי הסיומת ×”× ×™×ª× ×ª.\n"
-"×מן: a%, כותר: A%, יוצר: c%, ×©× ×”×¨×¦×•×¢×”: t%, ×¡×’× ×•×Ÿ: G%, מספר רצועה: T%, מספר "
-"תקליטור: C%, ×©× ×”: Y%, ×©× ×ž×§×•×¨×™ (דרוש מידע מורחב): o%, רשימת ההשמעה ×”× ×•×›×—×™×ª: p"
-"%, הסימן '%': %%."
+"×תה יכול לציין מספר ×ª×‘× ×™×•×ª מופרדות על ידי × ×§×•×“×”Ö¾×¤×¡×™×§. ×”×™×™×©×•× gtkpod יקבע ב××™×–×” יעשה שימוש על ידי הסיומת ×”× ×™×ª× ×ª.\n"
+"×מן: a%, כותר: A%, יוצר: c%, ×©× ×”×¨×¦×•×¢×”: t%, ×¡×’× ×•×Ÿ: G%, מספר רצועה: T%, מספר תקליטור: C%, ×©× ×”: Y%, ×©× ×ž×§×•×¨×™ (דרוש מידע מורחב): o%, רשימת ההשמעה ×”× ×•×›×—×™×ª: p%, הסימן '%': %%."
-#: ../data/gtkpod.glade.h:137
+#: ../data/gtkpod.glade.h:136
#, no-c-format
-msgid ""
-"Determines the name of the file with the cover art. You can separate several "
-"patterns by semicolons which will be tried in order. Artist: %a, album: %A, "
-"composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, year: %Y, "
-"original filename (requires extended information file): %o, original "
-"filename without file extension: %O, current playlist: %p, the character "
-"'%': %%."
-msgstr ""
-"קובע ×ת ×©× ×”×§×•×‘×¥ ×¢× ×”×¢×˜×™×¤×”. ×תה יכול לציין מספר ×ª×‘× ×™×•×ª מופרדות על ידי "
-"פסיקי×, שיבוצעו לפי הסדר.×מן: a%, כותר: A%, יוצר: c%, ×©× ×”×¨×¦×•×¢×”: t%, ×¡×’× ×•×Ÿ: G"
-"%, מספר רצועה: T%, מספר תקליטור: C%, ×©× ×”: Y%, ×©× ×ž×§×•×¨×™ (דרוש מידע מורחב): o"
-"%, ×©× ×ž×§×•×¨×™ ×œ×œ× ×¡×™×•×ž×ª: %O, רשימת ההשמעה ×”× ×•×›×—×™×ª: p%, הסימן '%': %%."
+msgid "Determines the name of the file with the cover art. You can separate several patterns by semicolons which will be tried in order. Artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, year: %Y, original filename (requires extended information file): %o, original filename without file extension: %O, current playlist: %p, the character '%': %%."
+msgstr "קובע ×ת ×©× ×”×§×•×‘×¥ ×¢× ×”×¢×˜×™×¤×”. ×תה יכול לציין מספר ×ª×‘× ×™×•×ª מופרדות על ידי פסיקי×, שיבוצעו לפי הסדר.×מן: a%, כותר: A%, יוצר: c%, ×©× ×”×¨×¦×•×¢×”: t%, ×¡×’× ×•×Ÿ: G%, מספר רצועה: T%, מספר תקליטור: C%, ×©× ×”: Y%, ×©× ×ž×§×•×¨×™ (דרוש מידע מורחב): o%, ×©× ×ž×§×•×¨×™ ×œ×œ× ×¡×™×•×ž×ª: %O, רשימת ההשמעה ×”× ×•×›×—×™×ª: p%, הסימן '%': %%."
-#: ../data/gtkpod.glade.h:138
-msgid ""
-"Directories to sync with are determined from the filenames of the tracks in "
-"the playlist."
+#: ../data/gtkpod.glade.h:137
+msgid "Directories to sync with are determined from the filenames of the tracks in the playlist."
msgstr "התיקיות ×œ×¡× ×›×¨×•×Ÿ × ×§×‘×¢×•×ª לפי שמות ×”×§×‘×¦×™× ×©×œ הרצועות ברשימת ההשמעה."
-#: ../data/gtkpod.glade.h:139
-msgid "Dirs"
-msgstr "תיקיות"
-
-#: ../data/gtkpod.glade.h:140
+#: ../data/gtkpod.glade.h:138
msgid "Display a list of tracks that could actually be updated."
msgstr "הצג רשימה של רצועות ש×פשר לעדכן ×ותן."
-#: ../data/gtkpod.glade.h:141
+#: ../data/gtkpod.glade.h:139
msgid "Display a list of tracks that could not be updated."
msgstr "הצג רשימה של רצועות ש××™ ×פשר לעדכן ×ותן."
-#: ../data/gtkpod.glade.h:142
+#: ../data/gtkpod.glade.h:140
msgid "Display conversion log"
-msgstr ""
+msgstr "הצג יומן המרות"
-#: ../data/gtkpod.glade.h:143
+#: ../data/gtkpod.glade.h:141
msgid "Display info about detected duplicates"
msgstr "הצג מידע ×ודות כפילויות מזוהות"
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:142
msgid "Display info about non-updated tracks"
msgstr "הצג מידע על רצועות ×©×œ× ×¢×•×“×›× ×• בזמן ×¡× ×›×¨×•×Ÿ תיקיות"
-#: ../data/gtkpod.glade.h:145
+#: ../data/gtkpod.glade.h:143
msgid "Display info about updated tracks"
msgstr "הצג מידע ×ודות רצועות ×ž×¢×•×“×›× ×•×ª"
-#: ../data/gtkpod.glade.h:146
+#: ../data/gtkpod.glade.h:144
msgid "Display messages and warnings at startup"
msgstr "הר××” הודעות ו×זהרות בתחילת ×”×ª×•×›× ×™×ª"
-#: ../data/gtkpod.glade.h:147
-msgid ""
-"Display the list of duplicates that have been detected after adding files."
+#: ../data/gtkpod.glade.h:145
+msgid "Display the list of duplicates that have been detected after adding files."
msgstr "הצג ×ת רשימת הכפילויות שזוהו ×חרי הוספת הקבצי×."
-#: ../data/gtkpod.glade.h:148
+#: ../data/gtkpod.glade.h:146
msgid "Display toolbar..."
msgstr "הר××” סרגל כלי×..."
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:147
msgid "Display tooltips in main window"
msgstr "הצג תוויות מידע בחלון הר×שי"
-#: ../data/gtkpod.glade.h:150
+#: ../data/gtkpod.glade.h:148
msgid "Display tooltips in prefs window"
msgstr "הצג תוויות מידע בחלון ×”×פשרויות"
-#: ../data/gtkpod.glade.h:151
+#: ../data/gtkpod.glade.h:149
msgid "Display tracks that match the criteria entered above."
msgstr "הצג רצועות המת×ימות ×œ×§×¨×™×˜×¨×™×•× ×™× ×”×ž×•×›× ×¡×™× ×œ×ž×¢×œ×”."
-#: ../data/gtkpod.glade.h:152
+#: ../data/gtkpod.glade.h:150
msgid ""
"Displayed\n"
"Tracks"
@@ -654,213 +637,161 @@
"רצועות\n"
"מוצגות"
-#: ../data/gtkpod.glade.h:154
+#: ../data/gtkpod.glade.h:152
+msgid "Displayed:"
+msgstr "מוצגי×:"
+
+#: ../data/gtkpod.glade.h:153
msgid "Don't allow file duplication"
msgstr "×ל תרשה כפילויות של קבצי×"
-#: ../data/gtkpod.glade.h:155
+#: ../data/gtkpod.glade.h:154
msgid "Don't automatically sync on startup"
msgstr "×ל ×ª×¡× ×›×¨×Ÿ ×וטומטית בתחילת ×”×ª×•×›× ×™×ª"
-#: ../data/gtkpod.glade.h:156
-msgid "Download Cover"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:157
-#, fuzzy
+#: ../data/gtkpod.glade.h:155
msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
-msgstr "זיהוי כפילויות מתבסס על חישוב קוד ערבוב md5 על הקובץ."
+msgstr "זיהוי כפילויות מתבסס על חישוב קוד ערבוב sha1 על הקובץ."
-#: ../data/gtkpod.glade.h:158
+#: ../data/gtkpod.glade.h:156
msgid "Edit Repository/iPod Options"
msgstr "ערוך מ×גר/×פשרויות iPod"
-#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:659
+#: ../data/gtkpod.glade.h:157
+#: ../src/context_menus.c:662
msgid "Edit Smart Playlist"
msgstr "ערוך רשימת השמעה חכמה"
-#: ../data/gtkpod.glade.h:160 ../src/context_menus.c:746
+#: ../data/gtkpod.glade.h:158
+#: ../src/context_menus.c:749
msgid "Edit Track Details"
msgstr "ערוך פרטי רצועה"
-#: ../data/gtkpod.glade.h:161
+#: ../data/gtkpod.glade.h:159
msgid "Edit _Preferences"
msgstr "עריכת _העדפות"
-#: ../data/gtkpod.glade.h:162
+#: ../data/gtkpod.glade.h:160
msgid "Effective free space"
msgstr "×ž×§×•× ×¤× ×•×™ ×פקטיבי"
-#: ../data/gtkpod.glade.h:163
+#: ../data/gtkpod.glade.h:161
msgid "Empty Playlist"
msgstr "רשימת השמעה ריקה"
-#: ../data/gtkpod.glade.h:164
+#: ../data/gtkpod.glade.h:162
msgid "Exclude file mask(s)"
msgstr "×ל תכלול מסכה(ות) קבצי×"
-#: ../data/gtkpod.glade.h:165
+#: ../data/gtkpod.glade.h:163
+msgid "Export can be continued at a later time if canceled."
+msgstr "×פשר להמשיך ×ת ×”×™×¦×•× ×‘×–×ž×Ÿ מ×וחר יותר, ×× ×‘×•×˜×œ."
+
+#: ../data/gtkpod.glade.h:164
msgid "File size"
msgstr "גודל קובץ"
-#: ../data/gtkpod.glade.h:166
+#: ../data/gtkpod.glade.h:165
msgid "File size (deleted)"
msgstr "גודל קובץ (× ×ž×—×§)"
-#: ../data/gtkpod.glade.h:167
+#: ../data/gtkpod.glade.h:166
msgid "File size (non-transferred)"
msgstr "גודל קובץ (ל×-מועבר)"
-#: ../data/gtkpod.glade.h:168
+#: ../data/gtkpod.glade.h:167
msgid "Filename Format: "
msgstr "×ª×‘× ×™×ª הקובץ:"
+#: ../data/gtkpod.glade.h:168
+msgid "Find orphan files (files with no track info in DB) and dangling tracks (tracks with no corresponding files on iPod)"
+msgstr "×ž×¦× ×§×‘×¦×™× ×™×ª×•×ž×™× (×§×‘×¦×™× ×œ×œ× ×ž×™×“×¢ רצועה במסד ×”× ×ª×•× ×™×) ורצועות ×ž×ª× ×“× ×“×•×ª (רצועות ×œ×œ× ×§×‘×¦×™× ×ž×ª××™×ž×™× ×¢×œ ×”-iPod)"
+
#: ../data/gtkpod.glade.h:169
-msgid "Files"
-msgstr "קבצי×"
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgstr "תחילה × ×¡×” ×ת <i>folder.jpg</i>, ו×חר כך ×ת <i><artist>.jpg</i>"
#: ../data/gtkpod.glade.h:170
-#, fuzzy
-msgid ""
-"Find orphan files (files with no track info in DB) and dangling tracks "
-"(tracks with no corresponding files on iPod)"
-msgstr ""
-"×ž×¦× ×§×‘×¦×™× ×™×ª×•×ž×™× (×§×‘×¦×™× ×œ×œ× ×ž×™×“×¢ רצועה במסד ×”× ×ª×•× ×™×) ורצועות ×ž×ª× ×“× ×“×•×ª "
-"(רצועות ×œ×œ× ×§×‘×¦×™× ×ž×ª××™×ž×™× ×¢×œ ×”-iPod)"
+msgid "Flac with :"
+msgstr "סוג Flac ×¢× :"
-#: ../data/gtkpod.glade.h:171
-#, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
-msgstr ""
-"תחילה × ×¡×” ×ת try <i>folder.jpg</i>, ו×חר כך ×ת <i><artist>.jpg</i>"
-
#: ../data/gtkpod.glade.h:172
-msgid "Flac with :"
-msgstr ""
+#, no-c-format
+msgid "For example, 'xmms %s' will clear xmms' current playlist, add the selected tracks and start playing."
+msgstr "לדוגמ×, 'xmms %s' ×™× ×§×” ×ת רשימת ההשמעה ×”× ×•×›×—×™×ª של xmms, יוסיף ×ת הרצועות ×”× ×‘×—×¨×•×ª ויתחיל ×œ× ×’×Ÿ."
#: ../data/gtkpod.glade.h:174
#, no-c-format
-msgid ""
-"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
-"tracks and start playing."
-msgstr ""
-"לדוגמ×, 'xmms %s' ×™× ×§×” ×ת רשימת ההשמעה ×”× ×•×›×—×™×ª של xmms, יוסיף ×ת הרצועות "
-"×”× ×‘×—×¨×•×ª ויתחיל ×œ× ×’×Ÿ."
+msgid "For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' current playlist."
+msgstr "לדוגמ×, 'xmms -e %s' יוסיף ×ת הרצועות ×”× ×‘×—×¨×•×ª לרשימת ההשמעה ×”× ×•×›×—×™×ª ב-xmms."
-#: ../data/gtkpod.glade.h:176
-#, no-c-format
-msgid ""
-"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
-"current playlist."
-msgstr ""
-"לדוגמ×, 'xmms -e %s' יוסיף ×ת הרצועות ×”× ×‘×—×¨×•×ª לרשימת ההשמעה ×”× ×•×›×—×™×ª ב-xmms."
-
-#: ../data/gtkpod.glade.h:177 ../src/display_sorttabs.c:2957
-#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
+#: ../data/gtkpod.glade.h:175
+#: ../src/display_sorttabs.c:2985
+#: ../src/display_spl.c:89
+#: ../src/misc_conversion.c:63
msgid "Genre"
msgstr "×¡×’× ×•×Ÿ"
-#: ../data/gtkpod.glade.h:178
+#: ../data/gtkpod.glade.h:176
msgid "Group artists on compilation CDs"
msgstr "קבץ ××ž× ×™× ×‘×ª×§×œ×™×˜×•×¨×™ שיצרת"
-#: ../data/gtkpod.glade.h:179
-#, fuzzy
-msgid ""
-"Highly recommended for faster import when taking advantage of the "
-"duplication recognition. Also, having the PC filenames allows writing "
-"changed ID3 tags to disk, and even to reconstruct your iPod's contents in "
-"case of file system corruption (change the \"transferred=\" entries in your "
-"backuped database)."
-msgstr ""
-"מומלץ מ×וד ×œ×™×™×‘×•× ×ž×”×™×¨ יותר ,×›×שר ×ž× ×¦×œ×™× ×ת ×ž× ×’× ×•×Ÿ זיהוי הכפילויות. ×‘× ×•×¡×£, "
-"על ידי כך ×©×§×™×™× ×ž×™×“×¢ ×©× ×”×§×•×‘×¥ של ×”×§×‘×¦×™× ×¢×œ ×”-PC ×–×” מ×פשר כתיבת של תגיות ×”-"
-"ID3 לדיסק הקשיח, ו×פילו ×‘× ×™×” מחדש של תוכן ×”-iPod במקרה של בעיה במערכת ×”×§×‘×¦×™× "
-"(×©× ×” ×ת שדה ×”-\"הועבר\" במסד ×”× ×ª×•× ×™× ×”×ž×’×•×‘×”)."
+#: ../data/gtkpod.glade.h:177
+msgid "Highly recommended for faster import when taking advantage of the duplication recognition. Also, having the PC filenames allows writing changed ID3 tags to disk, and even to reconstruct your iPod's contents in case of file system corruption (change the \"transferred=\" entries in your backuped database)."
+msgstr "מומלץ מ×וד ×œ×™×™×‘×•× ×ž×”×™×¨ יותר ,×›×שר ×ž× ×¦×œ×™× ×ת ×ž× ×’× ×•×Ÿ זיהוי הכפילויות. ×‘× ×•×¡×£, על ידי כך ×©×§×™×™× ×ž×™×“×¢ ×©× ×”×§×•×‘×¥ של ×”×§×‘×¦×™× ×¢×œ ×”-PC ×–×” מ×פשר כתיבת של תגיות ×”-ID3 לדיסק הקשיח, ו×פילו ×‘× ×™×” מחדש של תוכן ×”-iPod במקרה של בעיה במערכת ×”×§×‘×¦×™× (×©× ×” ×ת שדה ×”-\"הועבר\" במסד ×”× ×ª×•× ×™× ×”×ž×’×•×‘×”)."
-#: ../data/gtkpod.glade.h:180 ../src/context_menus.c:682
-#: ../src/context_menus.c:700 ../src/context_menus.c:824
+#: ../data/gtkpod.glade.h:178
+#: ../src/context_menus.c:685
+#: ../src/context_menus.c:703
+#: ../src/context_menus.c:820
msgid "I'm sure"
msgstr "×× ×™ בטוח"
-#: ../data/gtkpod.glade.h:181
-msgid ""
-"If available, the local copy of the track is referenced in the playlist. "
-"Otherwise the file on the iPod is used."
-msgstr ""
-"×× ×–×ž×™×Ÿ, העותק המקומי של הרצועה יקושר מרשימת ההשמעה. ×חרת × ×©×ª×ž×© בקובץ על ×”-"
-"iPod."
+#: ../data/gtkpod.glade.h:179
+msgid "If available, the local copy of the track is referenced in the playlist. Otherwise the file on the iPod is used."
+msgstr "×× ×–×ž×™×Ÿ, העותק המקומי של הרצועה יקושר מרשימת ההשמעה. ×חרת × ×©×ª×ž×© בקובץ על ×”-iPod."
-#: ../data/gtkpod.glade.h:182
+#: ../data/gtkpod.glade.h:180
msgid "If both options are selected, embedded APIC data takes precedence."
msgstr "×× ×©×ª×™ ×”×פשרויות × ×‘×—×¨×•, מידע מוכל בתוך ×”Ö¾APIC ×™×”×™×” בעל עדיפות ר××©×•× ×”."
+#: ../data/gtkpod.glade.h:181
+msgid "If checked, sorting will be case sensitive. Please note that case sensitive sorting will not work well with most charsets."
+msgstr "×× ×™×¡×•×ž×Ÿ, המיון יבחין בין ×ותיות ×§×˜× ×•×ª לגדולות. ×©×™× ×œ×‘ ×©×”×‘×—× ×” ×–×ת ×œ× ×ª×¢×‘×•×“ היטב ברוב ערכות התווי×."
+
+#: ../data/gtkpod.glade.h:182
+msgid "If the filename (full path) of an existing track matches that of a track to be added, this option allows you to update the information about the existing track rather than just skipping the track altogether. No update will take place if the file hasn't changed and you have selected the 'Don't allow file duplication' option above."
+msgstr "×× ×”×§×•×‘×¥ (× ×ª×™×‘ מל×) של רצועה קיימת תו×× ×ת ×–×” של רצועה להוספה, ×פשרות ×–×ת מ×פשרת לך לעדכן ×ת המידע על הרצועה הקיימת ×‘×ž×§×•× ×¨×§ לדלג על הרצועה בכלל. ×©×•× ×¢×“×›×•×Ÿ ×œ× ×™×ª×‘×¦×¢ ×× ×”×§×•×‘×¥ ×œ× ×”×©×ª× ×” ובחרת ב×פשרות ×œ× ×œ×פשר כפילות ×‘×§×‘×¦×™× ×œ×ž×¢×œ×”."
+
#: ../data/gtkpod.glade.h:183
-msgid ""
-"If checked, sorting will be case sensitive. Please note that case sensitive "
-"sorting will not work well with most charsets."
-msgstr ""
-"×× ×™×¡×•×ž×Ÿ, המיון יבחין בין ×ותיות ×§×˜× ×•×ª לגדולות. ×©×™× ×œ×‘ ×©×”×‘×—× ×” ×–×ת ×œ× ×ª×¢×‘×•×“ "
-"היטב ברוב ערכות התווי×."
+msgid "If you check this, gtkpod will descend into subdirectories recursively."
+msgstr "×× ×ª×¡×ž×Ÿ ×ופציה זו, gtkpod ×™×›× ×¡ לתוך תיקיות ×ž×©× ×” רקורסיבית."
#: ../data/gtkpod.glade.h:184
-msgid ""
-"If the filename (full path) of an existing track matches that of a track to "
-"be added, this option allows you to update the information about the "
-"existing track rather than just skipping the track altogether. No update "
-"will take place if the file hasn't changed and you have selected the 'Don't "
-"allow file duplication' option above."
-msgstr ""
-"×× ×”×§×•×‘×¥ (× ×ª×™×‘ מל×) של רצועה קיימת תו×× ×ת ×–×” של רצועה להוספה, ×פשרות ×–×ת "
-"מ×פשרת לך לעדכן ×ת המידע על הרצועה הקיימת ×‘×ž×§×•× ×¨×§ לדלג על הרצועה בכלל. ×©×•× "
-"עדכון ×œ× ×™×ª×‘×¦×¢ ×× ×”×§×•×‘×¥ ×œ× ×”×©×ª× ×” ובחרת ב×פשרות ×œ× ×œ×פשר כפילות ×‘×§×‘×¦×™× ×œ×ž×¢×œ×”."
+msgid "If you check this, information (cover art and meta information) changed for this track will be copied to all other selected tracks as well. Use with care."
+msgstr "×× ×ª×¡×ž×Ÿ ×ת ×–×”, ×©×™× ×•×™×™× ×‘×ž×™×“×¢ (עטיפה ומידע מטה) עבור רצועה ×–×ת יועתקו ×ל כל הרצועות ×”× ×‘×—×¨×•×ª ×’× ×›×Ÿ. השתמש בזהירות."
#: ../data/gtkpod.glade.h:185
-msgid "If you check this, gtkpod will descend into subdirectories recursively."
-msgstr "×× ×ª×¡×ž×Ÿ ×ופציה זו, gtkpod ×™×›× ×¡ לתוך תיקיות ×ž×©× ×” רקורסיבית."
+msgid "If you don't select the master playlist automatically, the initial database import is much faster because the display dosn't have to be updated."
+msgstr "×× ×œ× ×ª×‘×—×¨ ×ת רשימת ההשמעה הר×שית ×וטומטית, ×™×‘×•× ×ž×¡×“ ×”× ×ª×•× ×™× ×”×¨××©×•× ×™ ×™×”×™×” יותר מהיר בעקבות כך שהתצוגה ×œ× ×ª×”×™×” חייבת להתעדכן."
#: ../data/gtkpod.glade.h:186
-msgid ""
-"If you check this, information (cover art and meta information) changed for "
-"this track will be copied to all other selected tracks as well. Use with "
-"care."
-msgstr ""
-"×× ×ª×¡×ž×Ÿ ×ת ×–×”, ×©×™× ×•×™×™× ×‘×ž×™×“×¢ (עטיפה ומידע מטה) עבור רצועה ×–×ת יועתקו ×ל כל "
-"הרצועות ×”× ×‘×—×¨×•×ª ×’× ×›×Ÿ. השתמש בזהירות."
+msgid "If you select several tracks in the track list and edit a tag of the first track, the tags in the other tracks are updated as well."
+msgstr "×× ×תה בוחר מספר רצועות ברשימת הרצועות ועורך תגית של הרצועה הר××©×•× ×”, התגיות ברצועות ×”×ž×ž×•×™× ×•×ª ×ž×ª×¢×“×›× ×•×ª ×’× ×›×Ÿ."
#: ../data/gtkpod.glade.h:187
-msgid ""
-"If you don't select the master playlist automatically, the initial database "
-"import is much faster because the display dosn't have to be updated."
-msgstr ""
-"×× ×œ× ×ª×‘×—×¨ ×ת רשימת ההשמעה הר×שית ×וטומטית, ×™×‘×•× ×ž×¡×“ ×”× ×ª×•× ×™× ×”×¨××©×•× ×™ ×™×”×™×” "
-"יותר מהיר בעקבות כך שהתצוגה ×œ× ×ª×”×™×” חייבת להתעדכן."
-
-#: ../data/gtkpod.glade.h:188
-msgid ""
-"If you select several tracks in the track list and edit a tag of the first "
-"track, the tags in the other tracks are updated as well."
-msgstr ""
-"×× ×תה בוחר מספר רצועות ברשימת הרצועות ועורך תגית של הרצועה הר××©×•× ×”, התגיות "
-"ברצועות ×”×ž×ž×•×™× ×•×ª ×ž×ª×¢×“×›× ×•×ª ×’× ×›×Ÿ."
-
-#: ../data/gtkpod.glade.h:189
msgid "Ignore these words when at the beginning of the following fields:"
msgstr "×”×ª×¢×œ× ×ž×ž×™×œ×™× ×לו ×›×שר הן מופיעות בתחילת השדות הב××™×:"
-#: ../data/gtkpod.glade.h:190
-msgid ""
-"In order to save the displayed track order to the iPod choose 'Save "
-"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
-msgstr ""
-"על ×ž× ×ª לשמור ×ת סדר הרצועות ×”× ×¨×ות ×ל ×”-iPod בחר 'שמור סדר רצועות × ×¨×ות' "
-"מתפריט ×”-'עריכה' ×ו בחר 'שמירה ×וטומטית' למטה."
+#: ../data/gtkpod.glade.h:188
+msgid "In order to save the displayed track order to the iPod choose 'Save Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
+msgstr "על ×ž× ×ª לשמור ×ת סדר הרצועות ×”× ×¨×ות ×ל ×”-iPod בחר 'שמור סדר רצועות × ×¨×ות' מתפריט ×”-'עריכה' ×ו בחר 'שמירה ×וטומטית' למטה."
-#: ../data/gtkpod.glade.h:191
+#: ../data/gtkpod.glade.h:189
msgid "Initialize iPod"
msgstr "×תחל iPod"
-#: ../data/gtkpod.glade.h:192
+#: ../data/gtkpod.glade.h:190
msgid ""
"Insert before\n"
"Insert after"
@@ -868,357 +799,317 @@
"×”×›× ×¡ ×œ×¤× ×™\n"
"×”×›× ×¡ ×חרי"
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:192
msgid "Keeps all compilation CDs grouped together in the artists sort tab."
-msgstr ""
-"שמור ×ת כל תקליטורי היצירות ×ž×§×•×‘×¦×™× ×‘×™×—×“ בתוך כרטיסיות המיון של ×”××ž× ×™×."
+msgstr "שמור ×ת כל תקליטורי היצירות ×ž×§×•×‘×¦×™× ×‘×™×—×“ בתוך כרטיסיות המיון של ×”××ž× ×™×."
-#: ../data/gtkpod.glade.h:195
+#: ../data/gtkpod.glade.h:193
msgid "Live _updating"
msgstr "עדכון _חי"
-#: ../data/gtkpod.glade.h:196
+#: ../data/gtkpod.glade.h:194
msgid "Load iPod(s)"
msgstr "טען iPod(×™×)"
-#: ../data/gtkpod.glade.h:197
+#: ../data/gtkpod.glade.h:195
msgid "Lower Margin"
msgstr "×©×•×œ×™×™× ×ª×—×ª×•× ×™×"
-#: ../data/gtkpod.glade.h:198
+#: ../data/gtkpod.glade.h:196
msgid "M4A with :"
-msgstr ""
+msgstr "סוג M4A ×¢× :"
-#: ../data/gtkpod.glade.h:199
+#: ../data/gtkpod.glade.h:197
msgid "MP3 with :"
-msgstr ""
+msgstr "סוג MP3 ×¢× :"
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:198
msgid "Match al_l of the following"
msgstr "הת×× ×ת _כל הב××™×"
-#: ../data/gtkpod.glade.h:201
+#: ../data/gtkpod.glade.h:199
msgid "Match an_y of the following"
msgstr "הת×× _כל ×חד מן הב××™×"
-#: ../data/gtkpod.glade.h:202
+#: ../data/gtkpod.glade.h:200
msgid "Match only _checked tracks"
msgstr "הת×× ×¨×§ רצועות _×ž×¡×•×ž× ×•×ª"
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:201
msgid "Maximum number of background threads:"
-msgstr ""
+msgstr "המספר המירבי עבור ×”×ª×”×œ×™×›×™× ×‘×¨×§×¢:"
-#: ../data/gtkpod.glade.h:204
+#: ../data/gtkpod.glade.h:202
msgid "Maximum size of cache directory (in GB):"
-msgstr ""
+msgstr "הגודל המירבי עבור מטמון התיקיות (ב־GB):"
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:203
msgid "Model:"
msgstr "דג×:"
-#: ../data/gtkpod.glade.h:206 ../src/display_tracks.c:1993
+#: ../data/gtkpod.glade.h:204
+#: ../src/display_tracks.c:2100
msgid "Modified"
msgstr "×©×•× ×”"
-#: ../data/gtkpod.glade.h:207
+#: ../data/gtkpod.glade.h:205
msgid "Most Recently Played Tracks"
msgstr "הרצועות שהושמעו ×”×›×™ ל××—×¨×•× ×”"
-#: ../data/gtkpod.glade.h:208
+#: ../data/gtkpod.glade.h:206
+msgid "Move selected attributes to the displayed list"
+msgstr "העבר ×ת המ××¤×™×™× ×™× ×”× ×‘×—×¨×™× ×œ×¨×©×™×ž×” המוצגת"
+
+#: ../data/gtkpod.glade.h:207
msgid "Music Root:"
msgstr "שורש המוזיקה:"
-#: ../data/gtkpod.glade.h:209
-msgid ""
-"Music files can have images embedded in the APIC tag. Currently this is only "
-"supported for MP3 files."
-msgstr ""
-"קבצי מוסיקה ×™×›×•×œ×™× ×œ×”×›×™×œ ×ª×ž×•× ×•×ª בתוך תווית ×”Ö¾APIC. כרגע ×–×” רק × ×ª×ž×š על ידי "
-"קבצי MP3."
+#: ../data/gtkpod.glade.h:208
+msgid "Music files can have images embedded in the APIC tag. Currently this is only supported for MP3 files."
+msgstr "קבצי מוסיקה ×™×›×•×œ×™× ×œ×”×›×™×œ ×ª×ž×•× ×•×ª בתוך תווית ×”Ö¾APIC. כרגע ×–×” רק × ×ª×ž×š על ידי קבצי MP3."
-#: ../data/gtkpod.glade.h:210
+#: ../data/gtkpod.glade.h:209
msgid "Never show this dialogue again"
msgstr "×ל תר××” חלון דו-שיח ×–×” בעתיד"
-#: ../data/gtkpod.glade.h:211
-msgid "New PL"
-msgstr "ר\"ה חדשה"
+#: ../data/gtkpod.glade.h:210
+#: ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66
+#: ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93
+#: ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428
+#: ../src/misc_playlist.c:430
+msgid "New Playlist"
+msgstr "רשימת השמעה חדשה"
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:211
msgid "No lower margin"
msgstr "×œ×œ× ×©×•×œ×™×™× ×ª×—×ª×•× ×™×"
-#: ../data/gtkpod.glade.h:213
+#: ../data/gtkpod.glade.h:212
msgid "No upper margin"
msgstr "×œ×œ× ×©×•×œ×™×™× ×¢×œ×™×•× ×™×"
-#: ../data/gtkpod.glade.h:214
+#: ../data/gtkpod.glade.h:213
msgid "Non-transferred tracks"
msgstr "רצועות ×œ× ×ž×•×¢×‘×¨×•×ª"
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:214
msgid "None"
msgstr "לל×"
+#: ../data/gtkpod.glade.h:215
+msgid "Normally the charset specified when first importing the track will be used for the filename. If you set this option you can set a different charset with the charset selector (Preferences/'Adding/Updating/Syncing'). Note: the charset info is stored in the extended information file (see Preferences/'Writing of the iTunesDB'). Tracks imported before V0.51 will have no charset stored. Instead the charset specified will be used."
+msgstr "ב×ופן רגיל ערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª ×›×שר מייב××™× ×œ×¨××©×•× ×” ×ת הרצועות תהיה זו שיעשה בה שימוש לעדכן ×ת ×©× ×”×§×•×‘×¥. ×× ×¡×ž× ×ª ×פשרות זו תוכל לבחור ערכת ×ª×•×•×™× ×חרת בעזרת בוחר ערכת ×”×ª×•×•×™× (העדפות 'הוספה/עדכון/×¡× ×›×¨×•×Ÿ'). הערה: מידע ערכת ×”×ª×•×•×™× × ×©×ž×¨ במידע המורחב (ר××” העדפות כתיבה ל-iTunesDB). רצועות שיוב×ו ×œ×¤× ×™ גרסה 0.51 ×œ× ×ª×”×™×” ×œ×”× ×¢×¨×›×ª ×ª×•×•×™× ×©×ž×•×¨×”. ×‘×ž×§×•× ×–×ת ערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª למעלה תהיה זו ×©× ×©×ª×ž×© בה."
+
#: ../data/gtkpod.glade.h:216
-msgid ""
-"Normally the charset specified when first importing the track will be used "
-"for the filename. If you set this option you can set a different charset "
-"with the charset selector (Preferences/'Adding/Updating/Syncing'). Note: the "
-"charset info is stored in the extended information file (see "
-"Preferences/'Writing of the iTunesDB'). Tracks imported before V0.51 will "
-"have no charset stored. Instead the charset specified will be used."
-msgstr ""
-"ב×ופן רגיל ערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª ×›×שר מייב××™× ×œ×¨××©×•× ×” ×ת הרצועות תהיה זו שיעשה "
-"בה שימוש לעדכן ×ת ×©× ×”×§×•×‘×¥. ×× ×¡×ž× ×ª ×פשרות זו תוכל לבחור ערכת ×ª×•×•×™× ×חרת "
-"בעזרת בוחר ערכת ×”×ª×•×•×™× (העדפות 'הוספה/עדכון/×¡× ×›×¨×•×Ÿ'). הערה: מידע ערכת ×”×ª×•×•×™× "
-"× ×©×ž×¨ במידע המורחב (ר××” העדפות כתיבה ל-iTunesDB). רצועות שיוב×ו ×œ×¤× ×™ גרסה "
-"0.51 ×œ× ×ª×”×™×” ×œ×”× ×¢×¨×›×ª ×ª×•×•×™× ×©×ž×•×¨×”. ×‘×ž×§×•× ×–×ת ערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª למעלה תהיה "
-"זו ×©× ×©×ª×ž×© בה."
+msgid "Normally the charset specified when first importing the track will be used to update the track information. If you have chosen a wrong charset when first importing a track and want to correct it using the 'Update Track' function, you must check this option. Note: the charset info is stored in the extended information file (see 'Writing of iTunesDB' below) and tracks imported before V0.51 will have no charset stored. Instead the charset specified above will be used then."
+msgstr "ב×ופן רגיל ערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª ×›×שר מייב××™× ×œ×¨××©×•× ×” ×ת הרצועות תהיה זו שיעשה בה שימוש לעדכן ×ת מידע הרצועה. ×× ×‘×—×¨×ª ערכת ×ª×•×•×™× ×©×’×•×™×” ×›×שר ייב×ת לר××©×•× ×” ×ת הרצועה ×•×‘×¨×¦×•× ×š לתקן ×–×ת בעזרת 'עדכן רצועה', ×תה תהיה חייב לסמן ×ת ×”×פשרות ×”×–×ת. הערה: מידע ערכת ×”×ª×•×•×™× × ×©×ž×¨ במידע המורחב (ר××” : כתיבה ל-iTunesDB למטה) ורצועות שיוב×ו ×œ×¤× ×™ גרסה 0.51 ×œ× ×ª×”×™×” ×œ×”× ×¢×¨×›×ª ×ª×•×•×™× ×©×ž×•×¨×”. ×‘×ž×§×•× ×–×ת ערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª למעלה תהיה זו ×©× ×©×ª×ž×© בה ××–."
#: ../data/gtkpod.glade.h:217
-msgid ""
-"Normally the charset specified when first importing the track will be used "
-"to update the track information. If you have chosen a wrong charset when "
-"first importing a track and want to correct it using the 'Update Track' "
-"function, you must check this option. Note: the charset info is stored in "
-"the extended information file (see 'Writing of iTunesDB' below) and tracks "
-"imported before V0.51 will have no charset stored. Instead the charset "
-"specified above will be used then."
-msgstr ""
-"ב×ופן רגיל ערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª ×›×שר מייב××™× ×œ×¨××©×•× ×” ×ת הרצועות תהיה זו שיעשה "
-"בה שימוש לעדכן ×ת מידע הרצועה. ×× ×‘×—×¨×ª ערכת ×ª×•×•×™× ×©×’×•×™×” ×›×שר ייב×ת לר××©×•× ×” "
-"×ת הרצועה ×•×‘×¨×¦×•× ×š לתקן ×–×ת בעזרת 'עדכן רצועה', ×תה תהיה חייב לסמן ×ת ×”×פשרות "
-"×”×–×ת. הערה: מידע ערכת ×”×ª×•×•×™× × ×©×ž×¨ במידע המורחב (ר××” : כתיבה ל-iTunesDB למטה) "
-"ורצועות שיוב×ו ×œ×¤× ×™ גרסה 0.51 ×œ× ×ª×”×™×” ×œ×”× ×¢×¨×›×ª ×ª×•×•×™× ×©×ž×•×¨×”. ×‘×ž×§×•× ×–×ת ערכת "
-"×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª למעלה תהיה זו ×©× ×©×ª×ž×© בה ××–."
+msgid "Normally the charset specified when first importing the track will be used to write the tags. If you have chosen a wrong charset when first importing a track, you should select this option along with the correct charset. Note: uses the extended information file to store the charset information (see 'Writing of the iTunesDB' on the 'Input/Output' page) and tracks imported before V0.51 will have no charset stored -- the charset specified on the 'Input/Output' page will be used."
+msgstr "בדרך כלל יעשה שימוש בערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª בזמן ×™×™×‘×•× ×”×¨×¦×•×¢×” ×œ×©× ×›×ª×™×‘×ª התגיות. ×× ×‘×—×¨×ª ערכת ×ª×•×•×™× ×©×’×•×™×” בזמן ×™×™×‘×•× ×¨×¦×•×¢×”, ×תה יכול לבחור ×פשרות זו ביחד ×¢× ×¢×¨×›×ª ×”×ª×•×•×™× ×”× ×›×•× ×”. הערה: משתמש בקובץ המידע המורחב לשמור ×ת מידע ערכת ×”×ª×•×•×™× (ר××” 'כתיבת iTunesDB' בעמוד קלט/פלט) ורצועות שיוב×ו ×œ×¤× ×™ גרסה 0.51 ×œ× ×ª×”×™×™×” להן ערכה שמורה -- הערכה ×”×ž×¦×•×™× ×ª בעמוד קלט/פלט יעשה בה שימוש."
#: ../data/gtkpod.glade.h:218
msgid ""
-"Normally the charset specified when first importing the track will be used "
-"to write the tags. If you have chosen a wrong charset when first importing a "
-"track, you should select this option along with the correct charset. Note: "
-"uses the extended information file to store the charset information (see "
-"'Writing of the iTunesDB' on the 'Input/Output' page) and tracks imported "
-"before V0.51 will have no charset stored -- the charset specified on the "
-"'Input/Output' page will be used."
+"Normally, if a track is no longer present in the sync directory, it will be removed from the playlist, but not from the iPod or local repository.\n"
+"If this option is checked, tracks will be completely removed from the iPod or local repository, unless the track is a member of other playlists as well.\n"
+"NOTE: if you sync with the master playlist, you must check this option if you want tracks to be removed, because removing from the master playlist means removing from the iPod."
msgstr ""
-"בדרך כלל יעשה שימוש בערכת ×”×ª×•×•×™× ×”×ž×¦×•×™× ×ª בזמן ×™×™×‘×•× ×”×¨×¦×•×¢×” ×œ×©× ×›×ª×™×‘×ª התגיות. "
-"×× ×‘×—×¨×ª ערכת ×ª×•×•×™× ×©×’×•×™×” בזמן ×™×™×‘×•× ×¨×¦×•×¢×”, ×תה יכול לבחור ×פשרות זו ביחד ×¢× "
-"ערכת ×”×ª×•×•×™× ×”× ×›×•× ×”. הערה: משתמש בקובץ המידע המורחב לשמור ×ת מידע ערכת ×”×ª×•×•×™× "
-"(ר××” 'כתיבת iTunesDB' בעמוד קלט/פלט) ורצועות שיוב×ו ×œ×¤× ×™ גרסה 0.51 ×œ× ×ª×”×™×™×” "
-"להן ערכה שמורה -- הערכה ×”×ž×¦×•×™× ×ª בעמוד קלט/פלט יעשה בה שימוש."
+"בצורה × ×•×¨×ž×œ×™×ª, ×× ×¨×¦×•×¢×” כבר ×œ× ×§×™×™×ž×ª בתיקיית ×”×¡× ×›×¨×•×Ÿ, ×”×™× ×ª×•×¡×¨ מרשימת ×”× ×™×’×•×Ÿ, ×בל ×œ× ×ž×”Ö¾iPod ×ו המ×גר המקומי.\n"
+"×× ×פשרות זו ×ž×¡×•×ž× ×ª, הרצועות יוסרו לגמרי מה־iPod ×ו המ×גר המקומי, ××œ× ×× ×›×Ÿ הרצועה מופיעה ברשימת השמעה ×חרת ×‘× ×•×¡×£.\n"
+"הערה: ×× ×ª×¡× ×›×¨×Ÿ ×ת רשימת ההשמעה הר×שית, ×תה חייב לסמן ×ת ×פשרות זו ×× ×ª×¨×¦×” שהרצועות יוסרו, בגלל שהסרה מהרשימה הר×שית משמעותה הסרה מה־iPod."
-#: ../data/gtkpod.glade.h:219
-msgid ""
-"Normally, if a track is no longer present in the sync directory, it will be "
-"removed from the playlist, but not from the iPod or local repository.\n"
-"If this option is checked, tracks will be completely removed from the iPod "
-"or local repository, unless the track is a member of other playlists as "
-"well.\n"
-"NOTE: if you sync with the master playlist, you must check this option if "
-"you want tracks to be removed, because removing from the master playlist "
-"means removing from the iPod."
-msgstr ""
-
-#: ../data/gtkpod.glade.h:222
+#: ../data/gtkpod.glade.h:221
msgid "Notes sync command:"
msgstr "פקודת ×¡× ×›×¨×•×Ÿ לפתק×ות (notes):"
-#: ../data/gtkpod.glade.h:223
+#: ../data/gtkpod.glade.h:222
msgid "Number of playlists"
msgstr "מספר רשימות ההשמעה"
-#: ../data/gtkpod.glade.h:224
+#: ../data/gtkpod.glade.h:223
msgid "Number of tracks"
msgstr "מספר רצועות"
-#: ../data/gtkpod.glade.h:225
+#: ../data/gtkpod.glade.h:224
msgid "Number of tracks in generated playlists:"
msgstr "מספר הרצועות ברשימת השמעה:"
-#: ../data/gtkpod.glade.h:226
-msgid ""
-"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
-"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
-msgstr ""
-"מספר הרצועות ברשימות ההשמעה ×”× ×•×¦×¨×•×ª '×”×ž×•×©×ž×¢×™× ×‘×™×•×ª×¨', 'הדירוג ×”×›×™ גבוה' "
-"ו-'× ×•×’× ×• ×”×›×™ ל××—×¨×•× ×”'. בחר '0' עבור '×œ×œ× ×ž×’×‘×œ×”'."
+#: ../data/gtkpod.glade.h:225
+msgid "Number of tracks in the generated playlists 'Most Often Listened', 'Best Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
+msgstr "מספר הרצועות ברשימות ההשמעה ×”× ×•×¦×¨×•×ª '×”×ž×•×©×ž×¢×™× ×‘×™×•×ª×¨', 'הדירוג ×”×›×™ גבוה' ו-'× ×•×’× ×• ×”×›×™ ל××—×¨×•× ×”'. בחר '0' עבור '×œ×œ× ×ž×’×‘×œ×”'."
-#: ../data/gtkpod.glade.h:227
+#: ../data/gtkpod.glade.h:226
msgid "Ogg with :"
-msgstr ""
+msgstr "סוג Ogg ×¢× :"
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:227
msgid "On startup automatically sync with playlist directories"
msgstr "בתחילה ×”×ª×›× ×™×ª ×¡× ×›×¨×Ÿ ×וטומטית ×¢× ×ª×™×§×™×•×ª רשימות ההשמעה"
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:228
msgid "On startup automatically sync with the following directory"
msgstr "בתחילת ×”×ª×•×›× ×™×ª ×¡× ×›×¨×Ÿ ×וטומטית ×¢× ×”×ª×™×§×™×™×” הב××”"
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:229
msgid "On startup automatically update (Live Playlist)"
msgstr "בתחילת ×”×ª×•×›× ×™×ª עדכ ×וטומטית (רשימת השמעה ×—×™×”)"
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:230
msgid "One for each Album"
msgstr "×חת לכל כותר"
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:231
msgid "One for each Artist"
msgstr "×חת לכל ×מן"
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:232
msgid "One for each Composer"
msgstr "×חת לכל יוצר"
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:233
msgid "One for each Genre"
msgstr "×חת לכל ×¡×’× ×•×Ÿ"
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:234
msgid "One for each Rating"
msgstr "×חת לכל מדרוג"
-#: ../data/gtkpod.glade.h:236
+#: ../data/gtkpod.glade.h:235
msgid "One for each Year"
msgstr "×חת לכל ×©× ×”"
-#: ../data/gtkpod.glade.h:237
+#: ../data/gtkpod.glade.h:236
msgid "Overwrite tags that are already set"
msgstr "שכתב תגיות שכבר כתובות"
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:237
msgid "Password:"
-msgstr ""
+msgstr "סיסמה:"
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:238
msgid "Path:"
msgstr "× ×ª×™×‘:"
+#: ../data/gtkpod.glade.h:239
+msgid "Photo Window"
+msgstr "חלון ×ª×ž×•× ×•×ª"
+
#: ../data/gtkpod.glade.h:240
+#: ../src/display_spl.c:94
msgid "Play time"
msgstr "זמן השמעה"
-#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
+#: ../data/gtkpod.glade.h:241
+#: ../src/display_spl.c:98
#: ../src/misc_conversion.c:77
msgid "Playcount"
msgstr "מספור השמעות"
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:1990
+#: ../data/gtkpod.glade.h:242
+#: ../src/display_tracks.c:2097
msgid "Played"
msgstr "הושמע"
-#: ../data/gtkpod.glade.h:243 ../src/display_spl.c:105
-msgid "Playlist"
-msgstr "רשימת השמעה"
-
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:243
msgid "Playlist name:"
msgstr "×©× ×¨×©×™×ž×ª ההשמעה:"
-#: ../data/gtkpod.glade.h:245
+#: ../data/gtkpod.glade.h:244
msgid "Playlist type:"
msgstr "סוג רשימת ההשמעה:"
-#: ../data/gtkpod.glade.h:246 ../src/display_playlists.c:2176
+#: ../data/gtkpod.glade.h:245
+#: ../src/display_playlists.c:2258
msgid "Playlists"
msgstr "רשימות השמעה"
-#: ../data/gtkpod.glade.h:247
+#: ../data/gtkpod.glade.h:246
msgid "Please refer to the notice below."
msgstr "הסתכל בבקשה בהודעה למטה."
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:247
msgid "Please specify a time interval"
msgstr "×× × ×¦×™×™×Ÿ מרווח זמן"
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:248
msgid "Preferences"
msgstr "הגדרות"
-#: ../data/gtkpod.glade.h:250
-msgid ""
-"Press button to abort.\n"
-"Export can be continued at a later time."
-msgstr ""
-"לחץ על הכפתור לביטול.\n"
-"בכל עת × ×™×ª×Ÿ להמשיך ×ת היצו×."
-
-#: ../data/gtkpod.glade.h:252
-msgid "Previous"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:253
-#, fuzzy
+#: ../data/gtkpod.glade.h:249
msgid "Progress Information"
-msgstr "מידע"
+msgstr "מידע התקדמות"
-#: ../data/gtkpod.glade.h:254
+#: ../data/gtkpod.glade.h:250
+msgid "R_ename Album"
+msgstr "_×©× ×” ×©× ×œ×לבו×"
+
+#: ../data/gtkpod.glade.h:251
msgid "Random Playlist from Displayed Tracks"
msgstr "רשימת השמעה ×קר×ית מהרצועות ×”× ×¨×ות"
-#: ../data/gtkpod.glade.h:255
+#: ../data/gtkpod.glade.h:252
msgid "Randomize Current Playlist"
msgstr "יצירת רשימת השמעה ×קר×ית"
-#: ../data/gtkpod.glade.h:256 ../src/display_spl.c:101
+#: ../data/gtkpod.glade.h:253
+#: ../src/display_spl.c:101
#: ../src/misc_conversion.c:78
msgid "Rating"
msgstr "מדרוג"
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:254
msgid "Read coverart from embedded APIC data"
msgstr "×§×¨× ×ª×ž×•× ×ª עטיפה מתוך מידע ×”Ö¾APIC"
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:255
msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
msgstr "×§×¨× ×ª×’×™×•×ª מתוכן הקובץ (כלומר תגיות ID3 של קבצי MP3)"
-#: ../data/gtkpod.glade.h:259
-msgid "Remove Cover Art"
-msgstr "הסר עטיפה"
+#: ../data/gtkpod.glade.h:256
+msgid "Remove selected attributes from the displayed list"
+msgstr "הסר ×ת המ××¤×™×™× ×™× ×”× ×‘×—×¨×™× ×ž×”×¨×©×™×ž×” המוצגת"
-#: ../data/gtkpod.glade.h:260
+#: ../data/gtkpod.glade.h:257
msgid "Repository Options"
msgstr "×פשרויות מ×גר"
-#: ../data/gtkpod.glade.h:261
+#: ../data/gtkpod.glade.h:258
msgid "Repository name:"
msgstr "×©× ×”×ž×גר:"
-#: ../data/gtkpod.glade.h:262
+#: ../data/gtkpod.glade.h:259
msgid "Repository type:"
msgstr "סוג מ×גר:"
-#: ../data/gtkpod.glade.h:263
+#: ../data/gtkpod.glade.h:260
msgid "Root directory of mserv database (trackinfo root)."
msgstr "תיקיית שורש ×ו מסד × ×ª×•× ×™× mserv (השורש של trackinfo)."
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:261
msgid "Rules"
msgstr "חוקי×"
-#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:808
+#: ../data/gtkpod.glade.h:262
+#: ../src/context_menus.c:804
msgid "Save Changes"
msgstr "שמור ×©×™× ×•×™×™×"
-#: ../data/gtkpod.glade.h:266
-#, fuzzy
+#: ../data/gtkpod.glade.h:263
msgid "Scrobble Tracks?"
-msgstr "ר_צועות × ×‘×—×¨×•×ª"
+msgstr "שלח רצועות?"
-#: ../data/gtkpod.glade.h:267
+#: ../data/gtkpod.glade.h:264
msgid "Select '-1' for no upper limit."
msgstr "בחר '-1' עבור ביטול גבול עליון."
-#: ../data/gtkpod.glade.h:268
+#: ../data/gtkpod.glade.h:265
msgid "Select '0' for no lower limit."
msgstr "בחר '0' עבור ביטול גבול תחתון."
-#: ../data/gtkpod.glade.h:269
+#: ../data/gtkpod.glade.h:266
msgid ""
"Selected\n"
"Playlist"
@@ -1226,7 +1117,7 @@
"רשימות השמעה\n"
"× ×‘×—×¨×•×ª"
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:268
msgid ""
"Selected\n"
"Tracks"
@@ -1234,257 +1125,221 @@
"רצועות\n"
"× ×‘×—×¨×•×ª"
+#: ../data/gtkpod.glade.h:270
+msgid "Selected Filter Tab Entry from Database"
+msgstr "× ×‘×—×¨×” רשומת כרטיסיית ×ž×¡× ×Ÿ ממסד ×”× ×ª×•× ×™×"
+
+#: ../data/gtkpod.glade.h:271
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "× ×‘×—×¨×” רשומת כרטיסיית ×ž×¡× ×Ÿ מהדיסק הקשיח"
+
+#: ../data/gtkpod.glade.h:272
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "× ×‘×—×¨×” רשומת כרטיסיית ×ž×¡× ×Ÿ מרשימת ההשמעה"
+
#: ../data/gtkpod.glade.h:273
-msgid "Selected Tab _Entry"
-msgstr "רשומות _כרטיסיה × ×‘×—×¨×•×ª"
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "× ×‘×—×¨×” רשומת כרטיסיית ×ž×¡× ×Ÿ מה־iPod"
#: ../data/gtkpod.glade.h:274
-msgid "Selected _Playlist"
-msgstr "_רשימות השמעה × ×‘×—×¨×•×ª"
+msgid "Selected Playlist Including Tracks from Database"
+msgstr "× ×‘×—×¨×” רשימת השמעה כולל רצועות ממסד ×”× ×ª×•× ×™×"
#: ../data/gtkpod.glade.h:275
-msgid "Selected _Tracks"
-msgstr "ר_צועות × ×‘×—×¨×•×ª"
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "× ×‘×—×¨×” רשימת השמעה כולל רצועות מהדיסק הקשיח"
#: ../data/gtkpod.glade.h:276
-msgid "Selected filter tab entry from database"
-msgstr "× ×‘×—×¨×” רשומת כרטיסיית ×ž×¡× ×Ÿ ממסד ×”× ×ª×•× ×™×"
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "× ×‘×—×¨×” רשימת השמעה כולל רצועות מה־iPod"
#: ../data/gtkpod.glade.h:277
-msgid "Selected filter tab entry from harddisk"
-msgstr "× ×‘×—×¨×” רשומת כרטיסיית ×ž×¡× ×Ÿ מהדיסק הקשיח"
+msgid "Selected Tab _Entry"
+msgstr "רשומות _כרטיסיה × ×‘×—×¨×•×ª"
#: ../data/gtkpod.glade.h:278
-msgid "Selected filter tab entry from iPod"
-msgstr "× ×‘×—×¨×” רשומת כרטיסיית ×ž×¡× ×Ÿ מה־iPod"
+msgid "Selected Tracks from Database"
+msgstr "הרצועות ×”× ×‘×—×¨×•×ª ממסד ×”× ×ª×•× ×™×"
#: ../data/gtkpod.glade.h:279
-msgid "Selected filter tab entry from playlist"
-msgstr "× ×‘×—×¨×” רשומת כרטיסיית ×ž×¡× ×Ÿ מרשימת ההשמעה"
+msgid "Selected Tracks from Hard Disk"
+msgstr "הרצועות ×”× ×‘×—×¨×•×ª מהדיסק הקשיח"
#: ../data/gtkpod.glade.h:280
-msgid "Selected playlist"
-msgstr "רשימות השמעה × ×‘×—×¨×•×ª"
+msgid "Selected Tracks from Playlist"
+msgstr "הרצועות ×”× ×‘×—×¨×•×ª מרשימות ×”× ×™×’×•×Ÿ"
#: ../data/gtkpod.glade.h:281
-msgid "Selected playlist including tracks from database"
-msgstr "× ×‘×—×¨×” רשימת השמעה × ×‘×—×¨×ª כוללת רצועות ממסד ×”× ×ª×•× ×™×"
+msgid "Selected Tracks from iPod"
+msgstr "הרצועות ×”× ×‘×—×¨×•×ª מה־iPod"
#: ../data/gtkpod.glade.h:282
-msgid "Selected playlist including tracks from harddisk"
-msgstr "× ×‘×—×¨×” רשימת השמעה × ×‘×—×¨×ª כוללת רצועות מהדיסק הקשיח"
+msgid "Selected _Playlist"
+msgstr "_רשימות השמעה × ×‘×—×¨×•×ª"
#: ../data/gtkpod.glade.h:283
-msgid "Selected playlist including tracks from iPod"
-msgstr "× ×‘×—×¨×” רשימת השמעה × ×‘×—×¨×ª כוללת רצועות מה־iPod"
+msgid "Selected _Tracks"
+msgstr "ר_צועות × ×‘×—×¨×•×ª"
#: ../data/gtkpod.glade.h:284
-msgid "Selected tracks from database"
-msgstr "הרצועות ×”× ×‘×—×¨×•×ª ממסד ×”× ×ª×•× ×™×"
+msgid "Selected playlist"
+msgstr "רשימות השמעה × ×‘×—×¨×•×ª"
#: ../data/gtkpod.glade.h:285
-msgid "Selected tracks from harddisk"
-msgstr "הרצועות ×”× ×‘×—×¨×•×ª מהדיסק הקשיח"
+msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
+msgstr "רשימת מופרדת × ×§×•×“×”Ö¾×¤×¡×™×§ של מסכות שלילה, לדוגמה: \"*.mp3"
#: ../data/gtkpod.glade.h:286
-msgid "Selected tracks from iPod"
-msgstr "הרצועות ×”× ×‘×—×¨×•×ª מה־iPod"
+msgid "Set Cover Art from _File"
+msgstr "קבע עטיפה מתוך _קובץ"
#: ../data/gtkpod.glade.h:287
-msgid "Selected tracks from playlist"
-msgstr "הרצועות ×”× ×‘×—×¨×•×ª מרשימות ההשמעה"
+msgid "Set mountpoint or edit repository options"
+msgstr "קבע × ×§×•×“×•×ª ×¢×’×™× ×” ×ו ערוך ×פשרויות מ×גר"
#: ../data/gtkpod.glade.h:288
-#, fuzzy
-msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
-msgstr "רשימת מופרדת ×¤×¡×™×§×™× ×©×œ מסכות שלילה, לדוגמה: \"*.mp3"
+msgid "Set options for Calendar/Contacts/Notes"
+msgstr "קבע ×פשרויות עבור יומן/×× ×©×™ קשר/תזכורות"
#: ../data/gtkpod.glade.h:289
-#, fuzzy
-msgid "Set Cover Art from File"
-msgstr "קבע עטיפה"
+msgid "Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in the Tools Menu. If this is set, missing normalization data for .m4a and .m4b files will be calculated and written to your music file using this command."
+msgstr "קבע ×ת ×–×” ל־'aacgain -q -k' על ×ž× ×ª להשתמש ב'× ×¨×ž×•×œ עוצת קול' בתפריט הכלי×. ×× ×–×” סומן, מידע × ×¨×ž×•×œ מקבצי m4a ו m4b יחושב ויכתב לקבצי המוזיקה שלך תוך שימוש בפקודה ×”×–×ת."
#: ../data/gtkpod.glade.h:290
-#, fuzzy
-msgid "Set Cover Art from Web"
-msgstr "קבע עטיפה"
+msgid "Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in the Tools Menu. If this is set, missing normalization data for mp3 files will be calculated and written to your mp3 file using this command."
+msgstr "קבע ×ת ×–×” ל־'mp3gain -q -k' על ×ž× ×ª להשתמש ב'× ×¨×ž×•×œ עוצת קול' בתפריט הכלי×. ×× ×–×” סומן, מידע × ×¨×ž×•×œ מקבצי mp3 יחושב ויכתב לקבצי המוזיקה שלך תוך שימוש בפקודה ×”×–×ת."
#: ../data/gtkpod.glade.h:291
-msgid "Set mountpoint or edit repository options"
-msgstr "קבע × ×§×•×“×•×ª ×¢×’×™× ×” ×ו ערוך ×פשרויות מ×גר"
+msgid "Set this to your last.fm password"
+msgstr "×”×›× ×¡ ×›×ן ×ת הסיסמה שלך עבור last.fm"
#: ../data/gtkpod.glade.h:292
-msgid "Set options for Calendar/Contacts/Notes"
-msgstr "קבע ×פשרויות עבור יומן/×× ×©×™ קשר/תזכורות"
+msgid "Set this to your last.fm username"
+msgstr "×”×›× ×¡ ×›×ן ×ת ×©× ×”×ž×©×ª×ž×© שלך עבור last.fm"
#: ../data/gtkpod.glade.h:293
-msgid ""
-"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
-"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
-"files will be calculated and written to your music file using this command."
-msgstr ""
+msgid "Set to 0 to effectively disable caching (a maximum of one track will be cached at a time)."
+msgstr "קבע ל־0 על ×ž× ×ª לבטל שימוש במטמון (×ž×§×¡×™×ž×•× ×©×œ רצועה ×חת תהיה במטמון ביחידת זמן ×חת)."
#: ../data/gtkpod.glade.h:294
-msgid ""
-"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
-"the Tools Menu. If this is set, missing normalization data for mp3 files "
-"will be calculated and written to your mp3 file using this command."
-msgstr ""
+msgid "Set to 0 to use as many background threads as CPUs are available on your system."
+msgstr "קבע ל־0 על ×ž× ×ª להשתמש בכמה שיותר ×ª×”×œ×™×›×™× ×‘×¨×§×¢ ×©×§×™×™×ž×™× ×¢×‘×•×¨ המעבד על המחשב שלך."
#: ../data/gtkpod.glade.h:295
-msgid "Set this to your last.fm password"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:296
-msgid "Set this to your last.fm username"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:297
-msgid ""
-"Set to 0 to effectively disable caching (a maximum of one track will be "
-"cached at a time)."
-msgstr ""
-
-#: ../data/gtkpod.glade.h:298
-msgid ""
-"Set to 0 to use as many background threads as CPUs are available on your "
-"system."
-msgstr ""
-
-#: ../data/gtkpod.glade.h:299
msgid "Show information about problems when accessing mserv"
msgstr "הצג מידע על בעיות בגישה ל-mserv"
-#: ../data/gtkpod.glade.h:300
+#: ../data/gtkpod.glade.h:296
msgid "Show summary of sync result"
msgstr "הצג ×¡×™×›×•× ×©×œ תוצ×ות ×¡×™× ×›×¨×•×Ÿ"
-#: ../data/gtkpod.glade.h:301 ../src/misc_playlist.c:96
+#: ../data/gtkpod.glade.h:297
+#: ../src/misc_playlist.c:96
#: ../src/repository.c:1356
msgid "Smart Playlist"
msgstr "רשימת השמעה חכמה"
-#: ../data/gtkpod.glade.h:302
+#: ../data/gtkpod.glade.h:298
msgid "Sort tracks according to: "
msgstr "מיין רצועות לפי:"
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:299
msgid "Sorting Options"
msgstr "×פשרויות מיון"
-#: ../data/gtkpod.glade.h:304
+#: ../data/gtkpod.glade.h:300
msgid "Sorting case sensitive"
msgstr "מיון ×¢× ×ª×œ×•×ª בגודל (case)"
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:301
msgid "Sorttab: "
msgstr "כרטיסייה מיון:"
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:302
msgid "Sorttabs"
msgstr "כרטיסיות מיון"
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:303
msgid "Source:"
msgstr "מקור:"
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:305
#, no-c-format
-msgid ""
-"Specify exact path including command line options. '%i' will be replaced "
-"with the mount point of the iPod."
-msgstr ""
-"מציין × ×ª×™×‘ ×ž×œ× ×›×•×œ×œ ×פשרויות שורת פקודה. המחרוזת '%i' תוחלף ×¢× × ×§×•×“×ª ×”×¢×’×™× ×” "
-"של ה-iPod."
+msgid "Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod."
+msgstr "מציין × ×ª×™×‘ ×ž×œ× ×›×•×œ×œ ×פשרויות שורת פקודה. המחרוזת '%i' תוחלף ×¢× × ×§×•×“×ª ×”×¢×’×™× ×” של ×”-iPod."
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:306
msgid "Specify interval"
msgstr "ציין מרווח"
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:307
msgid "Start display automatically"
msgstr "התחל תצוגה ×וטומטית"
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:308
msgid "Synchronise Contacts, Calendar and Notes"
msgstr "×¡× ×›×¨×Ÿ ×× ×©×™ קשר, יומן ופתקי×"
-#: ../data/gtkpod.glade.h:313
+#: ../data/gtkpod.glade.h:309
msgid "Synchronize All"
msgstr "×¡× ×›×¨×Ÿ הכל"
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:310
msgid "Synchronize Calendar"
msgstr "×¡× ×›×¨×Ÿ יומן"
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:311
msgid "Synchronize Contacts"
msgstr "×¡× ×›×¨×Ÿ ×× ×©×™ קשר"
-#: ../data/gtkpod.glade.h:316
+#: ../data/gtkpod.glade.h:312
msgid "Synchronize Notes"
msgstr "×¡× ×›×¨×Ÿ פתקי×"
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:313
msgid "Template for info field: "
msgstr "×ª×‘× ×™×ª עבור שדה המידע:"
-#: ../data/gtkpod.glade.h:318
-msgid ""
-"The local copy of the track is referenced in the playlist. If the track is "
-"not available locally, an error message is displayed."
-msgstr ""
-"העותק המקומי של הרצועה יקושר מרשימת ההשמעה. ×× ×”×¨×¦×•×¢×” ×œ× ×–×ž×™× ×” מקומית, תוצג "
-"הודעת שגי××”."
+#: ../data/gtkpod.glade.h:314
+msgid "The local copy of the track is referenced in the playlist. If the track is not available locally, an error message is displayed."
+msgstr "העותק המקומי של הרצועה יקושר מרשימת ההשמעה. ×× ×”×¨×¦×•×¢×” ×œ× ×–×ž×™× ×” מקומית, תוצג הודעת שגי××”."
-#: ../data/gtkpod.glade.h:319
-msgid ""
-"The output of the background conversion scripts is copied below. Each page "
-"of the notebook corresponds to one background thread."
-msgstr ""
+#: ../data/gtkpod.glade.h:315
+msgid "The output of the background conversion scripts is copied below. Each page of the notebook corresponds to one background thread."
+msgstr "תוצר הפלט של תסריט ההמרה ברקע יועתק למטה. כל דף של המחברת תו×× ×œ×ª×”×œ×™×š רקע ×חד."
-#: ../data/gtkpod.glade.h:320
-#, fuzzy
-msgid ""
-"The tags are written to the files on your harddrive and on the iPod (if "
-"available)."
+#: ../data/gtkpod.glade.h:316
+msgid "The tags are written to the files on your harddrive and on the iPod (if available)."
msgstr "התגיות × ×›×ª×‘×•×ª ×œ×§×‘×¦×™× ×¢×œ הדיסק הקשיח ועל ×”-iPod (×× ×–×ž×™×Ÿ)."
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:317
msgid "The track on the iPod is referenced in the playlist file."
msgstr "הרצועה על ה-iPod מקושרת בקובץ רשימת ההשמעה."
-#: ../data/gtkpod.glade.h:322
+#: ../data/gtkpod.glade.h:318
msgid "This is the same option as in 'Edit/Delete Confirmation'"
msgstr "זוהי ×ופציה ×–×”×” לזו שב- 'עריכה/×•×•×™×“×•× ×ž×—×™×§×”'"
-#: ../data/gtkpod.glade.h:323
-msgid ""
-"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
-"uses unicode to store the tags, so you won't have to worry about charsets "
-"any more. gtkpod will use UTF8 encoding as this will not increase the size "
-"of pure ASCII tags. ID3v2.2/4 tags will also be written if they are already "
-"present in the file to write to."
-msgstr ""
-"זוהי הדרך ×”× ×›×•× ×”, ×ך ×ולי ×œ× ×›×œ ×”×ª×›× ×™×•×ª תומכות בזה עדיין. ×”×¡×™×ž× ×™×™×” ID3v2.4 "
-"משתמשת ב־unicode לשמור על התגיות, על ×ž× ×ª ×©×œ× × ×¦×˜×¨×š לד×וג לגבי ערכות תווי×. "
-"gtkpod ישתמש ב־UTF8 ×›×™ ×–×” ×œ× ×™×’×“×™×œ ×ת הגודל של תגיות ASCII טהורות. תגיות "
-"ID3V2.2/4 יכתבו ×’× ×× ×”×Ÿ כבר קיימות בקובץ ×©×›×•×ª×‘×™× ×¢×œ×™×•."
+#: ../data/gtkpod.glade.h:319
+msgid "This is the way to go, but maybe not all programs support it yet. ID3v2.4 uses unicode to store the tags, so you won't have to worry about charsets any more. gtkpod will use UTF8 encoding as this will not increase the size of pure ASCII tags. ID3v2.2/4 tags will also be written if they are already present in the file to write to."
+msgstr "זוהי הדרך ×”× ×›×•× ×”, ×ך ×ולי ×œ× ×›×œ ×”×ª×›× ×™×•×ª תומכות בזה עדיין. ×”×¡×™×ž× ×™×™×” ID3v2.4 משתמשת ב־unicode לשמור על התגיות, על ×ž× ×ª ×©×œ× × ×¦×˜×¨×š לד×וג לגבי ערכות תווי×. gtkpod ישתמש ב־UTF8 ×›×™ ×–×” ×œ× ×™×’×“×™×œ ×ת הגודל של תגיות ASCII טהורות. תגיות ID3V2.2/4 יכתבו ×’× ×× ×”×Ÿ כבר קיימות בקובץ ×©×›×•×ª×‘×™× ×¢×œ×™×•."
-#: ../data/gtkpod.glade.h:324
+#: ../data/gtkpod.glade.h:320
msgid "This option will be re-activated when you upgrade gtkpod."
msgstr "×”×פשרות ×”×–×ת תופעל מחדש בזמן שדרוג gtkpod."
-#: ../data/gtkpod.glade.h:325
+#: ../data/gtkpod.glade.h:321
msgid "Time:"
msgstr "זמן:"
-#: ../data/gtkpod.glade.h:326 ../src/display_sorttabs.c:2963
-#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
+#: ../data/gtkpod.glade.h:322
+#: ../src/display_sorttabs.c:2991
+#: ../src/display_spl.c:83
+#: ../src/misc_conversion.c:62
msgid "Title"
msgstr "×©× ×”×¨×¦×•×¢×”"
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:323
msgid ""
"Total\n"
"(iPod)"
@@ -1492,7 +1347,7 @@
"סך הכל\n"
"(iPod)"
-#: ../data/gtkpod.glade.h:329
+#: ../data/gtkpod.glade.h:325
msgid ""
"Total\n"
"(local)"
@@ -1500,92 +1355,87 @@
"סך הכל\n"
"(מקומי)"
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:327
msgid "Tracks"
msgstr "רצועות"
-#: ../data/gtkpod.glade.h:332
+#: ../data/gtkpod.glade.h:328
msgid "Tracks Most Often Listened To"
msgstr "הרצועות שהכי מ××–×™× ×™× ×œ×”×Ÿ"
-#: ../data/gtkpod.glade.h:333
-msgid ""
-"Tracks can be transferred in the background as soon as they are added to an "
-"iPod repository. Otherwise they will be transferred when ejecting the "
-"contents of the iPod completely unchanged until then."
-msgstr ""
+#: ../data/gtkpod.glade.h:329
+msgid "Tracks can be transferred in the background as soon as they are added to an iPod repository. Otherwise they will be transferred when ejecting the contents of the iPod completely unchanged until then."
+msgstr "רצועות יכולות להיות מועברות ברקע ברגע ×©×”× ×ž×•×¡×¤×•×ª למ×גר ×”Ö¾iPod. ×חרת הן יועברו בזמן ×”× ×™×ª×•×§ של ×”Ö¾iPod, ויש×רו ×œ×œ× ×©×™× ×•×™ עד ××–."
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:330
msgid "Tracks in Selected Tab _Entry"
msgstr "רצועות ב_רשומות כרטיסיות × ×‘×—×¨×•×ª"
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:331
msgid "Tracks in Selected _Playlist"
msgstr "רצועות ב_רשימות השמעה × ×‘×—×¨×•×ª"
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:332
msgid "Transfer tracks to the iPod in the background"
-msgstr ""
+msgstr "העבר רצועות ×ל ×”Ö¾iPod ברקע"
-#: ../data/gtkpod.glade.h:337
+#: ../data/gtkpod.glade.h:333
msgid "Translators"
msgstr "מתרגמי×"
-#: ../data/gtkpod.glade.h:338
-msgid ""
-"Try to load contents of all connected iPods. For each iPod a separate "
-"repository must be set up."
-msgstr ""
-"×ž× ×¡×” לטעון תוכן של כל ×”Ö¾iPod-×™× ×”×ž×—×•×‘×¨×™×. עבור כל iPod חייב להיות ×ž×•×§× ×ž×גר "
-"× ×¤×¨×“."
+#: ../data/gtkpod.glade.h:334
+msgid "Try to load contents of all connected iPods. For each iPod a separate repository must be set up."
+msgstr "×ž× ×¡×” לטעון תוכן של כל ×”Ö¾iPod-×™× ×”×ž×—×•×‘×¨×™×. עבור כל iPod חייב להיות ×ž×•×§× ×ž×גר × ×¤×¨×“."
-#: ../data/gtkpod.glade.h:339
+#: ../data/gtkpod.glade.h:335
+msgid "Undo _Track"
+msgstr "בטל _רצועה"
+
+#: ../data/gtkpod.glade.h:336
msgid "Update _mserv Data from File"
msgstr "עדכון _× ×ª×•× ×™ mserv מקובץ"
-#: ../data/gtkpod.glade.h:340
+#: ../data/gtkpod.glade.h:337
msgid "Update/Sync all playlists now"
msgstr "עדכן/×¡× ×›×¨×Ÿ ×ת כל רשימות ההשמעה עכשיו"
-#: ../data/gtkpod.glade.h:341
+#: ../data/gtkpod.glade.h:338
msgid "Update/Sync playlist now"
msgstr "עדכן/×¡× ×›×¨×Ÿ ×ת רשימת ×”× ×™×’×•×Ÿ עכשיו"
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:339
msgid "Upper margin"
msgstr "×©×•×œ×™×™× ×¢×œ×™×•× ×™×"
-#: ../data/gtkpod.glade.h:343
+#: ../data/gtkpod.glade.h:340
msgid "Use 'Multi-Edit' also for title field"
msgstr "השתמש ב-'עריכה מרובה' ×’× ×¢×‘×•×¨ שדה ×©× ×”×¨×¦×•×¢×”"
-#: ../data/gtkpod.glade.h:344
+#: ../data/gtkpod.glade.h:341
msgid "Use 'Multi-Edit' for tracks selections"
msgstr "השתמש ב-'עריכה מרובה' עבור בחירת רצועות"
-#: ../data/gtkpod.glade.h:345
-#, fuzzy
-msgid "Use <i><Album>.jpg</i> in the parent directory"
-msgstr "השתמש ב־ <i><Album>.jpg</i> בתור תיקייה ×ב"
+#: ../data/gtkpod.glade.h:342
+msgid "Use <i><Album>.jpg</i> in the parent directory"
+msgstr "השתמש ב־ <i><Album>.jpg</i> בתוך תיקיית ×”×ב"
-#: ../data/gtkpod.glade.h:346
-#, fuzzy
-msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
-msgstr "השתמש ב־ <i><Album>.jpg</i>, <i><Album>.png</i>..."
+#: ../data/gtkpod.glade.h:343
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+msgstr "רשימת מופרדת × ×§×•×“×”Ö¾×¤×¡×™×§ של מסכות שלילה, לדוגמה: \"*.mp3"
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:344
msgid "Use <i>folder.jpg</i> as cover art."
msgstr "השתמש ב <i>folder.jpg</i> בתור עטיפה."
-#: ../data/gtkpod.glade.h:348
+#: ../data/gtkpod.glade.h:345
msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
msgstr "השתמש ב־ <i>folder.jpg</i>, <i>folder.png</i>..."
-#: ../data/gtkpod.glade.h:349
+#: ../data/gtkpod.glade.h:346
msgid "Use mserv database to fill additional information"
msgstr "השתמש במסד × ×ª×•× ×™× ×©×œ mserv על ×ž× ×ª ×œ×ž×œ× ×ž×™×“×¢ × ×•×¡×£"
-#: ../data/gtkpod.glade.h:350
+#: ../data/gtkpod.glade.h:347
msgid ""
"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
"for this filename."
@@ -1593,7 +1443,7 @@
"השתמש בערכת ×”×ª×•×•×™× ×”× ×‘×—×¨×ª (×פשרויות/'הוספה/עדכון/×¡× ×›×¨×•×Ÿ')\n"
"עבור הקובץ הזה."
-#: ../data/gtkpod.glade.h:352
+#: ../data/gtkpod.glade.h:349
msgid ""
"Use selected encoding (on the 'General' page)\n"
"when writing tags"
@@ -1601,37 +1451,35 @@
"השתמש בערכת ×ª×•×•×™× ×”× ×‘×—×¨×ª (בעמוד 'כללי')\n"
"בזמן כתיבת התגיות"
-#: ../data/gtkpod.glade.h:354
-#, fuzzy
+#: ../data/gtkpod.glade.h:351
msgid "Use selected encoding also when updating or syncing tracks"
msgstr "השתמש בערכת ×ª×•×•×™× × ×‘×—×¨×ª ×’× ×‘×–×ž×Ÿ עדכון ×ו ×¡× ×›×¨×•×Ÿ רצועות"
-#: ../data/gtkpod.glade.h:355
+#: ../data/gtkpod.glade.h:352
msgid "Use this template to parse filename for tag information:"
msgstr "השתמש ×‘×ª×‘× ×™×ª ×”×–×ת על ×ž× ×ª ×œ× ×ª×— ×ת הקובץ למידע תגית:"
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:353
msgid "Username to be used for mserv database lookup."
msgstr "×©× ×ž×©×ª×ž×© ×”× ×•×¢×“ לשימוש במסד ×”× ×ª×•× ×™× ×©×œ mserv."
-#: ../data/gtkpod.glade.h:357
+#: ../data/gtkpod.glade.h:354
msgid "Username:"
msgstr "×©× ×ž×©×ª×ž×©:"
-#: ../data/gtkpod.glade.h:358
-msgid ""
-"Usually you don't want to set the title of several tracks to the same text. "
-"This option might avoid unwanted results (especially since there is no "
-"'undo' yet)."
-msgstr ""
-"בדרך כלל ×תה ×œ× ×ª×¨×¦×” לקבוע ×ת ×©× ×”×¨×¦×•×¢×” של מספר רצועות ל×ותו טקסט. ×פשרות "
-"×–×ת עלולה ×œ×ž× ×•×¢ תוצ×ות ×œ× ×¨×¦×•×™×•×ª (במיוחד ש×ין עדיין ×פשרות 'בטל')"
+#: ../data/gtkpod.glade.h:355
+msgid "Usually you don't want to set the title of several tracks to the same text. This option might avoid unwanted results (especially since there is no 'undo' yet)."
+msgstr "בדרך כלל ×תה ×œ× ×ª×¨×¦×” לקבוע ×ת ×©× ×”×¨×¦×•×¢×” של מספר רצועות ל×ותו טקסט. ×פשרות ×–×ת עלולה ×œ×ž× ×•×¢ תוצ×ות ×œ× ×¨×¦×•×™×•×ª (במיוחד ש×ין עדיין ×פשרות 'בטל')"
-#: ../data/gtkpod.glade.h:359
+#: ../data/gtkpod.glade.h:356
+msgid "View Full Size"
+msgstr "הצג בגודל מל×"
+
+#: ../data/gtkpod.glade.h:357
msgid "WAV with :"
-msgstr ""
+msgstr "סוג WAV ×¢× :"
-#: ../data/gtkpod.glade.h:360
+#: ../data/gtkpod.glade.h:358
msgid ""
"When adding dirs/files, update information of\n"
"existing tracks with identical filenames"
@@ -1639,117 +1487,108 @@
"בזמן הוספת תיקיות/קבצי×, עדכן ×ת המידע על\n"
"רצועות קיימות ×¢× ×©×ž×•×ª ×§×‘×¦×™× ×–×”×™×"
-#: ../data/gtkpod.glade.h:362
-msgid ""
-"When copying from iPod no check is performed on whether the destination file "
-"exists. Enabling this option will make gtkpod check whether the length of "
-"the destination file is the same as the file in the iPod. If so the file is "
-"skipped, allowing a quick sync of the iPod's contents."
-msgstr ""
-"בזמן ההעתקה מה-iPod ×œ× ×ž×ª×‘×¦×¢×ª בדיקה ×”×× ×§×•×‘×¥ היעד קיי×. ×פשר ×פשרות זו "
-"×•×”×ª×›× ×™×ª תבדוק ×”×× ×’×•×“×œ×• של קובץ היעד ×”×•× ×–×”×” לקובץ שעל ×”-iPod. ×× ×›×Ÿ × ×“×œ×’ על "
-"הקובץ, ובכך × ×פשר ×¡× ×›×¨×•×Ÿ מהיר של תוכן ×”-iPod."
+#: ../data/gtkpod.glade.h:360
+msgid "When copying from iPod no check is performed on whether the destination file exists. Enabling this option will make gtkpod check whether the length of the destination file is the same as the file in the iPod. If so the file is skipped, allowing a quick sync of the iPod's contents."
+msgstr "בזמן ההעתקה מה-iPod ×œ× ×ž×ª×‘×¦×¢×ª בדיקה ×”×× ×§×•×‘×¥ היעד קיי×. ×פשר ×פשרות זו ×•×”×ª×›× ×™×ª תבדוק ×”×× ×’×•×“×œ×• של קובץ היעד ×”×•× ×–×”×” לקובץ שעל ×”-iPod. ×× ×›×Ÿ × ×“×œ×’ על הקובץ, ובכך × ×פשר ×¡× ×›×¨×•×Ÿ מהיר של תוכן ×”-iPod."
-#: ../data/gtkpod.glade.h:363
+#: ../data/gtkpod.glade.h:361
msgid "When syncing playlists"
msgstr "בזמן ×¡× ×›×¨×•×Ÿ רשימות השמעה"
-#: ../data/gtkpod.glade.h:364
-msgid ""
-"Will show a list of tracks removed and a list of tracks newly added or "
-"updated."
-msgstr ""
-"יר××” רשימה של רצועות שהוסרו ורשימות של רצועות שהוספו ×ו ×¢×•×“×›× ×• ל××—×¨×•× ×”."
+#: ../data/gtkpod.glade.h:362
+msgid "Will show a list of tracks removed and a list of tracks newly added or updated."
+msgstr "יר××” רשימה של רצועות שהוסרו ורשימות של רצועות שהוספו ×ו ×¢×•×“×›× ×• ל××—×¨×•× ×”."
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:363
msgid "Write ID3 tags to disk when modified in gtkpod"
msgstr "כתוב תגיות ID3 לדיסק ×›×שר הן ×ž×©×ª× ×•×ª ב-gtkpod"
-#: ../data/gtkpod.glade.h:366
+#: ../data/gtkpod.glade.h:364
msgid "Write all changes made to the disk and the iPod(s)."
msgstr "שמור ×ת כל ×”×©×™× ×•×™×™× ×©× ×¢×©×• ×ל הדיסק ו×ל ×”Ö¾iPod-×™×."
-#: ../data/gtkpod.glade.h:367
-#, fuzzy
+#: ../data/gtkpod.glade.h:365
msgid ""
"Write extended information (PC filenames, SHA1 hashes,\n"
"encoding...). Recommended."
-msgstr ""
-"כתוב מידע מורחב (שמות ×§×‘×¦×™× ×‘-PC,\n"
-" ערבובי MD5, ערכות תווי×). מומלץ."
+msgstr "השתמש ב־ <i><Album>.jpg</i> בתוך תיקיית ×”×ב"
+#: ../data/gtkpod.glade.h:367
+msgid "You can also use the table headers, but this allows you to sort according to a column that is not displayed."
+msgstr "×תה ×’× ×™×›×•×œ להשתמש בכותרות הטבל×ות, ×בל ×–×” ×™×פשר לך למיין רק לפי העמודה המוצגת."
+
+#: ../data/gtkpod.glade.h:368
+msgid "_About gtkpod"
+msgstr "_×ודות gtkpod"
+
#: ../data/gtkpod.glade.h:369
-msgid ""
-"You can also use the table headers, but this allows you to sort according to "
-"a column that is not displayed."
-msgstr ""
-"×תה ×’× ×™×›×•×œ להשתמש בכותרות הטבל×ות, ×בל ×–×” ×™×פשר לך למיין רק לפי העמודה "
-"המוצגת."
+msgid "_Add Album"
+msgstr "_הוסף כותר"
#: ../data/gtkpod.glade.h:370
-msgid "_About"
-msgstr "_×ודות"
+msgid "_Add Image"
+msgstr "_הוסף ×ª×ž×•× ×”"
#: ../data/gtkpod.glade.h:371
+msgid "_Album"
+msgstr "_כותר"
+
+#: ../data/gtkpod.glade.h:372
msgid "_All Tracks"
msgstr "_כל הרצועות"
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:373
msgid "_Arrange Sort Tabs"
msgstr "_סדר כרטיסיות מיון"
-#: ../data/gtkpod.glade.h:373
+#: ../data/gtkpod.glade.h:374
msgid "_Check iPod's Files"
msgstr "_בדיקת קבצי iPod"
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:375
msgid "_Conversion Log"
-msgstr ""
+msgstr "_יומן המרות"
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:376
msgid "_Create Playlists"
msgstr "_יצירת רשימות השמעה"
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:377
msgid "_Create iPod's Directories"
msgstr "_יצירת תיקיות iPod"
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:378
msgid "_Delete"
msgstr "_מחק"
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:379
msgid "_Display"
msgstr "_תצוגה"
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:380
msgid "_Displayed Tracks"
msgstr "_הר××” רצועות"
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:381
msgid "_Edit"
msgstr "_עריכה"
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:382
msgid "_Encoding (ID3, files):"
msgstr "_ערכת ×ª×•×•×™× (ID3, קבצי×):"
-#: ../data/gtkpod.glade.h:382
+#: ../data/gtkpod.glade.h:383
msgid "_Enqueue"
msgstr "_×”×›× ×¡ לתור"
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:384
msgid "_Export Tracks from Database"
msgstr "_×™×™×¦× ×¨×¦×•×¢×•×ª ממסד ×”× ×ª×•× ×™×"
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:385
msgid "_File"
msgstr "_קובץ"
-#: ../data/gtkpod.glade.h:385
-msgid "_Find New"
-msgstr ""
-
#: ../data/gtkpod.glade.h:386
msgid "_General"
msgstr "_כללי"
@@ -1763,177 +1602,176 @@
msgstr "_×”×ª×¢×œ× ×ž×—×•×§×™×"
#: ../data/gtkpod.glade.h:389
+msgid "_Image"
+msgstr "_×ª×ž×•× ×”"
+
+#: ../data/gtkpod.glade.h:390
msgid "_Info Window"
msgstr "_חלון מידע"
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:391
msgid "_Last.FM"
-msgstr ""
+msgstr "_Last.FM"
-#: ../data/gtkpod.glade.h:391
+#: ../data/gtkpod.glade.h:392
msgid "_Less Sort Tabs"
msgstr "_פחות כרטיסיות מיון"
-#: ../data/gtkpod.glade.h:392
+#: ../data/gtkpod.glade.h:393
msgid "_Limit to"
msgstr "_הגבל ל"
-#: ../data/gtkpod.glade.h:393
+#: ../data/gtkpod.glade.h:394
msgid "_Load iPod(s)"
msgstr "_טען iPod"
-#: ../data/gtkpod.glade.h:394
+#: ../data/gtkpod.glade.h:395
msgid "_Local"
msgstr "_מקומי"
-#: ../data/gtkpod.glade.h:395
+#: ../data/gtkpod.glade.h:396
msgid "_M3U"
msgstr "_M3U"
-#: ../data/gtkpod.glade.h:396
+#: ../data/gtkpod.glade.h:397
+msgid "_Misc."
+msgstr "_×חר"
+
+#: ../data/gtkpod.glade.h:398
msgid "_More Sort Tabs"
msgstr "_יותר כרטיסיות מיון"
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:399
msgid "_Newly Added Tracks"
msgstr "_רצועות חדשות שהוספו"
-#: ../data/gtkpod.glade.h:398
+#: ../data/gtkpod.glade.h:400
msgid "_Normalize Volume"
msgstr "_× ×¨×ž×œ עוצמת קול"
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:401
msgid "_Number of sort tabs:"
msgstr "_מספר כרטיסיות המיון:"
-#: ../data/gtkpod.glade.h:400
-msgid "_Other"
-msgstr "_×חר"
-
-#: ../data/gtkpod.glade.h:401
+#: ../data/gtkpod.glade.h:402
msgid "_PLS"
msgstr "_PLS"
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
msgid "_Play Now"
msgstr "_× ×’×Ÿ עכשיו"
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
msgid "_Podcasts"
msgstr "_פודקסטי×"
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:405
msgid "_Prefer Local"
msgstr "_העדף מקומי"
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:406
+msgid "_Remove Album"
+msgstr "ה_סרת כותר"
+
+#: ../data/gtkpod.glade.h:407
+msgid "_Remove Cover Art"
+msgstr "הצג בגודל מל×"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr "×”_סר ×ª×ž×•× ×•×ª"
+
+#: ../data/gtkpod.glade.h:409
msgid "_Save Changes"
msgstr "_שמור ×©×™× ×•×™×™×"
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:410
msgid "_Save Displayed Track Order"
msgstr "_שמירת סדר רצועות × ×¨×ות"
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:411
msgid "_Sorting"
msgstr "_מיון"
-#: ../data/gtkpod.glade.h:408
-#, fuzzy
+#: ../data/gtkpod.glade.h:412
msgid "_Synchronize Playlist with Dir(s)"
msgstr "×¡× ×›×¨×Ÿ ×ת רשימת ההשמעה ×¢× ×”×ª×™×§×™×”(יות)"
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:413
msgid "_Toolbar"
msgstr "_סרגל כלי×"
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:414
msgid "_Tools"
msgstr "_כלי×"
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:415
msgid "_Tooltips"
msgstr "_תוויות מידע"
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:416
msgid "_Track Info"
msgstr "_מידע רצועה"
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:417
msgid "_Undo All"
msgstr "_בטל הכל"
-#: ../data/gtkpod.glade.h:414
-msgid "_Undo Track"
-msgstr "_בטל פעולה על רצועה"
-
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:418
msgid "_Update Tracks from File"
msgstr "_×¡× ×›×¨×•×Ÿ רצועות מקובץ"
-#: ../data/gtkpod.glade.h:416
-#, fuzzy
+#: ../data/gtkpod.glade.h:419
msgid "_Video"
-msgstr "_תצוגה"
+msgstr "_ויד×ו"
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:420
msgid "_View"
msgstr "_תצוגה"
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:421
msgid "_iPod"
msgstr "_iPod"
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:423
#, no-c-format
-msgid ""
-"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
-"nr: %C, year: %Y, skip data: %*, the character '%': %%. You can separate "
-"several templates by a ';'. The first one matching the filename will be "
-"used. Example: '%a - %A/%T %t.mp3;%t.wav'."
+msgid "artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, year: %Y, skip data: %*, the character '%': %%. You can separate several templates by a ';'. The first one matching the filename will be used. Example: '%a - %A/%T %t.mp3;%t.wav'."
msgstr ""
-"×מן: a%, כותר: A%, יוצר: c%, ×©× ×”×¨×¦×•×¢×”: t%, ×¡×’× ×•×Ÿ: G%, מספר רצועה: T%, מספר "
-"תקליטור: C%, ×©× ×”: Y%, מידע דילוג: *%, ×”×ות '%': %%.\n"
+"×מן: a%, כותר: A%, יוצר: c%, ×©× ×”×¨×¦×•×¢×”: t%, ×¡×’× ×•×Ÿ: G%, מספר רצועה: T%, מספר תקליטור: C%, ×©× ×”: Y%, מידע דילוג: *%, ×”×ות '%': %%.\n"
"×פשר להפריד בין מספר ×ª×‘× ×™×•×ª על ידי ';'. הר×שון שית××™× ×œ×§×•×‘×¥ יבחר. לדוגמה:\n"
" '%a - %A/%T %t.mp3;%t.wav'."
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:424
msgid "folder"
msgstr "תיקיה"
-#: ../data/gtkpod.glade.h:422
+#: ../data/gtkpod.glade.h:425
msgid "folder.jpg"
msgstr "folder.jpg"
-#: ../data/gtkpod.glade.h:424
+#: ../data/gtkpod.glade.h:427
#, no-c-format
msgid "folder.jpg;%a.jpg"
msgstr "folder.jpg;%a.jpg"
-#: ../data/gtkpod.glade.h:425
+#: ../data/gtkpod.glade.h:428
msgid "gtkpod"
msgstr "gtkpod"
-#: ../data/gtkpod.glade.h:426
+#: ../data/gtkpod.glade.h:429
msgid "gtkpod Info"
msgstr "מידע gtkpod"
-#: ../data/gtkpod.glade.h:427
-msgid ""
-"gtkpod expects the ID3 tags and the filenames to be in the encoding "
-"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
-"operation. 'System Charset' is the charset used by your current locale."
-msgstr ""
-"×”×™×™×©×•× gtkpod מצפה שהתגיות של ×”ID3 ×•×”×§×‘×¦×™× ×™×”×™×• בקידוד המצוין ×›×ן. תוכל "
-"×œ×©× ×•×ª ×–×ת בשביל פעולות עוקבות של 'הוספת קבצי×' ו 'הוספת תיקיות'. 'ערכת "
-"×”×ª×•×•×™× ×©×œ המערכת' ×”×™× ×¢×¨×›×ª ×”×ª×•×•×™× ×‘×©×™×ž×•×© עבור הלוקל ×”× ×•×›×—×™ שלך."
+#: ../data/gtkpod.glade.h:430
+msgid "gtkpod expects the ID3 tags and the filenames to be in the encoding specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' operation. 'System Charset' is the charset used by your current locale."
+msgstr "×”×™×™×©×•× gtkpod מצפה שהתגיות של ×”ID3 ×•×”×§×‘×¦×™× ×™×”×™×• בקידוד המצוין ×›×ן. תוכל ×œ×©× ×•×ª ×–×ת בשביל פעולות עוקבות של 'הוספת קבצי×' ו 'הוספת תיקיות'. 'ערכת ×”×ª×•×•×™× ×©×œ המערכת' ×”×™× ×¢×¨×›×ª ×”×ª×•×•×™× ×‘×©×™×ž×•×© עבור הלוקל ×”× ×•×›×—×™ שלך."
-#: ../data/gtkpod.glade.h:428
+#: ../data/gtkpod.glade.h:431
msgid "gtkpod options"
msgstr "×פשרויות ×”-gtkpod"
#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
-#: ../data/gtkpod.glade.h:430
+#: ../data/gtkpod.glade.h:433
msgid ""
"iPod\n"
"Local Repository (Standard)\n"
@@ -1943,35 +1781,57 @@
"מ×גר מקומי (×¡×˜× ×“×¨×˜×™)\n"
"מ×גר מקומי (פודקסטי×)\n"
-#: ../data/gtkpod.glade.h:434
+#: ../data/gtkpod.glade.h:437
msgid "iPod mountpoint:"
msgstr "× ×§×•×“×ª ×”×¢×’×™× ×” של ×”-iPod:"
-#: ../data/gtkpod.glade.h:435
+#: ../data/gtkpod.glade.h:438
msgid "iTunesDB backup:"
msgstr "גיבוי ה־iTunesDB:"
-#: ../data/gtkpod.glade.h:436
-#, fuzzy
-msgid "label"
-msgstr "label21"
-
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:439
msgid "mserv Root:"
msgstr "שורש ה-mserv:"
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:440
msgid "mserv database lookup will be done for music in this directory."
msgstr "החיפוש במסד ×”× ×ª×•× ×™× mserv יתבצע בתיקייה ×–×ת עבור מוזיקה."
-#: ../data/gtkpod.glade.h:439 ../src/details.c:1175
+#: ../data/gtkpod.glade.h:441
+#: ../src/details.c:1347
msgid "n/a"
msgstr "ל/ז"
-#: ../data/gtkpod.glade.h:440
+#: ../data/gtkpod.glade.h:442
msgid "special_sorttab -- Don't translate!"
msgstr "special_sorttab -- Don't translate!"
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr "××™ ×פשר ל×תחל ×ת GnomeVFS\n"
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr ""
+"××™ ×פשר לטעון ×ת ×”Ö¾iPod החדש '%s' שעוגן לתוך gtkpod.\n"
+"\n"
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+"ה־iPod החדש העגון ב־'%s' כבר עדיין טעון!\n"
+"\n"
+
+#: ../src/autodetection.c:416
+msgid "New iPod"
+msgstr "מכשיר iPod חדש"
+
#: ../src/charset.c:53
msgid "Arabic (IBM-864)"
msgstr "ערבית (IBM-864)"
@@ -2174,211 +2034,289 @@
#. sanity!
#. check for "System Charset" and return NULL
-#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+#: ../src/charset.c:160
+#: ../src/charset.c:170
+#: ../src/charset.c:223
msgid "System Charset"
msgstr "ערכת ×”×ª×•×•×™× ×©×œ המערכת"
#. we are not the first instance of gtkpod -- the socket is
#. already being used, so we pass
#: ../src/clientserver.c:214
-msgid ""
-"Another instance of gtkpod was detected. Playcount server not started.\n"
+msgid "Another instance of gtkpod was detected. Playcount server not started.\n"
msgstr "עותק ריצה × ×•×¡×£ של gtkpod × ×ž×¦×. שרת ספירה ×œ× ×™×•×¤×¢×œ.\n"
#: ../src/confirmation.c:377
msgid "Confirmation Dialogue"
msgstr "תיבת דו שיח ל×ישור"
-#: ../src/context_menus.c:359
+#: ../src/context_menus.c:362
#, c-format
msgid "Copied \"%s\" playlist to %s"
-msgstr ""
+msgstr "הועתקה רשימת השמעה '%s' ×ל '%s'."
-#: ../src/context_menus.c:398
-#, fuzzy, c-format
+#: ../src/context_menus.c:401
+#, c-format
msgid "Copied %d track to '%s'"
msgid_plural "Copied %d tracks to '%s'"
-msgstr[0] "הועתק %d מתוך %d רצועה."
-msgstr[1] "הועתקו %d מתוך %d רצועות."
+msgstr[0] "הועתקה %d רצועה ×ל '%s'."
+msgstr[1] "הועתקו %d רצועות ×ל '%s'."
-#: ../src/context_menus.c:426
+#: ../src/context_menus.c:429
#, c-format
msgid "Copied '%s' playlist to '%s' in '%s'"
-msgstr ""
+msgstr "הועתקה רצועת השמעה '%s' ×ל '%s' בתוך '%s'."
-#: ../src/context_menus.c:459
-#, fuzzy, c-format
+#: ../src/context_menus.c:462
+#, c-format
msgid "Copied %d track to '%s' in '%s'"
msgid_plural "Copied %d tracks to %s in '%s'"
-msgstr[0] "× ×ž×—×§×” %d רצועה מרשימת ההשמעה '%s'"
-msgstr[1] "× ×ž×—×§×• %d רצועות מרשימת ההשמעה '%s'"
+msgstr[0] "הועתקה %d רצועה ×ל '%s' בתוך '%s'"
+msgstr[1] "הועתקו %d רצועות ×ל '%s' בתוך '%s'"
-#: ../src/context_menus.c:619 ../src/tools.c:854
+#: ../src/context_menus.c:622
+#: ../src/tools.c:854
msgid "Play Now"
msgstr "× ×’×Ÿ עכשיו"
-#: ../src/context_menus.c:625 ../src/tools.c:867
+#: ../src/context_menus.c:628
+#: ../src/tools.c:867
msgid "Enqueue"
msgstr "×”×›× ×¡ לתור"
-#: ../src/context_menus.c:631
+#: ../src/context_menus.c:634
msgid "Copy Tracks to Filesystem"
msgstr "העתק רצועות ×ל מערכת הקבצי×"
-#: ../src/context_menus.c:638 ../src/file_export.c:1085
+#: ../src/context_menus.c:641
+#: ../src/file_export.c:1085
msgid "Create Playlist File"
msgstr "יצירת קובץ רשימת השמעה"
-#: ../src/context_menus.c:645
+#: ../src/context_menus.c:648
msgid "Create new Playlist"
msgstr "יצירת רשימת השמעה חדשה"
-#: ../src/context_menus.c:652
+#: ../src/context_menus.c:655
msgid "Update Tracks from File"
msgstr "עדכן רצועות מקובץ"
-#: ../src/context_menus.c:666
+#: ../src/context_menus.c:669
msgid "Sync Playlist with Dir(s)"
msgstr "×¡× ×›×¨×Ÿ ×ת רשימת ההשמעה ×¢× ×”×ª×™×§×™×”(יות)"
-#: ../src/context_menus.c:676
+#: ../src/context_menus.c:679
msgid "Remove All Tracks from iPod"
msgstr "מחק ×ת כל הרצועות מה-iPod"
-#: ../src/context_menus.c:694
+#: ../src/context_menus.c:697
msgid "Remove All Podcasts from iPod"
msgstr "מחק ×ת כל ×”×¤×•×“×§×¡×˜×™× ×ž×”-iPod"
-#: ../src/context_menus.c:709
+#: ../src/context_menus.c:712
msgid "Delete Including Tracks"
msgstr "מחק כולל רצועות"
-#: ../src/context_menus.c:717
+#: ../src/context_menus.c:720
msgid "Delete But Keep Tracks"
msgstr "מחק ×בל שמור רצועות"
-#: ../src/context_menus.c:725
+#: ../src/context_menus.c:728
msgid "Edit iPod Properties"
msgstr "ערוך מ××¤×™×™× ×™ iPod"
-#: ../src/context_menus.c:732
-#, fuzzy
+#: ../src/context_menus.c:735
msgid "Edit Repository Properties"
-msgstr "ערוך מ××¤×™×™× ×™ iPod"
+msgstr "ערוך מ××¤×™×™× ×™ מ×גר"
-#: ../src/context_menus.c:739
+#: ../src/context_menus.c:742
msgid "Edit Playlist Properties"
msgstr "ערוך מ××¤×™×™× ×™ רשימת השמעה"
-#: ../src/context_menus.c:767
+#: ../src/context_menus.c:770
msgid "View Full Size Artwork"
-msgstr ""
+msgstr "הצג ×ª×ž×•× ×•×ª בגודל מל×"
-#: ../src/context_menus.c:774
-#, fuzzy
+#: ../src/context_menus.c:777
msgid "Select Cover From File"
-msgstr "מחק מה-iPod"
+msgstr "בחירת עטיפה מקובץ"
-#: ../src/context_menus.c:781
-msgid "Find Cover on Web"
-msgstr ""
-
-#: ../src/context_menus.c:794
+#: ../src/context_menus.c:790
msgid "Load iPod"
msgstr "טען iPod"
-#: ../src/context_menus.c:801
+#: ../src/context_menus.c:797
msgid "Eject iPod"
msgstr "× ×ª×§ iPod"
-#: ../src/context_menus.c:818
+#: ../src/context_menus.c:814
msgid "Remove All Tracks from Database"
msgstr "מחק ×ת כל הרצועות ממסד ×”× ×ª×•× ×™×"
-#: ../src/context_menus.c:833
+#: ../src/context_menus.c:829
msgid "Delete Including Tracks (Harddisk)"
msgstr "מחק כולל רצועות (דיסק קשיח)"
-#: ../src/context_menus.c:841
+#: ../src/context_menus.c:837
msgid "Delete Including Tracks (Database)"
msgstr "מחק כולל רצועות (מסד × ×ª×•× ×™×)"
-#: ../src/context_menus.c:849
+#: ../src/context_menus.c:845
msgid "Delete From iPod"
msgstr "מחק מה-iPod"
-#: ../src/context_menus.c:857
+#: ../src/context_menus.c:853
msgid "Delete From Playlist"
msgstr "מחק מרשימת ההשמעה"
-#: ../src/context_menus.c:865
+#: ../src/context_menus.c:861
msgid "Delete From Harddisk"
msgstr "מחק מהדיסק הקשיח"
-#: ../src/context_menus.c:873
+#: ../src/context_menus.c:869
msgid "Delete From Database"
msgstr "מחק ממסד ×”× ×ª×•× ×™×"
-#: ../src/context_menus.c:881
+#: ../src/context_menus.c:877
msgid "Alphabetize"
msgstr "סדר ×לפ×בתי"
-#: ../src/context_menus.c:949 ../src/context_menus.c:998
-#, fuzzy
+#: ../src/context_menus.c:895
+msgid "Remove Album"
+msgstr "הסרת כותר"
+
+#: ../src/context_menus.c:905
+msgid "Remove Photo"
+msgstr "הסרת ×ª×ž×•× ×”"
+
+#: ../src/context_menus.c:922
+msgid "Rename Album"
+msgstr "×©× ×” ×©× ×לבו×"
+
+#: ../src/context_menus.c:981
+#: ../src/context_menus.c:1030
msgid "Copy selected playlist to..."
-msgstr "רשימות השמעה × ×‘×—×¨×•×ª"
+msgstr "העתק רשימות השמעה × ×‘×—×¨×•×ª ×ל..."
-#: ../src/context_menus.c:1051
-#, fuzzy
+#: ../src/context_menus.c:1083
msgid "Copy selected track(s) to..."
-msgstr "רצועות × ×ž×—×§×•×ª"
+msgstr "העתק רצועה/ות × ×‘×—×¨×ª/ות ×ל..."
#: ../src/date_parser.l:269
#, c-format
msgid "Date format error: unrecognized character: '%s'\n"
msgstr "פורמט ת×ריך שגוי: תו ×œ× ×ž×–×•×”×”: '%s'\n"
-#: ../src/details.c:700
+#: ../src/details.c:82
+msgid "Audio/Video"
+msgstr "שמע/ויד×ו"
+
+#: ../src/details.c:83
+msgid "Audio"
+msgstr "שמע"
+
+#: ../src/details.c:84
+msgid "Video"
+msgstr "ויד×ו"
+
+#: ../src/details.c:85
+msgid "Podcast"
+msgstr "פודקסט"
+
+#: ../src/details.c:86
+msgid "Video Podcast"
+msgstr "פודקסט ויד×ו"
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr "ספר שמע"
+
+#: ../src/details.c:88
+#: ../src/display_spl.c:209
+#: ../src/display_spl.c:218
+msgid "Music Video"
+msgstr "ויד×ו מוזיקה"
+
+#: ../src/details.c:89
+#: ../src/display_spl.c:107
+#: ../src/display_spl.c:210
+#: ../src/display_spl.c:219
+#: ../src/misc_conversion.c:101
+msgid "TV Show"
+msgstr "×ª×•×›× ×™×ª טלויזיה"
+
+#: ../src/details.c:90
+msgid "TV Show & Music Video"
+msgstr "×ª×•×›× ×™×ª טלויזיה & ויד×ו מוזיקה"
+
+#: ../src/details.c:836
#, c-format
msgid "%s (image data corrupted or unreadable)"
-msgstr ""
+msgstr "(מידע ×ª×ž×•× ×” הושחת ×ו ×œ× ×§×¨×™×) %s"
-#: ../src/details.c:1246
+#: ../src/details.c:973
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr "×× × ×“×•×•×— על מדיות ×œ× ×™×“×•×¢×•×ª %x\n"
+
+#: ../src/details.c:1418
msgid "<b>n/a</b>"
msgstr "<b>×œ× ×–×ž×™×Ÿ</b>"
-#: ../src/display.c:647
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr "תקלה ×ירעה בעת הורדת ×ª×ž×•× ×” ×ל חלון הפרטי×: %s\n"
+
+#: ../src/details.c:1952
+#: ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr "×ª×ž×•× ×ª עטיפה חדשה עבור הרצועה ×”× ×‘×—×¨×ª × ×§×‘×¢×” בהצלחה"
+
+#: ../src/display.c:490
+#, c-format
+msgid "<b>Image Dimensions: %s</b>"
+msgstr "<b>גודל ×”×ª×ž×•× ×”:: %s</b>"
+
+#: ../src/display.c:744
msgid "Edit selected entry of which sort tab?"
msgstr "מ××™×–×” כרטיסיית מיון לערוך ×ת הרשומה ×”× ×‘×—×¨×ª?"
#. no entry selected
-#: ../src/display.c:654 ../src/misc_confirm.c:435 ../src/misc_track.c:2059
+#: ../src/display.c:751
+#: ../src/misc_confirm.c:435
+#: ../src/misc_track.c:2138
msgid "No entry selected."
msgstr "×œ× × ×‘×—×¨×” רשומה."
-#: ../src/display.c:813 ../src/display.c:1133 ../src/display.c:1189
-#: ../src/display.c:1243 ../src/display.c:1298 ../src/display.c:1559
+#: ../src/display.c:910
+#: ../src/display.c:1230
+#: ../src/display.c:1286
+#: ../src/display.c:1340
+#: ../src/display.c:1395
+#: ../src/display.c:1656
#, c-format
msgid "No entry selected in Sort Tab %d"
msgstr "×œ× × ×‘×—×¨×” רשומה בכרטיסיית מיון %d"
-#: ../src/display.c:852
+#: ../src/display.c:949
msgid "Remove entry of which sort tab from database?"
msgstr "הסר רשומה מ××™×–×” כרטיסיית מיון במסד ×”× ×ª×•× ×™×?"
-#: ../src/display.c:860
+#: ../src/display.c:957
msgid "Remove tracks in selected entry of which filter tab from the iPod?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª להסיר רצועות מה־iPod?"
-#: ../src/display.c:882
+#: ../src/display.c:979
msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª להסיר רצועות מהדיסק הקשיח?"
-#: ../src/display.c:912
+#: ../src/display.c:1009
msgid "Remove tracks in selected entry of which filter tab from playlist?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª להסיר רצועות מרשימת ההשמעה?"
-#: ../src/display.c:939 ../src/display.c:977
+#: ../src/display.c:1036
+#: ../src/display.c:1074
#, c-format
msgid ""
"iPod at '%s' is not loaded.\n"
@@ -2387,87 +2325,190 @@
"×”Ö¾iPod ב־'%s' ×œ× ×˜×¢×•×Ÿ.\n"
"×× × ×˜×¢×Ÿ ×ותו תחילה."
-#: ../src/display.c:1014 ../src/display.c:1041
+#: ../src/display.c:1111
+#: ../src/display.c:1138
msgid "Update selected entry of which sort tab?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª לעדכן?"
-#: ../src/display.c:1127
+#: ../src/display.c:1224
msgid "Export selected entry of which sort tab?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª לייצ×?"
-#: ../src/display.c:1183
+#: ../src/display.c:1280
msgid "Create playlist file from selected entry of which sort tab?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª ליצור קובץ רשימת השמעה?"
-#: ../src/display.c:1237
+#: ../src/display.c:1334
msgid "Play tracks in selected entry of which sort tab?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª ×œ× ×’×Ÿ רצועות?"
-#: ../src/display.c:1292
+#: ../src/display.c:1389
msgid "Enqueue tracks in selected entry of which sort tab?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª להוסיף רצועות לתור?"
-#: ../src/display.c:1549
+#: ../src/display.c:1646
msgid "Normalize tracks in selected entry of which sort tab?"
msgstr "ב××™×–×” כרטיסיית מיון של רשומה × ×‘×—×¨×ª ×œ× ×¨×ž×œ רצועות?"
-#: ../src/display_coverart.c:1714
+#: ../src/display_coverart.c:1713
msgid "Failed to remove the album from the album hash store."
-msgstr ""
+msgstr "× ×›×©×œ×” ההסרה של ×”××œ×‘×•× ×ž×ª×•×š ×ž×§×•× ×”×יכסון של ×”×לבומי×."
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr "תקלה ×ירעה בעת הורדת ×ª×ž×•× ×” ×ל חלון העטיפות: %s\n"
+
#: ../src/display_itdb.c:376
#, c-format
msgid "Failed to set cover art: '%s'\n"
msgstr "כשלון בקביעת עטיפה: '%s'\n"
-#: ../src/display_itdb.c:851 ../src/display_itdb.c:984
+#: ../src/display_itdb.c:858
+#: ../src/display_itdb.c:991
msgid "Local"
msgstr "מקומי"
#. add podcast playlist
-#: ../src/display_itdb.c:859 ../src/display_itdb.c:982
-#: ../src/display_itdb.c:1010
+#: ../src/display_itdb.c:866
+#: ../src/display_itdb.c:989
+#: ../src/display_itdb.c:1025
msgid "Podcasts"
msgstr "פודקסטי×"
-#: ../src/display_itdb.c:868 ../src/display_itdb.c:986
+#: ../src/display_itdb.c:875
+#: ../src/display_itdb.c:993
#: ../src/repository.c:1186
msgid "iPod"
msgstr "iPod"
-#: ../src/display_itdb.c:1069
+#: ../src/display_itdb.c:1084
#, c-format
msgid "Increased playcount for '%s'"
msgstr "הועלתה ספירת השמעות עבור '%s'"
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr "תקלה בזמן קרי×ת מסד ×”× ×ª×•× ×™× ×©×œ ×”×ª×ž×•× ×•×ª (%s) על ×”Ö¾iPod.\n"
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr "תקלה בזמן קרי×ת מסד ×”× ×ª×•× ×™× ×©×œ ×”×ª×ž×•× ×•×ª על ×”Ö¾iPod.\n"
+
+#: ../src/display_photo.c:238
+msgid "Could not access the iPod's photo database."
+msgstr "××™ ×פשר לגשת ×ל מסד ×”× ×ª×•× ×™× ×©×œ ×”×ª×ž×•× ×•×ª ב־iPod."
+
+#: ../src/display_photo.c:441
+msgid "Photo Albums"
+msgstr "×לבומי ×ª×ž×•× ×•×ª"
+
+#: ../src/display_photo.c:451
+#: ../src/display_photo.c:1685
+msgid "<Unnamed>"
+msgstr "<×œ×œ× ×©×>"
+
+#: ../src/display_photo.c:939
+msgid "The Photo Library album cannot be removed"
+msgstr "××™ ×פשר ×”×™×” להסיר ×ת ××œ×‘×•× ×¡×¤×¨×™×™×ª ×”×ª×ž×•× ×•×ª"
+
+#: ../src/display_photo.c:961
+msgid "Do you want to remove the album's photos too?"
+msgstr "×”×× ×תה בטוח ש×תה רוצה להסיר ×ת כל ×לבומי ×”×ª×ž×•× ×•×ª ×’× ×›×Ÿ?"
+
+#: ../src/display_photo.c:967
+msgid "Yes. Do Not Display Again"
+msgstr "כן. ×ל תציג ×©× ×™×ª"
+
+#: ../src/display_photo.c:1038
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr ""
+"×–×” יסיר ×ת בחירת ×”×ª×ž×•× ×” מה××œ×‘×•× ×”× ×‘×—×¨.\n"
+" ×”×× ×‘×¨×¦×•× ×š למחוק ×ת מסד ×”× ×ª×•× ×™× ×’× ×›×Ÿ?"
+
+#: ../src/display_photo.c:1053
+msgid "This will delete the photo selection from the Photo Library and all albums. Are you sure?"
+msgstr "פעולה זו תמחק ×ת בחירת ×”×ª×ž×•× ×•×ª מספריית ×”×ª×ž×•× ×•×ª וכל ×”×לבומי×. ×”×× ×תה בטוח?"
+
+#: ../src/display_photo.c:1128
+msgid "New Photo Album Name"
+msgstr "×©× ××œ×‘×•× ×ª×ž×•× ×•×ª חדש"
+
+#: ../src/display_photo.c:1129
+msgid "Please enter a new name for the photo album"
+msgstr "×”×›× ×¡ בבקשה ×ת ×”×©× ×©×œ ××œ×‘×•× ×”×ª×ž×•× ×•×ª"
+
+#: ../src/display_photo.c:1141
+#: ../src/display_photo.c:1223
+msgid "An album with that name already exists."
+msgstr "××œ×‘×•× ×‘×©× ×–×” כבר קיי×."
+
+#: ../src/display_photo.c:1210
+msgid "New Photo Album"
+msgstr "××œ×‘×•× ×ª×ž×•× ×•×ª חדש"
+
+#: ../src/display_photo.c:1211
+msgid "Please enter a name for the new photo album"
+msgstr "×”×›× ×¡ בבקשה ×ת ×”×©× ×©×œ ××œ×‘×•× ×”×ª×ž×•× ×•×ª החדש"
+
+#: ../src/display_photo.c:1232
+msgid "The new album failed to be created."
+msgstr "כשלון ביצירת ×”××œ×‘×•× ×”×—×“×©."
+
+#: ../src/display_photo.c:1256
+msgid "Add Image to iPod"
+msgstr "הוסף ×ª×ž×•× ×” ל־iPod"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1311
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr "הוספת תיקיית ×ª×ž×•× ×•×ª ×ל ×”Ö¾iPod. בחר ×ת התיקייה."
+
+#: ../src/display_photo.c:1699
+#, c-format
+msgid "<No members>\n"
+msgstr "<×œ×œ× ×—×‘×¨×™×>\n"
+
#. give a notice on the statusbar -- otherwise the user
#. * will never know why the drag is not possible
-#: ../src/display_playlists.c:500 ../src/display_playlists.c:542
+#: ../src/display_playlists.c:516
+#: ../src/display_playlists.c:558
msgid "Error: drag from iPod not possible in offline mode."
msgstr "שגי××”: גרירה מה-iPod ×”×™× ×œ× ×פשרית במצב ×œ× ×ž×§×•×•×Ÿ."
-#: ../src/display_playlists.c:569 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:585
+#: ../src/display_tracks.c:286
#, c-format
msgid "Copied one track"
msgid_plural "Copied %d tracks"
msgstr[0] "רצועה ×חת הועתקה"
msgstr[1] "הועתקו %d רצועות"
-#: ../src/display_playlists.c:849 ../src/display_playlists.c:861
+#: ../src/display_playlists.c:865
+#: ../src/display_playlists.c:877
msgid "Can't reorder sorted treeview."
msgstr "××™ ×פשר לסדר מחדש ×¢×¥ ממוין."
-#: ../src/display_playlists.c:938
+#: ../src/display_playlists.c:954
#, c-format
msgid ""
-"This DND type (%d) is not (yet) supported. If you feel implementing this "
-"would be useful, please contact the author.\n"
+"This DND type (%d) is not (yet) supported. If you feel implementing this would be useful, please contact the author.\n"
"\n"
msgstr ""
-"פעולת הגרור & שחרר ×”×–×ת (%d) (עדיין) ×œ× × ×ª×ž×›×ª. ×× ×תה מרגיש שמימושה ×™×”×™×” "
-"ר×וי, צור קשר ×¢× ×”×ž×—×‘×¨.\n"
+"פעולת הגרור & שחרר ×”×–×ת (%d) (עדיין) ×œ× × ×ª×ž×›×ª. ×× ×תה מרגיש שמימושה ×™×”×™×” ר×וי, צור קשר ×¢× ×”×ž×—×‘×¨.\n"
"\n"
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr "×ª×ž×•× ×•×ª"
+
#: ../src/display_sorttabs.c:473
msgid "'Played' condition ignored because of error."
msgstr "התעלמות ממצב 'הושמע' עקב תקלה"
@@ -2480,32 +2521,35 @@
msgid "'Added' condition ignored because of error."
msgstr "התעלמות ממצב 'הוספה' עקב תקלה"
-#: ../src/display_sorttabs.c:1563 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1562
+#: ../src/misc_conversion.c:59
msgid "All"
msgstr "הכל"
-#: ../src/display_sorttabs.c:1589
+#: ../src/display_sorttabs.c:1588
msgid "Compilations"
msgstr "יצירות"
-#: ../src/display_sorttabs.c:2960
+#: ../src/display_sorttabs.c:2988
msgid "Comp."
msgstr "יצירה"
-#: ../src/display_sorttabs.c:2966 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2002 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:2994
+#: ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109
+#: ../src/misc_conversion.c:84
msgid "Year"
msgstr "×©× ×”"
-#: ../src/display_sorttabs.c:2969
+#: ../src/display_sorttabs.c:2997
msgid "Special"
msgstr "מיוחד"
-#: ../src/display_sorttabs.c:3230
+#: ../src/display_sorttabs.c:3245
msgid "Last Played"
msgstr "הושמע ל××—×¨×•× ×”"
-#: ../src/display_sorttabs.c:3231
+#: ../src/display_sorttabs.c:3246
msgid "Last Modified"
msgstr "×©×•× ×” ל××—×¨×•× ×”"
@@ -2529,7 +2573,9 @@
msgid "Hz"
msgstr "הרץ"
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:777
+#: ../src/display_spl.c:75
+#: ../src/display_spl.c:179
+#: ../src/info.c:780
msgid "MB"
msgstr "מ\"ב"
@@ -2537,12 +2583,14 @@
msgid "secs"
msgstr "×©× ×™×•×ª"
-#: ../src/display_spl.c:86 ../src/misc_conversion.c:74
+#: ../src/display_spl.c:86
+#: ../src/misc_conversion.c:74
msgid "Bitrate"
msgstr "קצב סיביות"
#. 15
-#: ../src/display_spl.c:87 ../src/misc_conversion.c:75
+#: ../src/display_spl.c:87
+#: ../src/misc_conversion.c:75
msgid "Samplerate"
msgstr "קצב דגימה"
@@ -2550,7 +2598,8 @@
msgid "Kind"
msgstr "סוג"
-#: ../src/display_spl.c:91 ../src/misc_conversion.c:81
+#: ../src/display_spl.c:91
+#: ../src/misc_conversion.c:81
msgid "Date modified"
msgstr "ת×ריך ×©×™× ×•×™"
@@ -2562,15 +2611,13 @@
msgid "Size"
msgstr "גודל"
-#: ../src/display_spl.c:94 ../src/display_tracks.c:1984
-msgid "Time"
-msgstr "זמן"
-
-#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
+#: ../src/display_spl.c:95
+#: ../src/misc_conversion.c:64
msgid "Comment"
msgstr "הערה"
-#: ../src/display_spl.c:96 ../src/misc_conversion.c:79
+#: ../src/display_spl.c:96
+#: ../src/misc_conversion.c:79
msgid "Date added"
msgstr "ת×ריך הוספה"
@@ -2582,45 +2629,44 @@
msgid "Disc number"
msgstr "מספר דיסק"
-#: ../src/display_spl.c:102 ../src/misc_conversion.c:87
+#: ../src/display_spl.c:102
+#: ../src/misc_conversion.c:87
msgid "Compilation"
msgstr "יצירה"
-#: ../src/display_spl.c:103 ../src/misc_conversion.c:76
+#: ../src/display_spl.c:103
+#: ../src/misc_conversion.c:76
msgid "BPM"
msgstr "BPM"
-#: ../src/display_spl.c:104 ../src/misc_conversion.c:86
+#: ../src/display_spl.c:104
+#: ../src/misc_conversion.c:86
msgid "Grouping"
msgstr "קיבוץ"
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "רשימת השמעה"
+
#: ../src/display_spl.c:106
msgid "Video Kind"
-msgstr ""
+msgstr "מסוג ויד×ו"
-#: ../src/display_spl.c:107 ../src/display_spl.c:210 ../src/display_spl.c:219
-#: ../src/misc_conversion.c:101
-msgid "TV Show"
-msgstr ""
-
#: ../src/display_spl.c:108
-#, fuzzy
msgid "Season number"
-msgstr "מספר דיסק"
+msgstr "מספר חלק"
#: ../src/display_spl.c:109
msgid "Skip count"
-msgstr ""
+msgstr "מספור דילוגי×"
#: ../src/display_spl.c:110
-#, fuzzy
msgid "Last skipped"
-msgstr "הושמע ל××—×¨×•× ×”"
+msgstr "×”×חרון שדילגת עליו"
#: ../src/display_spl.c:111
-#, fuzzy
msgid "Album artist"
-msgstr "×מן"
+msgstr "כותר ×מן"
#: ../src/display_spl.c:117
msgid "contains"
@@ -2630,13 +2676,19 @@
msgid "does not contain"
msgstr "×œ× ×ž×›×™×œ"
-#: ../src/display_spl.c:119 ../src/display_spl.c:128 ../src/display_spl.c:138
-#: ../src/display_spl.c:157 ../src/display_spl.c:164
+#: ../src/display_spl.c:119
+#: ../src/display_spl.c:128
+#: ../src/display_spl.c:138
+#: ../src/display_spl.c:157
+#: ../src/display_spl.c:164
msgid "is"
msgstr "קיי×"
-#: ../src/display_spl.c:120 ../src/display_spl.c:129 ../src/display_spl.c:139
-#: ../src/display_spl.c:158 ../src/display_spl.c:165
+#: ../src/display_spl.c:120
+#: ../src/display_spl.c:129
+#: ../src/display_spl.c:139
+#: ../src/display_spl.c:158
+#: ../src/display_spl.c:165
msgid "is not"
msgstr "×œ× ×§×™×™×"
@@ -2656,7 +2708,8 @@
msgid "is less than"
msgstr "קטן מ-"
-#: ../src/display_spl.c:132 ../src/display_spl.c:144
+#: ../src/display_spl.c:132
+#: ../src/display_spl.c:144
msgid "is in the range"
msgstr "בטווח "
@@ -2685,9 +2738,8 @@
msgstr "×œ× ×ž×§×•×‘×¢"
#: ../src/display_spl.c:171
-#, fuzzy
msgid "Not supported"
-msgstr "×œ× ×¨×©×•×"
+msgstr "×œ× × ×ª×ž×š"
#: ../src/display_spl.c:178
msgid "minutes"
@@ -2701,7 +2753,8 @@
msgid "hours"
msgstr "שעות"
-#: ../src/display_spl.c:182 ../src/info.c:777
+#: ../src/display_spl.c:182
+#: ../src/info.c:780
msgid "GB"
msgstr "ג\"ב"
@@ -2757,35 +2810,24 @@
msgid "lowest rating"
msgstr "מדרוג × ×ž×•×š ביותר"
-#: ../src/display_spl.c:208 ../src/display_spl.c:217
-#, fuzzy
+#: ../src/display_spl.c:208
+#: ../src/display_spl.c:217
msgid "Movie"
-msgstr "×©×•× ×”"
+msgstr "סרט"
-#: ../src/display_spl.c:209 ../src/display_spl.c:218
-#, fuzzy
-msgid "Music Video"
-msgstr "שורש המוזיקה:"
-
-#: ../src/display_spl.c:1162 ../src/display_spl.c:1177
+#: ../src/display_spl.c:1192
+#: ../src/display_spl.c:1207
msgid "to"
msgstr "×ל "
-#: ../src/display_spl.c:1455
+#: ../src/display_spl.c:1485
msgid "-"
msgstr "-"
-#: ../src/display_spl.c:1470
+#: ../src/display_spl.c:1500
msgid "+"
msgstr "+"
-#: ../src/display_spl.c:1689 ../src/misc_playlist.c:66
-#: ../src/misc_playlist.c:68 ../src/misc_playlist.c:93
-#: ../src/misc_playlist.c:95 ../src/misc_playlist.c:428
-#: ../src/misc_playlist.c:430
-msgid "New Playlist"
-msgstr "רשימת השמעה חדשה"
-
#: ../src/display_tracks.c:281
#, c-format
msgid "Moved one track"
@@ -2793,58 +2835,80 @@
msgstr[0] "רצועה ×חת הועברה"
msgstr[1] "הועברו %d רצועות"
-#: ../src/display_tracks.c:1717
+#: ../src/display_tracks.c:1810
#, c-format
msgid ""
-"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
-"d.%d < 2.5.4). Once you sort the track view, you cannot go back to the "
-"unsorted state.\n"
+"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%d.%d < 2.5.4). Once you sort the track view, you cannot go back to the unsorted state.\n"
"\n"
msgstr ""
-"××™ ×פשר לבטל מיון של תצוגת ×”×¢×¥ עקב ב××’ בספרית ×”-GTK ×”× ×ž×¦×ת בשימוש (%d.%d.%d "
-"< 2.5.4). ברגע ×©×ž×™×™× ×ª ×ת תוגת ×”×¢×¥, ××™ ×פשר לחזור חזרה למצב ×”×œ× ×ž×ž×•×™×Ÿ.\n"
+"××™ ×פשר לבטל מיון של תצוגת ×”×¢×¥ עקב ב××’ בספרית ×”-GTK ×”× ×ž×¦×ת בשימוש (%d.%d.%d < 2.5.4). ברגע ×©×ž×™×™× ×ª ×ת תוגת ×”×¢×¥, ××™ ×פשר לחזור חזרה למצב ×”×œ× ×ž×ž×•×™×Ÿ.\n"
"\n"
-#: ../src/display_tracks.c:1962
+#: ../src/display_tracks.c:2069
msgid "Rtng"
msgstr "מדרוג"
-#: ../src/display_tracks.c:1965
+#: ../src/display_tracks.c:2072
msgid "#"
msgstr "#"
-#: ../src/display_tracks.c:1968
+#: ../src/display_tracks.c:2075
msgid "CD"
msgstr "דיסק שמע"
-#: ../src/display_tracks.c:1971
+#: ../src/display_tracks.c:2078
msgid "ID"
msgstr "מזהה"
-#: ../src/display_tracks.c:1974
+#: ../src/display_tracks.c:2081
msgid "Trnsfrd"
msgstr "העברה"
-#: ../src/display_tracks.c:1978
+#: ../src/display_tracks.c:2085
msgid "Cmpl"
msgstr "יצירה"
-#: ../src/display_tracks.c:1987
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "זמן"
+
+#: ../src/display_tracks.c:2094
msgid "Plycnt"
msgstr "ספירת שמע"
-#: ../src/display_tracks.c:1999
+#: ../src/display_tracks.c:2106
msgid "Released"
msgstr "שוחרר"
-#: ../src/display_tracks.c:2005
+#: ../src/display_tracks.c:2112
msgid "Vol."
msgstr "עוצמה"
-#: ../src/display_tracks.c:2008
+#: ../src/display_tracks.c:2115
msgid "Sndchk."
msgstr "בדיקת קול"
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr "קובץ עטיפה כבר קיי×"
+
+#: ../src/fetchcover.c:371
+#, c-format
+msgid ""
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
+"\n"
+"- Clicking Yes will overwrite the existing file, possibly associating\n"
+" other music files in the same directory with this coverart file.\n"
+"- Clicking No will save the file with a unique file name.\n"
+"- Clicking Cancel will abort the fetchcover operation."
+msgstr ""
+"קובץ ×”×ª×ž×•× ×” %s כבר קיי×.\n"
+"×”×•× ×¢×©×•×™ להיות מקושר ×¢× ×§×•×‘×¥ מוזיקה ×חר בתיקייה זו.\n"
+"\n"
+"- לחיצה על \"כן\" תדרוס ×ת הקובץ הקיי×, ועלולה לקשר קבצי מוזיקה ××—×¨×™× ×‘×ª×™×§×™×™×” זו ×× ×§×•×‘×¥ עטיפה ×–×”.\n"
+"- לחיצה על \"ל×\" תשמור ×ת הקובץ ×¢× ×©× ×™×™×—×•×“×™./n- לחיצה על \"בטל\" תבטל ×ת פעולה הב×ת העטיפה."
+
#: ../src/file.c:236
#, c-format
msgid ""
@@ -2864,13 +2928,12 @@
"\n"
#: ../src/file.c:283
+#: ../src/file_export.c:217
+#: ../src/oggfile.c:62
+#: ../src/wavfile.c:107
#, c-format
-msgid ""
-"Cannot open '%s' for reading.\n"
-"\n"
-msgstr ""
-"×œ× ×ž×¡×•×’×œ לפתוח ×ת '%s' לקרי××”.\n"
-"\n"
+msgid "Could not open '%s' for reading.\n"
+msgstr "×œ× ×ž×¡×•×’×œ לפתוח ×ת '%s' לכתיבה.\n"
#: ../src/file.c:369
#, c-format
@@ -2887,71 +2950,69 @@
msgid "Unknown token '%s' in template '%s'\n"
msgstr "הסימן '%s' ×‘×ª×‘× ×™×ª '%s' ×œ× ×™×“×•×¢\n"
-#: ../src/file.c:890
+#: ../src/file.c:923
#, c-format
msgid "Local filename not valid (%s)"
msgstr "×©× ×§×•×‘×¥ מקומי ×œ× ×ª×§×™×Ÿ (%s)"
-#: ../src/file.c:949
+#: ../src/file.c:982
#, c-format
msgid "No information found for user '%s' in '%s'"
msgstr "×œ× ×§×™×™× ×ž×™×“×¢ למשתמש '%s' ב- '%s'"
-#: ../src/file.c:958
+#: ../src/file.c:991
#, c-format
msgid "mserv data file (%s) not available for track (%s)"
msgstr "מידע קובץ mserv (%s) ×œ× ×–×ž×™×Ÿ עבור רצועה (%s)"
-#: ../src/file.c:966
+#: ../src/file.c:999
#, c-format
msgid "Track (%s) not in mserv music root directory (%s)"
msgstr "הרצועה (%s) ×œ× ×§×™×™×ž×ª בתיקיית השורש של mserv (%s)"
-#: ../src/file.c:1090
+#: ../src/file.c:1123
#, c-format
-msgid ""
-"The following track could not be processed (file does not exist): '%s'\n"
+msgid "The following track could not be processed (file does not exist): '%s'\n"
msgstr "××™ ×פשר לעבד ×ת הרצועה הב××” (הקובץ ×œ× ×§×™×™×): '%s'\n"
-#: ../src/file.c:1169
+#: ../src/file.c:1209
#, c-format
msgid "The following track could not be processed (filetype unknown): '%s'\n"
msgstr "××™ ×פשר לעבד ×ת הרצועה הב××” (סוג קובץ ×œ× ×™×“×•×¢): '%s'\n"
-#: ../src/file.c:1262
+#: ../src/file.c:1307
#, c-format
-msgid ""
-"The following track could not be processed (filetype is known but analysis "
-"failed): '%s'\n"
+msgid "The following track could not be processed (filetype is known but analysis failed): '%s'\n"
msgstr "××™ ×פשר לעבד ×ת הרצועה הב××” (סוג קובץ ידוע, ×ך הבדיקה × ×›×©×œ×”): '%s'\n"
-#: ../src/file.c:1292 ../src/file.c:1346
+#: ../src/file.c:1337
+#: ../src/file.c:1391
msgid "Nothing to update"
msgstr "×ין מה לעדכן"
-#: ../src/file.c:1313
+#: ../src/file.c:1358
#, c-format
msgid "Updating %s"
msgstr "מעדכן %s"
-#: ../src/file.c:1327
+#: ../src/file.c:1372
msgid "Updated selected tracks with info from file."
msgstr "מעדכן רצועות × ×‘×—×¨×•×ª ×¢× ×ž×™×“×¢ מקובץ."
-#: ../src/file.c:1361
+#: ../src/file.c:1406
#, c-format
msgid "Retrieving mserv data %s"
msgstr "מ×חזר × ×ª×•× ×™ mserv %s"
-#: ../src/file.c:1366
+#: ../src/file.c:1411
msgid "no filename available"
msgstr "קובץ ×œ× ×§×™×™×"
-#: ../src/file.c:1371
+#: ../src/file.c:1416
msgid "Updated selected tracks with data from mserv."
msgstr "×¢×•×“×›× ×• רצועות × ×‘×—×¨×•×ª ×¢× × ×ª×•× ×™× ×ž-mserv"
-#: ../src/file.c:1392
+#: ../src/file.c:1437
#, c-format
msgid "The following track could not be updated"
msgid_plural "The following %d tracks could not be updated"
@@ -2960,11 +3021,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1398
+#: ../src/file.c:1443
msgid "Failed Track Update"
msgstr "עדכון רצועה × ×›×©×œ"
-#: ../src/file.c:1456
+#: ../src/file.c:1501
#, c-format
msgid "The following track has been updated"
msgid_plural "The following %d tracks have been updated"
@@ -2973,60 +3034,63 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1462
+#: ../src/file.c:1507
msgid "Successful Track Update"
msgstr "הרצועה ×¢×•×“×›× ×” בהצלחה"
-#: ../src/file.c:1521
+#: ../src/file.c:1566
#, c-format
msgid "No mserv information could be retrieved for the following track"
-msgid_plural ""
-"No mserv information could be retrieved for the following %d tracks"
+msgid_plural "No mserv information could be retrieved for the following %d tracks"
msgstr[0] "×œ× × ×™×ª×Ÿ להשיג מידע mserv מהרצועה הב××”"
msgstr[1] "×œ× × ×™×ª×Ÿ להשיג מידע mserv מ-%d הרצועות הב×ות"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1527
+#: ../src/file.c:1572
msgid "mserv data retrieval problem"
msgstr "בעיה בהשגת מידע מ-mserv"
-#: ../src/file.c:1616
+#: ../src/file.c:1661
msgid "no local filename available, file on the iPod will be used instead"
msgstr "קובץ מקומי ×œ× ×–×ž×™×Ÿ, יעשה שימוש בקובץ על ×”Ö¾iPod"
-#: ../src/file.c:1622
+#: ../src/file.c:1667
msgid "no local filename available and copy on iPod cannot be found"
msgstr "קובץ מקומי ×œ× ×–×ž×™×Ÿ ועותק על ×”Ö¾iPod ×’× ×›×Ÿ ×œ× ×–×ž×™×Ÿ"
-#: ../src/file.c:1626 ../src/file.c:1644
+#: ../src/file.c:1671
+#: ../src/file.c:1689
msgid "no local filename available"
msgstr "קובץ מקומי ×œ× ×–×ž×™×Ÿ"
-#: ../src/file.c:1634
+#: ../src/file.c:1679
msgid "local file could not be found, file on the iPod will be used instead"
msgstr "קובץ מקומי ×œ× ×§×™×™×, יעשה שימוש בקובץ על ×”Ö¾iPod"
-#: ../src/file.c:1640
+#: ../src/file.c:1685
msgid "local file as well as copy on the iPod cannot be found"
msgstr "×œ× × ×ž×¦× ×§×•×‘×¥ מקומי ×•×’× ×”×¢×•×ª×§ על ×”Ö¾iPod ×œ× × ×ž×¦×"
#. update not successful -- log this track for later display
-#: ../src/file.c:1728
-msgid "update failed (format no supported?)"
+#: ../src/file.c:1788
+msgid "update failed (format not supported?)"
msgstr "העדכון × ×›×©×œ (×”×ª×‘× ×™×ª ×œ× × ×ª×ž×›×ª?)"
-#: ../src/file.c:1813
+#: ../src/file.c:1873
+#: ../src/misc_playlist.c:916
#, c-format
msgid "Processing '%s'..."
msgstr "מעבד '%s'..."
-#: ../src/file.c:1819
+#: ../src/file.c:1879
#, c-format
-msgid "File skipped. match exclude masks: '%s'\n"
-msgstr "×“×™×œ×’× ×• על הקובץ. ×ª×‘× ×™×ª מסכת שלילה: '%s'\n"
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "מדלג על '%s' בגלל ×©×”×•× ×ª×•×× ×œ×ž×¡×›×ª ××™ ההכללה.\n"
-#: ../src/file.c:1939 ../src/misc_track.c:1694 ../src/misc_track.c:1799
+#: ../src/file.c:1999
+#: ../src/misc_track.c:1773
+#: ../src/misc_track.c:1878
#, c-format
msgid ""
"Podcast already present: '%s'\n"
@@ -3035,7 +3099,7 @@
"הפודקסט כבר קיי×: '%s'\n"
"\n"
-#: ../src/file.c:2004
+#: ../src/file.c:2064
#, c-format
msgid ""
"Writing to video files not yet supported (%s).\n"
@@ -3044,48 +3108,49 @@
"כתיבת קבצי ויד×ו עדיין ×œ× × ×ª×ž×š (%s).\n"
"\n"
-#: ../src/file.c:2056 ../src/file.c:2070
+#: ../src/file.c:2116
+#: ../src/file.c:2130
#, c-format
msgid "Couldn't change tags of file: %s\n"
msgstr "×œ× ×ž×¡×•×’×œ ×œ×©× ×•×ª תג של קובץ: %s\n"
-#: ../src/file.c:2172
+#: ../src/file.c:2232
#, c-format
msgid "Could not open '%s' for reading and writing.\n"
msgstr "××™ ×פשר לפתוח ×ת '%s' לקרי××” וכתיבה.\n"
-#: ../src/file.c:2179
+#: ../src/file.c:2239
#, c-format
msgid "Could not obtain lock on '%s'.\n"
msgstr "××™ ×שפר להשיג × ×¢×™×œ×” על '%s'.\n"
#. error!
-#: ../src/file.c:2196 ../src/file.c:2205 ../src/file.c:2216 ../src/file.c:2226
+#: ../src/file.c:2256
+#: ../src/file.c:2265
+#: ../src/file.c:2276
+#: ../src/file.c:2286
#, c-format
msgid "Malformed line in '%s': %s\n"
msgstr "שורה ×œ× ×ª×§×™× ×” ב '%s' : %s\n"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:2255
+#: ../src/file.c:2315
msgid "Remove offline playcounts?"
msgstr "הסר מספור השמעות ×œ× ×ž×§×•×•×Ÿ?"
#. title
-#: ../src/file.c:2256
-msgid ""
-"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
-"remove them from the offline playcount file, 'Cancel' to keep them."
-msgstr ""
-"××™ ×פשר ל×תר מספר רצועות ×©× ×•×’× ×• בצורה ×œ× ×ž×§×•×•× ×ª ב-iTunesDB. לחץ על '×ישור' "
-"להסיר ×ותן ממספור ההשמעה ×”×œ× ×ž×§×•×•×Ÿ, ועל 'ביטול' להש×יר ×ותן."
+#: ../src/file.c:2316
+msgid "Some tracks played offline could not be found in the iTunesDB. Press 'OK' to remove them from the offline playcount file, 'Cancel' to keep them."
+msgstr "××™ ×פשר ל×תר מספר רצועות ×©× ×•×’× ×• בצורה ×œ× ×ž×§×•×•× ×ª ב-iTunesDB. לחץ על '×ישור' להסיר ×ותן ממספור ההשמעה ×”×œ× ×ž×§×•×•×Ÿ, ועל 'ביטול' להש×יר ×ותן."
-#: ../src/file.c:2273
+#: ../src/file.c:2333
#, c-format
msgid "Error writing to '%s'.\n"
msgstr "תקלה בכתיבה ל-'%s'.\n"
-#: ../src/file.c:2330 ../src/tools.c:271
+#: ../src/file.c:2390
+#: ../src/tools.c:270
#, c-format
msgid ""
"Normalization failed: file type not supported (%s).\n"
@@ -3094,7 +3159,8 @@
"× ×¨×ž×•×œ × ×›×©×œ: סוג קובץ ×œ× × ×ª×ž×š(%s).\n"
"\n"
-#: ../src/file.c:2346 ../src/tools.c:288
+#: ../src/file.c:2406
+#: ../src/tools.c:287
#, c-format
msgid ""
"Normalization failed: file not available (%s).\n"
@@ -3105,119 +3171,130 @@
#: ../src/file_convert.c:316
msgid "Summary status of conversion processes"
-msgstr ""
+msgstr "×¡×™×›×•× ×¢×‘×•×¨ תהליך ההמרה"
#: ../src/file_convert.c:564
msgid "active"
-msgstr ""
+msgstr "פעיל"
#: ../src/file_convert.c:569
msgid "inactive"
-msgstr ""
+msgstr "×œ× ×¤×¢×™×œ"
#: ../src/file_convert.c:580
#, c-format
msgid "Active threads: %d. Scheduled tracks: %d."
-msgstr ""
+msgstr "×ª×”×œ×™×›×™× ×¤×¢×™×œ×™×: %d. רצועות ×ž×ª×•×–×ž× ×•×ª: %d."
-#: ../src/file_convert.c:1061
-#, fuzzy, c-format
+#: ../src/file_convert.c:1071
+#, c-format
msgid "Original filename not available for '%s.'\n"
-msgstr ""
-"× ×¨×ž×•×œ × ×›×©×œ: קובץ ×œ× ×§×™×™× (%s).\n"
-"\n"
+msgstr "קובץ מקורי ×œ× ×–×ž×™×Ÿ עבור '%s'.\n"
-#: ../src/file_convert.c:1076
+#: ../src/file_convert.c:1086
#, c-format
msgid "Filename '%s' is no longer valid for '%s'.\n"
-msgstr ""
+msgstr "הקובץ '%s' כבר ×œ× ×–×ž×™×Ÿ עבור '%s'.\n"
-#: ../src/file_convert.c:1127
+#: ../src/file_convert.c:1137
msgid "Ogg Vorbis"
-msgstr ""
+msgstr "Ogg Vorbis"
-#: ../src/file_convert.c:1133
+#: ../src/file_convert.c:1143
msgid "FLAC"
-msgstr ""
+msgstr "FLAC"
-#: ../src/file_convert.c:1188
+#: ../src/file_convert.c:1198
#, c-format
msgid ""
-"Files of type '%s' are not supported by the iPod. Please go to the "
-"Preferences to set up and turn on a suitable conversion script for '%s'.\n"
+"Files of type '%s' are not supported by the iPod. Please go to the Preferences to set up and turn on a suitable conversion script for '%s'.\n"
"\n"
msgstr ""
+"×§×‘×¦×™× ×ž×¡×•×’ '%s' ×œ× × ×ª×ž×›×™× ×¢×œ ידי ×”Ö¾iPod. ×× × ×’×© ×ל ההגדרות והגדר תסריט המרה מת××™× ×¢×‘×•×¨ '%s'.\n"
+"\n"
-#: ../src/file_convert.c:1274
-#, fuzzy
+#: ../src/file_convert.c:1284
msgid "No information available"
-msgstr "קובץ ×œ× ×§×™×™×"
+msgstr "×œ× ×§×™×™× ×ž×™×“×¢"
-#: ../src/file_convert.c:1313
+#: ../src/file_convert.c:1323
#, c-format
msgid "Could not create '%s'. Filetype conversion will not work.\n"
-msgstr ""
+msgstr "××™ ×פשר ליצור ×ת '%s'. המרת סוג קובץ ×œ× ×ª×¦×œ×™×—.\n"
-#: ../src/file_convert.c:1631 ../src/file_convert.c:3040
-#, fuzzy, c-format
+#: ../src/file_convert.c:1641
+#: ../src/file_convert.c:3049
+#, c-format
msgid ""
"Transfer of '%s' failed. %s\n"
"\n"
msgstr ""
-"הביצוע של '%s' × ×›×©×œ.\n"
+"ההעברה של '%s' × ×›×©×œ×”. %s\n"
"\n"
-#: ../src/file_convert.c:2035 ../src/file_convert.c:2313
-#, fuzzy, c-format
+#: ../src/file_convert.c:2047
+#: ../src/file_convert.c:2325
+#, c-format
msgid ""
"Conversion of '%s' failed: '%s'.\n"
"\n"
msgstr ""
-"הביצוע של '%s' × ×›×©×œ.\n"
+"ההמרה של '%s' × ×›×©×œ×”: '%s'\n"
"\n"
-#: ../src/file_convert.c:2050
+#: ../src/file_convert.c:2062
#, c-format
msgid ""
"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
"\n"
msgstr ""
+"ההמרה של '%s' × ×›×©×œ×”: '%s %s' החזיר ערך יצי××” %d.\n"
+"\n"
-#: ../src/file_convert.c:2079
+#: ../src/file_convert.c:2091
#, c-format
msgid ""
-"Conversion of '%s' failed: '%s %s' did not return filename extension as "
-"expected.\n"
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as expected.\n"
"\n"
msgstr ""
+"ההמרה של '%s' × ×›×©×œ×”: '%s %s' ×œ× ×”×—×–×™×¨ סיומת קובץ כצפוי.\n"
+"\n"
-#: ../src/file_convert.c:2155
+#: ../src/file_convert.c:2167
#, c-format
msgid ""
-"Covnersion of '%s' failed: Could not access original file '%s' (%s).\n"
+"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
"\n"
msgstr ""
+"ההמרה של '%s' × ×›×©×œ×”: ×œ× × ×™×ª×Ÿ לגשת ×ל הקובץ המקורי '%s (%s)'.\n"
+"\n"
-#: ../src/file_convert.c:2210
+#: ../src/file_convert.c:2222
#, c-format
msgid ""
"Conversion of '%s' failed: Could not create directory '%s'.\n"
"\n"
msgstr ""
+"ההמרה של '%s' × ×›×©×œ×”: ×œ× × ×™×ª×Ÿ ליצור תיקייה '%s'.\n"
+"\n"
-#: ../src/file_convert.c:2344
+#: ../src/file_convert.c:2356
#, c-format
msgid ""
"Conversion of '%s' failed: '%s' returned exit status %d.\n"
"\n"
msgstr ""
+"ההמרה של '%s' × ×›×©×œ×”: '%s' החזיר ערך יצי××” %d.\n"
+"\n"
-#: ../src/file_convert.c:2383
+#: ../src/file_convert.c:2395
#, c-format
msgid ""
"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
"\n"
msgstr ""
+"ההמרה של '%s' × ×›×©×œ×”: ×œ× × ×™×ª×Ÿ ×”×™×” להציג × ×ª×•× ×™× ×¢×œ הקובץ המומר '%s'.\n"
+"\n"
#: ../src/file_export.c:182
#, c-format
@@ -3239,22 +3316,19 @@
msgid "Error copying '%s' to '%s' (%s)\n"
msgstr "תקלה בהעתקת '%s' ל '%s' (%s)\n"
-#: ../src/file_export.c:217
-#, c-format
-msgid "Unable to open '%s' for reading\n"
-msgstr "××™ ×פשר לפתוח ×ת '%s' לקרי××”\n"
-
#: ../src/file_export.c:327
#, c-format
msgid "Could find file for '%s' on the iPod\n"
msgstr "××™ ×פשר ×œ×ž×¦×•× ×ת הקובץ '%s' על ×”-iPod\n"
#. create the dialog window
-#: ../src/file_export.c:395 ../src/tools.c:361
+#: ../src/file_export.c:395
+#: ../src/tools.c:360
msgid "Information"
msgstr "מידע"
-#: ../src/file_export.c:406 ../src/tools.c:373
+#: ../src/file_export.c:406
+#: ../src/tools.c:372
msgid "Press button to abort."
msgstr "לביטול לחץ על הכפתור."
@@ -3274,7 +3348,8 @@
msgstr[0] "הועתק %d מתוך %d רצועה."
msgstr[1] "הועתקו %d מתוך %d רצועות."
-#: ../src/file_export.c:505 ../src/tools.c:519
+#: ../src/file_export.c:505
+#: ../src/tools.c:518
#, c-format
msgid "%d%% (%d:%02d:%02d left)"
msgstr "%d%% (%d:%02d:%02d × ×•×ª×¨×•)"
@@ -3301,12 +3376,10 @@
#: ../src/file_export.c:815
msgid ""
-"Some tracks were not copied to your harddisk. Only the copied tracks will be "
-"included in the current drag and drop operation.\n"
+"Some tracks were not copied to your harddisk. Only the copied tracks will be included in the current drag and drop operation.\n"
"\n"
msgstr ""
-"מספר רצועות ×œ× ×”×•×¢×ª×§×• לדיסק הקשיח שלך. רק הרצועות המועתקות יכללו בפעולת "
-"הגרור & שחרר ×”× ×•×›×—×™×ª.\n"
+"מספר רצועות ×œ× ×”×•×¢×ª×§×• לדיסק הקשיח שלך. רק הרצועות המועתקות יכללו בפעולת הגרור & שחרר ×”× ×•×›×—×™×ª.\n"
"\n"
#: ../src/file_export.c:1010
@@ -3334,38 +3407,37 @@
"××™ ×פשר לפתוח ×ת '%s' לכתיבה (%s).\n"
"\n"
-#: ../src/file_itunesdb.c:127
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:129
+#, c-format
msgid "Matching SHA1 checksum for file %d/%d"
-msgstr "בודק סכומי MD5 עבור קובץ %d/%d"
+msgstr "מת××™× ×‘×“×™×§×•×ª ×¡×›×•×ž×™× SHA1 עבור קובץ %d/%d"
-#: ../src/file_itunesdb.c:234
-msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
-msgstr "××™ ×פשר לפתוח ×ת \"iTunesDB.ext\" לקרי×ת מידע מורחב.\n"
+#: ../src/file_itunesdb.c:236
+#, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "××™ ×פשר לפתוח \"%s\" לקרי×ת מידע מורחב.\n"
-#: ../src/file_itunesdb.c:241
+#: ../src/file_itunesdb.c:243
msgid "Could not create hash value from itunesdb\n"
msgstr "××™ ×פשר ליצור ערך ערבוב עבור itunesdb\n"
-#: ../src/file_itunesdb.c:255
+#: ../src/file_itunesdb.c:259
#, c-format
msgid "Error while reading extended info: %s\n"
msgstr "תקלה בזמן קרי×ת מידע מורחב: %s\n"
-#: ../src/file_itunesdb.c:272
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:276
+#, c-format
msgid ""
"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
-"gtkpod will try to match the information using SHA1 checksums. This may take "
-"a long time.\n"
+"gtkpod will try to match the information using SHA1 checksums. This may take a long time.\n"
"\n"
msgstr ""
-"×¡×›×•× ×”×‘×™×§×•×¨×ª (checksum) של iTunesDB '%s' ×œ× ×ª×•×× ×ת ×”×¡×›×•× ×‘×§×•×‘×¥ המידע המורחב "
-"'%s'\n"
-"gtkpod ×™× ×¡×” להת××™× ×ת המידע על ידי שימוש ב-MD5. דבר ×–×” עלול לקחת זמן רב.\n"
+"×¡×›×•× ×”×‘×™×§×•×¨×ª (checksum) של iTunesDB '%s' ×œ× ×ª×•×× ×ת ×”×¡×›×•× ×‘×§×•×‘×¥ המידע המורחב '%s'\n"
+"×”×™×™×©×•× gtkpod ×™× ×¡×” להת××™× ×ת המידע תוך שימוש בחישובי ×¡×›×•×ž×™× ×©×œ SHA1. ×–×” עלול לקחת ×–×” רב.\n"
"\n"
-#: ../src/file_itunesdb.c:284
+#: ../src/file_itunesdb.c:288
#, c-format
msgid ""
"%s:\n"
@@ -3374,7 +3446,7 @@
"%s:\n"
"×ž×¦×¤×™× ×œ \"itunesdb_hash=\" ×בל ×§×™×‘×œ× ×•:\"%s\"\n"
-#: ../src/file_itunesdb.c:344
+#: ../src/file_itunesdb.c:348
#, c-format
msgid ""
"%s:\n"
@@ -3383,22 +3455,17 @@
"%s:\n"
"תקלת פורמט: %s\n"
-#: ../src/file_itunesdb.c:387
-#, fuzzy
+#: ../src/file_itunesdb.c:393
msgid ""
"No SHA1 checksums on individual tracks are available.\n"
"\n"
-"To avoid this situation in the future either switch on duplicate detection "
-"(will provide SHA1 checksums) or avoid using the iPod with programs other "
-"than gtkpod.\n"
+"To avoid this situation in the future either switch on duplicate detection (will provide SHA1 checksums) or avoid using the iPod with programs other than gtkpod.\n"
"\n"
msgstr ""
-"×œ× × ×ž×¦×ו סכומי ביקורת (checksum) על רצועות ×™×—×™×“× ×™×•×ª.\n"
-"על ×ž× ×ª ×œ×ž× ×•×¢ שמצב ×–×” ×œ× ×™×•×¤×™×¢ בעתיד הפעל מצב זיהוי כפילויות (שייתן סכומי "
-"ביקורת) ×ו ×”×™×ž× ×¢ משימוש ×‘×ª×•×›× ×•×ª ×חרות מלבד gtkpod.\n"
+"××™ ×פשר להסיר ×ת הקובץ: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:451
+#: ../src/file_itunesdb.c:457
msgid ""
"Extended info will not be used. If you have non-transferred tracks,\n"
"these will be lost.\n"
@@ -3406,15 +3473,15 @@
"מידע מורחב ×œ× ×™×”×™×” בשימוש. ×× ×™×© לך רצועות ×©×œ× ×”×•×¢×‘×¨×•,\n"
"הן ילכו ל×יבוד.\n"
-#: ../src/file_itunesdb.c:459
+#: ../src/file_itunesdb.c:465
msgid "Offline iPod database successfully imported"
msgstr "מסד × ×ª×•× ×™× ×œ× ×ž×§×•×•×Ÿ של iPod ×™×•×‘× ×‘×”×¦×œ×—×”."
-#: ../src/file_itunesdb.c:462
+#: ../src/file_itunesdb.c:468
msgid "Local database successfully imported"
msgstr "מסד × ×ª×•× ×™× ×ž×§×•×ž×™ ×™×•×‘× ×‘×”×¦×œ×—×”"
-#: ../src/file_itunesdb.c:470
+#: ../src/file_itunesdb.c:476
#, c-format
msgid ""
"Offline iPod database import failed: '%s'\n"
@@ -3423,7 +3490,7 @@
"כישלון ×‘×™×‘×•× ×ž×¡×“ × ×ª×•× ×™× ×œ× ×ž×§×•×•×Ÿ של iPod: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:474
+#: ../src/file_itunesdb.c:480
#, c-format
msgid ""
"Local database import failed: '%s'\n"
@@ -3432,7 +3499,7 @@
"כישלון ×‘×™×‘×•× ×ž×¡×“ × ×ª×•× ×™× ×ž×§×•×ž×™: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:481
+#: ../src/file_itunesdb.c:487
msgid ""
"Offline iPod database import failed: \n"
"\n"
@@ -3440,7 +3507,7 @@
"כישלון ×‘×™×‘×•× ×ž×¡×“ × ×ª×•× ×™× ×œ× ×ž×§×•×•×Ÿ של iPod: \n"
"\n"
-#: ../src/file_itunesdb.c:484
+#: ../src/file_itunesdb.c:490
msgid ""
"Local database import failed: \n"
"\n"
@@ -3448,7 +3515,7 @@
"כישלון ×‘×™×‘×•× ×ž×¡×“ × ×ª×•× ×™× ×ž×§×•×ž×™: \n"
"\n"
-#: ../src/file_itunesdb.c:491
+#: ../src/file_itunesdb.c:497
#, c-format
msgid ""
"'%s' does not exist. Import aborted.\n"
@@ -3457,15 +3524,15 @@
"×™×‘×•× ×‘×•×˜×œ. ×œ× ×§×™×™× '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:514
+#: ../src/file_itunesdb.c:520
msgid "Extended info will not be used.\n"
msgstr "מידע מורחב ×œ× ×™×”×™×” בשימוש.\n"
-#: ../src/file_itunesdb.c:521
+#: ../src/file_itunesdb.c:527
msgid "iPod Database Successfully Imported"
msgstr "מסד × ×ª×•× ×™× ×©×œ iPod ×™×•×‘× ×‘×”×¦×œ×—×”."
-#: ../src/file_itunesdb.c:528
+#: ../src/file_itunesdb.c:534
#, c-format
msgid ""
"iPod Database Import Failed: '%s'\n"
@@ -3474,7 +3541,7 @@
"כישלון ×‘×™×‘×•× ×ž×¡×“ × ×ª×•× ×™× ×©×œ iPod: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:540
msgid ""
"iPod Database Import Failed.\n"
"\n"
@@ -3482,7 +3549,7 @@
"כישלון ×‘×™×‘×•× ×ž×¡×“ × ×ª×•× ×™× ×©×œ iPod: \n"
"\n"
-#: ../src/file_itunesdb.c:543
+#: ../src/file_itunesdb.c:549
#, c-format
msgid ""
"'%s' (or similar) does not exist. Import aborted.\n"
@@ -3491,219 +3558,232 @@
"×”Ö¾'%s' ×œ× ×§×™×™×. ×”×™×‘×•× ×‘×•×˜×œ.\n"
"\n"
-#: ../src/file_itunesdb.c:859
+#: ../src/file_itunesdb.c:865
#, c-format
msgid ""
"Could not find iPod directory structure at '%s'.\n"
-"If you are sure that the iPod is properly mounted at '%s', gtkpod can create "
-"the directory structure for you.\n"
+"If you are sure that the iPod is properly mounted at '%s', gtkpod can create the directory structure for you.\n"
"\n"
"Do you want to create the directory structure now?\n"
msgstr ""
+"××™ ×פשר ×”×™×” ×œ×ž×¦×•× ×ž×‘× ×” תיקיות של iPod ב־'%s'.\n"
+"×× ×תה בטוח שה־iPod שלך מעוגן בצורה ×ª×§×™× ×” ב־'%s', ×”×™×™×©×•× gtkpod יכול ליצור עבורך ×ת ×ž×‘× ×” התיקיות.\n"
+"\n"
+"×”×× ×תה רוצה ליצור ×ת ×ž×‘× ×” התיקיות עכשיו?\n"
-#: ../src/file_itunesdb.c:1140
+#: ../src/file_itunesdb.c:1180
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
msgstr "××™ ×פשר לפתוח \"%s\" לכתיבת מידע מורחב.\n"
-#: ../src/file_itunesdb.c:1155
+#: ../src/file_itunesdb.c:1195
msgid "Aborted writing of extended info.\n"
msgstr "כתיבת מידע מורחב בוטלה.\n"
-#: ../src/file_itunesdb.c:1356
+#: ../src/file_itunesdb.c:1397
#, c-format
msgid "%d%%"
-msgstr ""
+msgstr "%d%%"
-#: ../src/file_itunesdb.c:1370
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1411
+#, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left)"
-msgstr "%d%% (%d:%02d:%02d × ×•×ª×¨×•)"
+msgstr "%d%% (%d/%d %d:%02d:%02d × ×•×ª×¨×•)"
-#: ../src/file_itunesdb.c:1412
+#: ../src/file_itunesdb.c:1463
msgid "Status: Deleting File"
-msgstr ""
+msgstr "מצב: מוחק קובץ"
-#: ../src/file_itunesdb.c:1473
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1524
+#, c-format
msgid ""
"Could not remove the following file: '%s'\n"
"\n"
msgstr ""
-"××™ ×פשר לפתוח ×ת '%s' לכתיבה (%s).\n"
+"××™ ×פשר להסיר ×ת הקובץ: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:1581
-#, fuzzy
+#: ../src/file_itunesdb.c:1632
msgid ""
"The following track could not be converted successfully:\n"
"\n"
msgid_plural ""
"The following tracks could not be converted successfully:\n"
"\n"
-msgstr[0] "הרצועה הב××” ××™× × ×” יכולה להתעדכן"
-msgstr[1] "%d הרצועות הב×ות ××™× ×Ÿ יכולות להתעדכן"
+msgstr[0] ""
+"×œ× ×”×™×” × ×™×ª×Ÿ להמיר ×ת הרצועה הב××” בהצלחה:\n"
+"\n"
+msgstr[1] ""
+"×œ× ×”×™×” × ×™×ª×Ÿ להמיר ×ת הרצועות הב×ות בהצלחה:\n"
+"\n"
-#: ../src/file_itunesdb.c:1591
-#, fuzzy
+#: ../src/file_itunesdb.c:1642
msgid ""
"The following track could not be transferred successfully:\n"
"\n"
msgid_plural ""
"The following tracks could not be transferred successfully:\n"
"\n"
-msgstr[0] "הרצועה הב××” ××™× × ×” יכולה להתעדכן"
-msgstr[1] "%d הרצועות הב×ות ××™× ×Ÿ יכולות להתעדכן"
+msgstr[0] ""
+"×œ× ×”×™×” × ×™×ª×Ÿ להעביר ×ת הרצועה הב××” בהצלחה:\n"
+"\n"
+msgstr[1] ""
+"×œ× ×”×™×” × ×™×ª×Ÿ להעביר ×ת הרצועות הב×ות בהצלחה:\n"
+"\n"
#. ID
#. modal,
#. gint id,
#. gboolean modal,
-#: ../src/file_itunesdb.c:1600 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1651
+#: ../src/misc_confirm.c:70
msgid "Warning"
msgstr "×זהרה"
#. title
-#: ../src/file_itunesdb.c:1601
-msgid ""
-"The iPod could not be ejected. Please fix the problems mentioned below and "
-"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
-"for conversion and transfer."
-msgstr ""
+#: ../src/file_itunesdb.c:1652
+msgid "The iPod could not be ejected. Please fix the problems mentioned below and then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks for conversion and transfer."
+msgstr "×ª×ž×•× ×•×ª"
-#: ../src/file_itunesdb.c:1663
+#: ../src/file_itunesdb.c:1715
+#, c-format
msgid "Status: Copying track"
-msgstr ""
+msgstr "מצב: מעתיק רצועה"
-#: ../src/file_itunesdb.c:1669
+#: ../src/file_itunesdb.c:1721
+#, c-format
msgid "Status: Waiting for conversion to complete"
-msgstr ""
+msgstr "מצב: ממתין ×œ×¡×™×•× ×”×”×ž×¨×”"
-#: ../src/file_itunesdb.c:1673
+#: ../src/file_itunesdb.c:1725
+#, c-format
msgid "Status: Finished transfer"
-msgstr ""
+msgstr "מצב: העברה הסתיימה"
-#: ../src/file_itunesdb.c:1714
+#: ../src/file_itunesdb.c:1770
#, c-format
-msgid ""
-"One track could not be transferred because your iPod is full. Either delete "
-"some tracks or otherwise create space on the iPod before ejecting the iPod "
-"again."
-msgid_plural ""
-"%d tracks could not be transferred because your iPod is full. Either delete "
-"some tracks or otherwise create space on the iPod before ejecting the iPod "
-"again."
-msgstr[0] ""
-msgstr[1] ""
+msgid "One track could not be transferred because your iPod is full. Either delete some tracks or otherwise create space on the iPod before ejecting the iPod again."
+msgid_plural "%d tracks could not be transferred because your iPod is full. Either delete some tracks or otherwise create space on the iPod before ejecting the iPod again."
+msgstr[0] "××™ ×פשר להעביר רצועה ×חת בעקבות ×–×” שה־iPod שלך מל×. מחק מספר רצועות ×ו לחילופין ×¤× ×” ×ž×§×•× ×¢×œ ×”Ö¾iPod ×œ×¤× ×™ ×©×ª× ×ª×§ ×ת ×”Ö¾iPod שוב."
+msgstr[1] "××™ ×פשר להעביר %d רצועות בעקבות ×–×” שה־iPod שלך מל×. מחק מספר רצועות ×ו לחילופין ×¤× ×” ×ž×§×•× ×¢×œ ×”Ö¾iPod ×œ×¤× ×™ ×©×ª× ×ª×§ ×ת ×”Ö¾iPod שוב."
-#: ../src/file_itunesdb.c:1792
+#: ../src/file_itunesdb.c:1852
#, c-format
msgid ""
-"You did not import the existing iTunesDB ('%s'). This is most likely "
-"incorrect and will result in the loss of the existing database.\n"
+"You did not import the existing iTunesDB ('%s'). This is most likely incorrect and will result in the loss of the existing database.\n"
"\n"
-"Press 'OK' if you want to proceed anyhow or 'Cancel' to skip storing. If you "
-"cancel, you can import the existing database before calling this function "
-"again.\n"
+"Press 'OK' if you want to proceed anyhow or 'Cancel' to skip storing. If you cancel, you can import the existing database before calling this function again.\n"
msgstr ""
-"×œ× ×™×™×‘×ת ×ת iTunesDB ×”×§×™×™× ('%s'). ×–×” קרוב לווד××™ ×œ× ×ª×§×™×Ÿ ×•×™×‘×™× ×œ×יבוד של "
-"המסד ×”× ×ª×•× ×™× ×”×§×™×™×.\n"
+"×œ× ×™×™×‘×ת ×ת iTunesDB ×”×§×™×™× ('%s'). ×–×” קרוב לווד××™ ×œ× ×ª×§×™×Ÿ ×•×™×‘×™× ×œ×יבוד של המסד ×”× ×ª×•× ×™× ×”×§×™×™×.\n"
"\n"
-"לחץ ×ישור ×× ×ª×¨×¦×” להמשיך בכל ×–×ת ×ו ביטול לדלג על השמירה. ×× ×ª×‘×˜×œ, תוכל "
-"×œ×™×™×‘× ×ת מסד ×”× ×ª×•× ×™× ×”×§×™×™× ×œ×¤× ×™ קרי××” ×œ×¤×•× ×§×¦×™×” זו שוב.\n"
+"לחץ ×ישור ×× ×ª×¨×¦×” להמשיך בכל ×–×ת ×ו ביטול לדלג על השמירה. ×× ×ª×‘×˜×œ, תוכל ×œ×™×™×‘× ×ת מסד ×”× ×ª×•× ×™× ×”×§×™×™× ×œ×¤× ×™ קרי××” ×œ×¤×•× ×§×¦×™×” זו שוב.\n"
-#: ../src/file_itunesdb.c:1827
-msgid ""
-"iPod directory structure must be present before synching to the iPod can be "
-"performed.\n"
+#: ../src/file_itunesdb.c:1887
+msgid "iPod directory structure must be present before synching to the iPod can be performed.\n"
msgstr "×ž×‘× ×” התיקיות של ×”-iPod חייב להיות זמין ×œ×¤× ×™ ×¡× ×›×¨×•×Ÿ ×”-iPod.\n"
-#: ../src/file_itunesdb.c:1836
+#: ../src/file_itunesdb.c:1896
msgid "Some tracks could not be deleted from the iPod. Export aborted!"
msgstr "מספר רצועות ×œ× ×™×›×œ×• להימחק מה-iPod. ×™×¦×•× ×‘×•×˜×œ!"
-#: ../src/file_itunesdb.c:1854
-msgid "Now writing database. Please wait..."
-msgstr "כותב כעת מסד × ×ª×•× ×™×. ×× × ×”×ž×ª×Ÿ..."
+#: ../src/file_itunesdb.c:1914
+#, c-format
+msgid "Now writing database '%s'. Please wait..."
+msgstr "כותב כעת מסד × ×ª×•× ×™× '%s'. ×× × ×”×ž×ª×Ÿ..."
-#: ../src/file_itunesdb.c:1901
+#: ../src/file_itunesdb.c:1963
#, c-format
msgid "Extended information file not deleted: '%s'"
msgstr "קובץ מידע מורחב ×œ× × ×ž×—×§: '%s'"
-#: ../src/file_itunesdb.c:1987
+#: ../src/file_itunesdb.c:2070
#, c-format
msgid "%s: Database saved"
msgstr "מסד × ×ª×•× ×™× ×©×œ iPod × ×©×ž×¨ :%s"
-#: ../src/file_itunesdb.c:1991
+#: ../src/file_itunesdb.c:2074
#, c-format
msgid "%s: Changes saved"
msgstr "%s: ×©×™× ×•×™×™× × ×©×ž×¨×•"
-#: ../src/fileselection.c:128
+#: ../src/fileselection.c:129
msgid "Successfully added files"
msgstr "×§×‘×¦×™× ×”×•×¡×¤×• בהצלחה"
-#: ../src/fileselection.c:130
+#: ../src/fileselection.c:131
msgid "Some files were not added successfully"
msgstr "מספר ×§×‘×¦×™× ×œ× ×”×•×¡×¤×• בהצלחה"
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:160
-msgid "Add Files"
-msgstr "הוספת קבצי×"
+#: ../src/fileselection.c:164
+#: ../src/fileselection.c:305
+#: ../src/fileselection.c:792
+msgid "Please select a playlist or repository before adding tracks."
+msgstr "×× × ×‘×—×¨ רשימת השמעה ×ו מ×גר ×œ×¤× ×™ הוספת רצועות."
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:253
-msgid "Add Playlists"
-msgstr "הוספת רשימת השמעה"
+#: ../src/fileselection.c:175
+#: ../src/fileselection.c:314
+#: ../src/fileselection.c:803
+msgid "Please load the iPod before adding tracks."
+msgstr "×× × ×˜×¢×Ÿ ×ת ×”Ö¾iPod ×œ×¤× ×™ הוספת רצועות."
+#: ../src/fileselection.c:185
+#, c-format
+msgid "Add files to '%s'"
+msgstr "הוספת ×§×‘×¦×™× ×ל '%s'"
+
+#: ../src/fileselection.c:189
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr "הוסף ×§×‘×¦×™× ×ל '%s/%s'"
+
+#. Create window title
+#: ../src/fileselection.c:322
+#, c-format
+msgid "Add playlist files to '%s'"
+msgstr "הוספת קבצי רשימות × ×™×’×•×Ÿ ×ל '%s'"
+
#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:300
+#: ../src/fileselection.c:378
msgid "Set Cover"
msgstr "קבע עטיפה"
-#: ../src/fileselection.c:721
-msgid "Select directory to add recursively"
-msgstr "בחר תיקייה להוספה רקורסיבית"
+#: ../src/fileselection.c:816
+#, c-format
+msgid "Add directories to '%s'"
+msgstr "הוספת תיקיות ×ל '%s'"
-#: ../src/fileselection.c:992
+#: ../src/fileselection.c:820
+#, c-format
+msgid "Add directories to '%s/%s'"
+msgstr "הוספת תיקיות ×ל '%s%s'"
+
+#: ../src/fileselection.c:1097
msgid "Ok"
msgstr "×ישור"
-#: ../src/fileselection.c:1001
+#: ../src/fileselection.c:1106
msgid "Cancel"
msgstr "ביטול"
-#: ../src/flacfile.c:33
-#, fuzzy, c-format
+#: ../src/flacfile.c:62
+#, c-format
msgid "'%s' does not appear to be an FLAC audio file.\n"
-msgstr "הקובץ '%s' ×”×•× ×›× ×¨××” ×œ× ×§×•×‘×¥ שמע mp4.\n"
+msgstr "הקובץ '%s' ×”×•× ×›× ×¨××” ×œ× ×§×•×‘×¥ שמע מסוג FLAC.\n"
-#: ../src/flacfile.c:52
-#, fuzzy, c-format
+#: ../src/flacfile.c:78
+#, c-format
msgid "Error retrieving tags for '%s'.\n"
-msgstr "תקלה בכתיבה ל-'%s'.\n"
+msgstr "תקלה ב×חזור התגיות עבור '%s'.\n"
-#: ../src/flacfile.c:119
-#, fuzzy, c-format
-msgid ""
-"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
-"compile the gtkpod source together with the FLAC library.\n"
-msgstr ""
-"×”×™×™×‘×•× ×©×œ '%s' × ×›×©×œ: m4a/m4p/m4b ×œ× × ×ª×ž×š ×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת "
-"קוד המקור gtkpod ביחד ×¢× ×”×¡×¤×¨×™×” mp4v2.\n"
+#: ../src/flacfile.c:165
+#, c-format
+msgid "Import of '%s' failed: FLAC not supported without the FLAC library. You must compile the gtkpod source together with the FLAC library.\n"
+msgstr "×”×™×™×‘×•× ×©×œ '%s' × ×›×©×œ: FLAC ×œ× × ×ª×ž×š ×œ×œ× ×”×¡×¤×¨×™×” של FLAC. ×תה חייב להדר ×ת קוד המקור gtkpod ביחד ×¢× ×”×¡×¤×¨×™×” של FLAC.\n"
-#: ../src/flacfile.c:125
-#, fuzzy, c-format
-msgid ""
-"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
-"library. You must compile the gtkpod source together with the FLAC library.\n"
-msgstr ""
-"עדכון מט×-מידע של m4a/m4p/m4b עבור '%s' × ×›×©×œ: ×”×¡×•×’×™× m4a/m4p/m4b ×œ× × ×ª×ž×›×™× "
-"×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת קוד המקור של gtkpod ביחד ×¢× ×¡×¤×¨×™×™×ª "
-"mp4v2.\n"
+#: ../src/flacfile.c:171
+#, c-format
+msgid "FLAC metadata update for '%s' failed: FLAC not supported without the FLAC library. You must compile the gtkpod source together with the FLAC library.\n"
+msgstr "עדכון מט×-מידע של FLAC עבור '%s' × ×›×©×œ: הסוג FLAC ×œ× × ×ª×ž×š ×œ×œ× ×”×¡×¤×¨×™×” FLAC. ×תה חייב להדר ×ת קוד המקור של gtkpod ביחד ×¢× ×¡×¤×¨×™×™×ª FLAC.\n"
#: ../src/getopt.c:681
#, c-format
@@ -3720,7 +3800,8 @@
msgid "%s: option `%c%s' doesn't allow an argument\n"
msgstr "%s: ×פשרות '%c%s' ×œ× ×ž×פשרת ××¨×’×•×ž× ×˜\n"
-#: ../src/getopt.c:729 ../src/getopt.c:902
+#: ../src/getopt.c:729
+#: ../src/getopt.c:902
#, c-format
msgid "%s: option `%s' requires an argument\n"
msgstr "%s: ×פשרות '%s' דורשת ××¨×’×•×ž× ×˜\n"
@@ -3749,7 +3830,8 @@
msgstr "%s: ×פשרות --%c ×œ× ×ª×§×™× ×”\n"
#. 1003.2 specifies the format of this message.
-#: ../src/getopt.c:821 ../src/getopt.c:951
+#: ../src/getopt.c:821
+#: ../src/getopt.c:951
#, c-format
msgid "%s: option requires an argument -- %c\n"
msgstr "%s: ×פשרות דורשת ××¨×’×•×ž× ×˜ -- %c\n"
@@ -3768,411 +3850,396 @@
msgid "n/c"
msgstr "n/c"
-#: ../src/info.c:388 ../src/info.c:835
+#: ../src/info.c:388
+#: ../src/info.c:838
msgid "offline"
msgstr "×œ× ×ž×§×•×•×Ÿ"
-#: ../src/info.c:483
+#: ../src/info.c:486
#, c-format
msgid " P:%d T:%d/%d"
msgstr " P:%d T:%d/%d"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "B"
msgstr "בתי×"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "kB"
msgstr "ק\"ב"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "TB"
msgstr "ט\"ב"
-#: ../src/info.c:820
+#: ../src/info.c:823
#, c-format
msgid " %s Free"
msgstr " %s זמין"
-#: ../src/info.c:825
+#: ../src/info.c:828
#, c-format
msgid " %s Pending"
msgstr " %s ממתין"
-#: ../src/info.c:830
+#: ../src/info.c:833
msgid " disconnected"
msgstr " ×ž× ×•×ª×§"
-#: ../src/info.c:881
+#: ../src/info.c:884
msgid "No database or playlist selected"
msgstr "×œ× × ×‘×—×¨×• מסד × ×ª×•× ×™× ×ת רשימת השמעה"
-#: ../src/info.c:886
+#: ../src/info.c:889
msgid "No tracks selected"
msgstr "×œ× × ×‘×—×¨×• רצועות"
-#: ../src/info.c:891
+#: ../src/info.c:894
msgid "No playlist selected"
msgstr "×œ× × ×‘×—×¨×” רשימת השמעה"
-#: ../src/info.c:896
+#: ../src/info.c:899
msgid "No iPod or iPod playlist selected"
msgstr "×œ× × ×‘×—×¨ iPod ×ו ×œ× × ×‘×—×¨×” רשימת השמעה של iPod"
#. Strings used several times
#: ../src/ipod_init.c:48
msgid "Select or enter your model"
-msgstr ""
+msgstr "בחר ×ו ×”×›× ×¡ ×ת ×”×“×’× ×©×œ×š"
-#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
+#: ../src/ipod_init.c:79
+#: ../src/repository.c:546
+#: ../src/repository.c:2369
msgid "Select mountpoint"
msgstr "בחר × ×§×•×“×ª ×¢×’×™× ×”"
#: ../src/ipod_init.c:359
-#, fuzzy, c-format
+#, c-format
msgid "Error initialising iPod: %s\n"
-msgstr "תקלה בכתיבה ל-'%s'.\n"
+msgstr "תקלה ב×תחול ×”Ö¾iPod: %s\n"
#: ../src/ipod_init.c:366
msgid "Error initialising iPod, unknown error\n"
-msgstr ""
+msgstr "תקלה ב×תחול ×”Ö¾iPod, תקלה בלתי ידועה\n"
#: ../src/ipod_init.c:422
-#, fuzzy, c-format
+#, c-format
msgid "<b>Please select your iPod model at </b><i>%s</i>"
-msgstr "<b>×× × ×‘×—×¨ × ×§×•×“×ª ×¢×’×™× ×” ו×ת ×”×“×’× ×©×œ ×”Ö¾iPod</b>"
+msgstr "<b>×× × ×‘×—×¨ ×ת המודל של ×”Ö¾iPod שלך ב־</b><i>%s</i>"
-#: ../src/misc.c:86
-#, c-format
+#: ../src/ipod_init.c:463
msgid ""
-"gtkpod Version %s: Cross-Platform Multi-Lingual Interface to Apple's iPod"
-"(tm)."
-msgstr "גרסת gtkpod %s: ממשק חוצה-פלטפורמות רב-שפות ל×ייפוד(TM) של ×פל."
-
-#: ../src/misc.c:90
-#, fuzzy
-msgid ""
-"(C) 2002 - 2007\n"
-"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
-"Corey Donohoe (atmos at atmos dot org)\n"
+"Could not determine the model you selected -- this could be a bug or incompatibilty in the GTK+ or glade library.\n"
"\n"
+msgstr ""
+"××™ ×פשר לקבוע ×ת ×”×“×’× ×©×תה משתמש בו -- ×–×” יכול ×œ× ×‘×•×¢ כתוצ××” מב××’ ×ו ××™ הת×מה ב־GTK+ ×ו ספריית glade.\n"
"\n"
-msgstr "×’×¨×ž× ×™×ª:\tיורג שולר (jcsjcs at users dot sourceforge dot net)\n"
-#: ../src/misc.c:96
+#: ../src/misc.c:70
msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
+"© 2002 - 2007\n"
+"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+"Corey Donohoe (atmos at atmos dot org)\n"
msgstr ""
+"© 2002 - 2007\n"
+"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+"Corey Donohoe (atmos at atmos dot org)\n"
-#: ../src/misc.c:104
-msgid ""
-"Patches were supplied by the following people (list may be incomplete -- "
-"please contact me)\n"
-"\n"
-msgstr ""
-"טל××™× ×¡×•×¤×§×• על ידי ×”×× ×©×™× ×”×‘××™× (הרשימה עלולה להיות ×œ× ×ž×•×©×œ×ž×ª -- ×× × ×¦×¨×• "
-"×יתי קשר)\n"
-"\n"
+#: ../src/misc.c:74
+msgid "Patches were supplied by the following people (list may be incomplete -- please contact me)\n"
+msgstr "טל××™× ×¡×•×¤×§×• על ידי ×”×× ×©×™× ×”×‘××™× (הרשימה עלולה להיות ×œ× ×ž×•×©×œ×ž×ª -- ×× × ×¦×¨×• ×יתי קשר)\n"
-#: ../src/misc.c:106
-msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)\n"
-msgstr "רמס דה×ר×ן: עריכה-מרובה (עריכת תגיות של מספר רצועות בו ×–×ž× ×™×ª)\n"
+#: ../src/misc.c:75
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
+msgstr "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
-#: ../src/misc.c:108
-msgid "Hiroshi Kawashima: Japanese charset autodetecion feature\n"
-msgstr "הירושי ק×וו×שימה: זיהוי ×וטומטי של ערכת ×ª×•×•×™× ×™×¤× ×™×ª.\n"
+#: ../src/misc.c:76
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
+msgstr "Hiroshi Kawashima: Japanese charset autodetection feature"
-#: ../src/misc.c:110
-msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c\n"
-msgstr "×דרי×ן ×לריך: הסבה של קוד רשימות השמעה מ mktunes.pl ל itunesdb.c\n"
+#: ../src/misc.c:77
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
+msgstr "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
-#: ../src/misc.c:112
-msgid ""
-"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
-"newlines at the end\n"
-msgstr ""
-"וולטר בל: טיפול × ×›×•×Ÿ ×‘× ×ª×™×‘×™ גרירה ושחרור ×¢× ×ª×•×•×™× ×ž×™×•×—×“×™× ×ו תווי cr ושורות "
-"חדשות בסוף\n"
+#: ../src/misc.c:78
+msgid "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/newlines at the end"
+msgstr "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/newlines at the end"
-#: ../src/misc.c:114
-msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod\n"
-msgstr "ס×× ×§×œ××’: קביעת שמות ×§×‘×¦×™× ×¢×œ ידי משתמש בזמן ×™×™×¦×•× ×¨×¦×•×¢×•×ª מה-iPod\n"
+#: ../src/misc.c:79
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
+msgstr "Sam Clegg: user defined filenames when exporting tracks from the iPod"
-#: ../src/misc.c:116
-msgid "Chris Cutler: automatic creation of various playlist types\n"
-msgstr "כריס קוטלר: יצירת ×¡×•×’×™× ×©×•× ×™× ×©×œ רשימות השמעה ×וטומטית\n"
+#: ../src/misc.c:80
+msgid "Chris Cutler: automatic creation of various playlist types"
+msgstr "Chris Cutler: automatic creation of various playlist types"
-#: ../src/misc.c:118
-msgid ""
-"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
-"dialogue during sync\n"
-msgstr ""
-"גרה×× ×•×™×œ×¤×•×¨×“: קרי××” וכתיבה של תגיות ×”ID3 של ×”'יוצר', פקד התקדמות בזמן "
-"×¡× ×›×¨×•×Ÿ\n"
+#: ../src/misc.c:81
+msgid "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress dialogue during sync"
+msgstr "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress dialogue during sync"
-#: ../src/misc.c:120
-msgid ""
-"Edward Matteucci: debugging, special playlist creation, most of the volume "
-"normalizing code\n"
-msgstr ""
-"×דו×רד מ×טוצ'×™ : דיבוג, יצירת רשימות השמעה מיוחדות, רוב הקוד של × ×™×¨×ž×•×œ "
-"הקול.\n"
+#: ../src/misc.c:82
+msgid "Edward Matteucci: debugging, special playlist creation, most of the volume normalizing code"
+msgstr "Edward Matteucci: debugging, special playlist creation, most of the volume normalizing code"
-#: ../src/misc.c:122
-msgid "Jens Lautenbach: some optical improvements\n"
-msgstr "×–'×× ×¡ ל××•×˜× ×‘×ך: מספר ×©×™×¤×•×¨×™× ×ופטיי×\n"
+#: ../src/misc.c:83
+msgid "Jens Lautenbach: some optical improvements"
+msgstr "Jens Lautenbach: some optical improvements"
-#: ../src/misc.c:124
-msgid "Alex Tribble: iPod eject patch\n"
-msgstr "×לכס טריבל: טל××™ שחרור iPod\n"
+#: ../src/misc.c:84
+msgid "Alex Tribble: iPod eject patch"
+msgstr "Alex Tribble: iPod eject patch"
-#: ../src/misc.c:126
-msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling\n"
-msgstr "ירוסלב ×לצ'× ×§×•: טיפול ברצועות יתומות ×•×ž×ª× ×“× ×“×•×ª\n"
+#: ../src/misc.c:85
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+msgstr "Yaroslav Halchenko: Orphaned and dangling tracks handling"
-#: ../src/misc.c:128
-msgid ""
-"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes\n"
-msgstr ""
-"×× ×“×¨×• ×”× ×˜×•×•×¨×§: טיפול ×‘×”×‘×—× ×” ב×ותיות גדולות/×§×˜× ×•×ª בשמות ×§×‘×¦×™× ×•×ž×¡×¤×¨ ב××’×™× "
-"× ×•×¡×¤×™×\n"
+#: ../src/misc.c:86
+msgid "Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
+msgstr "Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
-#: ../src/misc.c:130
-msgid ""
-"Ero Carrera: Filename validation and quick sync when copying tracks from the "
-"iPod\n"
-msgstr "×ירו ק×ררה: בדיקת ×§×‘×¦×™× ×•×¡× ×›×¨×•×Ÿ מהיר בזמן העתקת רצועות מה-iPod\n"
+#: ../src/misc.c:87
+msgid "Ero Carrera: Filename validation and quick sync when copying tracks from the iPod"
+msgstr "Ero Carrera: Filename validation and quick sync when copying tracks from the iPod"
-#: ../src/misc.c:132
-msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume\n"
-msgstr "×–'×× ×¡ ט×פרוג: תמיכה ×‘× ×¨×ž×•×œ עוצמת קול של LAME\n"
+#: ../src/misc.c:88
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
+msgstr "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
-#: ../src/misc.c:134
-msgid "Armando Atienza: Support with external playcounts\n"
-msgstr "××¨×ž× ×“×• ×טי×× ×–×”: תמיכה בספירה השמעה ×—×™×¦×•× ×™×ª\n"
+#: ../src/misc.c:89
+msgid "Armando Atienza: Support with external playcounts"
+msgstr "Armando Atienza: Support with external playcounts"
-#: ../src/misc.c:136
-msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)\n"
-msgstr "ד.×”. שרפ: תמיכה בקבצי m4b (קבצי AAC ×¢× ×ª×’×™×•×ª)\n"
+#: ../src/misc.c:90
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+msgstr "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
-#: ../src/misc.c:138
-msgid "Jim Hall: Decent INSTALL file\n"
-msgstr "×’'×™× ×”×•×œ: הליך ×”×ª×§× ×” × ×•×¨×ž×œ×™\n"
+#: ../src/misc.c:91
+msgid "Jim Hall: Decent INSTALL file"
+msgstr "Jim Hall: Decent INSTALL file"
-#: ../src/misc.c:140
-msgid ""
-"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
-"contacts to the iPod\n"
-msgstr ""
-"יורגן הלמרס, מרכוס ×’×וגושס: תסריטי המרה ×œ×¡× ×›×¨×•×Ÿ היומן/×× ×©×™ קשר ×ל ×”-iPod\n"
+#: ../src/misc.c:92
+msgid "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/contacts to the iPod"
+msgstr "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/contacts to the iPod"
#. J"urgen!
-#: ../src/misc.c:142
-msgid "Flavio Stanchina: bugfixes\n"
-msgstr "פל×ביו סט×× ×¦×™× ×”: תיקון ב××’×™×\n"
+#: ../src/misc.c:93
+msgid "Flavio Stanchina: bugfixes"
+msgstr "Flavio Stanchina: bugfixes"
-#: ../src/misc.c:144
-msgid ""
-"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title\n"
-msgstr ""
-"כריס מיק×צ'×™: בזמן מיון ×”×ª×¢×œ× ×ž×ª×—×™×œ×•×ª כגון ×”' הידיעה (the) ו××—×¨×™× ×‘×ª×—×™×œ×ª ×©× "
-"הרצועה\n"
+#: ../src/misc.c:94
+msgid "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of the title"
+msgstr "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of the title"
-#: ../src/misc.c:146
-msgid "Steve Jay: use statvfs() instead of df (better portability, faster)\n"
-msgstr ""
-"סטיב ×’××™: השתמש ב-statvfs() ×‘×ž×§×•× ×‘-df (מהיר יותר, ×•× ×™×ª×Ÿ להמרה לפלטפורמות "
-"×©×•× ×•×ª בקלות יותר)\n"
+#: ../src/misc.c:95
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
+msgstr "Steve Jay: use statvfs() instead of df (better portability, faster)"
-#: ../src/misc.c:149
-msgid ""
-"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
-"tags\n"
-msgstr "כריסטוף ×§×•× ×¥: טיפול בבעיות ת×ימות בזמן כתיבת תגיות id3v2.4 בקבצי mp3\n"
+#: ../src/misc.c:97
+msgid "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 tags"
+msgstr "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 tags"
-#: ../src/misc.c:152
+#: ../src/misc.c:99
msgid ""
"James Liggett:\n"
-" replacement of old GTK file selection dialogs with new GTK filechooser "
-"dialogs\n"
-" refactored user preferences system.\n"
+"replacement of old GTK file selection dialogs with new GTK filechooser dialogs\n"
+"refactored user preferences system."
msgstr ""
+"James Liggett:\n"
+"replacement of old GTK file selection dialogs with new GTK filechooser dialogs\n"
+"refactored user preferences system."
-#: ../src/misc.c:157
-msgid "Daniel Kercher: sync scripts for abook and webcalendar\n"
-msgstr "×“× ×™×ל קרצר: קבצי ×¡× ×›×¨×•×Ÿ בשביל abook ו-webcalender\n"
+#: ../src/misc.c:103
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
+msgstr "Daniel Kercher: sync scripts for abook and webcalendar"
-#: ../src/misc.c:160
-msgid "Clinton Gormley: sync scripts for thunderbird\n"
-msgstr "×§×œ×™× ×˜×•×Ÿ גורמלי: קבצי ×צווה ×œ×¡×™× ×›×¨×•×Ÿ ×¢× thunderbird\n"
+#: ../src/misc.c:105
+msgid "Clinton Gormley: sync scripts for thunderbird"
+msgstr "Clinton Gormley: sync scripts for thunderbird"
-#: ../src/misc.c:163
-msgid "Sebastien Beridot: sync script for ldif addressbook format\n"
-msgstr ""
+#: ../src/misc.c:107
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
+msgstr "Sebastien Beridot: sync script for ldif addressbook format"
-#: ../src/misc.c:166
-msgid "Sebastian Scherer: sync script for kNotes\n"
-msgstr ""
+#: ../src/misc.c:109
+msgid "Sebastian Scherer: sync script for kNotes"
+msgstr "Sebastian Scherer: sync script for kNotes"
-#: ../src/misc.c:169
-msgid "Nick Piper: sync script for Palm, type-ahead search\n"
-msgstr ""
+#: ../src/misc.c:111
+msgid "Nick Piper: sync script for Palm, type-ahead search"
+msgstr "Nick Piper: sync script for Palm, type-ahead search"
-#: ../src/misc.c:172
-msgid "Uwe Hermann: help with support for iPod Video\n"
-msgstr ""
+#: ../src/misc.c:113
+msgid "Uwe Hermann: help with support for iPod Video"
+msgstr "Uwe Hermann: help with support for iPod Video"
-#: ../src/misc.c:175
-msgid ""
-"Iain Benson: support for compilation tag in mp3 files and separate display "
-"of compilations in the sort tab.\n"
-msgstr ""
+#: ../src/misc.c:115
+msgid "Iain Benson: support for compilation tag in mp3 files and separate display of compilations in the sort tab."
+msgstr "Iain Benson: support for compilation tag in mp3 files and separate display of compilations in the sort tab."
-#: ../src/misc.c:177
+#: ../src/misc.c:116
msgid ""
"Nicolas Chariot: icons of buttons\n"
"\n"
-"\n"
msgstr ""
+"Nicolas Chariot: icons of buttons\n"
+"\n"
-#: ../src/misc.c:181
-msgid "This program borrows code from the following projects:\n"
-msgstr "×”×ª×•×›× ×” שו×לת קוד ×ž×”×¤×¨×•×™×™×§×˜×™× ×”×‘××™×: \n"
+#: ../src/misc.c:118
+msgid "This program borrows code from the following projects:"
+msgstr "×”×ª×•×›× ×” שו×לת קוד ×ž×”×¤×¨×•×™×™×§×˜×™× ×”×‘××™×:"
-#: ../src/misc.c:183
-msgid ""
-" gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB "
-"(http://www.gnu.org/software/gnupod/)\n"
-msgstr ""
+#: ../src/misc.c:119
+msgid "gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://www.gnu.org/software/gnupod/)"
+msgstr "gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://www.gnu.org/software/gnupod/)"
-#: ../src/misc.c:185
-msgid ""
-" iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some "
-"code for smart playlists is based on his C++-classes.\n"
-msgstr ""
+#: ../src/misc.c:120
+msgid "iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code for smart playlists is based on his C++-classes."
+msgstr "iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code for smart playlists is based on his C++-classes."
-#: ../src/misc.c:187
-msgid " mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)\n"
-msgstr ""
+#: ../src/misc.c:121
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
+msgstr "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
-#: ../src/misc.c:189
-msgid ""
-" xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)\n"
-msgstr ""
+#: ../src/misc.c:122
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
+msgstr "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
-#: ../src/misc.c:192
-msgid ""
-"The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"
-msgstr ""
+#: ../src/misc.c:124
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
+msgstr "×”Ö¾GUI יוצר בעזרת glade-2, ר××”: (http://glade.gnome.org)."
-#: ../src/misc.c:207
-msgid "French: David Le Brun (david at dyn-ns dot net)\n"
-msgstr "צרפתית:\tדיוויד לה-ברון (david at dyn-ns dot net)\n"
+#: ../src/misc.c:128
+msgid "French: David Le Brun (david at dyn-ns dot net)"
+msgstr "צרפתית: David Le Brun (david at dyn-ns dot net)"
-#: ../src/misc.c:209
-msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
-msgstr "×’×¨×ž× ×™×ª:\tיורג שולר (jcsjcs at users dot sourceforge dot net)\n"
+#: ../src/misc.c:129
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr "צרפתית: Éric Lassauge (rpmfarm at free dot fr)"
-#: ../src/misc.c:211
-msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)\n"
-msgstr "עברית:\t×סף גילת (gillata at gmail dot com)\n"
+#: ../src/misc.c:130
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+msgstr "×’×¨×ž× ×™×ª: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
-#: ../src/misc.c:213
+#: ../src/misc.c:131
+msgid "German: Kai-Ove"
+msgstr "×’×¨×ž× ×™×ª: Kai-Ove"
+
+#: ../src/misc.c:132
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+msgstr "עברית: ×סף גילת (gillata at gmail dot com)"
+
+#: ../src/misc.c:133
+msgid "Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
+msgstr "×יטלקית: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
+
+#: ../src/misc.c:134
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr "×יטלקית: Daniele Forsi (dforsi at gmail dot com)"
+
+#: ../src/misc.c:135
+msgid "Japanese: Ayako Sano"
+msgstr "×™×¤× ×™×ª: Ayako Sano"
+
+#: ../src/misc.c:136
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+msgstr "×™×¤× ×™×ª: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+
+#: ../src/misc.c:137
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr "×¨×•×ž× ×™×ª: Alex Eftimie (alexeftimie at gmail dot com)"
+
+#: ../src/misc.c:138
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr "ספרדית: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+
+#: ../src/misc.c:139
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
+msgstr "שוודית: Stefan Asserhall (stefan.asserhall at comhem dot se)"
+
+#: ../src/misc.c:144
msgid ""
-"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net)\n"
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
msgstr ""
-"×יטלקית:\t×דו×רד מ×טוצ'×™ (edward_matteucc at users dot sourceforge dot net)\n"
-#: ../src/misc.c:215
-msgid "Japanese: Ayako Sano\n"
-msgstr "×™×¤× ×™×ª:\t×ייקו ס×× ×•\n"
+#: ../src/misc.c:159
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+msgstr ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
-#: ../src/misc.c:217
-msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
-msgstr "×™×¤× ×™×ª:\t×§×•× ×˜×¨×• פוקוצ'×™ (fukuchi at users dot sourceforge dot net)\n"
+#: ../src/misc.c:167
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr "ממשק חוצה-פלטפורמות רב-שפות עבור iPodâ„¢ של ×פל."
-#: ../src/misc.c:219
-msgid "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
-msgstr "שוודית:\tסטפן ×סרהול (stefan asserhall at comhem dot se)\n"
-
-#: ../src/misc.c:975
+#: ../src/misc.c:934
#, c-format
msgid "Could not process '%s' (no filename available)"
msgstr "××™ ×פשר לעבד ×ת '%s' (קובץ ×œ× ×–×ž×™×Ÿ)"
-#: ../src/misc.c:1129
+#: ../src/misc.c:1088
#, c-format
msgid "Unknown token '%%%c' in template '%s'"
msgstr "×סימון ×œ× ×™×“×•×¢ '%%%c' ×‘×ª×‘× ×™×ª '%s'"
-#: ../src/misc.c:1212
+#: ../src/misc.c:1171
#, c-format
msgid "Template ('%s') does not match file type '%s'\n"
msgstr "×”×ª×‘× ×™×ª ('%s') ×œ× ×ž×ª×ימה לסוג הקובץ '%s'\n"
-#: ../src/misc.c:1298
+#: ../src/misc.c:1257
#, c-format
msgid "Error creating %s: %s\n"
msgstr "תקלה ביצירת %s: %s\n"
-#: ../src/misc.c:1777
-#, fuzzy, c-format
+#: ../src/misc.c:1691
+#, c-format
msgid ""
"Writing preferences file '%s' failed (%s).\n"
"\n"
msgstr ""
-"הביצוע של '%s' × ×›×©×œ.\n"
+"כתיבת קובץ הגדרות '%s' × ×›×©×œ×” (%s).\n"
"\n"
-#: ../src/misc.c:1779
+#: ../src/misc.c:1693
msgid "unspecified error"
-msgstr ""
+msgstr "תקלה ×œ× ×ž×•×’×“×¨×ª"
-#: ../src/misc.c:1787
+#: ../src/misc.c:1701
#, c-format
msgid ""
-"Writing preferences to the iPod (%s) failed: could not get path to Control "
-"Directory.\n"
+"Writing preferences to the iPod (%s) failed: could not get path to Control Directory.\n"
"\n"
msgstr ""
+"כתיבת ההעדפות ×ל ×”Ö¾iPod (%s) × ×›×©×œ×•: ××™ ×פשר ×”×™×” להשיג × ×ª×™×‘ ×ל תיקיית הבקרה.\n"
+"\n"
#. title
#: ../src/misc_confirm.c:71
-#, fuzzy
msgid "The following has occurred:"
msgstr "×ירע ×”×ירוע הב×:"
#: ../src/misc_confirm.c:122
-msgid ""
-"Are you sure you want to delete the following track completely from your "
-"iPod? The number of playlists this track is a member of is indicated in "
-"parentheses."
-msgid_plural ""
-"Are you sure you want to delete the following tracks completely from your "
-"iPod? The number of playlists the tracks are member of is indicated in "
-"parentheses."
-msgstr[0] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועה הב××” לגמרי מה-iPod? מספר רשימות ההשמעה "
-"שהרצועה הזו חברה בהן ×ž×¦×•×™× ×ª בסוגריי×."
-msgstr[1] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועות הב×ות לגמרי מה-iPod? מספר רשימות "
-"ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgid "Are you sure you want to delete the following track completely from your iPod? The number of playlists this track is a member of is indicated in parentheses."
+msgid_plural "Are you sure you want to delete the following tracks completely from your iPod? The number of playlists the tracks are member of is indicated in parentheses."
+msgstr[0] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועה הב××” לגמרי מה-iPod? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×ª בסוגריי×."
+msgstr[1] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועות הב×ות לגמרי מה-iPod? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
#: ../src/misc_confirm.c:126
msgid "Delete Track Completely from iPod?"
@@ -4180,37 +4247,26 @@
msgstr[0] "מחק ×ת הרצועה לגמרי מה-iPod?"
msgstr[1] "מחק ×ת הרצועות לגמרי מה-iPod?"
-#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#: ../src/misc_confirm.c:137
+#: ../src/misc_confirm.c:178
#, c-format
-msgid ""
-"Are you sure you want to remove the following track from the playlist \"%s\"?"
-msgid_plural ""
-"Are you sure you want to remove the following tracks from the playlist \"%s"
-"\"?"
+msgid "Are you sure you want to remove the following track from the playlist \"%s\"?"
+msgid_plural "Are you sure you want to remove the following tracks from the playlist \"%s\"?"
msgstr[0] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š להסיר ×ת הרצועה הב××” מרשימת ההשמעה \"%s\"?"
msgstr[1] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š להסיר ×ת הרצועות הב×ות מרשימת ההשמעה \"%s\"?"
-#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+#: ../src/misc_confirm.c:141
+#: ../src/misc_confirm.c:182
msgid "Remove Track From Playlist?"
msgid_plural "Remove Tracks From Playlist?"
msgstr[0] "הסר ×ת הרצועה מרשימת ההשמעה?"
msgstr[1] "הסר ×ת הרצועות מרשימת ההשמעה?"
#: ../src/misc_confirm.c:163
-msgid ""
-"Are you sure you want to delete the following track completely from your "
-"harddisk? The number of playlists this track is a member of is indicated in "
-"parentheses."
-msgid_plural ""
-"Are you sure you want to delete the following tracks completely from your "
-"harddisk? The number of playlists the tracks are member of is indicated in "
-"parentheses."
-msgstr[0] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועה הב××” לגמרי מהדיסק הקשיח? מספר רשימות "
-"ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
-msgstr[1] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועות הב×ות לגמרי מהדיסק הקשיח? מספר רשימות "
-"ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgid "Are you sure you want to delete the following track completely from your harddisk? The number of playlists this track is a member of is indicated in parentheses."
+msgid_plural "Are you sure you want to delete the following tracks completely from your harddisk? The number of playlists the tracks are member of is indicated in parentheses."
+msgstr[0] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועה הב××” לגמרי מהדיסק הקשיח? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgstr[1] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועות הב×ות לגמרי מהדיסק הקשיח? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
#: ../src/misc_confirm.c:167
msgid "Delete Track from Harddisk?"
@@ -4219,20 +4275,10 @@
msgstr[1] "מחק ×ת הרצועות מהדיסק הקשיח?"
#: ../src/misc_confirm.c:192
-msgid ""
-"Are you sure you want to remove the following track completely from your "
-"local database? The number of playlists this track is a member of is "
-"indicated in parentheses."
-msgid_plural ""
-"Are you sure you want to remove the following tracks completely from your "
-"local database? The number of playlists the tracks are member of is "
-"indicated in parentheses."
-msgstr[0] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועה הב××” לגמרי ממסד ×”× ×ª×•× ×™× ×”×ž×§×•×ž×™? מספר "
-"רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
-msgstr[1] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועות הב×ות לגמרי ממסד ×”× ×ª×•× ×™× ×”×ž×§×•×ž×™? מספר "
-"רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgid "Are you sure you want to remove the following track completely from your local database? The number of playlists this track is a member of is indicated in parentheses."
+msgid_plural "Are you sure you want to remove the following tracks completely from your local database? The number of playlists the tracks are member of is indicated in parentheses."
+msgstr[0] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועה הב××” לגמרי ממסד ×”× ×ª×•× ×™× ×”×ž×§×•×ž×™? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgstr[1] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת הרצועות הב×ות לגמרי ממסד ×”× ×ª×•× ×™× ×”×ž×§×•×ž×™? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
#: ../src/misc_confirm.c:196
msgid "Remove Track from Local Database?"
@@ -4247,7 +4293,8 @@
msgstr[0] "הרצועה × ×ž×—×§×” לגמרי מה-iPod"
msgstr[1] "הרצועות %d × ×ž×—×§×• לגמרי מה-iPod"
-#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#: ../src/misc_confirm.c:267
+#: ../src/misc_confirm.c:291
#, c-format
msgid "Deleted %d track from playlist '%s'"
msgid_plural "Deleted %d tracks from playlist '%s'"
@@ -4278,10 +4325,12 @@
msgstr "הוסרו כל %d הרצועות מה-iPod"
#: ../src/misc_confirm.c:541
+#, c-format
msgid "Removed all podcasts from the iPod"
msgstr "הוסרו כל ×”×¤×•×“×§×¡×˜×™× ×ž×”-iPod"
-#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#: ../src/misc_confirm.c:550
+#: ../src/misc_confirm.c:624
#, c-format
msgid "Deleted playlist '%s' including %d member track"
msgid_plural "Deleted playlist '%s' including %d member tracks"
@@ -4289,7 +4338,8 @@
msgstr[1] "× ×ž×—×§×” רשימת השמעה '%s' כולל %d רצועות"
#. first use playlist name
-#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#: ../src/misc_confirm.c:566
+#: ../src/misc_confirm.c:640
#, c-format
msgid "Deleted playlist '%s'"
msgstr "× ×ž×—×§×” רשומה '%s'"
@@ -4307,72 +4357,46 @@
msgstr "הסר ×ת כל %d הרצועות ממסד ×”× ×ª×•× ×™×"
#: ../src/misc_confirm.c:695
+#, c-format
msgid "Are you sure you want to remove all tracks from your iPod?"
msgstr "×”×× ×תה בטוח ש×תה רוצה להסיר ×ת כל הרצועות מה-iPod?"
#: ../src/misc_confirm.c:700
+#, c-format
msgid "Are you sure you want to remove all podcasts from your iPod?"
msgstr "×”×× ×תה בטוח ש×תה רוצה להסיר ×ת כל ×”×¤×•×“×§×¡×˜×™× ×ž×”-iPod שלך?"
#: ../src/misc_confirm.c:708
#, c-format
-msgid ""
-"Are you sure you want to delete playlist '%s' and the following track "
-"completely from your ipod? The number of playlists this track is a member of "
-"is indicated in parentheses."
-msgid_plural ""
-"Are you sure you want to delete playlist '%s' and the following tracks "
-"completely from your ipod? The number of playlists the tracks are member of "
-"is indicated in parentheses."
-msgstr[0] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועה הב××” לגמרי מה-"
-"iPod? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
-msgstr[1] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועות הב×ות לגמרי מה-"
-"iPod? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgid "Are you sure you want to delete playlist '%s' and the following track completely from your iPod? The number of playlists this track is a member of is indicated in parentheses."
+msgid_plural "Are you sure you want to delete playlist '%s' and the following tracks completely from your iPod? The number of playlists the tracks are member of is indicated in parentheses."
+msgstr[0] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועה הב××” לגמרי מה-iPod? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgstr[1] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועות הב×ות לגמרי מה-iPod? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
-#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#: ../src/misc_confirm.c:719
+#: ../src/misc_confirm.c:774
#, c-format
msgid "Are you sure you want to delete the playlist '%s'?"
msgstr "×”×× ×תה בטח ש×תה רוצה למחוק ×ת רשימת ההשמעה '%s'?"
#: ../src/misc_confirm.c:745
#, c-format
-msgid ""
-"Are you sure you want to delete playlist '%s' and remove the following track "
-"from your harddisk? The number of playlists this track is a member of is "
-"indicated in parentheses."
-msgid_plural ""
-"Are you sure you want to delete playlist '%s' and remove the following "
-"tracks from your harddisk? The number of playlists the tracks are member of "
-"is indicated in parentheses."
-msgstr[0] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועה הב××” לגמרי מהדיסק "
-"הקשיח? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
-msgstr[1] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועות הב×ות לגמרי "
-"מהדיסק הקשיח? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgid "Are you sure you want to delete playlist '%s' and remove the following track from your harddisk? The number of playlists this track is a member of is indicated in parentheses."
+msgid_plural "Are you sure you want to delete playlist '%s' and remove the following tracks from your harddisk? The number of playlists the tracks are member of is indicated in parentheses."
+msgstr[0] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועה הב××” לגמרי מהדיסק הקשיח? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgstr[1] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועות הב×ות לגמרי מהדיסק הקשיח? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
#: ../src/misc_confirm.c:753
+#, c-format
msgid "Are you sure you want to remove all tracks from the database?"
msgstr "×”×× ×תה בטוח ש×תה רוצה להסיר ×ת כל הרצועות ממסד ×”× ×ª×•× ×™×?"
#: ../src/misc_confirm.c:762
#, c-format
-msgid ""
-"Are you sure you want to delete playlist '%s' and remove the following track "
-"from the database? The number of playlists this track is a member of is "
-"indicated in parentheses."
-msgid_plural ""
-"Are you sure you want to delete playlist '%s' and remove the following "
-"tracks from the database? The number of playlists the tracks are member of "
-"is indicated in parentheses."
-msgstr[0] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועה הב××” לגמרי ממסד "
-"×”× ×ª×•× ×™×? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
-msgstr[1] ""
-"×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועות הב×ות לגמרי ממסד "
-"×”× ×ª×•× ×™×? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgid "Are you sure you want to delete playlist '%s' and remove the following track from the database? The number of playlists this track is a member of is indicated in parentheses."
+msgid_plural "Are you sure you want to delete playlist '%s' and remove the following tracks from the database? The number of playlists the tracks are member of is indicated in parentheses."
+msgstr[0] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועה הב××” לגמרי ממסד ×”× ×ª×•× ×™×? מספר רשימות ההשמעה שהרצועה הזו חברה בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
+msgstr[1] "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š למחוק ×ת רשימת ההשמעה '%s' ו×ת הרצועות הב×ות לגמרי ממסד ×”× ×ª×•× ×™×? מספר רשימות ההשמעה שהרצועות ×”×לו חברות בהן ×ž×¦×•×™× ×•×ª בסוגריי×."
#: ../src/misc_confirm.c:841
msgid ""
@@ -4486,124 +4510,162 @@
#. 40
#: ../src/misc_conversion.c:100
msgid "Media Type"
-msgstr ""
+msgstr "סוג מדיה"
#: ../src/misc_conversion.c:102
msgid "TV Episode"
-msgstr ""
+msgstr "פרק מסדרת טלויזיה"
#: ../src/misc_conversion.c:103
msgid "TV Network"
-msgstr ""
+msgstr "רשת שידור"
#: ../src/misc_conversion.c:104
msgid "Season Nr"
-msgstr ""
+msgstr "מספר ×¢×•× ×”"
#. 45
#: ../src/misc_conversion.c:105
msgid "Episode Nr"
-msgstr ""
+msgstr "מספר פרק"
-#: ../src/misc_conversion.c:118
+#: ../src/misc_conversion.c:106
+msgid "Album Artist"
+msgstr "מיין לפי כותר"
+
+#: ../src/misc_conversion.c:107
+msgid "Sort Artist"
+msgstr "מיין לפי ×מן"
+
+#: ../src/misc_conversion.c:108
+msgid "Sort Title"
+msgstr "מיין לפי ש×"
+
+#: ../src/misc_conversion.c:109
+msgid "Sort Album"
+msgstr "מיין לפי כותר"
+
+#. 50
+#: ../src/misc_conversion.c:110
+msgid "Sort Album Artist"
+msgstr "מיין לפי כותר ×מן"
+
+#: ../src/misc_conversion.c:111
+msgid "Sort Composer"
+msgstr "מיין לפי יוצר"
+
+#: ../src/misc_conversion.c:112
+msgid "Sort TV Show"
+msgstr "מיין לפי ×ª×•×›× ×™×ª טלויזיה"
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr "דגל רצועה ×œ×œ× ×ž×¨×•×•×—"
+
+#: ../src/misc_conversion.c:126
msgid "Name of file on PC, if available"
msgstr "×©× ×”×§×•×‘×¥ על ×”-PC, ×× ×§×™×™×"
-#: ../src/misc_conversion.c:119
+#: ../src/misc_conversion.c:127
msgid "Name of file on the iPod"
msgstr "×©× ×”×§×•×‘×¥ על ×”-iPod"
#. 10
-#: ../src/misc_conversion.c:121
+#: ../src/misc_conversion.c:129
msgid "Track Nr. and total number of tracks on CD"
msgstr "מספר רצועה וסך כל מספר הרצועות על דיסק השמע"
-#: ../src/misc_conversion.c:122
+#: ../src/misc_conversion.c:130
msgid "Whether the file has already been transferred to the iPod or not"
msgstr "×”×× ×”×§×•×‘×¥ הועבר כבר ×ל ×”-iPod ×ו ל×"
-#: ../src/misc_conversion.c:128
-msgid ""
-"Supposedly something that tells the iPod to increase or decrease the "
-"playback speed"
-msgstr "לכ×ורה משהו המסמן ל-iPod להגביר ×ו ×œ×”× ×ž×™×š ×ת מהירות ההשמעה"
+#: ../src/misc_conversion.c:136
+msgid "Beats per minute"
+msgstr "×“×¤×§×™× ×œ×“×§×”"
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:137
msgid "Number of times the track has been played"
msgstr "מספר ×”×¤×¢×ž×™× ×©×”×¨×¦×•×¢×” הושמעה"
-#: ../src/misc_conversion.c:131
+#: ../src/misc_conversion.c:138
msgid "Star rating from 0 to 5"
msgstr "דירוג ×›×•×›×‘×™× ×”×—×œ מ 0 עד 5"
-#: ../src/misc_conversion.c:132
+#: ../src/misc_conversion.c:139
msgid "Date and time track has been added"
msgstr "ת×ריך ושעה שהרצועה הוספה"
#. 20
-#: ../src/misc_conversion.c:133
+#: ../src/misc_conversion.c:140
msgid "Date and time track has last been played"
msgstr "ת×ריך ושעה שהרצועה הושמעה ל××—×¨×•× ×”"
-#: ../src/misc_conversion.c:134
+#: ../src/misc_conversion.c:141
msgid "Date and time track has last been modified"
msgstr "ת×ריך ושעה שהרצועה ×©×•× ×ª×” ל××—×¨×•× ×”"
-#: ../src/misc_conversion.c:135
+#: ../src/misc_conversion.c:142
msgid "Manual volume adjust"
msgstr "×©×™× ×•×™ עוצמת קול ×™×“× ×™×ª"
-#: ../src/misc_conversion.c:136
-msgid ""
-"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
-"the iPod"
-msgstr ""
-"תיקון עוצמת קול ×‘×“×¦×™×‘×œ×™× (הגבר השמעה) -- צריך להפעיל 'soundcheck' על ×”-iPod"
+#: ../src/misc_conversion.c:143
+msgid "Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on the iPod"
+msgstr "תיקון עוצמת קול ×‘×“×¦×™×‘×œ×™× (הגבר השמעה) -- צריך להפעיל 'soundcheck' על ×”-iPod"
#. 25
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:146
msgid "CD Nr. and total number of CDS in set"
msgstr "מספר דיסק שמע וסך כל דיסקי השמע בקבוצה"
-#: ../src/misc_conversion.c:142
-msgid ""
-"The category (e.g. 'Technology' or 'Music') where the podcast was located."
+#: ../src/misc_conversion.c:149
+msgid "The category (e.g. 'Technology' or 'Music') where the podcast was located."
msgstr "הקטגוריה (לדוגמה \"×˜×›× ×•×œ×•×’×™×”\" ×ו מוזיקה) שבה הפודקסט מוק×."
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:150
msgid "Accessible by selecting the center button on the iPod."
msgstr "זמין על ידי לחיצה על הכפתור המרכזי של ה־iPod."
-#: ../src/misc_conversion.c:147
+#: ../src/misc_conversion.c:154
msgid "Release date (for podcasts displayed next to the title on the iPod)"
msgstr "זמן שחרור (עבור ×¤×•×“×§×¡×˜×™× ×ž×•×¦×’ ליד הכותרת ב־iPod)"
-#: ../src/misc_conversion.c:713
+#. 50
+#: ../src/misc_conversion.c:168
+#: ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170
+#: ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172
+#: ../src/misc_conversion.c:173
+msgid "Used for sorting on the iPod"
+msgstr "משמש למיון ב-iPod"
+
+#: ../src/misc_conversion.c:735
#, c-format
msgid "The URI '%s' is not an absolute URI using the file scheme"
msgstr "×”× ×ª×™×‘ '%s' ×”×•× × ×ª×™×‘ ×œ× ×ž×•×—×œ×˜ המשתמש ×‘×ª×‘× ×™×ª הקובץ"
-#: ../src/misc_conversion.c:723
+#: ../src/misc_conversion.c:745
#, c-format
msgid "The local file URI '%s' may not include a '#'"
msgstr "×©× ×”×§×•×‘×¥ המקומי ×‘× ×ª×™×‘ '%s' ×œ× ×™×›×•×œ לכלול '#'"
-#: ../src/misc_conversion.c:740
+#: ../src/misc_conversion.c:762
#, c-format
msgid "The URI '%s' is invalid"
msgstr "×”× ×ª×™×‘ '%s' ×”×•× ×œ× ×—×•×§×™"
-#: ../src/misc_conversion.c:752
+#: ../src/misc_conversion.c:774
#, c-format
msgid "The hostname of the URI '%s' is invalid"
msgstr "×©× ×”×©×¨×ª של ×”× ×ª×™×‘ '%s' ×”×•× ×œ× ×—×•×§×™."
-#: ../src/misc_conversion.c:768
+#: ../src/misc_conversion.c:790
#, c-format
msgid "The URI '%s' contains invalidly escaped characters"
msgstr "×”× ×ª×™×‘ URI '%s' מכיל ×ª×•×•×™× ×œ× ×—×•×§×™×™×"
-#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
+#: ../src/misc_playlist.c:67
+#: ../src/misc_playlist.c:94
#: ../src/misc_playlist.c:429
msgid "Please enter a name for the new playlist"
msgstr "×”×›× ×¡ בבקשה ×ת ×”×©× ×©×œ רשימת ההשמעה החדשה"
@@ -4667,6 +4729,7 @@
msgstr "הכי הרבה הושמע (%d)"
#: ../src/misc_playlist.c:584
+#, c-format
msgid "Never Listened"
msgstr "×œ× ×”×•×©×ž×¢ ××£ פע×"
@@ -4705,11 +4768,6 @@
msgid "Dangling tracks with no files on PC were removed."
msgstr "רצועות ×ž×ª× ×“× ×“×•×ª ×œ×œ× ×§×‘×¦×™× ×¢×œ ×”-PC הוסרו."
-#: ../src/misc_playlist.c:916
-#, c-format
-msgid "Processing '%s'"
-msgstr "מעבד '%s'"
-
#: ../src/misc_playlist.c:943
msgid "Dangling tracks with files on PC were handled."
msgstr "רצועות ×ž×ª× ×“× ×“×•×ª ×¢× ×§×‘×¦×™× ×¢×œ ×”-PC טופלו."
@@ -4720,18 +4778,13 @@
#: ../src/misc_playlist.c:1019
msgid ""
-"You did not import the existing iTunesDB. This is most likely incorrect and "
-"will result in the loss of the existing database.\n"
+"You did not import the existing iTunesDB. This is most likely incorrect and will result in the loss of the existing database.\n"
"\n"
-"Press 'OK' if you want to proceed anyhow or 'Cancel' to abort. If you "
-"cancel, you can import the existing database before calling this function "
-"again.\n"
+"Press 'OK' if you want to proceed anyhow or 'Cancel' to abort. If you cancel, you can import the existing database before calling this function again.\n"
msgstr ""
-"×תה ×œ× ×™×™×‘×ת ×ת ×”-iTunesDB הקיי×. ×–×” ×›× ×¨××” ×œ× ×ª×§×™×Ÿ ×•×™×’×¨×•× ×œ×יבוד של מסד "
-"×”× ×ª×•× ×™× ×”×§×™×™×.\n"
+"×תה ×œ× ×™×™×‘×ת ×ת ×”-iTunesDB הקיי×. ×–×” ×›× ×¨××” ×œ× ×ª×§×™×Ÿ ×•×™×’×¨×•× ×œ×יבוד של מסד ×”× ×ª×•× ×™× ×”×§×™×™×.\n"
"\n"
-"לחץ '×ישור' על ×ž× ×ª להמשיך כרגיל ×ו 'ביטול' לביטול. ×× ×תה תבטל, ×תה תוכל "
-"×œ×™×™×‘× ×ת מסד ×”× ×ª×•× ×™× ×”×§×™×™× ×œ×¤× ×™ קרי××” לפעולה זו שוב.\n"
+"לחץ '×ישור' על ×ž× ×ª להמשיך כרגיל ×ו 'ביטול' לביטול. ×× ×תה תבטל, ×תה תוכל ×œ×™×™×‘× ×ת מסד ×”× ×ª×•× ×™× ×”×§×™×™× ×œ×¤× ×™ קרי××” לפעולה זו שוב.\n"
#: ../src/misc_playlist.c:1033
msgid "Creating a tree of known files"
@@ -4748,8 +4801,7 @@
#: ../src/misc_playlist.c:1147
#, c-format
msgid ""
-"The following orphaned file had already been added to the iPod again. It "
-"will be removed with the next sync:\n"
+"The following orphaned file had already been added to the iPod again. It will be removed with the next sync:\n"
"%s\n"
"\n"
msgstr ""
@@ -4766,12 +4818,10 @@
#, c-format
msgid ""
"The following dangling track has a file on PC.\n"
-"Press OK to have them transfered from the file on next Sync, CANCEL to leave "
-"it as is."
+"Press OK to have them transfered from the file on next Sync, CANCEL to leave it as is."
msgid_plural ""
"The following %d dangling tracks have files on PC.\n"
-"Press OK to have them transfered from the files on next Sync, CANCEL to "
-"leave them as is."
+"Press OK to have them transfered from the files on next Sync, CANCEL to leave them as is."
msgstr[0] ""
"הרצועה ×”×ž×ª× ×“× ×“×ª הב××” ×”×™× ×‘×¢×œ×ª קובץ על ×”-PC\n"
"לחץ ×ישור להעביר ×ותה מהקובץ ×‘×¡× ×›×¨×•×Ÿ הב×, וביטול לעזוב ×ת ×–×” כמו שזה."
@@ -4822,11 +4872,8 @@
#: ../src/misc_track.c:205
#, c-format
-msgid ""
-"The following duplicate track has not been added to the master play list."
-msgid_plural ""
-"The following %d duplicate tracks have not been added to the master play "
-"list."
+msgid "The following duplicate track has not been added to the master play list."
+msgid_plural "The following %d duplicate tracks have not been added to the master play list."
msgstr[0] "הרצועה הכפולה הב××” ×œ× ×”×•×¡×¤×” לרשימת ההשמעה הר×שית."
msgstr[1] "הרצועות הכפולות (%d) הב×ות ×œ× ×”×•×¡×¤×• לרשימת ההשמעה הר×שית."
@@ -4836,233 +4883,204 @@
msgid "Duplicate detection"
msgstr "זיהוי כפילויות"
-#: ../src/misc_track.c:1269
+#: ../src/misc_track.c:1339
msgid "Local Database"
msgstr "מסד × ×ª×•× ×™× ×ž×§×•×ž×™"
#. artwork is set
-#: ../src/misc_track.c:1280
+#: ../src/misc_track.c:1350
msgid "Embedded or filename was lost"
msgstr "מוטבע ×ו ×©×©× ×”×§×•×‘×¥ ×בד"
-#: ../src/misc_track.c:1284
+#: ../src/misc_track.c:1354
msgid "Artwork not set"
msgstr "×œ× × ×§×‘×¢×• ×ª×ž×•× ×•×ª"
-#: ../src/misc_track.c:1737
-#, fuzzy, c-format
+#: ../src/misc_track.c:1816
+#, c-format
msgid "Could not find source file for '%s'. Track not copied."
-msgstr "××™ ×פשר ×œ×ž×¦×•× ×ת הקובץ '%s' על ×”-iPod\n"
+msgstr "××™ ×פשר ×œ×ž×¦×•× ×ת הקובץ עבור '%s'. הרצועה ×œ× ×”×•×¢×ª×§×”."
-#: ../src/misc_track.c:1973
+#: ../src/misc_track.c:2052
#, c-format
msgid "drag and drop: ignored '%s'\n"
msgstr "גרור ושחרר: התעלמות מ '%s'\n"
-#: ../src/mp3file.c:1282
+#: ../src/mp3file.c:1336
#, c-format
msgid "Error setting ID3 field: %s\n"
msgstr "שגי××” בקביעת שדה ID3: %s\n"
-#: ../src/mp3file.c:1306 ../src/mp3file.c:1399 ../src/mp3file.c:1548
-#: ../src/mp3file.c:2186
+#: ../src/mp3file.c:1360
+#: ../src/mp3file.c:1453
+#: ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
#, c-format
msgid "ERROR while opening file: '%s' (%s).\n"
msgstr "שגי××” בזמן פתיחת קובץ: '%s' (%s).\n"
-#: ../src/mp3file.c:1619
+#: ../src/mp3file.c:1688
#, c-format
msgid "ERROR while writing tag to file: '%s' (%s).\n"
msgstr "שגי××” בזמן כתיבת תג לקובץ: '%s' (%s).\n"
#. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2352
+#: ../src/mp3file.c:2770
#, c-format
msgid "File \"%s\" has zero play length. Ignoring.\n"
msgstr "הקובץ \"%s\" בעל זמן ×פס. מתעל×.\n"
-#: ../src/mp4file.c:227 ../src/mp4file.c:359
-#, fuzzy, c-format
+#: ../src/mp4file.c:243
+#: ../src/mp4file.c:404
+#, c-format
msgid "'%s' does not appear to be a mp4 audio or video file.\n"
-msgstr "הקובץ '%s' ×”×•× ×›× ×¨××” ×œ× ×§×•×‘×¥ שמע mp4.\n"
+msgstr "הקובץ '%s' ×”×•× ×›× ×¨××” ×œ× ×§×•×‘×¥ שמע ×ו ויד×ו מסוד mp4.\n"
-#: ../src/mp4file.c:237 ../src/mp4file.c:369
+#: ../src/mp4file.c:253
+#: ../src/mp4file.c:414
#, c-format
msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
msgstr "××™ ×פשר לפתוח ×ת '%s' לקרי××”, ×ו הקובץ ×”×•× ×œ× ×§×•×‘×¥ שמע mp4.\n"
-#: ../src/mp4file.c:478
+#: ../src/mp4file.c:529
#, c-format
msgid "'%s' does not appear to be a mp4 audio file.\n"
msgstr "הקובץ '%s' ×”×•× ×›× ×¨××” ×œ× ×§×•×‘×¥ שמע mp4.\n"
-#: ../src/mp4file.c:489
+#: ../src/mp4file.c:540
#, c-format
msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
msgstr "××™ ×פשר לפתוח ×ת '%s' לכתיבה, ×ו הקובץ ×”×•× ×œ× ×§×•×‘×¥ שמע mp4.\n"
-#: ../src/mp4file.c:502
+#: ../src/mp4file.c:553
#, c-format
-msgid ""
-"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
-"You must compile the gtkpod source together with the mp4v2 library.\n"
-msgstr ""
-"×”×™×™×‘×•× ×©×œ '%s' × ×›×©×œ: m4a/m4p/m4b ×œ× × ×ª×ž×š ×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת "
-"קוד המקור gtkpod ביחד ×¢× ×”×¡×¤×¨×™×” mp4v2.\n"
+msgid "Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. You must compile the gtkpod source together with the mp4v2 library.\n"
+msgstr "×”×™×™×‘×•× ×©×œ '%s' × ×›×©×œ: m4a/m4p/m4b ×œ× × ×ª×ž×š ×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת קוד המקור gtkpod ביחד ×¢× ×”×¡×¤×¨×™×” mp4v2.\n"
-#: ../src/mp4file.c:508
+#: ../src/mp4file.c:559
#, c-format
-msgid ""
-"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
-"without the mp4v2 library. You must compile the gtkpod source together with "
-"the mp4v2 library.\n"
-msgstr ""
-"עדכון מט×-מידע של m4a/m4p/m4b עבור '%s' × ×›×©×œ: ×”×¡×•×’×™× m4a/m4p/m4b ×œ× × ×ª×ž×›×™× "
-"×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת קוד המקור של gtkpod ביחד ×¢× ×¡×¤×¨×™×™×ª "
-"mp4v2.\n"
+msgid "m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. You must compile the gtkpod source together with the mp4v2 library.\n"
+msgstr "עדכון מט×-מידע של m4a/m4p/m4b עבור '%s' × ×›×©×œ: ×”×¡×•×’×™× m4a/m4p/m4b ×œ× × ×ª×ž×›×™× ×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת קוד המקור של gtkpod ביחד ×¢× ×¡×¤×¨×™×™×ª mp4v2.\n"
-#: ../src/mp4file.c:514
+#: ../src/mp4file.c:565
#, c-format
-msgid ""
-"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
-"without the mp4v2 library. You must compile the gtkpod source together with "
-"the mp4v2 library.\n"
-msgstr ""
-"עדכון מידע קול של m4a/m4p/m4b עבור '%s' × ×›×©×œ: ×”×¡×•×’×™× m4a/m4p/m4b ×œ× × ×ª×ž×›×™× "
-"×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת קוד המקור של gtkpod ביחד ×¢× ×¡×¤×¨×™×™×ª "
-"mp4v2.\n"
+msgid "m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. You must compile the gtkpod source together with the mp4v2 library.\n"
+msgstr "עדכון מידע קול של m4a/m4p/m4b עבור '%s' × ×›×©×œ: ×”×¡×•×’×™× m4a/m4p/m4b ×œ× × ×ª×ž×›×™× ×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת קוד המקור של gtkpod ביחד ×¢× ×¡×¤×¨×™×™×ª mp4v2.\n"
-#: ../src/oggfile.c:62 ../src/wavfile.c:107
-#, c-format
-msgid "Could not open '%s' for reading.\n"
-msgstr "×œ× ×ž×¡×•×’×œ לפתוח ×ת '%s' לכתיבה.\n"
-
#: ../src/oggfile.c:73
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not appear to be an ogg audio file.\n"
-msgstr "הקובץ '%s' ×”×•× ×›× ×¨××” ×œ× ×§×•×‘×¥ שמע mp4.\n"
+msgstr "הקובץ '%s' ×”×•× ×›× ×¨××” ×œ× ×§×•×‘×¥ שמע מסוג ogg.\n"
-#: ../src/oggfile.c:150
-#, fuzzy, c-format
-msgid ""
-"Import of '%s' failed: ogg not supported without the ogg library. You must "
-"compile the gtkpod source together with the ogg library.\n"
-msgstr ""
-"×”×™×™×‘×•× ×©×œ '%s' × ×›×©×œ: m4a/m4p/m4b ×œ× × ×ª×ž×š ×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת "
-"קוד המקור gtkpod ביחד ×¢× ×”×¡×¤×¨×™×” mp4v2.\n"
+#: ../src/oggfile.c:154
+#, c-format
+msgid "Import of '%s' failed: ogg not supported without the ogg library. You must compile the gtkpod source together with the ogg library.\n"
+msgstr "×”×™×™×‘×•× ×©×œ '%s' × ×›×©×œ: ogg ×œ× × ×ª×ž×š ×œ×œ× ×”×¡×¤×¨×™×” של ogg. ×תה חייב להדר ×ת קוד המקור gtkpod ביחד ×¢× ×”×¡×¤×¨×™×” של ogg.\n"
-#: ../src/oggfile.c:156
-#, fuzzy, c-format
-msgid ""
-"ogg metadata update for '%s' failed: ogg not supported without the ogg "
-"library. You must compile the gtkpod source together with the ogg library.\n"
-msgstr ""
-"עדכון מט×-מידע של m4a/m4p/m4b עבור '%s' × ×›×©×œ: ×”×¡×•×’×™× m4a/m4p/m4b ×œ× × ×ª×ž×›×™× "
-"×œ×œ× ×”×¡×¤×¨×™×” mp4v2. ×תה חייב להדר ×ת קוד המקור של gtkpod ביחד ×¢× ×¡×¤×¨×™×™×ª "
-"mp4v2.\n"
+#: ../src/oggfile.c:160
+#, c-format
+msgid "ogg metadata update for '%s' failed: ogg not supported without the ogg library. You must compile the gtkpod source together with the ogg library.\n"
+msgstr "עדכון מט×-מידע של ogg עבור '%s' × ×›×©×œ: הסוג ogg ×œ× × ×ª×ž×š ×œ×œ× ×”×¡×¤×¨×™×” ogg. ×תה חייב להדר ×ת קוד המקור של gtkpod ביחד ×¢× ×¡×¤×¨×™×™×ª ogg.\n"
-#: ../src/prefs.c:356
+#: ../src/prefs.c:357
#, c-format
msgid "gtkpod version %s usage:\n"
msgstr "גרסה %s של gtkpod, שימוש:\n"
-#: ../src/prefs.c:357
+#: ../src/prefs.c:358
msgid " -h, --help: display this message\n"
msgstr " -h, --help: display this message\n"
-#: ../src/prefs.c:358
-#, fuzzy
+#: ../src/prefs.c:359
msgid " -p <file>: increment playcount for file by one\n"
-msgstr " -p <filename>:increment playcount for file by one\n"
+msgstr " -p <file>: increment playcount for file by one\n"
-#: ../src/prefs.c:359
+#: ../src/prefs.c:360
msgid " --hash <file>:print gtkpod hash for file\n"
-msgstr ""
+msgstr " --hash <file>:print gtkpod hash for file\n"
-#: ../src/prefs.c:360
+#: ../src/prefs.c:361
msgid " -m path: define the mountpoint of your iPod\n"
msgstr " -m path: define the mountpoint of your iPod\n"
-#: ../src/prefs.c:361
+#: ../src/prefs.c:362
msgid " --mountpoint: same as '-m'.\n"
msgstr " --mountpoint: same as '-m'.\n"
-#: ../src/prefs.c:362
+#: ../src/prefs.c:363
msgid " -a: import database automatically after start.\n"
msgstr " -a: import database automatically after start.\n"
-#: ../src/prefs.c:363
+#: ../src/prefs.c:364
msgid " --auto: same as '-a'.\n"
msgstr " --auto: same as '-a'.\n"
-#: ../src/prefs.c:560
+#: ../src/prefs.c:561
#, c-format
msgid "Couldn't create ~/.gtkpod\n"
-msgstr ""
+msgstr "××™ ×פשר ליצור ×ת ~/.gtkpod\n"
-#: ../src/prefs_window.c:134
+#: ../src/prefs_window.c:133
msgid "Please select command for 'Play Now'"
msgstr "בחר בבקשה פקודה ל '× ×’×Ÿ עכשיו'"
-#: ../src/prefs_window.c:135
+#: ../src/prefs_window.c:134
msgid "Please select command for 'Enqueue'"
msgstr "בחר בבקשה פקודה ל '×”×›× ×¡ לתור'"
-#: ../src/prefs_window.c:136
+#: ../src/prefs_window.c:135
msgid "Please select the mp3gain executable"
msgstr "בחר בבקשה ×ת קובץ ההרצה ל-mp3gain"
-#: ../src/prefs_window.c:137
+#: ../src/prefs_window.c:136
msgid "Please select the aacgain executable"
msgstr "בחר בבקשה ×ת קובץ ההרצה ל־aacgain"
-#: ../src/prefs_window.c:138
+#: ../src/prefs_window.c:137
msgid "Select the mserv music root directory"
msgstr "בחר ×ת תיקיית השורש ל mserv music"
-#: ../src/prefs_window.c:139
+#: ../src/prefs_window.c:138
msgid "Select the mserv trackinfo root directory"
msgstr "בחר ×ת תיקיית השורש ל mserv trackinfo"
-#: ../src/prefs_window.c:140
+#: ../src/prefs_window.c:139
msgid "Select the ogg/vorbis converter command"
-msgstr ""
+msgstr "בחר ×ת פקודת ההמרה של ogg/vorbis"
-#: ../src/prefs_window.c:141
+#: ../src/prefs_window.c:140
msgid "Select the flac converter command"
-msgstr ""
+msgstr "בחר ×ת פקודת ההמרה של flac"
-#: ../src/prefs_window.c:142
+#: ../src/prefs_window.c:141
msgid "Select the m4a converter command."
-msgstr ""
+msgstr "בחר ×ת פקודת ההמרה של m4a"
-#: ../src/prefs_window.c:143
+#: ../src/prefs_window.c:142
msgid "Select the mp3 converter command."
-msgstr ""
+msgstr "בחר ×ת פקודת ההמרה של mp3"
-#: ../src/prefs_window.c:144
+#: ../src/prefs_window.c:143
msgid "Select the wav converter command."
-msgstr ""
+msgstr "בחר ×ת פקודת ההמרה של wav"
-#: ../src/prefs_window.c:211 ../src/repository.c:662
-#, fuzzy, c-format
-msgid ""
-"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
-"improve an existing one, please send it to jcsjcs at users.sourceforge.net "
-"for inclusion into the next release.</i>"
-msgstr ""
-"<i>הסתכל על קבצי ×”×צווה ×”×ž×•×¤×™×¢×™× ×‘-'%s'. ×× ×ª×›×ª×•×‘ קובץ ×צווה חדש, שלח ×ותו "
-"בבקשה ×ל jcsjcs ב- users.sourceforge.net להכללה בגרסה הב××”.</i>"
+#: ../src/prefs_window.c:201
+#: ../src/repository.c:662
+#, c-format
+msgid "<i>Have a look at the scripts provided in '%s'. If you write a new script or improve an existing one, please send it to jcsjcs at users.sourceforge.net for inclusion into the next release.</i>"
+msgstr "<i>הסתכל על קבצי ×”×צווה ×”×ž×•×¤×™×¢×™× ×‘-'%s'. ×× ×ª×›×ª×•×‘ קובץ ×צווה חדש ×ו תשפר ×חד קיי×, שלח ×ותו בבקשה ×ל jcsjcs ב- users.sourceforge.net להכללה בגרסה הב××”.</i>"
-#: ../src/prefs_window.c:986 ../src/prefs_window.c:1004
+#: ../src/prefs_window.c:1205
+#: ../src/prefs_window.c:1223
msgid "Preferences not updated"
msgstr "העדפות ×œ× ×¢×•×“×›× ×•"
-#: ../src/prefs_window.c:1013
+#: ../src/prefs_window.c:1232
msgid "Preferences applied"
msgstr "העדפות ×¢×•×“×›× ×•"
-#: ../src/repository.c:573 ../src/repository.c:2395
+#: ../src/repository.c:573
+#: ../src/repository.c:2395
msgid "Set backup file"
msgstr "קבע קובץ גיבוי"
@@ -5119,7 +5137,7 @@
msgstr "קובץ מעורבב (Hashed) בעל גודל של 0\n"
#: ../src/sha1.c:239
-#, fuzzy, c-format
+#, c-format
msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
msgstr "×œ× ×™×›×•×œ לפתוח ×ת '%s' על ×ž× ×ª לחשב סכומי ביקורת: %s\n"
@@ -5136,8 +5154,7 @@
#: ../src/syncdir.c:255
msgid "The following track has been completely removed from the iPod:\n"
-msgid_plural ""
-"The following tracks have been completely removed from the iPod:\n"
+msgid_plural "The following tracks have been completely removed from the iPod:\n"
msgstr[0] "הרצועה הב××” הוסרה לחלוטין מה־iPod:\n"
msgstr[1] "הרצועות הב×ות הוסרו לחלוטין מה־iPod:\n"
@@ -5161,20 +5178,18 @@
msgid "Sync summary"
msgstr "×¡×™×›×•× ×”×¡× ×›×¨×•×Ÿ"
-#: ../src/tools.c:119
-#, fuzzy, c-format
+#: ../src/tools.c:118
+#, c-format
msgid ""
"Could not find '%s'.\n"
-"Please specifiy the exact path in the Tools section of the preference dialog "
-"or install the program if it is not installed on your system.\n"
+"Please specifiy the exact path in the Tools section of the preference dialog or install the program if it is not installed on your system.\n"
"\n"
msgstr ""
"×œ× ×ž×¡×•×’×œ ×œ×ž×¦×•× ×ת '%s'.\n"
-" ×× × ×¦×™×™×Ÿ ×ת ×”× ×ª×™×‘ המדוייק בחלק 'כלי×' של חלון דו-שיח ההעדפות ×ו התקן ×ת "
-"×”×ª×›× ×™×ª ×× ×”×™× ×œ× ×ž×•×ª×§× ×ª על המערכת שלך.\n"
+" ×× × ×¦×™×™×Ÿ ×ת ×”× ×ª×™×‘ המדוייק בחלק 'כלי×' של חלון דו-שיח ההעדפות ×ו התקן ×ת ×”×ª×›× ×™×ª ×× ×”×™× ×œ× ×ž×•×ª×§× ×ª על המערכת שלך.\n"
"\n"
-#: ../src/tools.c:204
+#: ../src/tools.c:203
#, c-format
msgid ""
"Execution of '%s' failed.\n"
@@ -5183,42 +5198,34 @@
"הביצוע של '%s' × ×›×©×œ.\n"
"\n"
-#: ../src/tools.c:249
+#: ../src/tools.c:248
#, c-format
-msgid ""
-"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
-"preferences.\n"
-msgstr ""
-"×œ× ×‘×•×¦×¢ × ×¨×ž×•×œ עבור '%s'.×× × ×§×‘×¢ ×ת ×”× ×ª×™×‘ של mp3gain בחלק 'כלי×' של חלון דו-"
-"שיח ההעדפות.\n"
+msgid "Did not normalize '%s'. Set mp3gain path in the Tools section of the preferences.\n"
+msgstr "×œ× ×‘×•×¦×¢ × ×¨×ž×•×œ עבור '%s'.×× × ×§×‘×¢ ×ת ×”× ×ª×™×‘ של mp3gain בחלק 'כלי×' של חלון דו-שיח ההעדפות.\n"
-#: ../src/tools.c:259
+#: ../src/tools.c:258
#, c-format
-msgid ""
-"Did not normalize '%s'. Set aacgain path in the Tools section of the "
-"preferences.\n"
-msgstr ""
-"×œ× ×‘×•×¦×¢ × ×¨×ž×•×œ עבור '%s'.×× × ×§×‘×¢ ×ת ×”× ×ª×™×‘ של aacgain בחלק 'כלי×' של חלון דו-"
-"שיח ההעדפות.\n"
+msgid "Did not normalize '%s'. Set aacgain path in the Tools section of the preferences.\n"
+msgstr "×œ× ×‘×•×¦×¢ × ×¨×ž×•×œ עבור '%s'.×× × ×§×‘×¢ ×ת ×”× ×ª×™×‘ של aacgain בחלק 'כלי×' של חלון דו-שיח ההעדפות.\n"
-#: ../src/tools.c:386
+#: ../src/tools.c:385
msgid "Normalizing..."
msgstr "×ž× ×¨×ž×œ..."
-#: ../src/tools.c:436
+#: ../src/tools.c:435
#, c-format
msgid "%s - %s"
msgstr "%s - %s"
-#: ../src/tools.c:462
+#: ../src/tools.c:461
msgid "Aborting..."
msgstr "מבטל..."
-#: ../src/tools.c:466
+#: ../src/tools.c:465
msgid "Will abort after current mp3gain process ends."
msgstr "יבוטל ×חרי שתהליך mp3gain יסתיי×."
-#: ../src/tools.c:492
+#: ../src/tools.c:491
#, c-format
msgid ""
"'%s-%s' (%s) could not be normalized.\n"
@@ -5227,20 +5234,18 @@
"××™ ×פשר ×œ× ×¨×ž×œ ×ת '%s-%s' (%s)\n"
"\n"
-#: ../src/tools.c:531
+#: ../src/tools.c:530
#, c-format
msgid "Normalized %d of %d tracks."
msgid_plural "Normalized %d of %d tracks."
msgstr[0] "× ×•×¨×ž×œ×• %d מתוך %d רצועות."
msgstr[1] "× ×•×¨×ž×œ×• %d מתוך %d רצועות."
-#: ../src/tools.c:634
-msgid ""
-"Please specify the command to be called on the 'Tools' section of the "
-"preferences dialog.\n"
+#: ../src/tools.c:633
+msgid "Please specify the command to be called on the 'Tools' section of the preferences dialog.\n"
msgstr "×× × ×¦×™×™×Ÿ ×ת הפקודה שיקר×ו לה בחלק 'כלי×' בחלון הדו-שיח העדפות.\n"
-#: ../src/tools.c:646
+#: ../src/tools.c:645
#, c-format
msgid ""
"Could not find the command '%s'.\n"
@@ -5277,68 +5282,3 @@
msgid "%s does not appear to be a supported wav file.\n"
msgstr "הקובץ %s ×”×•× ×›× ×¨××” ×œ× ×§×•×‘×¥ wav × ×ª×ž×š.\n"
-#, fuzzy
-#~ msgid "label21"
-#~ msgstr "label21"
-
-#~ msgid "window1"
-#~ msgstr "חלון1"
-
-#~ msgid "<b>Import</b>"
-#~ msgstr "<b>ייבו×</b>"
-
-#~ msgid "Automatically import iTunesDBs on startup"
-#~ msgstr "×™×‘× ×וטומטית ×ת iTunesDB בתחילת ×”×ª×•×›× ×™×ª"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "×œ× ×ž×•×¦× ×§×•×‘×¥ ×ª×ž×•× ×”: %s"
-
-#~ msgid "_Synchronize Playlist"
-#~ msgstr "_×¡× ×›×¨×Ÿ רשימת השמעה"
-
-#~ msgid "Stop Display Update"
-#~ msgstr "עצור עדכון תצוגה"
-
-#~ msgid "Stop"
-#~ msgstr "עצור"
-
-#~ msgid ""
-#~ "It is much faster to sort the display after all tracks have been added. "
-#~ "Some people might feel irritated by this behaviour and should uncheck "
-#~ "this option."
-#~ msgstr ""
-#~ "×–×” יותר מהיר למיין ×ת התצוגה ×חרי שכל הרצועות הוספו. חלק מה×× ×©×™× ×™×—×©×‘×• "
-#~ "×©×”×ª× ×”×’×•×ª זו ×ž×¢×¦×‘× ×ª ×•×›× ×¨××” יבטלו ×ת הסימון ל×פשרות זו."
-
-#~ msgid ""
-#~ "Temporarily disable sorting when changing playlist\n"
-#~ "or tab entry (faster!)"
-#~ msgstr "×—×¡×•× ×–×ž× ×™×ª מיון בזמן החלפת רשימת השמעה ×ו רשומת כרטיסיה (מהיר)"
-
-#~ msgid ""
-#~ "The display can be blocked after changing a selection. The display update "
-#~ "is faster, but you have to wait until it's finished. When using this "
-#~ "option, sorting is also temporarily disabled (see option above)."
-#~ msgstr ""
-#~ "התצוגה יכולה ×œ×”×™× ×¢×œ ×חרי ×©×™× ×•×™ הבחירה. עדכון התצוגה ×™×”×™×” מהיר יותר, ×ך "
-#~ "×תה תצטרך להמתין עד הסיו×. בזמן שימוש ב×פשרות זו, המיון ×’× ×”×•× ×–×ž× ×™×ª "
-#~ "מבוטל (ר××” ×פשרות למעלה)."
-
-#~ msgid ""
-#~ "Block display when changing playlist or tab\n"
-#~ " entry (faster!)"
-#~ msgstr "×—×¡×•× ×ª×¦×•×’×” בזמן החלפת רשימת השמעה ×ו רשומת כרטיסיה (מהיר)"
-
-#~ msgid "deleting..."
-#~ msgstr "מוחק..."
-
-#~ msgid "preparing to copy..."
-#~ msgstr "×ž×ª×›×•× ×Ÿ להעתיק..."
-
-#~ msgid "Copied %d of %d new track."
-#~ msgid_plural "Copied %d of %d new tracks."
-#~ msgstr[0] "הועתקו %d מתוך %d רצועה חדשה."
-#~ msgstr[1] "הועתקו %d מתוך %d רצועות חדשות."
-
-#~ msgid "Some tracks were not written to iPod. Export aborted!"
-#~ msgstr "מספר רצועות ×œ× × ×›×ª×‘×• ל-iPod. ×™×¦×•× ×‘×•×˜×œ!"
Property changes on: gtkpod/branches/etch-bpo/po/he.po
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/po/it.po
===================================================================
--- gtkpod/branches/etch-bpo/po/it.po 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/it.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-26 19:06+0200\n"
-"PO-Revision-Date: 2007-06-26 19:07+0200\n"
+"POT-Creation-Date: 2007-12-13 18:36-0500\n"
+"PO-Revision-Date: 2007-12-13 14:55+0100\n"
"Last-Translator: Daniele Forsi <dforsi at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"MIME-Version: 1.0\n"
@@ -175,73 +175,73 @@
msgstr "<b>Conferma l'eliminazione</b>"
#: ../data/gtkpod.glade.h:37
-msgid "<b>Displayed Track Attributes</b>"
-msgstr "<b>Attributi visualizzati delle tracce</b>"
-
-#: ../data/gtkpod.glade.h:38
msgid "<b>Examples</b>"
msgstr "<b>Esempi</b>"
-#: ../data/gtkpod.glade.h:39
+#: ../data/gtkpod.glade.h:38
msgid "<b>Ignore Frequent Words</b>"
msgstr "<b>Ignora parole frequenti</b>"
-#: ../data/gtkpod.glade.h:40
+#: ../data/gtkpod.glade.h:39
msgid "<b>Misc</b>"
msgstr "<b>Miscellanea</b>"
-#: ../data/gtkpod.glade.h:41
+#: ../data/gtkpod.glade.h:40
msgid "<b>Mountpoint and individual repository/playlist options</b>"
msgstr "<b>Punto di mount e opzioni individuali per archivio e playlist</b>"
-#: ../data/gtkpod.glade.h:42
+#: ../data/gtkpod.glade.h:41
msgid "<b>On-the-fly Conversion</b>"
msgstr "<b>Conversione al volo</b>"
-#: ../data/gtkpod.glade.h:43
+#: ../data/gtkpod.glade.h:42
msgid "<b>Play</b>"
msgstr "<b>Riproduzione</b>"
-#: ../data/gtkpod.glade.h:44
+#: ../data/gtkpod.glade.h:43
msgid "<b>Playlists</b>"
msgstr "<b>Playlist</b>"
-#: ../data/gtkpod.glade.h:45
+#: ../data/gtkpod.glade.h:44
msgid "<b>Please select mountpoint and your iPod model</b>"
msgstr "<b>Scegliere il punto di mount e il modello di iPod</b>"
-#: ../data/gtkpod.glade.h:46
+#: ../data/gtkpod.glade.h:45
msgid "<b>Repositories</b>"
-msgstr "<b>Archivio</b>"
+msgstr "<b>Archivi</b>"
-#: ../data/gtkpod.glade.h:47
+#: ../data/gtkpod.glade.h:46
msgid "<b>Sort Order</b>"
-msgstr "<b>Schede di ordinamento</b>"
+msgstr "<b>Tipo di ordinamento</b>"
-#: ../data/gtkpod.glade.h:48
+#: ../data/gtkpod.glade.h:47
msgid "<b>Sort Tabs</b>"
msgstr "<b>Schede di ordinamento</b>"
-#: ../data/gtkpod.glade.h:49
+#: ../data/gtkpod.glade.h:48
msgid "<b>Sync</b>"
msgstr "<b>Sincronizza</b>"
-#: ../data/gtkpod.glade.h:50
+#: ../data/gtkpod.glade.h:49
msgid "<b>Synchronization</b>"
msgstr "<b>Sincronizzazione</b>"
-#: ../data/gtkpod.glade.h:51
+#: ../data/gtkpod.glade.h:50
msgid "<b>Tag Reading</b>"
msgstr "<b>Lettura delle etichette</b>"
-#: ../data/gtkpod.glade.h:52
+#: ../data/gtkpod.glade.h:51
msgid "<b>Toolbar</b>"
msgstr "<b>Barra degli strumenti</b>"
-#: ../data/gtkpod.glade.h:53
+#: ../data/gtkpod.glade.h:52
msgid "<b>Tooltips</b>"
msgstr "<b>Suggerimenti</b>"
+#: ../data/gtkpod.glade.h:53
+msgid "<b>Track Attributes</b>"
+msgstr "<b>Attributi della traccia</b>"
+
#: ../data/gtkpod.glade.h:54
msgid "<b>Track Editing</b>"
msgstr "<b>Modifica della traccia</b>"
@@ -267,91 +267,114 @@
msgstr "Aggiunge directory ricorsivamente"
#: ../data/gtkpod.glade.h:60
-msgid "Add Files or Directories"
-msgstr "Aggiunge file o directory"
+msgid "Add Files"
+msgstr "Aggiungi file"
#: ../data/gtkpod.glade.h:61
-msgid "Add _Directory"
-msgstr "Aggiungi _directory"
+msgid "Add Files or Directories"
+msgstr "Aggiunge un file o una directory"
#: ../data/gtkpod.glade.h:62
+msgid "Add Fol_der"
+msgstr "Aggiungi _cartella"
+
+#: ../data/gtkpod.glade.h:63
+msgid "Add Folder"
+msgstr "Aggiungi cartella"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Image_s"
+msgstr "Aggiungi _immagini"
+
+#: ../data/gtkpod.glade.h:65
+msgid "Add Images from a Directory"
+msgstr "Aggiunge immagini da una directory"
+
+#: ../data/gtkpod.glade.h:66
+msgid "Add Playlist"
+msgstr "Aggiungi playlist"
+
+#: ../data/gtkpod.glade.h:67
msgid "Add _Files"
msgstr "Aggiungi _file"
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:68
msgid "Add _Playlist"
msgstr "Aggiungi _playlist"
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:69
msgid "Add coverart from file using the following template"
msgstr "Aggiungi la copertina da un file usando il seguente modello"
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:70
msgid "Add directories recursively"
msgstr "Aggiungi le directory ricorsivamente"
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:71
msgid "Add new repository/iPod"
msgstr "Aggiungi un nuovo archivio o iPod"
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:72
msgid "Add playlist from file"
-msgstr "Aggiunge playlist da file"
+msgstr "Aggiunge una playlist da un file"
-#: ../data/gtkpod.glade.h:68 ../src/display_sorttabs.c:3228
-#: ../src/display_tracks.c:2020
+#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
msgid "Added"
msgstr "Aggiunto"
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:74
msgid "Advanced Sorting Options"
msgstr "Opzioni avanzate di ordinamento"
#. 0
-#: ../data/gtkpod.glade.h:70 ../src/display_sorttabs.c:2963
+#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
msgid "Album"
msgstr "Album"
-#: ../data/gtkpod.glade.h:71
+#: ../data/gtkpod.glade.h:76
msgid "Album Art"
msgstr "Copertina dell'album"
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:77
msgid "All (AND)"
msgstr "Tutti (AND)"
-#: ../data/gtkpod.glade.h:73
+#: ../data/gtkpod.glade.h:78
msgid "All Tracks Never Listened To"
msgstr "Tutte le tracce mai ascoltate"
-#: ../data/gtkpod.glade.h:74
+#: ../data/gtkpod.glade.h:79
msgid "All Tracks Played Since Last Time"
msgstr "Tutte le tracce riprodotte dall'ultima volta"
-#: ../data/gtkpod.glade.h:75
+#: ../data/gtkpod.glade.h:80
msgid "All Tracks not Listed in any Playlist"
msgstr "Tutte le tracce non contenute in una playlist"
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:81
msgid "Also include tracks never played in \"Best Rated\" playlist"
-msgstr ""
-"Includi le tracce mai ascoltate nella playlist «Tracce con il voto migliore»"
+msgstr "Includi le tracce mai ascoltate nella playlist «Voti migliori»"
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:82
msgid "Always write ID3v2.4 tags (only applies to MP3)"
msgstr "Scrivi sempre le etichette ID3v2.4 (vale solo per gli MP3)"
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:83
msgid "Any (OR)"
msgstr "Qualsiasi (OR)"
-#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2960
+#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
msgid "Artist"
msgstr "Artista"
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:85
+msgid "Artwork Preview"
+msgstr "Anteprima artwork"
+
+#: ../data/gtkpod.glade.h:86
msgid ""
"As a last resort set the following tags to the\n"
"filename if they are (still) empty:"
@@ -359,15 +382,15 @@
"Come ultimo tentativo riempi le etichette seguenti con\n"
"il nome del file se sono (ancora) vuote:"
-#: ../data/gtkpod.glade.h:82
+#: ../data/gtkpod.glade.h:88
msgid "Ascending"
msgstr "Crescente"
-#: ../data/gtkpod.glade.h:83
+#: ../data/gtkpod.glade.h:89
msgid "Auto Store"
msgstr "Salvataggio automatico"
-#: ../data/gtkpod.glade.h:84
+#: ../data/gtkpod.glade.h:90
msgid ""
"Automatically start displaying tracks that match the criteria entered above. "
"If not selected, you must press 'Display' to start displaying."
@@ -376,51 +399,55 @@
"sopra. Se non selezionato, si deve premere «Mostra» per attivare la "
"visualizzazione."
-#: ../data/gtkpod.glade.h:85
+#: ../data/gtkpod.glade.h:91
+msgid "Available:"
+msgstr "Disponibili:"
+
+#: ../data/gtkpod.glade.h:92
msgid "Before removing playlists or tracks from a playlist"
msgstr "Prima di rimuovere le playlist o le tracce da una playlist"
-#: ../data/gtkpod.glade.h:86
+#: ../data/gtkpod.glade.h:93
msgid "Before removing tracks from the harddisk"
msgstr "Prima di rimuovere le tracce dal disco fisso"
-#: ../data/gtkpod.glade.h:87
+#: ../data/gtkpod.glade.h:94
msgid "Before removing tracks from the iPod"
msgstr "Prima di rimuovere le tracce dall'iPod"
-#: ../data/gtkpod.glade.h:88
+#: ../data/gtkpod.glade.h:95
msgid "Before removing tracks from the local database"
msgstr "Prima di rimuovere le tracce dal database locale"
-#: ../data/gtkpod.glade.h:89
+#: ../data/gtkpod.glade.h:96
msgid "Best Rated Tracks"
msgstr "Tracce con il voto migliore"
-#: ../data/gtkpod.glade.h:90
+#: ../data/gtkpod.glade.h:97
msgid "Browse"
msgstr "Sfoglia"
-#: ../data/gtkpod.glade.h:91
+#: ../data/gtkpod.glade.h:98
msgid "Cache directory:"
msgstr "Directory per la cache:"
-#: ../data/gtkpod.glade.h:92
+#: ../data/gtkpod.glade.h:99
msgid "Calendar"
msgstr "Calendario"
-#: ../data/gtkpod.glade.h:93
+#: ../data/gtkpod.glade.h:100
msgid "Calendar sync command:"
msgstr "Comando per sincronizzare il calendario:"
-#: ../data/gtkpod.glade.h:94
+#: ../data/gtkpod.glade.h:101
msgid "Call automatically when synchronizing iTunesDB"
msgstr "Chiama automaticamente mentre sincronizzi iTunesDB"
-#: ../data/gtkpod.glade.h:95
+#: ../data/gtkpod.glade.h:102
msgid "Category: "
msgstr "Categoria: "
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:103
msgid ""
"Change all tracks\n"
"simultaneously"
@@ -428,85 +455,93 @@
"Cambia tutte le tracce\n"
"simultaneamente"
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:105
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr ""
+"Controlla prima di rimuovere le foto da un album se\n"
+"debbano essere eliminate dal Photo Database."
+
+#: ../data/gtkpod.glade.h:107
msgid "Check for existing files when copying from iPod."
msgstr "Controlla se i file esistono durante la copia dall'iPod."
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:108
msgid "Command for 'Enqueue':"
msgstr "Comando per «Metti in coda»:"
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:109
msgid "Command for 'Play now':"
msgstr "Comando per «Riproduci ora»:"
#. 5
-#: ../data/gtkpod.glade.h:101 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
#: ../src/misc_conversion.c:65
msgid "Composer"
msgstr "Compositore"
-#: ../data/gtkpod.glade.h:102
+#: ../data/gtkpod.glade.h:111
msgid "Confirm before removing tracks from the iPod or repository"
msgstr "Chiedi conferma prima di rimuovere le tracce dall'iPod o dall'archivio"
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:112
msgid ""
"Confirm before removing tracks from the iPod or repository\n"
"when syncing playlists"
msgstr ""
-"Conferma prima di rimuovere le tracce dall'iPod o dall'archivio\n"
+"Chiedi conferma prima di rimuovere le tracce dall'iPod o dall'archivio\n"
"durante la sincronizzazione delle playlist"
-#: ../data/gtkpod.glade.h:105
+#: ../data/gtkpod.glade.h:114
msgid "Confirm lists of directories"
msgstr "Conferma la lista delle directory"
-#: ../data/gtkpod.glade.h:106
+#: ../data/gtkpod.glade.h:115
msgid "Contacts sync command:"
msgstr "Comando per sincronizzare i contatti:"
-#: ../data/gtkpod.glade.h:107
+#: ../data/gtkpod.glade.h:116
msgid "Containing Displayed Tracks"
msgstr "Contenente le tracce visualizzate"
-#: ../data/gtkpod.glade.h:108
+#: ../data/gtkpod.glade.h:117
msgid "Containing Selected Tracks"
msgstr "Contenente le tracce selezionate"
-#: ../data/gtkpod.glade.h:109
+#: ../data/gtkpod.glade.h:118
msgid "Conversion Progress Display"
msgstr "Visualizzazione dell'avanzamento della conversione"
-#: ../data/gtkpod.glade.h:110
+#: ../data/gtkpod.glade.h:119
msgid "Cover"
msgstr "Copertina"
-#: ../data/gtkpod.glade.h:111
+#: ../data/gtkpod.glade.h:120
msgid "Create New Playlist"
-msgstr "Crea nuova playlist"
+msgstr "Crea una nuova playlist"
-#: ../data/gtkpod.glade.h:112
+#: ../data/gtkpod.glade.h:121
msgid "Create Repository"
msgstr "Crea archivio"
-#: ../data/gtkpod.glade.h:113
+#: ../data/gtkpod.glade.h:122
msgid "Create _Playlist File"
msgstr "Crea un file di _playlist"
-#: ../data/gtkpod.glade.h:114
+#: ../data/gtkpod.glade.h:123
msgid "Credits"
msgstr "Riconoscimenti"
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:124
msgid "Currently only rating is supported."
msgstr "Attualmente solo il voto è supportato."
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:125
msgid "Delete repository"
msgstr "Elimina l'archivio"
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:126
msgid ""
"Delete tracks that are no longer present from the\n"
"iPod or repository"
@@ -514,19 +549,19 @@
"Elimina dall'iPod o dall'archivio\n"
"le tracce che non sono più presenti"
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:128
msgid "Deleted tracks"
msgstr "Tracce eliminate"
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:129
msgid "Descending"
msgstr "Decrescente"
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:130
msgid "Details"
msgstr "Dettagli"
-#: ../data/gtkpod.glade.h:123
+#: ../data/gtkpod.glade.h:132
#, no-c-format
msgid ""
"Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -543,7 +578,7 @@
"traccia: %T, numero CD: %C, anno: %Y, nome file originale (necessita del "
"file con le informazioni estese): %o, il carattere «%»: %%."
-#: ../data/gtkpod.glade.h:125
+#: ../data/gtkpod.glade.h:134
#, no-c-format
msgid ""
"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -561,7 +596,7 @@
"file con le informazioni estese): %o, playlist attuale: %p, il carattere "
"«%»: %%."
-#: ../data/gtkpod.glade.h:127
+#: ../data/gtkpod.glade.h:136
#, no-c-format
msgid ""
"Determines the name of the file with the cover art. You can separate several "
@@ -578,7 +613,7 @@
"informazioni estese): %o, nome del file originale senza estensione: %O, "
"playlist attuale: %p, il carattere «%»: %%."
-#: ../data/gtkpod.glade.h:128
+#: ../data/gtkpod.glade.h:137
msgid ""
"Directories to sync with are determined from the filenames of the tracks in "
"the playlist."
@@ -586,62 +621,58 @@
"Le directory da sincronizzare sono determinate a partire dal nome dei file "
"delle tracce nella playlist."
-#: ../data/gtkpod.glade.h:129
-msgid "Dirs"
-msgstr "Dir"
-
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:138
msgid "Display a list of tracks that could actually be updated."
msgstr "Mostra una lista di tracce che sono state veramente aggiornate."
-#: ../data/gtkpod.glade.h:131
+#: ../data/gtkpod.glade.h:139
msgid "Display a list of tracks that could not be updated."
msgstr "Mostra una lista di tracce che non è stato possibile aggiornare."
-#: ../data/gtkpod.glade.h:132
+#: ../data/gtkpod.glade.h:140
msgid "Display conversion log"
msgstr "Mostra il registro della conversione"
-#: ../data/gtkpod.glade.h:133
+#: ../data/gtkpod.glade.h:141
msgid "Display info about detected duplicates"
msgstr "Mostra informazioni sui duplicati individuati"
-#: ../data/gtkpod.glade.h:134
+#: ../data/gtkpod.glade.h:142
msgid "Display info about non-updated tracks"
msgstr "Mostra informazioni sulle tracce non aggiornate"
-#: ../data/gtkpod.glade.h:135
+#: ../data/gtkpod.glade.h:143
msgid "Display info about updated tracks"
msgstr "Mostra informazioni sulle tracce aggiornate"
-#: ../data/gtkpod.glade.h:136
+#: ../data/gtkpod.glade.h:144
msgid "Display messages and warnings at startup"
msgstr "Mostra messaggi e avvertimenti all'avvio"
-#: ../data/gtkpod.glade.h:137
+#: ../data/gtkpod.glade.h:145
msgid ""
"Display the list of duplicates that have been detected after adding files."
msgstr ""
"Mostra la lista dei duplicati che sono stati individuati dopo l'aggiunta dei "
"file."
-#: ../data/gtkpod.glade.h:138
+#: ../data/gtkpod.glade.h:146
msgid "Display toolbar..."
msgstr "Mostra la barra degli strumenti..."
-#: ../data/gtkpod.glade.h:139
+#: ../data/gtkpod.glade.h:147
msgid "Display tooltips in main window"
msgstr "Mostra i suggerimenti nella finestra principale"
-#: ../data/gtkpod.glade.h:140
+#: ../data/gtkpod.glade.h:148
msgid "Display tooltips in prefs window"
msgstr "Mostra i suggerimenti nella finestra delle preferenze"
-#: ../data/gtkpod.glade.h:141
+#: ../data/gtkpod.glade.h:149
msgid "Display tracks that match the criteria entered above."
msgstr "Mostra le tracce che corrispondono ai criteri inseriti sopra."
-#: ../data/gtkpod.glade.h:142
+#: ../data/gtkpod.glade.h:150
msgid ""
"Displayed\n"
"Tracks"
@@ -649,81 +680,73 @@
"Tracce\n"
"visualizzate"
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:152
+msgid "Displayed:"
+msgstr "Visualizzati:"
+
+#: ../data/gtkpod.glade.h:153
msgid "Don't allow file duplication"
msgstr "Non permettere i file duplicati"
-#: ../data/gtkpod.glade.h:145
+#: ../data/gtkpod.glade.h:154
msgid "Don't automatically sync on startup"
msgstr "Non sincronizzare automaticamente all'avvio"
-#: ../data/gtkpod.glade.h:146
-msgid "Download Cover"
-msgstr "Scarica copertina"
-
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:155
msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
msgstr ""
"Il riconoscimento dei file duplicati è basato su un hash sha1 (modificato) "
"sul file."
-#: ../data/gtkpod.glade.h:148
+#: ../data/gtkpod.glade.h:156
msgid "Edit Repository/iPod Options"
msgstr "Modifica le opzioni dell'archivio e dell'iPod"
-#: ../data/gtkpod.glade.h:149 ../src/context_menus.c:659
+#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
msgid "Edit Smart Playlist"
msgstr "Modifica la playlist intelligente"
-#: ../data/gtkpod.glade.h:150 ../src/context_menus.c:746
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
msgid "Edit Track Details"
msgstr "Modifica i dettagli della traccia"
-#: ../data/gtkpod.glade.h:151
+#: ../data/gtkpod.glade.h:159
msgid "Edit _Preferences"
msgstr "Modifica le _preferenze"
-#: ../data/gtkpod.glade.h:152
+#: ../data/gtkpod.glade.h:160
msgid "Effective free space"
msgstr "Spazio libero effettivo"
-#: ../data/gtkpod.glade.h:153
+#: ../data/gtkpod.glade.h:161
msgid "Empty Playlist"
msgstr "Playlist vuota"
-#: ../data/gtkpod.glade.h:154
+#: ../data/gtkpod.glade.h:162
msgid "Exclude file mask(s)"
msgstr "Maschera per i file da escludere"
-#: ../data/gtkpod.glade.h:155
+#: ../data/gtkpod.glade.h:163
msgid "Export can be continued at a later time if canceled."
msgstr "Se annullata, l'esportazione può essere ripresa in seguito."
-#: ../data/gtkpod.glade.h:156
+#: ../data/gtkpod.glade.h:164
msgid "File size"
msgstr "Dimensione file"
-#: ../data/gtkpod.glade.h:157
+#: ../data/gtkpod.glade.h:165
msgid "File size (deleted)"
msgstr "Dimensione dei file (eliminati)"
-#: ../data/gtkpod.glade.h:158
+#: ../data/gtkpod.glade.h:166
msgid "File size (non-transferred)"
msgstr "Dimensione dei file (non trasferiti)"
-#: ../data/gtkpod.glade.h:159
+#: ../data/gtkpod.glade.h:167
msgid "Filename Format: "
msgstr "Formato del nome del file: "
-#: ../data/gtkpod.glade.h:160
-msgid "Files"
-msgstr "File"
-
-#: ../data/gtkpod.glade.h:161
-msgid "Find _New"
-msgstr "Trova _nuova"
-
-#: ../data/gtkpod.glade.h:162
+#: ../data/gtkpod.glade.h:168
msgid ""
"Find orphan files (files with no track info in DB) and dangling tracks "
"(tracks with no corresponding files on iPod)"
@@ -731,15 +754,15 @@
"Trova i file orfani (file senza informazioni sulla traccia nel DB) e tracce "
"fantasma (tracce senza file corrispondenti sull'iPod)"
-#: ../data/gtkpod.glade.h:163
-msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
-msgstr "Prima prova <i>folder.jpg</i>, poi <i><artist>.jpg</i>"
+#: ../data/gtkpod.glade.h:169
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgstr "Prima prova <i>folder.jpg</i>, poi <i><artista>.jpg</i>"
-#: ../data/gtkpod.glade.h:164
+#: ../data/gtkpod.glade.h:170
msgid "Flac with :"
msgstr "Flac con :"
-#: ../data/gtkpod.glade.h:166
+#: ../data/gtkpod.glade.h:172
#, no-c-format
msgid ""
"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
@@ -748,7 +771,7 @@
"Per esempio, «xmms %s» cancellerà la playlist attuale di xmms, aggiungerà la "
"traccia selezionata e comincerà a suonarla."
-#: ../data/gtkpod.glade.h:168
+#: ../data/gtkpod.glade.h:174
#, no-c-format
msgid ""
"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
@@ -757,16 +780,16 @@
"Per esempio, «xmms -e %s» appenderà (in coda) la traccia selezionata alla "
"playlist corrente di xmms."
-#: ../data/gtkpod.glade.h:169 ../src/display_sorttabs.c:2966
+#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
msgid "Genre"
msgstr "Genere"
-#: ../data/gtkpod.glade.h:170
+#: ../data/gtkpod.glade.h:176
msgid "Group artists on compilation CDs"
msgstr "Raggruppa gli artisti nei CD di compilation"
-#: ../data/gtkpod.glade.h:171
+#: ../data/gtkpod.glade.h:177
msgid ""
"Highly recommended for faster import when taking advantage of the "
"duplication recognition. Also, having the PC filenames allows writing "
@@ -780,12 +803,12 @@
"ricostruire il contenuto dell'iPod nel caso di corruzione del filesystem "
"(cambiare le voci «transferred=» nel backup del database)."
-#: ../data/gtkpod.glade.h:172 ../src/context_menus.c:682
-#: ../src/context_menus.c:700 ../src/context_menus.c:824
+#: ../data/gtkpod.glade.h:178 ../src/context_menus.c:685
+#: ../src/context_menus.c:703 ../src/context_menus.c:820
msgid "I'm sure"
msgstr "Sono sicuro"
-#: ../data/gtkpod.glade.h:173
+#: ../data/gtkpod.glade.h:179
msgid ""
"If available, the local copy of the track is referenced in the playlist. "
"Otherwise the file on the iPod is used."
@@ -793,13 +816,13 @@
"Se disponibile, la playlist fa riferimento alla copia locale della traccia. "
"Altrimenti è usato il file sul iPod."
-#: ../data/gtkpod.glade.h:174
+#: ../data/gtkpod.glade.h:180
msgid "If both options are selected, embedded APIC data takes precedence."
msgstr ""
"Se entrambe le opzioni sono selezionate, i dati APIC incorporati hanno la "
"precedenza."
-#: ../data/gtkpod.glade.h:175
+#: ../data/gtkpod.glade.h:181
msgid ""
"If checked, sorting will be case sensitive. Please note that case sensitive "
"sorting will not work well with most charsets."
@@ -808,7 +831,7 @@
"l'ordinamento sensibile alle maiuscole non funziona bene con la maggior "
"parte delle codifiche."
-#: ../data/gtkpod.glade.h:176
+#: ../data/gtkpod.glade.h:182
msgid ""
"If the filename (full path) of an existing track matches that of a track to "
"be added, this option allows you to update the information about the "
@@ -823,11 +846,11 @@
"cambiato e l'opzione precedente «Non permettere i file duplicati» è "
"selezionata."
-#: ../data/gtkpod.glade.h:177
+#: ../data/gtkpod.glade.h:183
msgid "If you check this, gtkpod will descend into subdirectories recursively."
msgstr "Selezionando questo, gtkpod discenderà nelle directory ricorsivamente."
-#: ../data/gtkpod.glade.h:178
+#: ../data/gtkpod.glade.h:184
msgid ""
"If you check this, information (cover art and meta information) changed for "
"this track will be copied to all other selected tracks as well. Use with "
@@ -837,7 +860,7 @@
"informazioni) cambiate per questa traccia saranno copiate anche in tutte le "
"altre tracce selezionate. Usare con cautela."
-#: ../data/gtkpod.glade.h:179
+#: ../data/gtkpod.glade.h:185
msgid ""
"If you don't select the master playlist automatically, the initial database "
"import is much faster because the display dosn't have to be updated."
@@ -846,7 +869,7 @@
"iniziale del database sarà molto più veloce perché non verrà aggiornata "
"l'interfaccia."
-#: ../data/gtkpod.glade.h:180
+#: ../data/gtkpod.glade.h:186
msgid ""
"If you select several tracks in the track list and edit a tag of the first "
"track, the tags in the other tracks are updated as well."
@@ -855,11 +878,11 @@
"un'etichetta della prima traccia, saranno aggiornate anche le etichette "
"delle altre tracce."
-#: ../data/gtkpod.glade.h:181
+#: ../data/gtkpod.glade.h:187
msgid "Ignore these words when at the beginning of the following fields:"
msgstr "Ignorare queste parole quando sono all'inizio dei campi seguenti:"
-#: ../data/gtkpod.glade.h:182
+#: ../data/gtkpod.glade.h:188
msgid ""
"In order to save the displayed track order to the iPod choose 'Save "
"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
@@ -868,11 +891,11 @@
"«Salva l'ordine visualizzato delle tracce» dal menù «Modifica» o selezionare "
"«Salvataggio automatico» sotto."
-#: ../data/gtkpod.glade.h:183
+#: ../data/gtkpod.glade.h:189
msgid "Initialize iPod"
msgstr "Inizializza l'iPod"
-#: ../data/gtkpod.glade.h:184
+#: ../data/gtkpod.glade.h:190
msgid ""
"Insert before\n"
"Insert after"
@@ -880,69 +903,73 @@
"Inserisci prima\n"
"Inserisci dopo"
-#: ../data/gtkpod.glade.h:186
+#: ../data/gtkpod.glade.h:192
msgid "Keeps all compilation CDs grouped together in the artists sort tab."
msgstr ""
"Mantiene raggruppati tutti i CD di compilation nelle schede di ordinamento "
"degli artisti."
-#: ../data/gtkpod.glade.h:187
+#: ../data/gtkpod.glade.h:193
msgid "Live _updating"
msgstr "Aggiornamento contin_uo"
-#: ../data/gtkpod.glade.h:188
+#: ../data/gtkpod.glade.h:194
msgid "Load iPod(s)"
msgstr "Leggi gli iPod"
-#: ../data/gtkpod.glade.h:189
+#: ../data/gtkpod.glade.h:195
msgid "Lower Margin"
msgstr "Limite inferiore"
-#: ../data/gtkpod.glade.h:190
+#: ../data/gtkpod.glade.h:196
msgid "M4A with :"
msgstr "M4A con :"
-#: ../data/gtkpod.glade.h:191
+#: ../data/gtkpod.glade.h:197
msgid "MP3 with :"
msgstr "MP3 con :"
-#: ../data/gtkpod.glade.h:192
+#: ../data/gtkpod.glade.h:198
msgid "Match al_l of the following"
msgstr "Verifica _tutti i seguenti"
-#: ../data/gtkpod.glade.h:193
+#: ../data/gtkpod.glade.h:199
msgid "Match an_y of the following"
msgstr "Verifica _uno qualsiasi dei seguenti"
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:200
msgid "Match only _checked tracks"
msgstr "Confronta solo le tracce _selezionate"
-#: ../data/gtkpod.glade.h:195
+#: ../data/gtkpod.glade.h:201
msgid "Maximum number of background threads:"
msgstr "Numero massimo di thread sullo sfondo:"
-#: ../data/gtkpod.glade.h:196
+#: ../data/gtkpod.glade.h:202
msgid "Maximum size of cache directory (in GB):"
msgstr "Dimensione massima della directory della cache (in GB):"
-#: ../data/gtkpod.glade.h:197
+#: ../data/gtkpod.glade.h:203
msgid "Model:"
msgstr "Modello:"
-#: ../data/gtkpod.glade.h:198 ../src/display_tracks.c:2017
+#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
msgid "Modified"
msgstr "Modificato"
-#: ../data/gtkpod.glade.h:199
+#: ../data/gtkpod.glade.h:205
msgid "Most Recently Played Tracks"
msgstr "Tracce riprodotte più recentemente"
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:206
+msgid "Move selected attributes to the displayed list"
+msgstr "Sposta gli attributi selezionati nella lista di quelli visualizzati"
+
+#: ../data/gtkpod.glade.h:207
msgid "Music Root:"
msgstr "Radice della musica:"
-#: ../data/gtkpod.glade.h:201
+#: ../data/gtkpod.glade.h:208
msgid ""
"Music files can have images embedded in the APIC tag. Currently this is only "
"supported for MP3 files."
@@ -950,31 +977,34 @@
"I file musicali possono avere delle immagini incorporate nell'etichetta "
"APIC. Attualmente questo è supportato solo per i file MP3."
-#: ../data/gtkpod.glade.h:202
+#: ../data/gtkpod.glade.h:209
msgid "Never show this dialogue again"
msgstr "Non mostrare più questa finestra di dialogo"
-#: ../data/gtkpod.glade.h:203
-msgid "New PL"
-msgstr "Nuova PL"
+#: ../data/gtkpod.glade.h:210 ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66 ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93 ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428 ../src/misc_playlist.c:430
+msgid "New Playlist"
+msgstr "Nuova playlist"
-#: ../data/gtkpod.glade.h:204
+#: ../data/gtkpod.glade.h:211
msgid "No lower margin"
msgstr "Nessun limite inferiore"
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:212
msgid "No upper margin"
msgstr "Nessun limite superiore"
-#: ../data/gtkpod.glade.h:206
+#: ../data/gtkpod.glade.h:213
msgid "Non-transferred tracks"
msgstr "Tracce non trasferite"
-#: ../data/gtkpod.glade.h:207
+#: ../data/gtkpod.glade.h:214
msgid "None"
msgstr "Nessuno"
-#: ../data/gtkpod.glade.h:208
+#: ../data/gtkpod.glade.h:215
msgid ""
"Normally the charset specified when first importing the track will be used "
"for the filename. If you set this option you can set a different charset "
@@ -992,7 +1022,7 @@
"non avranno alcuna codifica memorizzata. Verrà usata invece la codifica "
"specificata."
-#: ../data/gtkpod.glade.h:209
+#: ../data/gtkpod.glade.h:216
msgid ""
"Normally the charset specified when first importing the track will be used "
"to update the track information. If you have chosen a wrong charset when "
@@ -1011,7 +1041,7 @@
"tracce importate prima della V0.51 non avranno una codifica memorizzata. "
"Verrà usata invece la codifica specificata qui sopra."
-#: ../data/gtkpod.glade.h:210
+#: ../data/gtkpod.glade.h:217
msgid ""
"Normally the charset specified when first importing the track will be used "
"to write the tags. If you have chosen a wrong charset when first importing a "
@@ -1030,7 +1060,7 @@
"una codifica memorizzata, verrà usata la codifica specificata nella nella "
"pagina «Input/Output»."
-#: ../data/gtkpod.glade.h:211
+#: ../data/gtkpod.glade.h:218
msgid ""
"Normally, if a track is no longer present in the sync directory, it will be "
"removed from the playlist, but not from the iPod or local repository.\n"
@@ -1051,187 +1081,194 @@
"questa opzione se si vuole che le tracce siano rimosse perché rimuovere "
"dalla playlist principale significa rimuovere dall'iPod."
-#: ../data/gtkpod.glade.h:214
+#: ../data/gtkpod.glade.h:221
msgid "Notes sync command:"
msgstr "Comando per sincronizzare le note:"
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:222
msgid "Number of playlists"
msgstr "Numero di playlist"
-#: ../data/gtkpod.glade.h:216
+#: ../data/gtkpod.glade.h:223
msgid "Number of tracks"
msgstr "Numero di tracce"
-#: ../data/gtkpod.glade.h:217
+#: ../data/gtkpod.glade.h:224
msgid "Number of tracks in generated playlists:"
msgstr "Numero di tracce nelle playlist generate:"
-#: ../data/gtkpod.glade.h:218
+#: ../data/gtkpod.glade.h:225
msgid ""
"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
msgstr ""
-"Numero delle tracce nelle playlist generate «Ascoltate più spesso», «Tracce "
-"con il voto migliore» e «Tracce riprodotte più recentemente». Scegliere «0» "
-"per «nessun limite»."
+"Numero delle tracce nelle playlist generate «Ascoltate più spesso», «Voti "
+"migliori» e «Riprodotte più recentemente». Scegliere «0» per «nessun limite»."
-#: ../data/gtkpod.glade.h:219
+#: ../data/gtkpod.glade.h:226
msgid "Ogg with :"
msgstr "Ogg con :"
-#: ../data/gtkpod.glade.h:220
+#: ../data/gtkpod.glade.h:227
msgid "On startup automatically sync with playlist directories"
msgstr "All'avvio sincronizza automaticamente con le directory delle playlist"
-#: ../data/gtkpod.glade.h:221
+#: ../data/gtkpod.glade.h:228
msgid "On startup automatically sync with the following directory"
msgstr "All'avvio sincronizza automaticamente con la seguente directory"
-#: ../data/gtkpod.glade.h:222
+#: ../data/gtkpod.glade.h:229
msgid "On startup automatically update (Live Playlist)"
msgstr "All'avvio aggiorna automaticamente (Live Playlist)"
-#: ../data/gtkpod.glade.h:223
+#: ../data/gtkpod.glade.h:230
msgid "One for each Album"
msgstr "Una per ogni album"
-#: ../data/gtkpod.glade.h:224
+#: ../data/gtkpod.glade.h:231
msgid "One for each Artist"
msgstr "Una per ogni artista"
-#: ../data/gtkpod.glade.h:225
+#: ../data/gtkpod.glade.h:232
msgid "One for each Composer"
msgstr "Una per ogni compositore"
-#: ../data/gtkpod.glade.h:226
+#: ../data/gtkpod.glade.h:233
msgid "One for each Genre"
msgstr "Una per ogni genere"
-#: ../data/gtkpod.glade.h:227
+#: ../data/gtkpod.glade.h:234
msgid "One for each Rating"
msgstr "Una per ogni voto"
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:235
msgid "One for each Year"
msgstr "Una per ogni anno"
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:236
msgid "Overwrite tags that are already set"
msgstr "Sovrascrivi le etichette che sono già impostate"
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:237
msgid "Password:"
msgstr "Password:"
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:238
msgid "Path:"
msgstr "Percorso:"
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:239
+msgid "Photo Window"
+msgstr "Finestra delle foto"
+
+#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
msgid "Play time"
msgstr "Durata"
-#: ../data/gtkpod.glade.h:233 ../src/display_spl.c:98
+#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
#: ../src/misc_conversion.c:77
msgid "Playcount"
msgstr "Contatore riproduzioni"
-#: ../data/gtkpod.glade.h:234 ../src/display_tracks.c:2014
+#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
msgid "Played"
msgstr "Riprodotto"
-#: ../data/gtkpod.glade.h:235 ../src/display_spl.c:105
-msgid "Playlist"
-msgstr "Playlist"
-
-#: ../data/gtkpod.glade.h:236
+#: ../data/gtkpod.glade.h:243
msgid "Playlist name:"
msgstr "Nome della playlist:"
-#: ../data/gtkpod.glade.h:237
+#: ../data/gtkpod.glade.h:244
msgid "Playlist type:"
msgstr "Tipo di playlist:"
-#: ../data/gtkpod.glade.h:238 ../src/display_playlists.c:2190
+#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
msgid "Playlists"
msgstr "Playlist"
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:246
msgid "Please refer to the notice below."
-msgstr "Consultare la nota seguente."
+msgstr "Consultare l'avviso seguente."
-#: ../data/gtkpod.glade.h:240
+#: ../data/gtkpod.glade.h:247
msgid "Please specify a time interval"
msgstr "Specificare un intervallo di tempo"
-#: ../data/gtkpod.glade.h:241
+#: ../data/gtkpod.glade.h:248
msgid "Preferences"
msgstr "Preferenze"
-#: ../data/gtkpod.glade.h:242
+#: ../data/gtkpod.glade.h:249
msgid "Progress Information"
msgstr "Informazioni sull'avanzamento"
-#: ../data/gtkpod.glade.h:243
+#: ../data/gtkpod.glade.h:250
+msgid "R_ename Album"
+msgstr "R_inomina album"
+
+#: ../data/gtkpod.glade.h:251
msgid "Random Playlist from Displayed Tracks"
msgstr "Playlist casuale dalle tracce mostrate"
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:252
msgid "Randomize Current Playlist"
msgstr "Rendi casuale la playlist corrente"
-#: ../data/gtkpod.glade.h:245 ../src/display_spl.c:101
+#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
#: ../src/misc_conversion.c:78
msgid "Rating"
msgstr "Voto"
-#: ../data/gtkpod.glade.h:246
+#: ../data/gtkpod.glade.h:254
msgid "Read coverart from embedded APIC data"
msgstr "Leggi la copertina dai dati APIC incorporati"
-#: ../data/gtkpod.glade.h:247
+#: ../data/gtkpod.glade.h:255
msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
msgstr ""
"Leggi le etichette dal contenuto del file (es. etichette ID3 nei file MP3)"
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:256
+msgid "Remove selected attributes from the displayed list"
+msgstr "Rimuove gli attributi selezionati dalla lista di quelli visualizzati"
+
+#: ../data/gtkpod.glade.h:257
msgid "Repository Options"
msgstr "Opzioni dell'archivio"
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:258
msgid "Repository name:"
msgstr "Nome dell'archivio:"
-#: ../data/gtkpod.glade.h:250
+#: ../data/gtkpod.glade.h:259
msgid "Repository type:"
msgstr "Tipo di archivio:"
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:260
msgid "Root directory of mserv database (trackinfo root)."
msgstr "Directory radice del database mserv (radice di trackinfo)."
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:261
msgid "Rules"
msgstr "Regole"
-#: ../data/gtkpod.glade.h:253 ../src/context_menus.c:808
+#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
msgid "Save Changes"
msgstr "Salva le modifiche"
-#: ../data/gtkpod.glade.h:254
+#: ../data/gtkpod.glade.h:263
msgid "Scrobble Tracks?"
msgstr "Invia le tracce a Audioscrobbler?"
-#: ../data/gtkpod.glade.h:255
+#: ../data/gtkpod.glade.h:264
msgid "Select '-1' for no upper limit."
msgstr "Scegliere «-1» per nessun limite superiore."
-#: ../data/gtkpod.glade.h:256
+#: ../data/gtkpod.glade.h:265
msgid "Select '0' for no lower limit."
msgstr "Scegliere «0» per nessun limite inferiore."
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:266
msgid ""
"Selected\n"
"Playlist"
@@ -1239,7 +1276,7 @@
"Playlist\n"
"selezionata"
-#: ../data/gtkpod.glade.h:259
+#: ../data/gtkpod.glade.h:268
msgid ""
"Selected\n"
"Tracks"
@@ -1247,89 +1284,85 @@
"Tracce\n"
"selezionate"
-#: ../data/gtkpod.glade.h:261
-msgid "Selected Tab _Entry"
-msgstr "Voc_e nella scheda selezionata"
-
-#: ../data/gtkpod.glade.h:262
-msgid "Selected _Playlist"
-msgstr "_Playlist selezionata"
-
-#: ../data/gtkpod.glade.h:263
-msgid "Selected _Tracks"
-msgstr "_Tracce selezionate"
-
-#: ../data/gtkpod.glade.h:264
-msgid "Selected filter tab entry from database"
+#: ../data/gtkpod.glade.h:270
+msgid "Selected Filter Tab Entry from Database"
msgstr "Voce selezionata nella scheda di filtro dal database"
-#: ../data/gtkpod.glade.h:265
-msgid "Selected filter tab entry from harddisk"
+#: ../data/gtkpod.glade.h:271
+msgid "Selected Filter Tab Entry from Hard Disk"
msgstr "Voce selezionata nella scheda di filtro dal disco fisso"
-#: ../data/gtkpod.glade.h:266
-msgid "Selected filter tab entry from iPod"
+#: ../data/gtkpod.glade.h:272
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "Voce selezionata nella scheda di filtro dalla playlist"
+
+#: ../data/gtkpod.glade.h:273
+msgid "Selected Filter Tab Entry from iPod"
msgstr "Voce selezionata nella scheda di filtro dall'iPod"
-#: ../data/gtkpod.glade.h:267
-msgid "Selected filter tab entry from playlist"
-msgstr "Voce selezionata nella scheda di filtro dalla playlist"
+#: ../data/gtkpod.glade.h:274
+msgid "Selected Playlist Including Tracks from Database"
+msgstr "Playlist selezionata comprese tracce dal database"
-#: ../data/gtkpod.glade.h:268
-msgid "Selected playlist"
-msgstr "Playlist selezionata"
+#: ../data/gtkpod.glade.h:275
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "Playlist selezionata comprese tracce dal disco fisso"
-#: ../data/gtkpod.glade.h:269
-msgid "Selected playlist including tracks from database"
-msgstr "Playlist selezionata comprese tracce nel database"
+#: ../data/gtkpod.glade.h:276
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "Playlist selezionata comprese tracce dall'iPod"
-#: ../data/gtkpod.glade.h:270
-msgid "Selected playlist including tracks from harddisk"
-msgstr "Playlist selezionata comprese tracce sul disco fisso"
+#: ../data/gtkpod.glade.h:277
+msgid "Selected Tab _Entry"
+msgstr "Voc_e nella scheda selezionata"
-#: ../data/gtkpod.glade.h:271
-msgid "Selected playlist including tracks from iPod"
-msgstr "Playlist selezionata comprese tracce nell'iPod"
-
-#: ../data/gtkpod.glade.h:272
-msgid "Selected tracks from database"
+#: ../data/gtkpod.glade.h:278
+msgid "Selected Tracks from Database"
msgstr "Tracce selezionate dal database"
-#: ../data/gtkpod.glade.h:273
-msgid "Selected tracks from harddisk"
+#: ../data/gtkpod.glade.h:279
+msgid "Selected Tracks from Hard Disk"
msgstr "Tracce selezionate dal disco fisso"
-#: ../data/gtkpod.glade.h:274
-msgid "Selected tracks from iPod"
+#: ../data/gtkpod.glade.h:280
+msgid "Selected Tracks from Playlist"
+msgstr "Tracce selezionate dalla playlist"
+
+#: ../data/gtkpod.glade.h:281
+msgid "Selected Tracks from iPod"
msgstr "Tracce selezionate dall'iPod"
-#: ../data/gtkpod.glade.h:275
-msgid "Selected tracks from playlist"
-msgstr "Tracce selezionate dalla playlist"
+#: ../data/gtkpod.glade.h:282
+msgid "Selected _Playlist"
+msgstr "_Playlist selezionata"
-#: ../data/gtkpod.glade.h:276
+#: ../data/gtkpod.glade.h:283
+msgid "Selected _Tracks"
+msgstr "_Tracce selezionate"
+
+#: ../data/gtkpod.glade.h:284
+msgid "Selected playlist"
+msgstr "Playlist selezionata"
+
+#: ../data/gtkpod.glade.h:285
msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
msgstr ""
"Lista separata da punto e virgola di maschere per escludere i file, es. «*."
"mp3»"
-#: ../data/gtkpod.glade.h:277
+#: ../data/gtkpod.glade.h:286
msgid "Set Cover Art from _File"
msgstr "Imposta la copertina da un _file"
-#: ../data/gtkpod.glade.h:278
-msgid "Set Cover Art from _Web"
-msgstr "Imposta la copertina dal _web"
-
-#: ../data/gtkpod.glade.h:279
+#: ../data/gtkpod.glade.h:287
msgid "Set mountpoint or edit repository options"
msgstr "Imposta il punto di mount o modifica le opzioni dell'archivio"
-#: ../data/gtkpod.glade.h:280
+#: ../data/gtkpod.glade.h:288
msgid "Set options for Calendar/Contacts/Notes"
msgstr "Imposta le opzioni per Calendario/Contatti/Note"
-#: ../data/gtkpod.glade.h:281
+#: ../data/gtkpod.glade.h:289
msgid ""
"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
@@ -1340,7 +1373,7 @@
"dei file .m4a e .m4b saranno calcolati e scritti nel file musicale usando "
"questo comando."
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:290
msgid ""
"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for mp3 files "
@@ -1350,15 +1383,15 @@
"nel menù «Strumenti». Se impostato, i dati mancanti per la normalizzazione "
"dei file mp3 saranno calcolati e scritti nel file mp3 usando questo comando."
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:291
msgid "Set this to your last.fm password"
msgstr "Impostare la propria password su last.fm"
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:292
msgid "Set this to your last.fm username"
msgstr "Impostare il proprio nome utente su last.fm"
-#: ../data/gtkpod.glade.h:285
+#: ../data/gtkpod.glade.h:293
msgid ""
"Set to 0 to effectively disable caching (a maximum of one track will be "
"cached at a time)."
@@ -1366,7 +1399,7 @@
"Impostare a 0 per disabilitare la cache (al massimo una traccia per volta "
"sarà mantenuta nella cache)."
-#: ../data/gtkpod.glade.h:286
+#: ../data/gtkpod.glade.h:294
msgid ""
"Set to 0 to use as many background threads as CPUs are available on your "
"system."
@@ -1374,85 +1407,85 @@
"Impostare a 0 per usare tanti thread sullo sfondo quante sono le CPU "
"disponibili nel sistema."
-#: ../data/gtkpod.glade.h:287
+#: ../data/gtkpod.glade.h:295
msgid "Show information about problems when accessing mserv"
msgstr "Mostra informazioni sui problemi nell'accesso a mserv"
-#: ../data/gtkpod.glade.h:288
+#: ../data/gtkpod.glade.h:296
msgid "Show summary of sync result"
msgstr "Mostra un riassunto dei risultati della sincronizzazione"
-#: ../data/gtkpod.glade.h:289 ../src/misc_playlist.c:96
+#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
#: ../src/repository.c:1356
msgid "Smart Playlist"
msgstr "Playlist intelligente"
-#: ../data/gtkpod.glade.h:290
+#: ../data/gtkpod.glade.h:298
msgid "Sort tracks according to: "
msgstr "Ordina le tracce secondo: "
-#: ../data/gtkpod.glade.h:291
+#: ../data/gtkpod.glade.h:299
msgid "Sorting Options"
msgstr "Opzioni di ordinamento"
-#: ../data/gtkpod.glade.h:292
+#: ../data/gtkpod.glade.h:300
msgid "Sorting case sensitive"
msgstr "Ordinamento sensibile alle maiuscole"
-#: ../data/gtkpod.glade.h:293
+#: ../data/gtkpod.glade.h:301
msgid "Sorttab: "
msgstr "Scheda di ordinamento: "
-#: ../data/gtkpod.glade.h:294
+#: ../data/gtkpod.glade.h:302
msgid "Sorttabs"
msgstr "Schede di ordinamento"
-#: ../data/gtkpod.glade.h:295
+#: ../data/gtkpod.glade.h:303
msgid "Source:"
msgstr "Sorgente:"
-#: ../data/gtkpod.glade.h:297
+#: ../data/gtkpod.glade.h:305
#, no-c-format
msgid ""
"Specify exact path including command line options. '%i' will be replaced "
"with the mount point of the iPod."
msgstr ""
"Specificare il percorso esatto incluse le opzioni della riga di comando. «%"
-"i» verrà sostituito con il punto di montaggio dell'iPod."
+"i» verrà sostituito con il punto di mount dell'iPod."
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:306
msgid "Specify interval"
msgstr "Specificare l'intervallo"
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:307
msgid "Start display automatically"
msgstr "Mostra automaticamente"
-#: ../data/gtkpod.glade.h:300
+#: ../data/gtkpod.glade.h:308
msgid "Synchronise Contacts, Calendar and Notes"
msgstr "Sincronizza contatti, calendario e note"
-#: ../data/gtkpod.glade.h:301
+#: ../data/gtkpod.glade.h:309
msgid "Synchronize All"
msgstr "Sincronizza tutto"
-#: ../data/gtkpod.glade.h:302
+#: ../data/gtkpod.glade.h:310
msgid "Synchronize Calendar"
msgstr "Sincronizza il calendario"
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:311
msgid "Synchronize Contacts"
msgstr "Sincronizza i contatti"
-#: ../data/gtkpod.glade.h:304
+#: ../data/gtkpod.glade.h:312
msgid "Synchronize Notes"
msgstr "Sincronizza le note"
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:313
msgid "Template for info field: "
msgstr "Modello per il campo delle informazioni: "
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:314
msgid ""
"The local copy of the track is referenced in the playlist. If the track is "
"not available locally, an error message is displayed."
@@ -1460,7 +1493,7 @@
"La playlist fa riferimento alla copia locale della traccia. Se la traccia "
"non è disponibile localmente, verrà mostrato un messaggio di errore."
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:315
msgid ""
"The output of the background conversion scripts is copied below. Each page "
"of the notebook corresponds to one background thread."
@@ -1468,7 +1501,7 @@
"L'output degli script di conversione sullo sfondo è copiato sotto. Ogni "
"linguetta corrisponde ad un thread sullo sfondo."
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:316
msgid ""
"The tags are written to the files on your harddrive and on the iPod (if "
"available)."
@@ -1476,16 +1509,16 @@
"Le etichette vengono scritte sui file nel disco fisso e sull'iPod (se "
"disponibile)."
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:317
msgid "The track on the iPod is referenced in the playlist file."
msgstr "Il file della playlist fa riferimento alla traccia sull'iPod."
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:318
msgid "This is the same option as in 'Edit/Delete Confirmation'"
msgstr ""
"Questa è la stessa opzione che si trova in «Modifica/Conferma l'eliminazione»"
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:319
msgid ""
"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
"uses unicode to store the tags, so you won't have to worry about charsets "
@@ -1500,20 +1533,20 @@
"pure. Le etichette ID3v2.2/4 verranno scritte se sono già presenti sul file "
"su cui si va a scrivere."
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:320
msgid "This option will be re-activated when you upgrade gtkpod."
msgstr "Questa opzione verrà riattivata dopo aver aggiornato gtkpod."
-#: ../data/gtkpod.glade.h:313
+#: ../data/gtkpod.glade.h:321
msgid "Time:"
msgstr "Ora:"
-#: ../data/gtkpod.glade.h:314 ../src/display_sorttabs.c:2972
+#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
msgid "Title"
msgstr "Titolo"
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:323
msgid ""
"Total\n"
"(iPod)"
@@ -1521,7 +1554,7 @@
"Totale\n"
"(iPod)"
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:325
msgid ""
"Total\n"
"(local)"
@@ -1529,15 +1562,15 @@
"Totale\n"
"(locale)"
-#: ../data/gtkpod.glade.h:319
+#: ../data/gtkpod.glade.h:327
msgid "Tracks"
msgstr "Tracce"
-#: ../data/gtkpod.glade.h:320
+#: ../data/gtkpod.glade.h:328
msgid "Tracks Most Often Listened To"
msgstr "Tracce ascoltate più spesso"
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:329
msgid ""
"Tracks can be transferred in the background as soon as they are added to an "
"iPod repository. Otherwise they will be transferred when ejecting the "
@@ -1548,23 +1581,23 @@
"dell'espulsione; il contenuto dell'iPod è completamente intatto fino a quel "
"momento."
-#: ../data/gtkpod.glade.h:322
+#: ../data/gtkpod.glade.h:330
msgid "Tracks in Selected Tab _Entry"
msgstr "Tracce nella scheda s_elezionata"
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:331
msgid "Tracks in Selected _Playlist"
msgstr "Tracce nella _playlist selezionata"
-#: ../data/gtkpod.glade.h:324
+#: ../data/gtkpod.glade.h:332
msgid "Transfer tracks to the iPod in the background"
msgstr "Trasferisci le tracce all'iPod sullo sfondo"
-#: ../data/gtkpod.glade.h:325
+#: ../data/gtkpod.glade.h:333
msgid "Translators"
msgstr "Traduttori"
-#: ../data/gtkpod.glade.h:326
+#: ../data/gtkpod.glade.h:334
msgid ""
"Try to load contents of all connected iPods. For each iPod a separate "
"repository must be set up."
@@ -1572,55 +1605,55 @@
"Tenta di caricare i contenuti di tutti gli iPod connessi. Per ogni iPod deve "
"essere impostato un archivio separato."
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:335
msgid "Undo _Track"
msgstr "Annulla _traccia"
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:336
msgid "Update _mserv Data from File"
msgstr "Aggiorna i dati _mserv da file"
-#: ../data/gtkpod.glade.h:329
+#: ../data/gtkpod.glade.h:337
msgid "Update/Sync all playlists now"
msgstr "Aggiorna/sincronizza tutte le playlist ora"
-#: ../data/gtkpod.glade.h:330
+#: ../data/gtkpod.glade.h:338
msgid "Update/Sync playlist now"
msgstr "Aggiorna/sincronizza la playlist ora"
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:339
msgid "Upper margin"
msgstr "Limite superiore"
-#: ../data/gtkpod.glade.h:332
+#: ../data/gtkpod.glade.h:340
msgid "Use 'Multi-Edit' also for title field"
msgstr "Usa «Multi-edit» anche per il campo titolo"
-#: ../data/gtkpod.glade.h:333
+#: ../data/gtkpod.glade.h:341
msgid "Use 'Multi-Edit' for tracks selections"
msgstr "Usa «Multi-Edit» per la selezione delle tracce"
-#: ../data/gtkpod.glade.h:334
-msgid "Use <i><Album>.jpg</i> in the parent directory"
+#: ../data/gtkpod.glade.h:342
+msgid "Use <i><Album>.jpg</i> in the parent directory"
msgstr "Usa <i><Album>.jpg</i> nella directory superiore"
-#: ../data/gtkpod.glade.h:335
-msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+#: ../data/gtkpod.glade.h:343
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
msgstr "Usa <i><Album>.jpg</i>, <i><Album>.png</i>..."
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:344
msgid "Use <i>folder.jpg</i> as cover art."
msgstr "Usa <i>folder.jpg</i> come copertina."
-#: ../data/gtkpod.glade.h:337
+#: ../data/gtkpod.glade.h:345
msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
msgstr "Usa <i>folder.jpg</i>, <i>folder.png</i>..."
-#: ../data/gtkpod.glade.h:338
+#: ../data/gtkpod.glade.h:346
msgid "Use mserv database to fill additional information"
msgstr "Usa il database mserv per aggiungere ulteriori informazioni"
-#: ../data/gtkpod.glade.h:339
+#: ../data/gtkpod.glade.h:347
msgid ""
"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
"for this filename."
@@ -1628,7 +1661,7 @@
"Usare la codifica selezionata (Preferenze/«Aggiungi/Aggiorna/ Sincronizza»)\n"
" per questo nome di file."
-#: ../data/gtkpod.glade.h:341
+#: ../data/gtkpod.glade.h:349
msgid ""
"Use selected encoding (on the 'General' page)\n"
"when writing tags"
@@ -1636,27 +1669,27 @@
"Usa la codifica selezionata (nella pagina «Generale»)\n"
"per la scrittura delle etichette"
-#: ../data/gtkpod.glade.h:343
+#: ../data/gtkpod.glade.h:351
msgid "Use selected encoding also when updating or syncing tracks"
msgstr ""
"Usa la codifica selezionata anche durante l'aggiornamento e la "
"sincronizzazione delle tracce"
-#: ../data/gtkpod.glade.h:344
+#: ../data/gtkpod.glade.h:352
msgid "Use this template to parse filename for tag information:"
msgstr ""
"Usa questa maschera per interpretare il nome del file per informazioni sulle "
"etichette:"
-#: ../data/gtkpod.glade.h:345
+#: ../data/gtkpod.glade.h:353
msgid "Username to be used for mserv database lookup."
msgstr "Nome utente da utilizzare per la consultazione del database mserv."
-#: ../data/gtkpod.glade.h:346
+#: ../data/gtkpod.glade.h:354
msgid "Username:"
msgstr "Nome utente:"
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:355
msgid ""
"Usually you don't want to set the title of several tracks to the same text. "
"This option might avoid unwanted results (especially since there is no "
@@ -1666,11 +1699,15 @@
"Questa opzione può evitare effetti non voluti (specialmente vista l'assenza "
"della opzione «Annulla»)."
-#: ../data/gtkpod.glade.h:348
+#: ../data/gtkpod.glade.h:356
+msgid "View Full Size"
+msgstr "Mostra a piena grandezza"
+
+#: ../data/gtkpod.glade.h:357
msgid "WAV with :"
msgstr "WAV con :"
-#: ../data/gtkpod.glade.h:349
+#: ../data/gtkpod.glade.h:358
msgid ""
"When adding dirs/files, update information of\n"
"existing tracks with identical filenames"
@@ -1678,7 +1715,7 @@
"Aggiorna le informazioni sulle tracce esistenti con\n"
"nomi identici durante l'aggiunta di directory e file"
-#: ../data/gtkpod.glade.h:351
+#: ../data/gtkpod.glade.h:360
msgid ""
"When copying from iPod no check is performed on whether the destination file "
"exists. Enabling this option will make gtkpod check whether the length of "
@@ -1691,11 +1728,11 @@
"così il file verrà saltato, permettendo una veloce sincronizzazione del "
"contenuto dell'iPod."
-#: ../data/gtkpod.glade.h:352
+#: ../data/gtkpod.glade.h:361
msgid "When syncing playlists"
msgstr "Durante la sincronizzazione delle playlist"
-#: ../data/gtkpod.glade.h:353
+#: ../data/gtkpod.glade.h:362
msgid ""
"Will show a list of tracks removed and a list of tracks newly added or "
"updated."
@@ -1703,15 +1740,15 @@
"Mostra una lista delle tracce rimosse e una lista di tracce nuove aggiunte o "
"aggiornate."
-#: ../data/gtkpod.glade.h:354
+#: ../data/gtkpod.glade.h:363
msgid "Write ID3 tags to disk when modified in gtkpod"
msgstr "Scrivi le etichette ID3 sul disco quando vengono modificate in gtkpod"
-#: ../data/gtkpod.glade.h:355
+#: ../data/gtkpod.glade.h:364
msgid "Write all changes made to the disk and the iPod(s)."
msgstr "Scrive sul disco e sugli iPod tutte le modifiche fatte."
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:365
msgid ""
"Write extended information (PC filenames, SHA1 hashes,\n"
"encoding...). Recommended."
@@ -1719,7 +1756,7 @@
"Scrivi informazioni estese (nome del file sul PC,\n"
" hash SHA1, codifica). Consigliato."
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:367
msgid ""
"You can also use the table headers, but this allows you to sort according to "
"a column that is not displayed."
@@ -1727,203 +1764,223 @@
"Si possono usare le intestazioni della tabella, ma questo metodo permette "
"l'ordinamento secondo una colonna non visualizzata."
-#: ../data/gtkpod.glade.h:359
-msgid "_About"
-msgstr "_Informazioni su gtkpod"
+#: ../data/gtkpod.glade.h:368
+msgid "_About gtkpod"
+msgstr "Informazioni _su gtkpod"
-#: ../data/gtkpod.glade.h:360
+#: ../data/gtkpod.glade.h:369
+msgid "_Add Album"
+msgstr "_Aggiungi album"
+
+#: ../data/gtkpod.glade.h:370
+msgid "_Add Image"
+msgstr "_Aggiungi immagine"
+
+#: ../data/gtkpod.glade.h:371
+msgid "_Album"
+msgstr "_Album"
+
+#: ../data/gtkpod.glade.h:372
msgid "_All Tracks"
msgstr "_Tutte le tracce"
-#: ../data/gtkpod.glade.h:361
+#: ../data/gtkpod.glade.h:373
msgid "_Arrange Sort Tabs"
msgstr "_Sistema le schede di ordinamento"
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:374
msgid "_Check iPod's Files"
msgstr "_Controlla i file dell'iPod"
-#: ../data/gtkpod.glade.h:363
+#: ../data/gtkpod.glade.h:375
msgid "_Conversion Log"
msgstr "Registro di _conversione"
-#: ../data/gtkpod.glade.h:364
+#: ../data/gtkpod.glade.h:376
msgid "_Create Playlists"
msgstr "_Crea playlist"
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:377
msgid "_Create iPod's Directories"
msgstr "_Crea le directory dell'iPod"
-#: ../data/gtkpod.glade.h:366
+#: ../data/gtkpod.glade.h:378
msgid "_Delete"
msgstr "_Elimina"
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:379
msgid "_Display"
msgstr "_Mostra"
-#: ../data/gtkpod.glade.h:368
+#: ../data/gtkpod.glade.h:380
msgid "_Displayed Tracks"
msgstr "_Tracce visualizzate"
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:381
msgid "_Edit"
msgstr "_Modifica"
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:382
msgid "_Encoding (ID3, files):"
msgstr "_Codifica (ID3, file):"
-#: ../data/gtkpod.glade.h:371
+#: ../data/gtkpod.glade.h:383
msgid "_Enqueue"
msgstr "_Metti in coda"
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:384
msgid "_Export Tracks from Database"
msgstr "_Esporta le tracce dal database"
-#: ../data/gtkpod.glade.h:373
+#: ../data/gtkpod.glade.h:385
msgid "_File"
msgstr "_File"
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:386
msgid "_General"
msgstr "_Generale"
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:387
msgid "_Help"
msgstr "_Aiuto"
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:388
msgid "_Ignore rules"
msgstr "_Ignora le regole"
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:389
+msgid "_Image"
+msgstr "_Immagine"
+
+#: ../data/gtkpod.glade.h:390
msgid "_Info Window"
msgstr "_Finestra di informazioni"
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:391
msgid "_Last.FM"
msgstr "_Last.FM"
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:392
msgid "_Less Sort Tabs"
msgstr "_Meno schede di ordinamento"
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:393
msgid "_Limit to"
msgstr "_Limita a"
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:394
msgid "_Load iPod(s)"
msgstr "_Leggi gli iPod"
-#: ../data/gtkpod.glade.h:382
+#: ../data/gtkpod.glade.h:395
msgid "_Local"
msgstr "_Locale"
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:396
msgid "_M3U"
msgstr "_M3U"
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:397
msgid "_Misc."
msgstr "_Misc."
-#: ../data/gtkpod.glade.h:385
+#: ../data/gtkpod.glade.h:398
msgid "_More Sort Tabs"
msgstr "_Più schede di ordinamento"
-#: ../data/gtkpod.glade.h:386
+#: ../data/gtkpod.glade.h:399
msgid "_Newly Added Tracks"
msgstr "_Tracce nuove aggiunte"
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:400
msgid "_Normalize Volume"
msgstr "_Normalizza il volume"
-#: ../data/gtkpod.glade.h:388
+#: ../data/gtkpod.glade.h:401
msgid "_Number of sort tabs:"
msgstr "_Numero di schede di ordinamento:"
-#: ../data/gtkpod.glade.h:389
+#: ../data/gtkpod.glade.h:402
msgid "_PLS"
msgstr "_PLS"
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:403
msgid "_Play Now"
msgstr "_Riproduci ora"
-#: ../data/gtkpod.glade.h:391
+#: ../data/gtkpod.glade.h:404
msgid "_Podcasts"
msgstr "_Podcast"
-#: ../data/gtkpod.glade.h:392
+#: ../data/gtkpod.glade.h:405
msgid "_Prefer Local"
msgstr "_Preferisci locali"
-#: ../data/gtkpod.glade.h:393
-msgid "_Previous"
-msgstr "_Precedente"
+#: ../data/gtkpod.glade.h:406
+msgid "_Remove Album"
+msgstr "_Rimuovi album"
-#: ../data/gtkpod.glade.h:394
+#: ../data/gtkpod.glade.h:407
msgid "_Remove Cover Art"
msgstr "_Rimuovi la copertina"
-#: ../data/gtkpod.glade.h:395
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr "_Rimuovi immagini"
+
+#: ../data/gtkpod.glade.h:409
msgid "_Save Changes"
msgstr "_Salva le modifiche"
-#: ../data/gtkpod.glade.h:396
+#: ../data/gtkpod.glade.h:410
msgid "_Save Displayed Track Order"
msgstr "_Salva l'ordine visualizzato delle tracce"
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:411
msgid "_Sorting"
msgstr "_Ordinamento"
-#: ../data/gtkpod.glade.h:398
+#: ../data/gtkpod.glade.h:412
msgid "_Synchronize Playlist with Dir(s)"
msgstr "_Sincronizza la playlist con le directory"
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:413
msgid "_Toolbar"
msgstr "_Barra degli strumenti"
-#: ../data/gtkpod.glade.h:400
+#: ../data/gtkpod.glade.h:414
msgid "_Tools"
msgstr "_Strumenti"
-#: ../data/gtkpod.glade.h:401
+#: ../data/gtkpod.glade.h:415
msgid "_Tooltips"
msgstr "_Suggerimenti"
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:416
msgid "_Track Info"
msgstr "Informazioni sulla _traccia"
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:417
msgid "_Undo All"
msgstr "Ann_ulla tutto"
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:418
msgid "_Update Tracks from File"
msgstr "_Aggiorna tracce da file"
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:419
msgid "_Video"
msgstr "_Video"
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:420
msgid "_View"
msgstr "_Visualizza"
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:421
msgid "_iPod"
msgstr "_iPod"
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:423
#, no-c-format
msgid ""
"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
@@ -1936,28 +1993,28 @@
"%. Si possono separare diversi modelli usando un «;». Verrà usato il primo "
"corrispondente al nome di un file. Esempio: «%a - %A/%T %t.mp;%t.wav»."
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:424
msgid "folder"
msgstr "folder"
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:425
msgid "folder.jpg"
msgstr "folder.jpg"
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:427
#, no-c-format
msgid "folder.jpg;%a.jpg"
msgstr "folder.jpg;%a.jpg"
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:428
msgid "gtkpod"
msgstr "gtkpod"
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:429
msgid "gtkpod Info"
msgstr "Informazioni su gtkpod"
-#: ../data/gtkpod.glade.h:416
+#: ../data/gtkpod.glade.h:430
msgid ""
"gtkpod expects the ID3 tags and the filenames to be in the encoding "
"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
@@ -1968,12 +2025,12 @@
"«Aggiungi directory». «Codifica di sistema» è la codifica usata dalla "
"localizzazione attuale."
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:431
msgid "gtkpod options"
msgstr "Opzioni di gtkpod"
#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
-#: ../data/gtkpod.glade.h:419
+#: ../data/gtkpod.glade.h:433
msgid ""
"iPod\n"
"Local Repository (Standard)\n"
@@ -1983,34 +2040,56 @@
"Archivio locale (standard)\n"
"Archivio locale (podcast)\n"
-#: ../data/gtkpod.glade.h:423
+#: ../data/gtkpod.glade.h:437
msgid "iPod mountpoint:"
-msgstr "Punto di montaggio dell'iPod:"
+msgstr "Punto di mount dell'iPod:"
-#: ../data/gtkpod.glade.h:424
+#: ../data/gtkpod.glade.h:438
msgid "iTunesDB backup:"
msgstr "Copia di iTunesDB:"
-#: ../data/gtkpod.glade.h:425
-msgid "label"
-msgstr "label"
-
-#: ../data/gtkpod.glade.h:426
+#: ../data/gtkpod.glade.h:439
msgid "mserv Root:"
msgstr "Radice di mserv:"
-#: ../data/gtkpod.glade.h:427
+#: ../data/gtkpod.glade.h:440
msgid "mserv database lookup will be done for music in this directory."
msgstr "Verrà consultato il database mserv per la musica in questa directory."
-#: ../data/gtkpod.glade.h:428 ../src/details.c:1325
+#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
msgid "n/a"
msgstr "n.d."
-#: ../data/gtkpod.glade.h:429
+#: ../data/gtkpod.glade.h:442
msgid "special_sorttab -- Don't translate!"
msgstr "special_sorttab -- Don't translate!"
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr "Impossibile inizializzare GnomeVFS\n"
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr ""
+"Non è stato possibile caricare in gtkpod il nuovo iPod montato in «%s».\n"
+"\n"
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+"Il nuovo iPod montato in «%s» sembra già caricato.\n"
+"\n"
+
+#: ../src/autodetection.c:416
+msgid "New iPod"
+msgstr "Nuovo iPod"
+
#: ../src/charset.c:53
msgid "Arabic (IBM-864)"
msgstr "Arabo (IBM-864)"
@@ -2230,143 +2309,151 @@
msgid "Confirmation Dialogue"
msgstr "Finestra di dialogo di conferma"
-#: ../src/context_menus.c:359
+#: ../src/context_menus.c:362
#, c-format
msgid "Copied \"%s\" playlist to %s"
msgstr "Playlist «%s» copiata in %s"
-#: ../src/context_menus.c:398
+#: ../src/context_menus.c:401
#, c-format
msgid "Copied %d track to '%s'"
msgid_plural "Copied %d tracks to '%s'"
msgstr[0] "Copiata %d traccia in «%s»"
msgstr[1] "Copiate %d tracce in «%s»"
-#: ../src/context_menus.c:426
+#: ../src/context_menus.c:429
#, c-format
msgid "Copied '%s' playlist to '%s' in '%s'"
msgstr "Playlist «%s» copiata su «%s» in «%s»"
-#: ../src/context_menus.c:459
+#: ../src/context_menus.c:462
#, c-format
msgid "Copied %d track to '%s' in '%s'"
msgid_plural "Copied %d tracks to %s in '%s'"
msgstr[0] "Copiata %d traccia su «%s» in «%s»"
msgstr[1] "Copiate %d tracce su «%s» in «%s»"
-#: ../src/context_menus.c:619 ../src/tools.c:854
+#: ../src/context_menus.c:622 ../src/tools.c:854
msgid "Play Now"
msgstr "Riproduci ora"
-#: ../src/context_menus.c:625 ../src/tools.c:867
+#: ../src/context_menus.c:628 ../src/tools.c:867
msgid "Enqueue"
msgstr "Metti in coda"
-#: ../src/context_menus.c:631
+#: ../src/context_menus.c:634
msgid "Copy Tracks to Filesystem"
msgstr "Copia le tracce sul filesystem"
-#: ../src/context_menus.c:638 ../src/file_export.c:1085
+#: ../src/context_menus.c:641 ../src/file_export.c:1085
msgid "Create Playlist File"
msgstr "Crea un file di playlist"
-#: ../src/context_menus.c:645
+#: ../src/context_menus.c:648
msgid "Create new Playlist"
msgstr "Crea una nuova playlist"
-#: ../src/context_menus.c:652
+#: ../src/context_menus.c:655
msgid "Update Tracks from File"
msgstr "Aggiorna tracce da file"
-#: ../src/context_menus.c:666
+#: ../src/context_menus.c:669
msgid "Sync Playlist with Dir(s)"
msgstr "Sincronizza la playlist con le directory"
-#: ../src/context_menus.c:676
+#: ../src/context_menus.c:679
msgid "Remove All Tracks from iPod"
msgstr "Rimuovi tutte le tracce dall'iPod"
-#: ../src/context_menus.c:694
+#: ../src/context_menus.c:697
msgid "Remove All Podcasts from iPod"
msgstr "Rimuovi tutti i podcast dall'iPod"
-#: ../src/context_menus.c:709
+#: ../src/context_menus.c:712
msgid "Delete Including Tracks"
msgstr "Elimina anche le tracce"
-#: ../src/context_menus.c:717
+#: ../src/context_menus.c:720
msgid "Delete But Keep Tracks"
msgstr "Elimina, ma preserva le tracce"
-#: ../src/context_menus.c:725
+#: ../src/context_menus.c:728
msgid "Edit iPod Properties"
msgstr "Modifica le proprietà dell'iPod"
-#: ../src/context_menus.c:732
+#: ../src/context_menus.c:735
msgid "Edit Repository Properties"
msgstr "Modifica le proprietà dell'archivio"
-#: ../src/context_menus.c:739
+#: ../src/context_menus.c:742
msgid "Edit Playlist Properties"
msgstr "Modifica le proprietà della playlist"
-#: ../src/context_menus.c:767
+#: ../src/context_menus.c:770
msgid "View Full Size Artwork"
msgstr "Mostra l'artwork a piena grandezza"
-#: ../src/context_menus.c:774
+#: ../src/context_menus.c:777
msgid "Select Cover From File"
msgstr "Seleziona copertina da file"
-#: ../src/context_menus.c:781
-msgid "Find Cover on Web"
-msgstr "Trova la copertina sul web"
-
-#: ../src/context_menus.c:794
+#: ../src/context_menus.c:790
msgid "Load iPod"
-msgstr "Carica l'iPod"
+msgstr "Leggi l'iPod"
-#: ../src/context_menus.c:801
+#: ../src/context_menus.c:797
msgid "Eject iPod"
msgstr "Espelli l'iPod"
-#: ../src/context_menus.c:818
+#: ../src/context_menus.c:814
msgid "Remove All Tracks from Database"
msgstr "Rimuovi tutte le tracce dal database"
-#: ../src/context_menus.c:833
+#: ../src/context_menus.c:829
msgid "Delete Including Tracks (Harddisk)"
msgstr "Elimina anche le tracce (disco fisso)"
-#: ../src/context_menus.c:841
+#: ../src/context_menus.c:837
msgid "Delete Including Tracks (Database)"
msgstr "Elimina anche le tracce (database)"
-#: ../src/context_menus.c:849
+#: ../src/context_menus.c:845
msgid "Delete From iPod"
msgstr "Elimina dall'iPod"
-#: ../src/context_menus.c:857
+#: ../src/context_menus.c:853
msgid "Delete From Playlist"
msgstr "Elimina dalla playlist"
-#: ../src/context_menus.c:865
+#: ../src/context_menus.c:861
msgid "Delete From Harddisk"
msgstr "Elimina dal disco fisso"
-#: ../src/context_menus.c:873
+#: ../src/context_menus.c:869
msgid "Delete From Database"
msgstr "Elimina dal database"
-#: ../src/context_menus.c:881
+#: ../src/context_menus.c:877
msgid "Alphabetize"
msgstr "Ordine alfabetico"
-#: ../src/context_menus.c:949 ../src/context_menus.c:998
+#: ../src/context_menus.c:895
+msgid "Remove Album"
+msgstr "Rimuovi album"
+
+#: ../src/context_menus.c:905
+msgid "Remove Photo"
+msgstr "Rimuovi foto"
+
+#: ../src/context_menus.c:922
+msgid "Rename Album"
+msgstr "Rinomina album"
+
+#: ../src/context_menus.c:981 ../src/context_menus.c:1030
msgid "Copy selected playlist to..."
msgstr "Copia la playlist selezionata su..."
-#: ../src/context_menus.c:1051
+#: ../src/context_menus.c:1083
msgid "Copy selected track(s) to..."
msgstr "Copia le tracce selezionate su..."
@@ -2375,95 +2462,111 @@
msgid "Date format error: unrecognized character: '%s'\n"
msgstr "Errore nel formato della data: carattere sconosciuto: «%s»\n"
-#: ../src/details.c:81
+#: ../src/details.c:82
msgid "Audio/Video"
msgstr "Audio/Video"
-#: ../src/details.c:82
+#: ../src/details.c:83
msgid "Audio"
msgstr "Audio"
-#: ../src/details.c:83
+#: ../src/details.c:84
msgid "Video"
msgstr "Video"
-#: ../src/details.c:84
+#: ../src/details.c:85
msgid "Podcast"
msgstr "Podcast"
-#: ../src/details.c:85
+#: ../src/details.c:86
msgid "Video Podcast"
-msgstr "Video Podcast"
+msgstr "Podcast video"
-#: ../src/details.c:86
+#: ../src/details.c:87
msgid "Audiobook"
msgstr "Audiolibro"
-#: ../src/details.c:87 ../src/display_spl.c:209 ../src/display_spl.c:218
+#: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
msgid "Music Video"
msgstr "Video musicale"
-#: ../src/details.c:88 ../src/display_spl.c:107 ../src/display_spl.c:210
+#: ../src/details.c:89 ../src/display_spl.c:107 ../src/display_spl.c:210
#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
msgid "TV Show"
msgstr "Programma TV"
-#: ../src/details.c:89
+#: ../src/details.c:90
msgid "TV Show & Music Video"
msgstr "Programma TV e video musicale"
-#: ../src/details.c:826
+#: ../src/details.c:836
#, c-format
msgid "%s (image data corrupted or unreadable)"
msgstr "%s (dati dell'immagine corrotti o non leggibili)"
-#: ../src/details.c:963
+#: ../src/details.c:973
#, c-format
msgid "Please report unknown mediatype %x\n"
msgstr "Segnalare il mediatype sconosciuto %x\n"
-#: ../src/details.c:1396
+#: ../src/details.c:1418
msgid "<b>n/a</b>"
msgstr "<b>n/d</b>"
-#: ../src/display.c:647
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr ""
+"Si è verificato un errore durante il rilascio di un'immagine nella finestra "
+"dei dettagli: %s\n"
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr "La copertina per le tracce selezionate è stata impostata con successo"
+
+#: ../src/display.c:490
+#, c-format
+msgid "<b>Image Dimensions: %s</b>"
+msgstr "<b>Dimensioni dell'immagine: %s</b>"
+
+#: ../src/display.c:744
msgid "Edit selected entry of which sort tab?"
msgstr "Modificare la voce selezionata di quale scheda di ordinamento?"
#. no entry selected
-#: ../src/display.c:654 ../src/misc_confirm.c:435 ../src/misc_track.c:2128
+#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
msgid "No entry selected."
msgstr "Nessuna voce selezionata."
-#: ../src/display.c:813 ../src/display.c:1133 ../src/display.c:1189
-#: ../src/display.c:1243 ../src/display.c:1298 ../src/display.c:1559
+#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
+#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
#, c-format
msgid "No entry selected in Sort Tab %d"
msgstr "Nessuna voce selezionata nella scheda di ordinamento %d"
-#: ../src/display.c:852
+#: ../src/display.c:949
msgid "Remove entry of which sort tab from database?"
msgstr "Rimuovere dal database la voce di quale scheda di ordinamento?"
-#: ../src/display.c:860
+#: ../src/display.c:957
msgid "Remove tracks in selected entry of which filter tab from the iPod?"
msgstr ""
"Rimuovere dall'iPod le tracce nella voce selezionata di quale scheda di "
"filtro?"
-#: ../src/display.c:882
+#: ../src/display.c:979
msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
msgstr ""
"Rimuovere dal disco fisso le tracce nella voce selezionata di quale scheda "
"di filtro?"
-#: ../src/display.c:912
+#: ../src/display.c:1009
msgid "Remove tracks in selected entry of which filter tab from playlist?"
msgstr ""
"Rimuovere dalla playlist le tracce nella voce selezionata di quale scheda di "
"filtro?"
-#: ../src/display.c:939 ../src/display.c:977
+#: ../src/display.c:1036 ../src/display.c:1074
#, c-format
msgid ""
"iPod at '%s' is not loaded.\n"
@@ -2472,39 +2575,46 @@
"L'iPod in «%s» non è caricato.\n"
"Prima è necessario caricarlo."
-#: ../src/display.c:1014 ../src/display.c:1041
+#: ../src/display.c:1111 ../src/display.c:1138
msgid "Update selected entry of which sort tab?"
msgstr "Aggiornare la voce selezionata di quale scheda di ordinamento?"
-#: ../src/display.c:1127
+#: ../src/display.c:1224
msgid "Export selected entry of which sort tab?"
msgstr "Esportare la voce selezionata di quale scheda di ordinamento?"
-#: ../src/display.c:1183
+#: ../src/display.c:1280
msgid "Create playlist file from selected entry of which sort tab?"
msgstr ""
"Creare la playlist dalle voci selezionate di quale scheda di ordinamento?"
-#: ../src/display.c:1237
+#: ../src/display.c:1334
msgid "Play tracks in selected entry of which sort tab?"
msgstr ""
"Riprodurre le tracce nella voce selezionata di quale scheda di ordinamento?"
-#: ../src/display.c:1292
+#: ../src/display.c:1389
msgid "Enqueue tracks in selected entry of which sort tab?"
msgstr ""
"Mettere in coda le tracce nella voce selezionata di quale scheda di "
"ordinamento?"
-#: ../src/display.c:1549
+#: ../src/display.c:1646
msgid "Normalize tracks in selected entry of which sort tab?"
msgstr ""
"Normalizzare le tracce nella voce selezionata di quale scheda di ordinamento?"
-#: ../src/display_coverart.c:1731
+#: ../src/display_coverart.c:1713
msgid "Failed to remove the album from the album hash store."
msgstr "Impossibile rimuovere l'album dall'archivio degli hash degli album."
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr ""
+"Si è verificato un errore durante il rilascio di un'immagine sulla "
+"visualizzazione della copertina: %s\n"
+
#: ../src/display_itdb.c:376
#, c-format
msgid "Failed to set cover art: '%s'\n"
@@ -2516,7 +2626,7 @@
#. add podcast playlist
#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1017
+#: ../src/display_itdb.c:1025
msgid "Podcasts"
msgstr "Podcast"
@@ -2525,30 +2635,117 @@
msgid "iPod"
msgstr "iPod"
-#: ../src/display_itdb.c:1076
+#: ../src/display_itdb.c:1084
#, c-format
msgid "Increased playcount for '%s'"
msgstr "Incrementato conta-riproduzione per «%s»"
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr "Errore durante la lettura del database delle foto dell'iPod (%s).\n"
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr "Errore durante la lettura del database delle foto dell'iPod.\n"
+
+#: ../src/display_photo.c:238
+msgid "Could not access the iPod's photo database."
+msgstr "Impossibile accedere al database delle foto dell'iPod."
+
+#: ../src/display_photo.c:441
+msgid "Photo Albums"
+msgstr "Album fotografici"
+
+#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+msgid "<Unnamed>"
+msgstr "<senza_nome>"
+
+#: ../src/display_photo.c:939
+msgid "The Photo Library album cannot be removed"
+msgstr "L'album Photo Library non può essere rimosso"
+
+#: ../src/display_photo.c:961
+msgid "Do you want to remove the album's photos too?"
+msgstr "Eliminare anche le foto contenute nell'album?"
+
+#: ../src/display_photo.c:967
+msgid "Yes. Do Not Display Again"
+msgstr "Sì. Non chiedere più"
+
+#: ../src/display_photo.c:1038
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr ""
+"Questo rimuoverà le foto selezionate dall'album selezionato.\n"
+" Eliminarle anche dal database?"
+
+#: ../src/display_photo.c:1053
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr ""
+"Questo rimuoverà le foto selezionate da Photo Library e da tutti gli album. "
+"Procedere?"
+
+#: ../src/display_photo.c:1128
+msgid "New Photo Album Name"
+msgstr "Nome del nuovo album fotografico"
+
+#: ../src/display_photo.c:1129
+msgid "Please enter a new name for the photo album"
+msgstr "Inserire un nuovo nome per l'album fotografico"
+
+#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+msgid "An album with that name already exists."
+msgstr "Un album con quel nome esiste già ."
+
+#: ../src/display_photo.c:1210
+msgid "New Photo Album"
+msgstr "Nuovo album fotografico"
+
+#: ../src/display_photo.c:1211
+msgid "Please enter a name for the new photo album"
+msgstr "Inserire un nome per il nuovo album fotografico"
+
+#: ../src/display_photo.c:1232
+msgid "The new album failed to be created."
+msgstr "La creazione del nuovo album è fallita."
+
+#: ../src/display_photo.c:1256
+msgid "Add Image to iPod"
+msgstr "Aggiungi un'immagine all'iPod"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1311
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr "Aggiungi una directory di immagini all'iPod. Selezionare la directory."
+
+#: ../src/display_photo.c:1699
+#, c-format
+msgid "<No members>\n"
+msgstr "<Nessun membro>\n"
+
#. give a notice on the statusbar -- otherwise the user
#. * will never know why the drag is not possible
-#: ../src/display_playlists.c:514 ../src/display_playlists.c:556
+#: ../src/display_playlists.c:516 ../src/display_playlists.c:558
msgid "Error: drag from iPod not possible in offline mode."
msgstr ""
"Errore: il trascinamento dall'iPod non è possibile in modalità non in linea."
-#: ../src/display_playlists.c:583 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
#, c-format
msgid "Copied one track"
msgid_plural "Copied %d tracks"
msgstr[0] "Copiata una traccia"
msgstr[1] "Copiate %d tracce"
-#: ../src/display_playlists.c:863 ../src/display_playlists.c:875
+#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
msgid "Can't reorder sorted treeview."
msgstr "Impossibile riordinare la vista ad albero ordinata."
-#: ../src/display_playlists.c:952
+#: ../src/display_playlists.c:954
#, c-format
msgid ""
"This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2558,6 +2755,14 @@
"Questo tipo DND (%d) non è (ancora) supportato. Se pensi che possa essere "
"utile implementarlo, contatta l'autore.\n"
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr "Fotografie"
+
#: ../src/display_sorttabs.c:473
msgid "'Played' condition ignored because of error."
msgstr "Condizione «Riprodotto» ignorata a causa di un errore."
@@ -2570,32 +2775,32 @@
msgid "'Added' condition ignored because of error."
msgstr "Condizione «Aggiunta» ignorata a causa di un errore."
-#: ../src/display_sorttabs.c:1563 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
msgid "All"
msgstr "Tutti"
-#: ../src/display_sorttabs.c:1589
+#: ../src/display_sorttabs.c:1588
msgid "Compilations"
msgstr "Compilation"
-#: ../src/display_sorttabs.c:2969
+#: ../src/display_sorttabs.c:2988
msgid "Comp."
msgstr "Comp."
-#: ../src/display_sorttabs.c:2975 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2026 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
msgid "Year"
msgstr "Anno"
-#: ../src/display_sorttabs.c:2978
+#: ../src/display_sorttabs.c:2997
msgid "Special"
msgstr "Speciale"
-#: ../src/display_sorttabs.c:3226
+#: ../src/display_sorttabs.c:3245
msgid "Last Played"
msgstr "Ultimo ascolto"
-#: ../src/display_sorttabs.c:3227
+#: ../src/display_sorttabs.c:3246
msgid "Last Modified"
msgstr "Ultima modifica"
@@ -2642,7 +2847,7 @@
#: ../src/display_spl.c:91 ../src/misc_conversion.c:81
msgid "Date modified"
-msgstr "Modificato il"
+msgstr "Data di modifica"
#: ../src/display_spl.c:92
msgid "Track number"
@@ -2652,10 +2857,6 @@
msgid "Size"
msgstr "Dimensione"
-#: ../src/display_spl.c:94 ../src/display_tracks.c:2008
-msgid "Time"
-msgstr "Durata"
-
#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
msgid "Comment"
msgstr "Commento"
@@ -2684,6 +2885,10 @@
msgid "Grouping"
msgstr "Raggruppamento"
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "Playlist"
+
#: ../src/display_spl.c:106
msgid "Video Kind"
msgstr "Tipo di video"
@@ -2842,25 +3047,18 @@
msgid "Movie"
msgstr "Film"
-#: ../src/display_spl.c:1162 ../src/display_spl.c:1177
+#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
msgid "to"
msgstr "a"
-#: ../src/display_spl.c:1455
+#: ../src/display_spl.c:1485
msgid "-"
msgstr "-"
-#: ../src/display_spl.c:1470
+#: ../src/display_spl.c:1500
msgid "+"
msgstr "+"
-#: ../src/display_spl.c:1689 ../src/misc_playlist.c:66
-#: ../src/misc_playlist.c:68 ../src/misc_playlist.c:93
-#: ../src/misc_playlist.c:95 ../src/misc_playlist.c:428
-#: ../src/misc_playlist.c:430
-msgid "New Playlist"
-msgstr "Nuova playlist"
-
# c-format
#: ../src/display_tracks.c:281
#, c-format
@@ -2869,7 +3067,7 @@
msgstr[0] "Spostata una traccia"
msgstr[1] "Spostate %d tracce"
-#: ../src/display_tracks.c:1734
+#: ../src/display_tracks.c:1810
#, c-format
msgid ""
"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -2883,65 +3081,74 @@
"ordinato».\n"
"\n"
-#: ../src/display_tracks.c:1986
+#: ../src/display_tracks.c:2069
msgid "Rtng"
msgstr "Voto"
-#: ../src/display_tracks.c:1989
+#: ../src/display_tracks.c:2072
msgid "#"
msgstr "N°"
-#: ../src/display_tracks.c:1992
+#: ../src/display_tracks.c:2075
msgid "CD"
msgstr "CD"
-#: ../src/display_tracks.c:1995
+#: ../src/display_tracks.c:2078
msgid "ID"
msgstr "ID"
-#: ../src/display_tracks.c:1998
+#: ../src/display_tracks.c:2081
msgid "Trnsfrd"
msgstr "Trasferito"
-#: ../src/display_tracks.c:2002
+#: ../src/display_tracks.c:2085
msgid "Cmpl"
msgstr "Cmpl"
-#: ../src/display_tracks.c:2011
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "Durata"
+
+#: ../src/display_tracks.c:2094
msgid "Plycnt"
msgstr "Conta rip."
-#: ../src/display_tracks.c:2023
+#: ../src/display_tracks.c:2106
msgid "Released"
msgstr "Pubblicato"
-#: ../src/display_tracks.c:2029
+#: ../src/display_tracks.c:2112
msgid "Vol."
msgstr "Vol."
# L'interfaccia italiana usa "Verifica livello"
-#: ../src/display_tracks.c:2032
+#: ../src/display_tracks.c:2115
msgid "Sndchk."
-msgstr "Verifica livello"
+msgstr "Ver. livello sonoro"
-#: ../src/fetchcover.c:637
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr "Il file della copertina esiste già "
+
+#: ../src/fetchcover.c:371
#, c-format
msgid ""
-"The picture file %s already exists. \n"
-"This may be associated with other music files in the directory. \n"
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
"\n"
-"- Clicking Yes will overwrite the existing file, possibly associating \n"
-" other music files in the same directory with this coverart file. \n"
-"- Clicking No will save the file with a unique file name. \n"
+"- Clicking Yes will overwrite the existing file, possibly associating\n"
+" other music files in the same directory with this coverart file.\n"
+"- Clicking No will save the file with a unique file name.\n"
"- Clicking Cancel will abort the fetchcover operation."
msgstr ""
"Il file immagine %s esiste già .\n"
"Potrebbe essere già associato ad altri file musicali nella directory.\n"
"\n"
-"- Selezionando Sì si sovrascriverà il file esistente ed è possibile che "
-"si associno a questa copertina anche altri file musicali nella stessa "
-"cartella.-..Selezionando No si salverà il file con un nome univoco.-.."
-"Selezionando Annulla si interromperà l'operazione."
+"- Selezionando Sì si sovrascriverà il file esistente ed è possibile che si\n"
+" associno a questa copertina anche altri file musicali nella stessa "
+"directory.\n"
+"-..Selezionando No si salverà il file con un nome univoco.\n"
+"-..Selezionando Annulla si interromperà l'operazione."
#: ../src/file.c:236
#, c-format
@@ -2961,14 +3168,11 @@
"«%s» non è un file di playlist conosciuto.\n"
"\n"
-#: ../src/file.c:283
+#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/wavfile.c:107
#, c-format
-msgid ""
-"Cannot open '%s' for reading.\n"
-"\n"
-msgstr ""
-"Impossibile aprire il file «%s» in lettura.\n"
-"\n"
+msgid "Could not open '%s' for reading.\n"
+msgstr "Impossibile aprire il file «%s» in lettura.\n"
#: ../src/file.c:369
#, c-format
@@ -2985,41 +3189,41 @@
msgid "Unknown token '%s' in template '%s'\n"
msgstr "Segnaposto «%s» sconosciuto nel modello «%s»\n"
-#: ../src/file.c:922
+#: ../src/file.c:923
#, c-format
msgid "Local filename not valid (%s)"
msgstr "Nome del file locale non valido (%s)"
-#: ../src/file.c:981
+#: ../src/file.c:982
#, c-format
msgid "No information found for user '%s' in '%s'"
msgstr "Nessuna informazione trovata per l'utente «%s» in «%s»"
-#: ../src/file.c:990
+#: ../src/file.c:991
#, c-format
msgid "mserv data file (%s) not available for track (%s)"
msgstr "Il file dei dati mserv (%s) non è disponibile per la traccia (%s)"
-#: ../src/file.c:998
+#: ../src/file.c:999
#, c-format
msgid "Track (%s) not in mserv music root directory (%s)"
msgstr "La traccia (%s) non è nella directory radice musicale di mserv (%s)"
-#: ../src/file.c:1122
+#: ../src/file.c:1123
#, c-format
msgid ""
"The following track could not be processed (file does not exist): '%s'\n"
msgstr ""
"La traccia seguente non può essere elaborata (il file non esiste): «%s»\n"
-#: ../src/file.c:1208
+#: ../src/file.c:1209
#, c-format
msgid "The following track could not be processed (filetype unknown): '%s'\n"
msgstr ""
"La traccia seguente non può essere elaborata (tipo di file sconosciuto): «%"
"s»\n"
-#: ../src/file.c:1306
+#: ../src/file.c:1307
#, c-format
msgid ""
"The following track could not be processed (filetype is known but analysis "
@@ -3028,33 +3232,33 @@
"La traccia seguente non può essere elaborata (tipo di file conosciuto ma "
"l'analisi è fallita): «%s»\n"
-#: ../src/file.c:1336 ../src/file.c:1390
+#: ../src/file.c:1337 ../src/file.c:1391
msgid "Nothing to update"
msgstr "Nulla da aggiornare"
-#: ../src/file.c:1357
+#: ../src/file.c:1358
#, c-format
msgid "Updating %s"
msgstr "Aggiornamento di %s in corso"
-#: ../src/file.c:1371
+#: ../src/file.c:1372
msgid "Updated selected tracks with info from file."
msgstr "Le tracce sono state aggiornate con le informazioni dal file."
-#: ../src/file.c:1405
+#: ../src/file.c:1406
#, c-format
msgid "Retrieving mserv data %s"
msgstr "Ricezione dei dati mserv %s"
-#: ../src/file.c:1410
+#: ../src/file.c:1411
msgid "no filename available"
msgstr "nessun nome di file disponibile"
-#: ../src/file.c:1415
+#: ../src/file.c:1416
msgid "Updated selected tracks with data from mserv."
msgstr "Le tracce sono state aggiornate con le informazioni da mserv."
-#: ../src/file.c:1436
+#: ../src/file.c:1437
#, c-format
msgid "The following track could not be updated"
msgid_plural "The following %d tracks could not be updated"
@@ -3063,11 +3267,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1442
+#: ../src/file.c:1443
msgid "Failed Track Update"
msgstr "Aggiornamento delle tracce fallito"
-#: ../src/file.c:1500
+#: ../src/file.c:1501
#, c-format
msgid "The following track has been updated"
msgid_plural "The following %d tracks have been updated"
@@ -3076,11 +3280,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1506
+#: ../src/file.c:1507
msgid "Successful Track Update"
msgstr "Aggiornamento delle tracce completato con successo"
-#: ../src/file.c:1565
+#: ../src/file.c:1566
#, c-format
msgid "No mserv information could be retrieved for the following track"
msgid_plural ""
@@ -3094,51 +3298,51 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1571
+#: ../src/file.c:1572
msgid "mserv data retrieval problem"
msgstr "problemi nel raccogliere le informazioni mserv"
-#: ../src/file.c:1660
+#: ../src/file.c:1661
msgid "no local filename available, file on the iPod will be used instead"
msgstr ""
"il nome del file locale non è disponibile, al suo posto sarà usato il file "
"sull'iPod"
-#: ../src/file.c:1666
+#: ../src/file.c:1667
msgid "no local filename available and copy on iPod cannot be found"
msgstr ""
"il nome del file locale non è disponibile e la copia sull'iPod non è stata "
"trovata"
-#: ../src/file.c:1670 ../src/file.c:1688
+#: ../src/file.c:1671 ../src/file.c:1689
msgid "no local filename available"
msgstr "il nome del file locale non è disponibile"
-#: ../src/file.c:1678
+#: ../src/file.c:1679
msgid "local file could not be found, file on the iPod will be used instead"
msgstr ""
"il file locale non è stato trovato, al suo posto sarà usato il file sull'iPod"
-#: ../src/file.c:1684
+#: ../src/file.c:1685
msgid "local file as well as copy on the iPod cannot be found"
msgstr "non è stato trovato né il file locale né la copia sull'iPod"
#. update not successful -- log this track for later display
-#: ../src/file.c:1776
+#: ../src/file.c:1788
msgid "update failed (format not supported?)"
msgstr "aggiornamento fallito (formato non supportato?)"
-#: ../src/file.c:1861 ../src/misc_playlist.c:916
+#: ../src/file.c:1873 ../src/misc_playlist.c:916
#, c-format
msgid "Processing '%s'..."
msgstr "Elaborazione di «%s» in corso..."
-#: ../src/file.c:1867
+#: ../src/file.c:1879
#, c-format
msgid "Skipping '%s' because it matches exclude masks.\n"
msgstr "Salto «%s» perché coincide con le maschere di esclusione.\n"
-#: ../src/file.c:1987 ../src/misc_track.c:1763 ../src/misc_track.c:1868
+#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
#, c-format
msgid ""
"Podcast already present: '%s'\n"
@@ -3147,7 +3351,7 @@
"Podcast già presente: «%s»\n"
"\n"
-#: ../src/file.c:2052
+#: ../src/file.c:2064
#, c-format
msgid ""
"Writing to video files not yet supported (%s).\n"
@@ -3156,35 +3360,35 @@
"La scrittura su file video non è ancora supportata (%s).\n"
"\n"
-#: ../src/file.c:2104 ../src/file.c:2118
+#: ../src/file.c:2116 ../src/file.c:2130
#, c-format
msgid "Couldn't change tags of file: %s\n"
msgstr "Impossibile cambiare le etichette del file: %s\n"
-#: ../src/file.c:2220
+#: ../src/file.c:2232
#, c-format
msgid "Could not open '%s' for reading and writing.\n"
msgstr "Impossibile aprire il file «%s» in lettura e scrittura.\n"
-#: ../src/file.c:2227
+#: ../src/file.c:2239
#, c-format
msgid "Could not obtain lock on '%s'.\n"
msgstr "Impossibile ottenere il lock su «%s».\n"
#. error!
-#: ../src/file.c:2244 ../src/file.c:2253 ../src/file.c:2264 ../src/file.c:2274
+#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
#, c-format
msgid "Malformed line in '%s': %s\n"
msgstr "Linea malformata in «%s»: %s\n"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:2303
+#: ../src/file.c:2315
msgid "Remove offline playcounts?"
msgstr "Rimuovere i contatori di riproduzioni non in linea?"
#. title
-#: ../src/file.c:2304
+#: ../src/file.c:2316
msgid ""
"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
"remove them from the offline playcount file, 'Cancel' to keep them."
@@ -3193,12 +3397,12 @@
"Premere «Ok» per rimuoverle dal file conta riproduzioni non in linea, "
"«Annulla» per mantenerle."
-#: ../src/file.c:2321
+#: ../src/file.c:2333
#, c-format
msgid "Error writing to '%s'.\n"
msgstr "Errore nella scrittura su «%s».\n"
-#: ../src/file.c:2378 ../src/tools.c:271
+#: ../src/file.c:2390 ../src/tools.c:270
#, c-format
msgid ""
"Normalization failed: file type not supported (%s).\n"
@@ -3207,7 +3411,7 @@
"Normalizzazione fallita: tipo di file non supportato (%s).\n"
"\n"
-#: ../src/file.c:2394 ../src/tools.c:288
+#: ../src/file.c:2406 ../src/tools.c:287
#, c-format
msgid ""
"Normalization failed: file not available (%s).\n"
@@ -3233,25 +3437,25 @@
msgid "Active threads: %d. Scheduled tracks: %d."
msgstr "Thread attivi: %d. Tracce in coda: %d."
-#: ../src/file_convert.c:1061
+#: ../src/file_convert.c:1071
#, c-format
msgid "Original filename not available for '%s.'\n"
msgstr "Nome del file originale non disponibile per «%s».\n"
-#: ../src/file_convert.c:1076
+#: ../src/file_convert.c:1086
#, c-format
msgid "Filename '%s' is no longer valid for '%s'.\n"
msgstr "Il nome del file «%s» non è più valido per «%s».\n"
-#: ../src/file_convert.c:1127
+#: ../src/file_convert.c:1137
msgid "Ogg Vorbis"
msgstr "Ogg Vorbis"
-#: ../src/file_convert.c:1133
+#: ../src/file_convert.c:1143
msgid "FLAC"
msgstr "FLAC"
-#: ../src/file_convert.c:1188
+#: ../src/file_convert.c:1198
#, c-format
msgid ""
"Files of type '%s' are not supported by the iPod. Please go to the "
@@ -3262,17 +3466,17 @@
"per impostare ed attivare uno script di conversione adatto per «%s».\n"
"\n"
-#: ../src/file_convert.c:1274
+#: ../src/file_convert.c:1284
msgid "No information available"
msgstr "Nessuna informazione disponibile"
-#: ../src/file_convert.c:1313
+#: ../src/file_convert.c:1323
#, c-format
msgid "Could not create '%s'. Filetype conversion will not work.\n"
msgstr ""
"Impossibile creare «%s». La conversione del tipo di file non funzionerà .\n"
-#: ../src/file_convert.c:1631 ../src/file_convert.c:3040
+#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
#, c-format
msgid ""
"Transfer of '%s' failed. %s\n"
@@ -3281,16 +3485,16 @@
"Trasferimento di «%s» fallito. %s\n"
"\n"
-#: ../src/file_convert.c:2035 ../src/file_convert.c:2313
+#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
#, c-format
msgid ""
"Conversion of '%s' failed: '%s'.\n"
"\n"
msgstr ""
-"Conversione di «%s» fallita: «%s».\n"
+"La conversione di «%s» è fallita: «%s».\n"
"\n"
-#: ../src/file_convert.c:2050
+#: ../src/file_convert.c:2062
#, c-format
msgid ""
"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
@@ -3299,53 +3503,53 @@
"La conversione di «%s» è fallita: «%s %s» ha fornito lo stato di uscita %d.\n"
"\n"
-#: ../src/file_convert.c:2079
+#: ../src/file_convert.c:2091
#, c-format
msgid ""
-"Conversion of '%s' failed: '%s %s' did not return filename extension as "
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
"expected.\n"
"\n"
msgstr ""
-"La conversione di «%s» è fallita: «%s %s» non ha fornito l'estensione del "
-"nome del file come previsto.\n"
+"La conversione di «%s» è fallita: «\"%s\" %s» non ha fornito l'estensione "
+"del nome del file come previsto.\n"
"\n"
-#: ../src/file_convert.c:2155
+#: ../src/file_convert.c:2167
#, c-format
msgid ""
"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
"\n"
msgstr ""
-"Conversione di «%s» fallita: impossibile accedere al file originale «%s» (%"
-"s).\n"
+"La conversione di «%s» è fallita: impossibile accedere al file originale «%"
+"s» (%s).\n"
"\n"
-#: ../src/file_convert.c:2210
+#: ../src/file_convert.c:2222
#, c-format
msgid ""
"Conversion of '%s' failed: Could not create directory '%s'.\n"
"\n"
msgstr ""
-"Conversione di «%s» fallita: impossibile creare la directory «%s».\n"
+"La conversione di «%s» è fallita: impossibile creare la directory «%s».\n"
"\n"
-#: ../src/file_convert.c:2344
+#: ../src/file_convert.c:2356
#, c-format
msgid ""
"Conversion of '%s' failed: '%s' returned exit status %d.\n"
"\n"
msgstr ""
-"Conversione di «%s» fallita: «%s» ha restituito lo stato %d.\n"
+"La conversione di «%s» è fallita: «%s» ha restituito lo stato %d.\n"
"\n"
-#: ../src/file_convert.c:2383
+#: ../src/file_convert.c:2395
#, c-format
msgid ""
"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
"\n"
msgstr ""
-"Conversione di «%s» fallita: impossibile eseguire stat sul file convertito «%"
-"s».\n"
+"La conversione di «%s» è fallita: impossibile eseguire stat sul file "
+"convertito «%s».\n"
"\n"
#: ../src/file_export.c:182
@@ -3368,22 +3572,17 @@
msgid "Error copying '%s' to '%s' (%s)\n"
msgstr "Errore nella copia di «%s» su «%s» (%s)\n"
-#: ../src/file_export.c:217
-#, c-format
-msgid "Unable to open '%s' for reading\n"
-msgstr "Impossibile aprire «%s» in lettura\n"
-
#: ../src/file_export.c:327
#, c-format
msgid "Could find file for '%s' on the iPod\n"
msgstr "Impossibile trovare il file per «%s» sull'iPod\n"
#. create the dialog window
-#: ../src/file_export.c:395 ../src/tools.c:361
+#: ../src/file_export.c:395 ../src/tools.c:360
msgid "Information"
msgstr "Informazioni"
-#: ../src/file_export.c:406 ../src/tools.c:373
+#: ../src/file_export.c:406 ../src/tools.c:372
msgid "Press button to abort."
msgstr "Premere il bottone per interrompere."
@@ -3403,7 +3602,7 @@
msgstr[0] "Copiata traccia %d di %d."
msgstr[1] "Copiata traccia %d di %d."
-#: ../src/file_export.c:505 ../src/tools.c:519
+#: ../src/file_export.c:505 ../src/tools.c:518
#, c-format
msgid "%d%% (%d:%02d:%02d left)"
msgstr "%d%% (%d:%02d:%02d rimasti)"
@@ -3466,26 +3665,26 @@
"Impossibile aprire il file «%s» in scrittura (%s).\n"
"\n"
-#: ../src/file_itunesdb.c:127
+#: ../src/file_itunesdb.c:129
#, c-format
msgid "Matching SHA1 checksum for file %d/%d"
msgstr "Confronto delle somme di controllo SHA1 per il file %d di %d"
-#: ../src/file_itunesdb.c:234
-msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
-msgstr ""
-"Impossibile aprire «iTunesDB.ext» per leggere le informazioni estese.\n"
+#: ../src/file_itunesdb.c:236
+#, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "Impossibile aprire «%s» per la lettura delle informazioni estese.\n"
-#: ../src/file_itunesdb.c:241
+#: ../src/file_itunesdb.c:243
msgid "Could not create hash value from itunesdb\n"
msgstr "Impossibile creare il valore di hash da itunesdb\n"
-#: ../src/file_itunesdb.c:257
+#: ../src/file_itunesdb.c:259
#, c-format
msgid "Error while reading extended info: %s\n"
msgstr "Errore nella lettura delle informazioni estese: %s\n"
-#: ../src/file_itunesdb.c:274
+#: ../src/file_itunesdb.c:276
#, c-format
msgid ""
"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -3499,7 +3698,7 @@
"SHA1. Questo può richiedere molto tempo.\n"
"\n"
-#: ../src/file_itunesdb.c:286
+#: ../src/file_itunesdb.c:288
#, c-format
msgid ""
"%s:\n"
@@ -3508,7 +3707,7 @@
"%s:\n"
"Atteso «itunesdb_hash=» ma trovato: «%s»\n"
-#: ../src/file_itunesdb.c:346
+#: ../src/file_itunesdb.c:348
#, c-format
msgid ""
"%s:\n"
@@ -3517,7 +3716,7 @@
"%s:\n"
"Errore nel formato: %s\n"
-#: ../src/file_itunesdb.c:391
+#: ../src/file_itunesdb.c:393
msgid ""
"No SHA1 checksums on individual tracks are available.\n"
"\n"
@@ -3533,7 +3732,7 @@
"l'iPod con programmi diversi da gtkpod.\n"
"\n"
-#: ../src/file_itunesdb.c:455
+#: ../src/file_itunesdb.c:457
msgid ""
"Extended info will not be used. If you have non-transferred tracks,\n"
"these will be lost.\n"
@@ -3541,15 +3740,15 @@
"Le informazioni estese non verranno usate. Le tracce non trasferite verranno "
"perse.\n"
-#: ../src/file_itunesdb.c:463
+#: ../src/file_itunesdb.c:465
msgid "Offline iPod database successfully imported"
msgstr "Database non in linea dell'iPod importato con successo"
-#: ../src/file_itunesdb.c:466
+#: ../src/file_itunesdb.c:468
msgid "Local database successfully imported"
msgstr "Database locale importato con successo"
-#: ../src/file_itunesdb.c:474
+#: ../src/file_itunesdb.c:476
#, c-format
msgid ""
"Offline iPod database import failed: '%s'\n"
@@ -3558,7 +3757,7 @@
"Importazione del database non in linea dell'iPod fallita: «%s» \n"
"\n"
-#: ../src/file_itunesdb.c:478
+#: ../src/file_itunesdb.c:480
#, c-format
msgid ""
"Local database import failed: '%s'\n"
@@ -3567,7 +3766,7 @@
"Importazione del database locale fallita: «%s»\n"
"\n"
-#: ../src/file_itunesdb.c:485
+#: ../src/file_itunesdb.c:487
msgid ""
"Offline iPod database import failed: \n"
"\n"
@@ -3575,7 +3774,7 @@
"Importazione del database non in linea dell'iPod fallita: \n"
"\n"
-#: ../src/file_itunesdb.c:488
+#: ../src/file_itunesdb.c:490
msgid ""
"Local database import failed: \n"
"\n"
@@ -3583,7 +3782,7 @@
"Importazione del database locale fallita:\n"
"\n"
-#: ../src/file_itunesdb.c:495
+#: ../src/file_itunesdb.c:497
#, c-format
msgid ""
"'%s' does not exist. Import aborted.\n"
@@ -3592,15 +3791,15 @@
"«%s» non esiste. Importazione interrotta.\n"
"\n"
-#: ../src/file_itunesdb.c:518
+#: ../src/file_itunesdb.c:520
msgid "Extended info will not be used.\n"
msgstr "Le informazioni estese non verranno usate.\n"
-#: ../src/file_itunesdb.c:525
+#: ../src/file_itunesdb.c:527
msgid "iPod Database Successfully Imported"
msgstr "Database dell'iPod importato con successo"
-#: ../src/file_itunesdb.c:532
+#: ../src/file_itunesdb.c:534
#, c-format
msgid ""
"iPod Database Import Failed: '%s'\n"
@@ -3609,7 +3808,7 @@
"Importazione del database dell'iPod fallita: «%s»\n"
"\n"
-#: ../src/file_itunesdb.c:538
+#: ../src/file_itunesdb.c:540
msgid ""
"iPod Database Import Failed.\n"
"\n"
@@ -3617,7 +3816,7 @@
"Importazione del database dell'iPod fallita.\n"
"\n"
-#: ../src/file_itunesdb.c:547
+#: ../src/file_itunesdb.c:549
#, c-format
msgid ""
"'%s' (or similar) does not exist. Import aborted.\n"
@@ -3626,7 +3825,7 @@
"«%s» (o simile) non esiste. Importazione interrotta.\n"
"\n"
-#: ../src/file_itunesdb.c:863
+#: ../src/file_itunesdb.c:865
#, c-format
msgid ""
"Could not find iPod directory structure at '%s'.\n"
@@ -3641,30 +3840,30 @@
"\n"
"Si desidera creare la struttura delle directory ora?\n"
-#: ../src/file_itunesdb.c:1144
+#: ../src/file_itunesdb.c:1180
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
msgstr "Impossibile aprire «%s» per la scrittura delle informazioni estese.\n"
-#: ../src/file_itunesdb.c:1159
+#: ../src/file_itunesdb.c:1195
msgid "Aborted writing of extended info.\n"
msgstr "Scrittura delle informazioni estese interrotta.\n"
-#: ../src/file_itunesdb.c:1360
+#: ../src/file_itunesdb.c:1397
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: ../src/file_itunesdb.c:1374
+#: ../src/file_itunesdb.c:1411
#, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left)"
msgstr "%d%% (%d/%d %d:%02d:%02d rimasti)"
-#: ../src/file_itunesdb.c:1416
+#: ../src/file_itunesdb.c:1463
msgid "Status: Deleting File"
msgstr "Status: eliminazione file in corso"
-#: ../src/file_itunesdb.c:1477
+#: ../src/file_itunesdb.c:1524
#, c-format
msgid ""
"Could not remove the following file: '%s'\n"
@@ -3673,7 +3872,7 @@
"Impossibile rimuovere il file seguente: «%s»\n"
"\n"
-#: ../src/file_itunesdb.c:1585
+#: ../src/file_itunesdb.c:1632
msgid ""
"The following track could not be converted successfully:\n"
"\n"
@@ -3687,7 +3886,7 @@
"Le tracce seguenti non sono state convertite con successo:\n"
"\n"
-#: ../src/file_itunesdb.c:1595
+#: ../src/file_itunesdb.c:1642
msgid ""
"The following track could not be transferred successfully:\n"
"\n"
@@ -3705,12 +3904,12 @@
#. modal,
#. gint id,
#. gboolean modal,
-#: ../src/file_itunesdb.c:1604 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
msgid "Warning"
msgstr "Attenzione"
#. title
-#: ../src/file_itunesdb.c:1605
+#: ../src/file_itunesdb.c:1652
msgid ""
"The iPod could not be ejected. Please fix the problems mentioned below and "
"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
@@ -3720,19 +3919,22 @@
"espellere di nuovo l'iPod. Premendo «Ok» le tracce mancanti saranno di nuovo "
"messe in coda per la conversione e il trasferimento."
-#: ../src/file_itunesdb.c:1667
+#: ../src/file_itunesdb.c:1715
+#, c-format
msgid "Status: Copying track"
msgstr "Status: copia traccia in corso"
-#: ../src/file_itunesdb.c:1673
+#: ../src/file_itunesdb.c:1721
+#, c-format
msgid "Status: Waiting for conversion to complete"
msgstr "Status: in attesa del completamento della conversione"
-#: ../src/file_itunesdb.c:1677
+#: ../src/file_itunesdb.c:1725
+#, c-format
msgid "Status: Finished transfer"
msgstr "Status: trasferimento completato"
-#: ../src/file_itunesdb.c:1718
+#: ../src/file_itunesdb.c:1770
#, c-format
msgid ""
"One track could not be transferred because your iPod is full. Either delete "
@@ -3751,7 +3953,7 @@
"alcune tracce oppure creare spazio sull'iPod in altro modo prima di "
"espellerlo di nuovo."
-#: ../src/file_itunesdb.c:1800
+#: ../src/file_itunesdb.c:1852
#, c-format
msgid ""
"You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -3768,7 +3970,7 @@
"interrompere l'operazione. Se la si interrompe, si può importare il database "
"esistente prima di richiamare di nuovo questa funzione.\n"
-#: ../src/file_itunesdb.c:1835
+#: ../src/file_itunesdb.c:1887
msgid ""
"iPod directory structure must be present before synching to the iPod can be "
"performed.\n"
@@ -3776,28 +3978,28 @@
"La struttura delle directory dell'iPod deve essere presente prima che la "
"sincronizzazione verso l'iPod possa essere eseguita.\n"
-#: ../src/file_itunesdb.c:1844
+#: ../src/file_itunesdb.c:1896
msgid "Some tracks could not be deleted from the iPod. Export aborted!"
msgstr ""
"Alcune tracce non possono essere cancellate dall'iPod. Esportazione "
"interrotta!"
-#: ../src/file_itunesdb.c:1862
+#: ../src/file_itunesdb.c:1914
#, c-format
msgid "Now writing database '%s'. Please wait..."
msgstr "Scrittura del database «%s» in corso. Attendere prego..."
-#: ../src/file_itunesdb.c:1911
+#: ../src/file_itunesdb.c:1963
#, c-format
msgid "Extended information file not deleted: '%s'"
msgstr "Il file con le informazioni estese non è stato cancellato: «%s»"
-#: ../src/file_itunesdb.c:1995
+#: ../src/file_itunesdb.c:2070
#, c-format
msgid "%s: Database saved"
msgstr "%s: database salvato"
-#: ../src/file_itunesdb.c:1999
+#: ../src/file_itunesdb.c:2074
#, c-format
msgid "%s: Changes saved"
msgstr "%s: modifiche salvate"
@@ -3859,17 +4061,17 @@
msgid "Cancel"
msgstr "Annulla"
-#: ../src/flacfile.c:33
+#: ../src/flacfile.c:62
#, c-format
msgid "'%s' does not appear to be an FLAC audio file.\n"
msgstr "«%s» non sembra essere un file audio FLAC.\n"
-#: ../src/flacfile.c:52
+#: ../src/flacfile.c:78
#, c-format
msgid "Error retrieving tags for '%s'.\n"
msgstr "Errore nel recupero delle etichette per «%s».\n"
-#: ../src/flacfile.c:122
+#: ../src/flacfile.c:165
#, c-format
msgid ""
"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
@@ -3878,7 +4080,7 @@
"Importazione di «%s» fallita: FLAC non è supportato senza la libreria FLAC. "
"Devi compilare i sorgenti di gtkpod insieme alla libreria FLAC.\n"
-#: ../src/flacfile.c:128
+#: ../src/flacfile.c:171
#, c-format
msgid ""
"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
@@ -4009,7 +4211,7 @@
#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
msgid "Select mountpoint"
-msgstr "Selezionare il punto di montaggio dell'iPod"
+msgstr "Selezionare il punto di mount"
#: ../src/ipod_init.c:359
#, c-format
@@ -4035,350 +4237,361 @@
"essere un bug o un'incompatibilità nelle librerie GTK+ o glade.\n"
"\n"
-#: ../src/misc.c:86
-#, c-format
+#: ../src/misc.c:70
msgid ""
-"gtkpod Version %s: Cross-Platform Multi-Lingual Interface to Apple's iPod"
-"(tm)."
-msgstr ""
-"gtkpod Versione %s: interfaccia multi-lingua e multi-piattaforma per Apple "
-"iPod (tm)."
-
-#: ../src/misc.c:90
-msgid ""
-"(C) 2002 - 2007\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
"Corey Donohoe (atmos at atmos dot org)\n"
-"\n"
-"\n"
msgstr ""
-"(C) 2002 - 2007\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
"Corey Donohoe (atmos at atmos dot org)\n"
-"\n"
-"\n"
-#: ../src/misc.c:96
+#: ../src/misc.c:74
msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-msgstr ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-
-#: ../src/misc.c:104
-msgid ""
"Patches were supplied by the following people (list may be incomplete -- "
"please contact me)\n"
-"\n"
msgstr ""
"Correzioni sono state fornite dalle seguenti persone (la lista potrebbe "
"essere incompleta -- per favore contattatemi)\n"
-"\n"
-#: ../src/misc.c:106
-msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)\n"
+#: ../src/misc.c:75
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
msgstr ""
"Ramesh Dharan: Multi-Edit (modifica le etichette di diverse tracce in una "
-"volta)\n"
+"volta)"
-#: ../src/misc.c:108
-msgid "Hiroshi Kawashima: Japanese charset autodetecion feature\n"
-msgstr ""
-"Hiroshi Kawashima: riconoscimento automatico della codifica giapponese\n"
+#: ../src/misc.c:76
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
+msgstr "Hiroshi Kawashima: riconoscimento automatico della codifica giapponese"
-#: ../src/misc.c:110
-msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c\n"
+#: ../src/misc.c:77
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
msgstr ""
-"Adrian Ulrich: porting del codice della playlist da mktunes.pl a itunesdb.c\n"
+"Adrian Ulrich: porting del codice della playlist da mktunes.pl a itunesdb.c"
-#: ../src/misc.c:112
+#: ../src/misc.c:78
msgid ""
"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
-"newlines at the end\n"
+"newlines at the end"
msgstr ""
"Waiter Bell: trattamento corretto dei DND di URI con la presenza di "
-"caratteri di escape e/o cr/nuova linea alla fine\n"
+"caratteri di escape e/o cr/nuova linea alla fine"
-#: ../src/misc.c:114
-msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod\n"
+#: ../src/misc.c:79
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
msgstr ""
"Sam Clegg: nomi dei file decisi dall'utente per l'esportazione delle tracce "
-"dall'iPod\n"
+"dall'iPod"
-#: ../src/misc.c:116
-msgid "Chris Cutler: automatic creation of various playlist types\n"
-msgstr "Chris Cutler: creazione automatica di diversi tipi di playlist\n"
+#: ../src/misc.c:80
+msgid "Chris Cutler: automatic creation of various playlist types"
+msgstr "Chris Cutler: creazione automatica di diversi tipi di playlist"
-#: ../src/misc.c:118
+#: ../src/misc.c:81
msgid ""
"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
-"dialogue during sync\n"
+"dialogue during sync"
msgstr ""
"Graeme Wilford: lettura e scrittura dell'etichetta ID3 «Compositore», barra "
-"di avanzamento durante la sincronizzazione\n"
+"di avanzamento durante la sincronizzazione"
-#: ../src/misc.c:120
+#: ../src/misc.c:82
msgid ""
"Edward Matteucci: debugging, special playlist creation, most of the volume "
-"normalizing code\n"
+"normalizing code"
msgstr ""
"Edward Matteucci: debugging, creazione delle playlist speciali, buona parte "
-"del codice relativo alla normalizzazione\n"
+"del codice relativo alla normalizzazione"
-#: ../src/misc.c:122
-msgid "Jens Lautenbach: some optical improvements\n"
-msgstr "Jens Lautenbach: alcuni miglioramenti ottici\n"
+#: ../src/misc.c:83
+msgid "Jens Lautenbach: some optical improvements"
+msgstr "Jens Lautenbach: alcuni miglioramenti ottici"
-#: ../src/misc.c:124
-msgid "Alex Tribble: iPod eject patch\n"
-msgstr "Alex Tribble: patch per l'espulsione dell'iPod\n"
+#: ../src/misc.c:84
+msgid "Alex Tribble: iPod eject patch"
+msgstr "Alex Tribble: patch per l'espulsione dell'iPod"
-#: ../src/misc.c:126
-msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling\n"
-msgstr "Yaroslav Halchenko: gestione delle tracce orfane e fantasma\n"
+#: ../src/misc.c:85
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+msgstr "Yaroslav Halchenko: gestione delle tracce orfane e fantasma"
-#: ../src/misc.c:128
+#: ../src/misc.c:86
msgid ""
-"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes\n"
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
msgstr ""
"Andrew Huntwork: correzione di maiuscole/minuscole nei nomi dei file e "
-"correzione di vari altri bug\n"
+"correzione di vari altri bug"
-#: ../src/misc.c:130
+#: ../src/misc.c:87
msgid ""
"Ero Carrera: Filename validation and quick sync when copying tracks from the "
-"iPod\n"
+"iPod"
msgstr ""
"Ero Carrera: validazione dei nomi dei file e sincronizzazione rapida nella "
-"copia delle tracce dall'iPod\n"
+"copia delle tracce dall'iPod"
-#: ../src/misc.c:132
-msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume\n"
+#: ../src/misc.c:88
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
msgstr ""
"Jens Taprogge: supporto per l'etichetta per il guadagno di riproduzione di "
-"LAME per normalizzare il volume\n"
+"LAME per normalizzare il volume"
-#: ../src/misc.c:134
-msgid "Armando Atienza: Support with external playcounts\n"
-msgstr "Armando Atienza: supporto per i contatori di riproduzione esterni\n"
+#: ../src/misc.c:89
+msgid "Armando Atienza: Support with external playcounts"
+msgstr "Armando Atienza: supporto per i contatori di riproduzione esterni"
-#: ../src/misc.c:136
-msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)\n"
-msgstr "D.L. Sharp: supporto per i file m4b (file AAC con segnalibri)\n"
+#: ../src/misc.c:90
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+msgstr "D.L. Sharp: supporto per i file m4b (file AAC con segnalibri)"
-#: ../src/misc.c:138
-msgid "Jim Hall: Decent INSTALL file\n"
-msgstr "Jim Hall: un file INSTALL decente\n"
+#: ../src/misc.c:91
+msgid "Jim Hall: Decent INSTALL file"
+msgstr "Jim Hall: un file INSTALL decente"
-#: ../src/misc.c:140
+#: ../src/misc.c:92
msgid ""
"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
-"contacts to the iPod\n"
+"contacts to the iPod"
msgstr ""
"Juergen Helmers, Markus Gaugusch: script di conversione per sincronizzare "
-"calendari e contatti con l'iPod\n"
+"calendari e contatti con l'iPod"
#. J"urgen!
-#: ../src/misc.c:142
-msgid "Flavio Stanchina: bugfixes\n"
-msgstr "Flavio Stanchina: correzione di bug\n"
+#: ../src/misc.c:93
+msgid "Flavio Stanchina: bugfixes"
+msgstr "Flavio Stanchina: correzione di bug"
-#: ../src/misc.c:144
+#: ../src/misc.c:94
msgid ""
"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title\n"
+"the title"
msgstr ""
"Chris Micacchi: ignora «the» e cose simili all'inizio del titolo durante "
-"l'ordinamento\n"
+"l'ordinamento"
-#: ../src/misc.c:146
-msgid "Steve Jay: use statvfs() instead of df (better portability, faster)\n"
+#: ../src/misc.c:95
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
msgstr ""
-"Steve Jay: usa statvfs() invece di df (migliore portabilità , più veloce)\n"
+"Steve Jay: usa statvfs() invece di df (migliore portabilità , più veloce)"
-#: ../src/misc.c:149
+#: ../src/misc.c:97
msgid ""
"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
-"tags\n"
+"tags"
msgstr ""
"Christoph Kunz: risoluzione dei problemi di compatibilità nella scrittura "
-"delle etichette mp3 di tipo id3v2.4\n"
+"delle etichette mp3 di tipo id3v2.4"
-#: ../src/misc.c:152
+#: ../src/misc.c:99
msgid ""
"James Liggett:\n"
-" replacement of old GTK file selection dialogs with new GTK filechooser "
+"replacement of old GTK file selection dialogs with new GTK filechooser "
"dialogs\n"
-" refactored user preferences system.\n"
+"refactored user preferences system."
msgstr ""
-"James Ligget: sostituzione dei «GTK file selection dialog» con i nuovi "
-"«GTK filechooser dialog»\n"
-" rifacimento del sistema di preferenze dell'utente\n"
+"James Ligget:\n"
+"sostituzione dei vecchi «GTK file selection dialog» con i nuovi «GTK "
+"filechooser dialog»\n"
+"rifacimento del sistema di preferenze dell'utente."
-#: ../src/misc.c:157
-msgid "Daniel Kercher: sync scripts for abook and webcalendar\n"
-msgstr "Daniel Kercher: script di sincronizzazione per abook e webcalendar\n"
+#: ../src/misc.c:103
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
+msgstr "Daniel Kercher: script di sincronizzazione per abook e webcalendar"
-#: ../src/misc.c:160
-msgid "Clinton Gormley: sync scripts for thunderbird\n"
-msgstr "Clinton Gormley: script di sincronizzazione per thunderbird\n"
+#: ../src/misc.c:105
+msgid "Clinton Gormley: sync scripts for thunderbird"
+msgstr "Clinton Gormley: script di sincronizzazione per thunderbird"
-#: ../src/misc.c:163
-msgid "Sebastien Beridot: sync script for ldif addressbook format\n"
+#: ../src/misc.c:107
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
msgstr ""
-"Sebastien Beridot: script di sincronizzazione per la rubrica in formato "
-"ldif \n"
+"Sebastien Beridot: script di sincronizzazione per la rubrica in formato ldif "
-#: ../src/misc.c:166
-msgid "Sebastian Scherer: sync script for kNotes\n"
-msgstr "Sebastian Scherer: script di sincronizzazione per kNotes\n"
+#: ../src/misc.c:109
+msgid "Sebastian Scherer: sync script for kNotes"
+msgstr "Sebastian Scherer: script di sincronizzazione per kNotes"
-#: ../src/misc.c:169
-msgid "Nick Piper: sync script for Palm, type-ahead search\n"
-msgstr "Nick Piper: script di sincronizzazione per Palm, ricerca type-ahead\n"
+#: ../src/misc.c:111
+msgid "Nick Piper: sync script for Palm, type-ahead search"
+msgstr "Nick Piper: script di sincronizzazione per Palm, ricerca type-ahead"
-#: ../src/misc.c:172
-msgid "Uwe Hermann: help with support for iPod Video\n"
-msgstr "Uwe Hermann: aiuto nel supporto per l'iPod Video\n"
+#: ../src/misc.c:113
+msgid "Uwe Hermann: help with support for iPod Video"
+msgstr "Uwe Hermann: aiuto nel supporto per l'iPod Video"
-#: ../src/misc.c:175
+#: ../src/misc.c:115
msgid ""
"Iain Benson: support for compilation tag in mp3 files and separate display "
-"of compilations in the sort tab.\n"
+"of compilations in the sort tab."
msgstr ""
"Iain Benson: supporto per l'etichetta compilation nei file mp3 e "
-"visualizzazione separata delle compilation nella scheda di ordinamento.\n"
+"visualizzazione separata delle compilation nella scheda di ordinamento."
-#: ../src/misc.c:177
+#: ../src/misc.c:116
msgid ""
"Nicolas Chariot: icons of buttons\n"
"\n"
-"\n"
msgstr ""
"Nicolas Chariot: icone dei bottoni\n"
"\n"
-"\n"
-#: ../src/misc.c:181
-msgid "This program borrows code from the following projects:\n"
-msgstr "Questo programma prende in prestito codice dai seguenti progetti:\n"
+#: ../src/misc.c:118
+msgid "This program borrows code from the following projects:"
+msgstr "Questo programma prende in prestito codice dai seguenti progetti:"
-#: ../src/misc.c:183
+#: ../src/misc.c:119
msgid ""
-" gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB "
-"(http://www.gnu.org/software/gnupod/)\n"
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
msgstr ""
-" gnutools: (mktunes.pl, portato in C) lettura e scrittura di iTunesDB "
-"(http://www.gnu.org/software/gnupod/)\n"
+"gnutools: (mktunes.pl, portato in C) lettura e scrittura di iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
-#: ../src/misc.c:185
+#: ../src/misc.c:120
msgid ""
-" iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some "
-"code for smart playlists is based on his C++-classes.\n"
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
msgstr ""
-" iPod.cpp, iPod.h di Samuel Wood (sam dot wood at gmail dot com): un po» "
-"di codice per le playlist intelligenti è basata sulle sue classi in C++.\n"
+"iPod.cpp, iPod.h di Samuel Wood (sam dot wood at gmail dot com): una "
+"partedel codice per le playlist intelligenti è basata sulle sue classi in C+"
+"+."
-#: ../src/misc.c:187
-msgid " mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)\n"
+#: ../src/misc.c:121
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
msgstr ""
-" mp3info: rilevazione della durata dei brani mp3 (http://ibiblio.org/"
-"mp3info/)\n"
+"mp3info: rilevazione della durata dei brani mp3 (http://ibiblio.org/"
+"mp3info/)"
-#: ../src/misc.c:189
-msgid ""
-" xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)\n"
+#: ../src/misc.c:122
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
msgstr ""
-" xmms: sfoglia directory, rilevazione della durata dei brani mp3 "
-"(http://www.xmms.org)\n"
+"xmms: sfoglia directory, rilevazione della durata dei brani mp3 (http://www."
+"xmms.org)"
-#: ../src/misc.c:192
-msgid ""
-"The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"
+#: ../src/misc.c:124
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
msgstr ""
-"La GUI è stata creata con l'aiuto di glade-2 (http://glade.gnome.org/).\n"
+"La GUI è stata creata con l'aiuto di glade-2 (http://glade.gnome.org/)."
-#: ../src/misc.c:207
-msgid "French: David Le Brun (david at dyn-ns dot net)\n"
-msgstr "Francese: David Le Brun (david at dyn-ns dot net)\n"
+#: ../src/misc.c:128
+msgid "French: David Le Brun (david at dyn-ns dot net)"
+msgstr "Francese: David Le Brun (david at dyn-ns dot net)"
-#: ../src/misc.c:209
-msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
-msgstr "Tedesco: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+#: ../src/misc.c:129
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr "Francese: Éric Lassauge (rpmfarm at free dot fr)"
-#: ../src/misc.c:211
-msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)\n"
-msgstr "Ebraico: Assaf Gillat (gillata at gmail dot com)\n"
+#: ../src/misc.c:130
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+msgstr "Tedesco: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
-#: ../src/misc.c:213
+#: ../src/misc.c:131
+msgid "German: Kai-Ove"
+msgstr "Tedesco: Kai-Ove"
+
+#: ../src/misc.c:132
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+msgstr "Ebraico: Assaf Gillat (gillata at gmail dot com)"
+
+#: ../src/misc.c:133
msgid ""
-"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net)\n"
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
msgstr ""
-"Italiano: Edward Matteucci (edward_matteucc at users dot sourceforge dot)\n"
-"Italiano: Daniele Forsi (dforsi at gmail dot com)\n"
+"Italiano: Edward Matteucci (edward_matteucc at users dot sourceforge dot)"
-#: ../src/misc.c:215
-msgid "Japanese: Ayako Sano\n"
-msgstr "Giapponese: Ayako Sano\n"
+#: ../src/misc.c:134
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr "Italiano: Daniele Forsi (dforsi at gmail dot com)"
-#: ../src/misc.c:217
-msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
+#: ../src/misc.c:135
+msgid "Japanese: Ayako Sano"
+msgstr "Giapponese: Ayako Sano"
+
+#: ../src/misc.c:136
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+msgstr "Giapponese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+
+#: ../src/misc.c:137
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr "Rumeno: Alex Eftimie (alexeftimie at gmail dot com)"
+
+#: ../src/misc.c:138
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
msgstr ""
-"Giapponese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
+"Spagnolo: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
-#: ../src/misc.c:219
-msgid "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
-msgstr "Svedese: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
+#: ../src/misc.c:139
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
+msgstr "Svedese: Stefan Asserhall (stefan.asserhall at comhem dot se)"
-#: ../src/misc.c:975
+#: ../src/misc.c:144
+msgid ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+msgstr ""
+"Questo programma è software libero; è possibile ridistribuirlo e/o\n"
+"modificarlo secondo i termini della licenza GNU General Public License,\n"
+"come pubblicata dalla Free Software Foundation; versione 2 della licenza,\n"
+"o (a scelta) una versione più recente.\n"
+"\n"
+"Questo programma è distribuito nella speranza che possa risultare utile,\n"
+"ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di\n"
+"COMMERCIABILITÀ o APPLICABILITÀ PER UNO SCOPO PARTICOLARE.\n"
+"Per maggiori dettagli vedere la GNU General Public License.\n"
+"\n"
+"Una copia della GNU General Public License dovrebbe essere stata\n"
+"fornita con questo programma. In caso contrario scrivere a:\n"
+"Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+
+#: ../src/misc.c:159
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+msgstr ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+
+#: ../src/misc.c:167
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr "Interfaccia multi-lingua e multi-piattaforma per Apple iPodâ„¢"
+
+#: ../src/misc.c:934
#, c-format
msgid "Could not process '%s' (no filename available)"
msgstr "Impossibile processare «%s» (nessun nome di file disponibile)"
-#: ../src/misc.c:1129
+#: ../src/misc.c:1088
#, c-format
msgid "Unknown token '%%%c' in template '%s'"
msgstr "Segnaposto sconosciuto «%%%c» nel modello «%s»"
-#: ../src/misc.c:1212
+#: ../src/misc.c:1171
#, c-format
msgid "Template ('%s') does not match file type '%s'\n"
msgstr "Il modello («%s») non coincide con il tipo di file «%s»\n"
-#: ../src/misc.c:1298
+#: ../src/misc.c:1257
#, c-format
msgid "Error creating %s: %s\n"
msgstr "Errore nella creazione di %s: %s\n"
-#: ../src/misc.c:1732
+#: ../src/misc.c:1691
#, c-format
msgid ""
"Writing preferences file '%s' failed (%s).\n"
@@ -4387,11 +4600,11 @@
"La scrittura del file delle preferenze «%s» è fallita (%s).\n"
"\n"
-#: ../src/misc.c:1734
+#: ../src/misc.c:1693
msgid "unspecified error"
msgstr "errore non specificato"
-#: ../src/misc.c:1742
+#: ../src/misc.c:1701
#, c-format
msgid ""
"Writing preferences to the iPod (%s) failed: could not get path to Control "
@@ -4444,8 +4657,8 @@
#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
msgid "Remove Track From Playlist?"
msgid_plural "Remove Tracks From Playlist?"
-msgstr[0] "Cancellare la traccia dalla playlist?"
-msgstr[1] "Cancellare le tracce dalla playlist?"
+msgstr[0] "Rimuovere la traccia dalla playlist?"
+msgstr[1] "Rimuovere le tracce dalla playlist?"
#: ../src/misc_confirm.c:163
msgid ""
@@ -4533,6 +4746,7 @@
msgstr "Eliminate tutte le %d tracce dall'iPod"
#: ../src/misc_confirm.c:541
+#, c-format
msgid "Removed all podcasts from the iPod"
msgstr "Eliminati tutti i podcast dall'iPod"
@@ -4547,7 +4761,7 @@
#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
#, c-format
msgid "Deleted playlist '%s'"
-msgstr "Playlist eliminata «%s»"
+msgstr "Playlist «%s» eliminata"
#: ../src/misc_confirm.c:600
#, c-format
@@ -4564,10 +4778,12 @@
msgstr "Rimosse tutte le %d tracce dal database"
#: ../src/misc_confirm.c:695
+#, c-format
msgid "Are you sure you want to remove all tracks from your iPod?"
msgstr "Eliminare veramente tutte le tracce dall'iPod?"
#: ../src/misc_confirm.c:700
+#, c-format
msgid "Are you sure you want to remove all podcasts from your iPod?"
msgstr "Eliminare veramente tutti i podcast dall'iPod?"
@@ -4575,11 +4791,11 @@
#, c-format
msgid ""
"Are you sure you want to delete playlist '%s' and the following track "
-"completely from your ipod? The number of playlists this track is a member of "
+"completely from your iPod? The number of playlists this track is a member of "
"is indicated in parentheses."
msgid_plural ""
"Are you sure you want to delete playlist '%s' and the following tracks "
-"completely from your ipod? The number of playlists the tracks are member of "
+"completely from your iPod? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
"Sei sicuro di voler eliminare completamente la playlist «%s» e la traccia "
@@ -4615,6 +4831,7 @@
"tra parentesi."
#: ../src/misc_confirm.c:753
+#, c-format
msgid "Are you sure you want to remove all tracks from the database?"
msgstr "Eliminare veramente tutte le tracce dal database?"
@@ -4797,53 +5014,57 @@
msgid "Sort TV Show"
msgstr "Programma TV per l'ordinamento"
-#: ../src/misc_conversion.c:125
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr "Traccia senza pause"
+
+#: ../src/misc_conversion.c:126
msgid "Name of file on PC, if available"
msgstr "Nome del file sul PC, se disponibile"
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:127
msgid "Name of file on the iPod"
msgstr "Nome del file sull'iPod"
#. 10
-#: ../src/misc_conversion.c:128
+#: ../src/misc_conversion.c:129
msgid "Track Nr. and total number of tracks on CD"
msgstr "N° traccia e numero totale di tracce sul CD"
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
msgid "Whether the file has already been transferred to the iPod or not"
msgstr "Se il file è stato già trasferito sull'iPod o meno"
-#: ../src/misc_conversion.c:135
+#: ../src/misc_conversion.c:136
msgid "Beats per minute"
msgstr "Battute al minuto"
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:137
msgid "Number of times the track has been played"
msgstr "Numero di volte in cui la traccia è stata riprodotta"
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
msgid "Star rating from 0 to 5"
msgstr "Votazione a stelle da 0 a 5"
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
msgid "Date and time track has been added"
msgstr "Data e ora in cui la traccia è stata aggiunta"
#. 20
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
msgid "Date and time track has last been played"
msgstr "Data e ora in cui la traccia è stata riprodotta l'ultima volta"
-#: ../src/misc_conversion.c:140
+#: ../src/misc_conversion.c:141
msgid "Date and time track has last been modified"
msgstr "Data e ora in cui la traccia è stata modificata l'ultima volta"
-#: ../src/misc_conversion.c:141
+#: ../src/misc_conversion.c:142
msgid "Manual volume adjust"
msgstr "Regolazione manuale del volume"
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:143
msgid ""
"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
"the iPod"
@@ -4852,53 +5073,53 @@
"attivare «Ver. livello sonoro» sull'iPod"
#. 25
-#: ../src/misc_conversion.c:145
+#: ../src/misc_conversion.c:146
msgid "CD Nr. and total number of CDS in set"
msgstr "N° CD e numero totale dei CD nel cofanetto"
-#: ../src/misc_conversion.c:148
+#: ../src/misc_conversion.c:149
msgid ""
"The category (e.g. 'Technology' or 'Music') where the podcast was located."
msgstr ""
"La categoria (es. «Tecnologia» o «Musica») in cui si trovava il podcast."
-#: ../src/misc_conversion.c:149
+#: ../src/misc_conversion.c:150
msgid "Accessible by selecting the center button on the iPod."
msgstr "Accessibile selezionando il bottone centrale sull'iPod."
-#: ../src/misc_conversion.c:153
+#: ../src/misc_conversion.c:154
msgid "Release date (for podcasts displayed next to the title on the iPod)"
msgstr ""
"Data di pubblicazione (per i podcast è mostrata accanto al titolo sull'iPod)"
#. 50
-#: ../src/misc_conversion.c:167 ../src/misc_conversion.c:168
-#: ../src/misc_conversion.c:169 ../src/misc_conversion.c:170
-#: ../src/misc_conversion.c:171 ../src/misc_conversion.c:172
+#: ../src/misc_conversion.c:168 ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170 ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172 ../src/misc_conversion.c:173
msgid "Used for sorting on the iPod"
msgstr "Usato per l'ordinamento sull'iPod"
-#: ../src/misc_conversion.c:733
+#: ../src/misc_conversion.c:735
#, c-format
msgid "The URI '%s' is not an absolute URI using the file scheme"
msgstr "L'URI «%s» non è un URI assoluto usando lo schema dei file"
-#: ../src/misc_conversion.c:743
+#: ../src/misc_conversion.c:745
#, c-format
msgid "The local file URI '%s' may not include a '#'"
msgstr "L'URI del file locale «%s» non può includere «#»"
-#: ../src/misc_conversion.c:760
+#: ../src/misc_conversion.c:762
#, c-format
msgid "The URI '%s' is invalid"
msgstr "L'URI «%s» non è valido"
-#: ../src/misc_conversion.c:772
+#: ../src/misc_conversion.c:774
#, c-format
msgid "The hostname of the URI '%s' is invalid"
msgstr "Il nome dell'host dell'URI «%s» non è valido"
-#: ../src/misc_conversion.c:788
+#: ../src/misc_conversion.c:790
#, c-format
msgid "The URI '%s' contains invalidly escaped characters"
msgstr "L'URI «%s» contiene caratteri di escape non validi"
@@ -4947,7 +5168,7 @@
#: ../src/misc_playlist.c:356
msgid "Not Listed"
-msgstr "Mai elencati"
+msgstr "Non elencati"
#: ../src/misc_playlist.c:406
#, c-format
@@ -4967,13 +5188,14 @@
msgstr "Più ascoltate (%d)"
#: ../src/misc_playlist.c:584
+#, c-format
msgid "Never Listened"
msgstr "Mai ascoltate"
#: ../src/misc_playlist.c:624
#, c-format
msgid "Best Rated (%d)"
-msgstr "Le meglio votate (%d)"
+msgstr "Voti migliori (%d)"
#: ../src/misc_playlist.c:666
msgid "Unrated tracks"
@@ -5037,7 +5259,7 @@
#: ../src/misc_playlist.c:1077
msgid "Checking iPOD files against known files in DB"
-msgstr "Controllo dei file dell'iPod con i file conosciuti nel DB"
+msgstr "Confronto dei file dell'iPod con i file conosciuti nel DB"
#: ../src/misc_playlist.c:1120
msgid "Orphaned"
@@ -5140,72 +5362,72 @@
msgid "Duplicate detection"
msgstr "Rilevazione dei duplicati"
-#: ../src/misc_track.c:1331
+#: ../src/misc_track.c:1339
msgid "Local Database"
msgstr "Database locale"
#. artwork is set
-#: ../src/misc_track.c:1342
+#: ../src/misc_track.c:1350
msgid "Embedded or filename was lost"
msgstr "Incorporato o il nome del file è andato perso"
-#: ../src/misc_track.c:1346
+#: ../src/misc_track.c:1354
msgid "Artwork not set"
msgstr "Artwork non impostato"
-#: ../src/misc_track.c:1806
+#: ../src/misc_track.c:1816
#, c-format
msgid "Could not find source file for '%s'. Track not copied."
msgstr "Impossibile trovare il file sorgente per «%s». Traccia non copiata."
-#: ../src/misc_track.c:2042
+#: ../src/misc_track.c:2052
#, c-format
msgid "drag and drop: ignored '%s'\n"
msgstr "drag and drop: ignorato «%s»\n"
-#: ../src/mp3file.c:1295
+#: ../src/mp3file.c:1336
#, c-format
msgid "Error setting ID3 field: %s\n"
msgstr "Errore nella impostazione del campo ID3: %s\n"
-#: ../src/mp3file.c:1319 ../src/mp3file.c:1412 ../src/mp3file.c:1567
-#: ../src/mp3file.c:2459
+#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
#, c-format
msgid "ERROR while opening file: '%s' (%s).\n"
msgstr "ERRORE nell'apertura del file: «%s» (%s).\n"
-#: ../src/mp3file.c:1647
+#: ../src/mp3file.c:1688
#, c-format
msgid "ERROR while writing tag to file: '%s' (%s).\n"
msgstr "ERRORE nella scrittura dell'etichetta sul file: «%s» (%s).\n"
#. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2671
+#: ../src/mp3file.c:2770
#, c-format
msgid "File \"%s\" has zero play length. Ignoring.\n"
msgstr "Il file «%s» ha durata zero. Ignorato.\n"
-#: ../src/mp4file.c:229 ../src/mp4file.c:390
+#: ../src/mp4file.c:243 ../src/mp4file.c:404
#, c-format
msgid "'%s' does not appear to be a mp4 audio or video file.\n"
msgstr "«%s» non sembra essere un file audio mp4 o un file video.\n"
-#: ../src/mp4file.c:239 ../src/mp4file.c:400
+#: ../src/mp4file.c:253 ../src/mp4file.c:414
#, c-format
msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
msgstr "Impossibile aprire «%s» in lettura, o il file non è un file mp4.\n"
-#: ../src/mp4file.c:515
+#: ../src/mp4file.c:529
#, c-format
msgid "'%s' does not appear to be a mp4 audio file.\n"
msgstr "«%s» non sembra essere un file audio mp4.\n"
-#: ../src/mp4file.c:526
+#: ../src/mp4file.c:540
#, c-format
msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
msgstr "Impossibile aprire «%s» in scrittura, o il file non è un file mp4.\n"
-#: ../src/mp4file.c:539
+#: ../src/mp4file.c:553
#, c-format
msgid ""
"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5215,7 +5437,7 @@
"libreria mp4v2. Devi compilare i sorgenti di gtkpod insieme alla libreria "
"mp4v2.\n"
-#: ../src/mp4file.c:545
+#: ../src/mp4file.c:559
#, c-format
msgid ""
"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5226,7 +5448,7 @@
"sono supportati senza la libreria mp4v2. Devi compilare i sorgenti di gtkpod "
"insieme alla libreria mp4v2.\n"
-#: ../src/mp4file.c:551
+#: ../src/mp4file.c:565
#, c-format
msgid ""
"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5237,11 +5459,6 @@
"sono supportati senza la libreria mp4v2. Devi compilare i sorgenti gtkpod "
"insieme alla libreria mp4v2.\n"
-#: ../src/oggfile.c:62 ../src/wavfile.c:107
-#, c-format
-msgid "Could not open '%s' for reading.\n"
-msgstr "Impossibile aprire il file «%s» in lettura.\n"
-
#: ../src/oggfile.c:73
#, c-format
msgid "'%s' does not appear to be an ogg audio file.\n"
@@ -5267,89 +5484,89 @@
"la libreria ogg. Devi compilare i sorgenti di gtkpod insieme alla libreria "
"ogg.\n"
-#: ../src/prefs.c:356
+#: ../src/prefs.c:357
#, c-format
msgid "gtkpod version %s usage:\n"
msgstr "uso di gtkpod versione %s:\n"
-#: ../src/prefs.c:357
+#: ../src/prefs.c:358
msgid " -h, --help: display this message\n"
msgstr " -h, --help: mostra questo messaggio\n"
-#: ../src/prefs.c:358
+#: ../src/prefs.c:359
msgid " -p <file>: increment playcount for file by one\n"
msgstr " -p <file>:incrementa di uno il contatore delle riproduzioni\n"
-#: ../src/prefs.c:359
+#: ../src/prefs.c:360
msgid " --hash <file>:print gtkpod hash for file\n"
msgstr " --hash <file>:stampa l'hash di gtkpod per il file\n"
-#: ../src/prefs.c:360
+#: ../src/prefs.c:361
msgid " -m path: define the mountpoint of your iPod\n"
-msgstr " -m percorso definisce il punto di montaggio dell'iPod\n"
+msgstr " -m percorso definisce il punto di mount dell'iPod\n"
-#: ../src/prefs.c:361
+#: ../src/prefs.c:362
msgid " --mountpoint: same as '-m'.\n"
msgstr " --mountpoint: come «-m».\n"
-#: ../src/prefs.c:362
+#: ../src/prefs.c:363
msgid " -a: import database automatically after start.\n"
msgstr " -a: importa il database automaticamente all'avvio.\n"
-#: ../src/prefs.c:363
+#: ../src/prefs.c:364
msgid " --auto: same as '-a'.\n"
msgstr " --auto: come «-a».\n"
-#: ../src/prefs.c:560
+#: ../src/prefs.c:561
#, c-format
msgid "Couldn't create ~/.gtkpod\n"
msgstr "Impossibile creare ~/.gtkpod\n"
-#: ../src/prefs_window.c:134
+#: ../src/prefs_window.c:133
msgid "Please select command for 'Play Now'"
msgstr "Selezionare il comando per «Riproduci ora»"
-#: ../src/prefs_window.c:135
+#: ../src/prefs_window.c:134
msgid "Please select command for 'Enqueue'"
msgstr "Selezionare il comando per «Metti in coda»"
-#: ../src/prefs_window.c:136
+#: ../src/prefs_window.c:135
msgid "Please select the mp3gain executable"
msgstr "Selezionare l'eseguibile di mp3gain"
-#: ../src/prefs_window.c:137
+#: ../src/prefs_window.c:136
msgid "Please select the aacgain executable"
msgstr "Selezionare l'eseguibile di aacgain"
-#: ../src/prefs_window.c:138
+#: ../src/prefs_window.c:137
msgid "Select the mserv music root directory"
msgstr "Selezionare la directory musicale radice di mserv"
-#: ../src/prefs_window.c:139
+#: ../src/prefs_window.c:138
msgid "Select the mserv trackinfo root directory"
msgstr "Selezionare la directory trackinfo radice di mserv"
-#: ../src/prefs_window.c:140
+#: ../src/prefs_window.c:139
msgid "Select the ogg/vorbis converter command"
msgstr "Selezionare il comando per il convertitore ogg/vorbis"
-#: ../src/prefs_window.c:141
+#: ../src/prefs_window.c:140
msgid "Select the flac converter command"
msgstr "Selezionare il comando per il convertitore flac"
-#: ../src/prefs_window.c:142
+#: ../src/prefs_window.c:141
msgid "Select the m4a converter command."
msgstr "Selezionare il comando per il convertitore m4a."
-#: ../src/prefs_window.c:143
+#: ../src/prefs_window.c:142
msgid "Select the mp3 converter command."
msgstr "Selezionare il comando per il convertitore mp3."
-#: ../src/prefs_window.c:144
+#: ../src/prefs_window.c:143
msgid "Select the wav converter command."
msgstr "Selezionare il comando per il convertitore wav."
-#: ../src/prefs_window.c:211 ../src/repository.c:662
+#: ../src/prefs_window.c:201 ../src/repository.c:662
#, c-format
msgid ""
"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
@@ -5360,11 +5577,11 @@
"a jcsjcs at users.sourceforge.net per la inclusione nella prossima release.</"
"i>"
-#: ../src/prefs_window.c:1054 ../src/prefs_window.c:1072
+#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
msgid "Preferences not updated"
msgstr "Preferenze non aggiornate"
-#: ../src/prefs_window.c:1081
+#: ../src/prefs_window.c:1232
msgid "Preferences applied"
msgstr "Preferenze applicate"
@@ -5469,7 +5686,7 @@
msgid "Sync summary"
msgstr "Riepilogo della sincronizzazione"
-#: ../src/tools.c:119
+#: ../src/tools.c:118
#, c-format
msgid ""
"Could not find '%s'.\n"
@@ -5483,7 +5700,7 @@
"sistema.\n"
"\n"
-#: ../src/tools.c:204
+#: ../src/tools.c:203
#, c-format
msgid ""
"Execution of '%s' failed.\n"
@@ -5492,7 +5709,7 @@
"Esecuzione di «%s» fallita.\n"
"\n"
-#: ../src/tools.c:249
+#: ../src/tools.c:248
#, c-format
msgid ""
"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
@@ -5501,7 +5718,7 @@
"Non normalizzato «%s». Impostare il percorso di mp3gain nella sezione "
"Strumenti delle preferenze.\n"
-#: ../src/tools.c:259
+#: ../src/tools.c:258
#, c-format
msgid ""
"Did not normalize '%s'. Set aacgain path in the Tools section of the "
@@ -5510,26 +5727,26 @@
"Non normalizzato «%s». Impostare il percorso di aacgain nella sezione "
"Strumenti delle preferenze.\n"
-#: ../src/tools.c:386
+#: ../src/tools.c:385
msgid "Normalizing..."
msgstr "Normalizzazione in corso..."
-#: ../src/tools.c:436
+#: ../src/tools.c:435
#, c-format
msgid "%s - %s"
msgstr "%s - %s"
-#: ../src/tools.c:462
+#: ../src/tools.c:461
msgid "Aborting..."
msgstr "Interruzione in corso..."
-#: ../src/tools.c:466
+#: ../src/tools.c:465
msgid "Will abort after current mp3gain process ends."
msgstr ""
"L'operazione verrà interrotta alla conclusione del processo corrente di "
"mp3gain."
-#: ../src/tools.c:492
+#: ../src/tools.c:491
#, c-format
msgid ""
"'%s-%s' (%s) could not be normalized.\n"
@@ -5538,14 +5755,14 @@
"«%s-%s» (%s) non può essere normalizzata.\n"
"\n"
-#: ../src/tools.c:531
+#: ../src/tools.c:530
#, c-format
msgid "Normalized %d of %d tracks."
msgid_plural "Normalized %d of %d tracks."
msgstr[0] "Normalizzata %d traccia su %d."
msgstr[1] "Normalizzate %d tracce su %d."
-#: ../src/tools.c:634
+#: ../src/tools.c:633
msgid ""
"Please specify the command to be called on the 'Tools' section of the "
"preferences dialog.\n"
@@ -5553,7 +5770,7 @@
"Specificare il comando da richiamare nella sezione «Strumenti» della "
"finestra di dialogo delle preferenze.\n"
-#: ../src/tools.c:646
+#: ../src/tools.c:645
#, c-format
msgid ""
"Could not find the command '%s'.\n"
Property changes on: gtkpod/branches/etch-bpo/po/it.po
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/po/ja.po
===================================================================
--- gtkpod/branches/etch-bpo/po/ja.po 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/ja.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -7,12 +7,12 @@
msgstr ""
"Project-Id-Version: gtkpod 0.40\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-14 22:57+0900\n"
+"POT-Creation-Date: 2007-12-13 18:36-0500\n"
"PO-Revision-Date: 2005-06-20 23:25+0900\n"
"Last-Translator: Kentaro Fukuchi <fukuchi at users.sourceforge.net>\n"
"Language-Team: n/a\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-jp\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -47,15 +47,15 @@
#: ../data/gtkpod.glade.h:5
msgid " Sort by:"
-msgstr " ¥½¡¼¥È½ç:"
+msgstr " ã‚½ãƒ¼ãƒˆé †:"
#: ../data/gtkpod.glade.h:6
msgid " <= cts <= "
-msgstr " <= ²ó¿ô <= "
+msgstr " <= 回数 <= "
#: ../data/gtkpod.glade.h:7
msgid " Logic: "
-msgstr "¾ò·ï: "
+msgstr "æ¡ä»¶: "
#: ../data/gtkpod.glade.h:9
#, no-c-format
@@ -67,42 +67,42 @@
"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
"finished."
msgstr ""
-"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' ¤Î¤è¤¦¤ËÀßÄꤷ¤Æ¤¯¤À¤µ¤¤. ½ñ¤¹þ¤ó"
-"¤À¤é 'enter' ¥¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤."
+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' ã®ã‚ˆã†ã«è¨å®šã—ã¦ãã ã•ã„. 書ã込ん"
+"ã ら 'enter' ã‚ーを押ã—ã¦ãã ã•ã„."
#: ../data/gtkpod.glade.h:11
#, fuzzy
msgid "'aacgain' executable:"
-msgstr "'mp3gain' ¥³¥Þ¥ó¥É¤Î¾ì½ê:"
+msgstr "'mp3gain' コマンドã®å ´æ‰€:"
#: ../data/gtkpod.glade.h:12
msgid "'mp3gain' executable:"
-msgstr "'mp3gain' ¥³¥Þ¥ó¥É¤Î¾ì½ê:"
+msgstr "'mp3gain' コマンドã®å ´æ‰€:"
#: ../data/gtkpod.glade.h:13
#, fuzzy
msgid "(Checked)"
-msgstr "¥Á¥§¥Ã¥¯ºÑ¤ß"
+msgstr "ãƒã‚§ãƒƒã‚¯æ¸ˆã¿"
#: ../data/gtkpod.glade.h:14
msgid "...as icons"
-msgstr "¥¢¥¤¥³¥ó¤Î¤ß"
+msgstr "アイコンã®ã¿"
#: ../data/gtkpod.glade.h:15
msgid "...as text"
-msgstr "¥Æ¥¥¹¥È¤Î¤ß"
+msgstr "テã‚ストã®ã¿"
#: ../data/gtkpod.glade.h:16
msgid "...both as icons and text"
-msgstr "¥¢¥¤¥³¥ó¤È¥Æ¥¥¹¥È"
+msgstr "アイコンã¨ãƒ†ã‚スト"
#: ../data/gtkpod.glade.h:17
msgid "...entry 'All' in sort tab..."
-msgstr "...°Ê²¼¤Î¥½¡¼¥È¥¿¥ÖÆâ¤Î¡Ö¤¹¤Ù¤Æ¡×¤Î¹àÌÜ"
+msgstr "...以下ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–内ã®ã€Œã™ã¹ã¦ã€ã®é …ç›®"
#: ../data/gtkpod.glade.h:18
msgid "...master playlist"
-msgstr "...¥Þ¥¹¥¿¡¼¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "...マスタープレイリスト"
#: ../data/gtkpod.glade.h:20
#, no-c-format
@@ -144,24 +144,24 @@
#: ../data/gtkpod.glade.h:29
#, fuzzy
msgid "<b>Account Information</b>"
-msgstr "<b>ºï½ü¤Î³Îǧ</b>"
+msgstr "<b>削除ã®ç¢ºèª</b>"
#: ../data/gtkpod.glade.h:30
msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>ÅÐÏ¿/¹¹¿·/Ʊ´ü</b>"
+msgstr "<b>登録/æ›´æ–°/åŒæœŸ</b>"
#: ../data/gtkpod.glade.h:31
#, fuzzy
msgid "<b>Audioscrobbler</b>"
-msgstr "<b>¥Ä¡¼¥ë¥Ð¡¼</b>"
+msgstr "<b>ツールãƒãƒ¼</b>"
#: ../data/gtkpod.glade.h:32
msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>¥×¥ì¥¤¥ê¥¹¥È¤Î¼«Æ°À¸À®</b>"
+msgstr "<b>プレイリストã®è‡ªå‹•ç”Ÿæˆ</b>"
#: ../data/gtkpod.glade.h:33
msgid "<b>Automatically select...</b>"
-msgstr "<b>¼«Æ°Åª¤ËÁªÂò...</b>"
+msgstr "<b>自動的ã«é¸æŠž...</b>"
#: ../data/gtkpod.glade.h:34
msgid "<b>Calendar/Contacts/Notes</b>"
@@ -170,90 +170,91 @@
#: ../data/gtkpod.glade.h:35
#, fuzzy
msgid "<b>Coverart</b>"
-msgstr "<b>¥¤¥ó¥Ý¡¼¥È</b>"
+msgstr "<b>インãƒãƒ¼ãƒˆ</b>"
#: ../data/gtkpod.glade.h:36
msgid "<b>Delete Confirmation</b>"
-msgstr "<b>ºï½ü¤Î³Îǧ</b>"
+msgstr "<b>削除ã®ç¢ºèª</b>"
#: ../data/gtkpod.glade.h:37
-msgid "<b>Displayed Track Attributes</b>"
-msgstr "<b>ɽ¼¨¤¹¤ë¶Ê°À</b>"
+msgid "<b>Examples</b>"
+msgstr "<b>例</b>"
#: ../data/gtkpod.glade.h:38
-msgid "<b>Examples</b>"
-msgstr "<b>Îã</b>"
-
-#: ../data/gtkpod.glade.h:39
msgid "<b>Ignore Frequent Words</b>"
msgstr ""
-#: ../data/gtkpod.glade.h:40
+#: ../data/gtkpod.glade.h:39
msgid "<b>Misc</b>"
-msgstr "<b>¤½¤Î¾</b>"
+msgstr "<b>ãã®ä»–</b>"
-#: ../data/gtkpod.glade.h:41
+#: ../data/gtkpod.glade.h:40
msgid "<b>Mountpoint and individual repository/playlist options</b>"
msgstr ""
-#: ../data/gtkpod.glade.h:42
+#: ../data/gtkpod.glade.h:41
#, fuzzy
msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>ºï½ü¤Î³Îǧ</b>"
+msgstr "<b>削除ã®ç¢ºèª</b>"
-#: ../data/gtkpod.glade.h:43
+#: ../data/gtkpod.glade.h:42
msgid "<b>Play</b>"
-msgstr "<b>ºÆÀ¸</b>"
+msgstr "<b>å†ç”Ÿ</b>"
-#: ../data/gtkpod.glade.h:44
+#: ../data/gtkpod.glade.h:43
#, fuzzy
msgid "<b>Playlists</b>"
-msgstr "<b>ºÆÀ¸</b>"
+msgstr "<b>å†ç”Ÿ</b>"
-#: ../data/gtkpod.glade.h:45
+#: ../data/gtkpod.glade.h:44
msgid "<b>Please select mountpoint and your iPod model</b>"
msgstr ""
-#: ../data/gtkpod.glade.h:46
+#: ../data/gtkpod.glade.h:45
#, fuzzy
msgid "<b>Repositories</b>"
-msgstr "<b>¥Ä¡¼¥ë¥Á¥Ã¥×</b>"
+msgstr "<b>ツールãƒãƒƒãƒ—</b>"
-#: ../data/gtkpod.glade.h:47
+#: ../data/gtkpod.glade.h:46
msgid "<b>Sort Order</b>"
-msgstr "<b>¥½¡¼¥È½ç</b>"
+msgstr "<b>ã‚½ãƒ¼ãƒˆé †</b>"
-#: ../data/gtkpod.glade.h:48
+#: ../data/gtkpod.glade.h:47
msgid "<b>Sort Tabs</b>"
-msgstr "<b>¥½¡¼¥È¥¿¥Ö</b>"
+msgstr "<b>ソートタブ</b>"
-#: ../data/gtkpod.glade.h:49
+#: ../data/gtkpod.glade.h:48
msgid "<b>Sync</b>"
msgstr ""
-#: ../data/gtkpod.glade.h:50
+#: ../data/gtkpod.glade.h:49
msgid "<b>Synchronization</b>"
-msgstr "<b>Ʊ´ü</b>"
+msgstr "<b>åŒæœŸ</b>"
-#: ../data/gtkpod.glade.h:51
+#: ../data/gtkpod.glade.h:50
msgid "<b>Tag Reading</b>"
-msgstr "<b>¥¿¥°¤ÎÆɤ߹þ¤ß</b>"
+msgstr "<b>ã‚¿ã‚°ã®èªã¿è¾¼ã¿</b>"
-#: ../data/gtkpod.glade.h:52
+#: ../data/gtkpod.glade.h:51
msgid "<b>Toolbar</b>"
-msgstr "<b>¥Ä¡¼¥ë¥Ð¡¼</b>"
+msgstr "<b>ツールãƒãƒ¼</b>"
-#: ../data/gtkpod.glade.h:53
+#: ../data/gtkpod.glade.h:52
msgid "<b>Tooltips</b>"
-msgstr "<b>¥Ä¡¼¥ë¥Á¥Ã¥×</b>"
+msgstr "<b>ツールãƒãƒƒãƒ—</b>"
+#: ../data/gtkpod.glade.h:53
+#, fuzzy
+msgid "<b>Track Attributes</b>"
+msgstr "<b>表示ã™ã‚‹æ›²å±žæ€§</b>"
+
#: ../data/gtkpod.glade.h:54
msgid "<b>Track Editing</b>"
-msgstr "<b>¶Ê¤ÎÊÔ½¸</b>"
+msgstr "<b>曲ã®ç·¨é›†</b>"
#: ../data/gtkpod.glade.h:55
msgid "<b>Volume Normalization</b>"
-msgstr "<b>²»Î̤ÎÊ¿¶Ñ²½</b>"
+msgstr "<b>音é‡ã®å¹³å‡åŒ–</b>"
#: ../data/gtkpod.glade.h:56
msgid "<b>mserv</b>"
@@ -265,286 +266,313 @@
#: ../data/gtkpod.glade.h:58
msgid "About gtkpod"
-msgstr "gtkpod ¤Ë¤Ä¤¤¤Æ"
+msgstr "gtkpod ã«ã¤ã„ã¦"
#: ../data/gtkpod.glade.h:59
msgid "Add Directories Recursively"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òºÆµ¢Åª¤ËÄɲä·¤Þ¤¹"
+msgstr "ディレクトリをå†å¸°çš„ã«è¿½åŠ ã—ã¾ã™"
#: ../data/gtkpod.glade.h:60
-msgid "Add Files or Directories"
-msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲä·¤Þ¤¹"
+#, fuzzy
+msgid "Add Files"
+msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã™ã‚‹(_F)"
#: ../data/gtkpod.glade.h:61
-msgid "Add _Directory"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲ乤ë(_D)"
+msgid "Add Files or Directories"
+msgstr "ファイルã¾ãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’è¿½åŠ ã—ã¾ã™"
#: ../data/gtkpod.glade.h:62
-msgid "Add _Files"
-msgstr "¥Õ¥¡¥¤¥ë¤òÄɲ乤ë(_F)"
+#, fuzzy
+msgid "Add Fol_der"
+msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã™ã‚‹(_F)"
#: ../data/gtkpod.glade.h:63
-msgid "Add _Playlist"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤òÄɲ乤ë(_P)"
+#, fuzzy
+msgid "Add Folder"
+msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã™ã‚‹(_F)"
#: ../data/gtkpod.glade.h:64
+msgid "Add Image_s"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:65
#, fuzzy
+msgid "Add Images from a Directory"
+msgstr "ファイルã¾ãŸã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’è¿½åŠ ã—ã¾ã™"
+
+#: ../data/gtkpod.glade.h:66
+#, fuzzy
+msgid "Add Playlist"
+msgstr "ãƒ—ãƒ¬ã‚¤ãƒªã‚¹ãƒˆã‚’è¿½åŠ ã™ã‚‹(_P)"
+
+#: ../data/gtkpod.glade.h:67
+msgid "Add _Files"
+msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã™ã‚‹(_F)"
+
+#: ../data/gtkpod.glade.h:68
+msgid "Add _Playlist"
+msgstr "ãƒ—ãƒ¬ã‚¤ãƒªã‚¹ãƒˆã‚’è¿½åŠ ã™ã‚‹(_P)"
+
+#: ../data/gtkpod.glade.h:69
+#, fuzzy
msgid "Add coverart from file using the following template"
-msgstr "¼¡¤Î¥Æ¥ó¥×¥ì¡¼¥È¤Ë¹ç¤¦¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥È¥ï¡¼¥¯¤È¤·¤ÆÅÐÏ¿¤¹¤ë"
+msgstr "次ã®ãƒ†ãƒ³ãƒ—レートã«åˆã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’アートワークã¨ã—ã¦ç™»éŒ²ã™ã‚‹"
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:70
msgid "Add directories recursively"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òºÆµ¢Åª¤ËÄɲ乤ë"
+msgstr "ディレクトリをå†å¸°çš„ã«è¿½åŠ ã™ã‚‹"
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:71
msgid "Add new repository/iPod"
msgstr ""
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:72
msgid "Add playlist from file"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò¥Õ¥¡¥¤¥ë¤«¤éÆɤ߹þ¤ó¤ÇÄɲä·¤Þ¤¹"
+msgstr "プレイリストをファイルã‹ã‚‰èªã¿è¾¼ã‚“ã§è¿½åŠ ã—ã¾ã™"
-#: ../data/gtkpod.glade.h:68 ../src/display_sorttabs.c:3232
-#: ../src/display_tracks.c:1996
+#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
msgid "Added"
-msgstr "ÅÐÏ¿Æü"
+msgstr "登録日"
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:74
msgid "Advanced Sorting Options"
msgstr ""
#. 0
-#: ../data/gtkpod.glade.h:70 ../src/display_sorttabs.c:2954
+#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
msgid "Album"
-msgstr "¥¢¥ë¥Ð¥à"
+msgstr "アルãƒãƒ "
-#: ../data/gtkpod.glade.h:71
+#: ../data/gtkpod.glade.h:76
#, fuzzy
msgid "Album Art"
-msgstr "¥¢¥ë¥Ð¥à"
+msgstr "アルãƒãƒ "
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:77
msgid "All (AND)"
-msgstr "¤¹¤Ù¤Æ(AND)"
+msgstr "ã™ã¹ã¦(AND)"
-#: ../data/gtkpod.glade.h:73
+#: ../data/gtkpod.glade.h:78
msgid "All Tracks Never Listened To"
-msgstr "°ìÅÙ¤âÄ°¤¤¤¿»ö¤¬¤Ê¤¤¶Ê"
+msgstr "一度もè´ã„ãŸäº‹ãŒãªã„曲"
-#: ../data/gtkpod.glade.h:74
+#: ../data/gtkpod.glade.h:79
msgid "All Tracks Played Since Last Time"
-msgstr "Á°²ó°Ê¹ßºÆÀ¸¤µ¤ì¤¿¶Ê"
+msgstr "å‰å›žä»¥é™å†ç”Ÿã•ã‚ŒãŸæ›²"
-#: ../data/gtkpod.glade.h:75
+#: ../data/gtkpod.glade.h:80
msgid "All Tracks not Listed in any Playlist"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ËºÜ¤Ã¤Æ¤¤¤Ê¤¤¤¹¤Ù¤Æ¤Î¶Ê"
+msgstr "プレイリストã«è¼‰ã£ã¦ã„ãªã„ã™ã¹ã¦ã®æ›²"
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:81
msgid "Also include tracks never played in \"Best Rated\" playlist"
msgstr ""
-"¡Öɾ²Á¤Î¹â¤¤¶Ê¡×¤Î¥ê¥¹¥È¤òºî¤ëºÝ¤Ë¡¢°ìÅÙ¤â\n"
-"ºÆÀ¸¤µ¤ì¤¿»ö¤Î¤Ê¤¤¶Ê¤âÂоݤȤ·¤Þ¤¹¡£"
+"「評価ã®é«˜ã„曲ã€ã®ãƒªã‚¹ãƒˆã‚’作る際ã«ã€ä¸€åº¦ã‚‚\n"
+"å†ç”Ÿã•ã‚ŒãŸäº‹ã®ãªã„曲も対象ã¨ã—ã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:82
msgid "Always write ID3v2.4 tags (only applies to MP3)"
-msgstr "¾ï¤Ë ID3v2.4 ¥¿¥°¤ò½ñ¤¹þ¤à (MP3 ¤Î¤ß)"
+msgstr "常㫠ID3v2.4 タグを書ã込む (MP3 ã®ã¿)"
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:83
msgid "Any (OR)"
-msgstr "¤¤¤º¤ì¤«(OR)"
+msgstr "ã„ãšã‚Œã‹(OR)"
-#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2951
+#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
msgid "Artist"
-msgstr "¥¢¡¼¥Æ¥£¥¹¥È"
+msgstr "アーティスト"
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:85
+#, fuzzy
+msgid "Artwork Preview"
+msgstr "ãŒè¨å®šã•ã‚Œã¦ã„ãªã„"
+
+#: ../data/gtkpod.glade.h:86
msgid ""
"As a last resort set the following tags to the\n"
"filename if they are (still) empty:"
msgstr ""
-"ºÇ¸å¤Î¼êÃʤȤ·¤Æ¡¢°Ê²¼¤Î¥¿¥°¤¬Ì¤ÀßÄê¤Î¾ì¹ç¤Ë¥Õ¥¡¥¤¥ë̾¤ò¤½¤ÎÃͤȤ·¤Æ»ÈÍѤ¹¤ë:"
+"最後ã®æ‰‹æ®µã¨ã—ã¦ã€ä»¥ä¸‹ã®ã‚¿ã‚°ãŒæœªè¨å®šã®å ´åˆã«ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ãã®å€¤ã¨ã—ã¦ä½¿ç”¨ã™ã‚‹:"
-#: ../data/gtkpod.glade.h:82
+#: ../data/gtkpod.glade.h:88
msgid "Ascending"
-msgstr "¾º½ç"
+msgstr "æ˜‡é †"
-#: ../data/gtkpod.glade.h:83
-msgid ""
-"Audio/Video\n"
-"Audio\n"
-"Video\n"
-"Podcast\n"
-"Video Podcast\n"
-"Audiobook\n"
-"Music Video\n"
-"TV Show\n"
-"TV Show & Music Video\n"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:93
+#: ../data/gtkpod.glade.h:89
msgid "Auto Store"
-msgstr "¼«Æ°Êݸ"
+msgstr "自動ä¿å˜"
-#: ../data/gtkpod.glade.h:94
+#: ../data/gtkpod.glade.h:90
msgid ""
"Automatically start displaying tracks that match the criteria entered above. "
"If not selected, you must press 'Display' to start displaying."
msgstr ""
-"³Æ¹àÌܤ¬ÆþÎϤµ¤ì¤ë¤È¤¹¤°¤Ëɽ¼¨¤ò¹¹¿·¤·¤Þ¤¹. ¤³¤Î¹àÌܤ¬ÁªÂò¤µ¤ì¤Æ¤¤¤Ê¤¤»þ¤Ë"
-"¤Ï¡¢¡Öɽ¼¨¡×¥Ü¥¿¥ó¤ò²¡¤¹¤³¤È¤Ç¹¹¿·¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹."
+"å„é …ç›®ãŒå…¥åŠ›ã•ã‚Œã‚‹ã¨ã™ãã«è¡¨ç¤ºã‚’æ›´æ–°ã—ã¾ã™. ã“ã®é …ç›®ãŒé¸æŠžã•ã‚Œã¦ã„ãªã„時ã«"
+"ã¯ã€ã€Œè¡¨ç¤ºã€ãƒœã‚¿ãƒ³ã‚’押ã™ã“ã¨ã§æ›´æ–°ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™."
-#: ../data/gtkpod.glade.h:95
+#: ../data/gtkpod.glade.h:91
+msgid "Available:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:92
msgid "Before removing playlists or tracks from a playlist"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ä¡¢¥×¥ì¥¤¥ê¥¹¥È¤«¤é¶Ê¤òºï½ü¤¹¤ë»þ"
+msgstr "プレイリストやã€ãƒ—レイリストã‹ã‚‰æ›²ã‚’削除ã™ã‚‹æ™‚"
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:93
msgid "Before removing tracks from the harddisk"
-msgstr "¶Ê¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤é´°Á´¤Ëºï½ü¤¹¤ë»þ"
+msgstr "曲をãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã™ã‚‹æ™‚"
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:94
msgid "Before removing tracks from the iPod"
-msgstr "¶Ê¤òiPod¤«¤é´°Á´¤Ëºï½ü¤¹¤ë»þ"
+msgstr "曲をiPodã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã™ã‚‹æ™‚"
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:95
msgid "Before removing tracks from the local database"
-msgstr "¶Ê¤ò¥í¡¼¥«¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤¹¤ë»þ"
+msgstr "曲をãƒãƒ¼ã‚«ãƒ«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‹ã‚‰å‰Šé™¤ã™ã‚‹æ™‚"
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:96
msgid "Best Rated Tracks"
-msgstr "ɾ²Á¤Î¹â¤¤¶Ê"
+msgstr "評価ã®é«˜ã„曲"
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:97
msgid "Browse"
-msgstr "¥Ö¥é¥¦¥º"
+msgstr "ブラウズ"
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:98
#, fuzzy
msgid "Cache directory:"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲ乤ë(_D)"
+msgstr "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’è¿½åŠ ã™ã‚‹(_D)"
-#: ../data/gtkpod.glade.h:102
+#: ../data/gtkpod.glade.h:99
msgid "Calendar"
-msgstr "¥«¥ì¥ó¥À¡¼"
+msgstr "カレンダー"
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:100
msgid "Calendar sync command:"
msgstr ""
-#: ../data/gtkpod.glade.h:104
+#: ../data/gtkpod.glade.h:101
msgid "Call automatically when synchronizing iTunesDB"
msgstr ""
-#: ../data/gtkpod.glade.h:105
+#: ../data/gtkpod.glade.h:102
msgid "Category: "
-msgstr "¥«¥Æ¥´¥ê: "
+msgstr "カテゴリ: "
-#: ../data/gtkpod.glade.h:106
+#: ../data/gtkpod.glade.h:103
msgid ""
"Change all tracks\n"
"simultaneously"
msgstr ""
-#: ../data/gtkpod.glade.h:108
+#: ../data/gtkpod.glade.h:105
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:107
msgid "Check for existing files when copying from iPod."
-msgstr "iPod ¤«¤é¥³¥Ô¡¼¤¹¤ëºÝ¤ËƱ¤¸¥Õ¥¡¥¤¥ë¤«¤É¤¦¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë"
+msgstr "iPod ã‹ã‚‰ã‚³ãƒ”ーã™ã‚‹éš›ã«åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã©ã†ã‹ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹"
-#: ../data/gtkpod.glade.h:109
+#: ../data/gtkpod.glade.h:108
msgid "Command for 'Enqueue':"
-msgstr "¡Ö±éÁÕ¥¥å¡¼¤ËÆþ¤ì¤ë¡×¤¿¤á¤Î¥³¥Þ¥ó¥É:"
+msgstr "「演å¥ã‚ューã«å…¥ã‚Œã‚‹ã€ãŸã‚ã®ã‚³ãƒžãƒ³ãƒ‰:"
-#: ../data/gtkpod.glade.h:110
+#: ../data/gtkpod.glade.h:109
msgid "Command for 'Play now':"
-msgstr "¡Öº£¤¹¤°±éÁաפΤ¿¤á¤Î¥³¥Þ¥ó¥É:"
+msgstr "「今ã™ãæ¼”å¥ã€ã®ãŸã‚ã®ã‚³ãƒžãƒ³ãƒ‰:"
#. 5
-#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
#: ../src/misc_conversion.c:65
msgid "Composer"
-msgstr "ºî¶Ê¼Ô"
+msgstr "作曲者"
-#: ../data/gtkpod.glade.h:112
+#: ../data/gtkpod.glade.h:111
#, fuzzy
msgid "Confirm before removing tracks from the iPod or repository"
-msgstr "¶Ê¤òiPod¤«¤é´°Á´¤Ëºï½ü¤¹¤ë»þ"
+msgstr "曲をiPodã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã™ã‚‹æ™‚"
-#: ../data/gtkpod.glade.h:113
+#: ../data/gtkpod.glade.h:112
msgid ""
"Confirm before removing tracks from the iPod or repository\n"
"when syncing playlists"
msgstr ""
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:114
msgid "Confirm lists of directories"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥ê¥¹¥È¤ò³Îǧ¤¹¤ë"
+msgstr "ディレクトリã®ãƒªã‚¹ãƒˆã‚’確èªã™ã‚‹"
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:115
msgid "Contacts sync command:"
msgstr ""
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:116
msgid "Containing Displayed Tracks"
-msgstr "ɽ¼¨¤µ¤ì¤Æ¤¤¤ë¶Ê¤«¤éºîÀ®"
+msgstr "表示ã•ã‚Œã¦ã„る曲ã‹ã‚‰ä½œæˆ"
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:117
msgid "Containing Selected Tracks"
-msgstr "ÁªÂò¤µ¤ì¤Æ¤¤¤ë¶Ê¤«¤éºîÀ®"
+msgstr "é¸æŠžã•ã‚Œã¦ã„る曲ã‹ã‚‰ä½œæˆ"
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:118
msgid "Conversion Progress Display"
msgstr ""
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:119
msgid "Cover"
-msgstr "¥«¥Ð¡¼"
+msgstr "ã‚«ãƒãƒ¼"
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:120
msgid "Create New Playlist"
-msgstr "¿·¤·¤¯¥×¥ì¥¤¥ê¥¹¥È¤òºîÀ®¤·¤Þ¤¹"
+msgstr "æ–°ã—ãプレイリストを作æˆã—ã¾ã™"
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:121
#, fuzzy
msgid "Create Repository"
-msgstr "iPod¤«¤éºï½ü"
+msgstr "iPodã‹ã‚‰å‰Šé™¤"
-#: ../data/gtkpod.glade.h:123
+#: ../data/gtkpod.glade.h:122
msgid "Create _Playlist File"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤òºîÀ® (_P)"
+msgstr "ãƒ—ãƒ¬ã‚¤ãƒªã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½œæˆ (_P)"
-#: ../data/gtkpod.glade.h:124
+#: ../data/gtkpod.glade.h:123
msgid "Credits"
-msgstr "¸¢Íøɽ¼¨"
+msgstr "権利表示"
-#: ../data/gtkpod.glade.h:125
+#: ../data/gtkpod.glade.h:124
msgid "Currently only rating is supported."
-msgstr "¸½ºß¤Ïɾ²Á¾ðÊó¤Î¤ß»ÈÍÑ"
+msgstr "ç¾åœ¨ã¯è©•ä¾¡æƒ…å ±ã®ã¿ä½¿ç”¨"
-#: ../data/gtkpod.glade.h:126
+#: ../data/gtkpod.glade.h:125
#, fuzzy
msgid "Delete repository"
-msgstr "iPod¤«¤éºï½ü"
+msgstr "iPodã‹ã‚‰å‰Šé™¤"
-#: ../data/gtkpod.glade.h:127
+#: ../data/gtkpod.glade.h:126
#, fuzzy
msgid ""
"Delete tracks that are no longer present from the\n"
"iPod or repository"
-msgstr "°Ê²¼¤Î½ÅÊ£¤·¤¿%d¶Ê¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿¡£"
+msgstr "以下ã®é‡è¤‡ã—ãŸ%d曲ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../data/gtkpod.glade.h:129
+#: ../data/gtkpod.glade.h:128
msgid "Deleted tracks"
-msgstr "ºï½ü¤µ¤ì¤¿¶Ê"
+msgstr "削除ã•ã‚ŒãŸæ›²"
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:129
msgid "Descending"
-msgstr "¹ß½ç"
+msgstr "é™é †"
-#: ../data/gtkpod.glade.h:131
+#: ../data/gtkpod.glade.h:130
msgid "Details"
-msgstr "¾ÜºÙ"
+msgstr "詳細"
-#: ../data/gtkpod.glade.h:133
+#: ../data/gtkpod.glade.h:132
#, no-c-format
msgid ""
"Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -554,13 +582,13 @@
"nr: %C, year: %Y, original filename (requires extended information file): %"
"o, the character '%': %%."
msgstr ""
-"¶Ê¾ðÊó¤òÃê½Ð¤¹¤ë¤¿¤á¤Î·Á¼°¾ðÊó¤òÀßÄꤷ¤Þ¤¹. Îã: '%a/%A/%T - %t.mp3' ¤ä '%o'."
-"Ê£¿ô¤Î·Á¼°¾ðÊó¤ò¥»¥ß¥³¥í¥ó¤Ç¶èÀڤäÆϢ³¤·¤Æ½ñ¤¯¤³¤È¤¬¤Ç¤¤Þ¤¹ -- gtkpod ¤Ï¤É"
-"¤Î·Á¼°¤ò»È¤¨¤Ð¤¤¤¤¤«¤ò, ¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤«¤éȽÃǤ·¤Þ¤¹.¥¢¡¼¥Æ¥£¥¹¥È: %a, ¥¢"
-"¥ë¥Ð¥à: %A, ºî¶Ê¼Ô: %c, ̾Á°: %t, ¥¸¥ã¥ó¥ë: %G, ¶ÊÈÖ¹æ: %T, ¥Ç¥£¥¹¥¯ÈÖ¹æ: %"
-"C, ǯ: %Y, ¸µ¤Î¥Õ¥¡¥¤¥ë̾ (³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë¤¬É¬Í×): %o, ¡Ö%¡×: %%."
+"æ›²æƒ…å ±ã‚’æŠ½å‡ºã™ã‚‹ãŸã‚ã®å½¢å¼æƒ…å ±ã‚’è¨å®šã—ã¾ã™. 例: '%a/%A/%T - %t.mp3' ã‚„ '%o'."
+"複数ã®å½¢å¼æƒ…å ±ã‚’ã‚»ãƒŸã‚³ãƒãƒ³ã§åŒºåˆ‡ã£ã¦é€£ç¶šã—ã¦æ›¸ãã“ã¨ãŒã§ãã¾ã™ -- gtkpod ã¯ã©"
+"ã®å½¢å¼ã‚’使ãˆã°ã„ã„ã‹ã‚’, ファイルåã®æ‹¡å¼µåã‹ã‚‰åˆ¤æ–ã—ã¾ã™.アーティスト: %a, ã‚¢"
+"ルãƒãƒ : %A, 作曲者: %c, åå‰: %t, ジャンル: %G, 曲番å·: %T, ディスク番å·: %"
+"C, å¹´: %Y, å…ƒã®ãƒ•ã‚¡ã‚¤ãƒ«å (æ‹¡å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¿…è¦): %o, 「%ã€: %%."
-#: ../data/gtkpod.glade.h:135
+#: ../data/gtkpod.glade.h:134
#, no-c-format
msgid ""
"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -570,14 +598,14 @@
"year: %Y, original filename (requires extended information file): %o, "
"current playlist: %p, the character '%': %%."
msgstr ""
-"iPod¤«¤é¥³¥Ô¡¼¤·¤¿¶Ê¤ËÉÕ¤±¤é¤ì¤ë¥Õ¥¡¥¤¥ë̾¤òÀßÄꤷ¤Þ¤¹. Îã:'%a/%A/%T - %t."
-"mp3' ¤ä '%o'. Ê£¿ô¤Î½ñ¼°¤ò¥»¥ß¥³¥í¥ó¤Ç¶èÀڤäÆϢ³¤·¤Æ½ñ¤¯¤³¤È¤â¤Ç¤¤Þ¤¹ -- "
-"gtkpod ¤Ï¤É¤Î½ñ¼°¤ò»È¤¨¤Ð¤¤¤¤¤«¤ò, ¥Õ¥¡¥¤¥ë̾¤Î³ÈÄ¥»Ò¤«¤éȽÃǤ·¤Þ¤¹.¥¢¡¼¥Æ¥£"
-"¥¹¥È: %a, ¥¢¥ë¥Ð¥à: %A, ºî¶Ê¼Ô: %c, ̾Á°: %t, ¥¸¥ã¥ó¥ë: %G, ¶ÊÈÖ¹æ: %T, ¥Ç¥£"
-"¥¹¥¯ÈÖ¹æ: %C, ǯ: %Y, ¸µ¤Î¥Õ¥¡¥¤¥ë̾ (³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë¤¬É¬Í×): %o, ¥×¥ì¥¤¥ê¥¹"
-"¥È: %p, ¡Ö%¡×: %%."
+"iPodã‹ã‚‰ã‚³ãƒ”ーã—ãŸæ›²ã«ä»˜ã‘られるファイルåã‚’è¨å®šã—ã¾ã™. 例:'%a/%A/%T - %t."
+"mp3' ã‚„ '%o'. 複数ã®æ›¸å¼ã‚’セミコãƒãƒ³ã§åŒºåˆ‡ã£ã¦é€£ç¶šã—ã¦æ›¸ãã“ã¨ã‚‚ã§ãã¾ã™ -- "
+"gtkpod ã¯ã©ã®æ›¸å¼ã‚’使ãˆã°ã„ã„ã‹ã‚’, ファイルåã®æ‹¡å¼µåã‹ã‚‰åˆ¤æ–ã—ã¾ã™.アーティ"
+"スト: %a, アルãƒãƒ : %A, 作曲者: %c, åå‰: %t, ジャンル: %G, 曲番å·: %T, ディ"
+"スク番å·: %C, å¹´: %Y, å…ƒã®ãƒ•ã‚¡ã‚¤ãƒ«å (æ‹¡å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¿…è¦): %o, プレイリス"
+"ト: %p, 「%ã€: %%."
-#: ../data/gtkpod.glade.h:137
+#: ../data/gtkpod.glade.h:136
#, fuzzy, no-c-format
msgid ""
"Determines the name of the file with the cover art. You can separate several "
@@ -587,189 +615,189 @@
"filename without file extension: %O, current playlist: %p, the character "
"'%': %%."
msgstr ""
-"iPod¤«¤é¥³¥Ô¡¼¤·¤¿¶Ê¤ËÉÕ¤±¤é¤ì¤ë¥Õ¥¡¥¤¥ë̾¤òÀßÄꤷ¤Þ¤¹¡£Îã:'%A/%d%t - %n' ¤ä "
-"'%o' ¤Ê¤É¡£%A: ¥¢¡¼¥Æ¥£¥¹¥È; %n: ¥¿¥¤¥È¥ë; %t: ¥È¥é¥Ã¥¯No.; %o: ¸µ¤Î¥Õ¥¡¥¤¥ë"
-"̾ (³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë¤¬É¬Í×)"
+"iPodã‹ã‚‰ã‚³ãƒ”ーã—ãŸæ›²ã«ä»˜ã‘られるファイルåã‚’è¨å®šã—ã¾ã™ã€‚例:'%A/%d%t - %n' ã‚„ "
+"'%o' ãªã©ã€‚%A: アーティスト; %n: タイトル; %t: トラックNo.; %o: å…ƒã®ãƒ•ã‚¡ã‚¤ãƒ«"
+"å (æ‹¡å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¿…è¦)"
-#: ../data/gtkpod.glade.h:138
+#: ../data/gtkpod.glade.h:137
msgid ""
"Directories to sync with are determined from the filenames of the tracks in "
"the playlist."
msgstr ""
-#: ../data/gtkpod.glade.h:139
-msgid "Dirs"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê"
-
-#: ../data/gtkpod.glade.h:140
+#: ../data/gtkpod.glade.h:138
msgid "Display a list of tracks that could actually be updated."
-msgstr "¼ÂºÝ¤Ë¹¹¿·¤µ¤ì¤¿¶Ê¤Î¥ê¥¹¥È¤òɽ¼¨¤·¤Þ¤¹¡£"
+msgstr "実際ã«æ›´æ–°ã•ã‚ŒãŸæ›²ã®ãƒªã‚¹ãƒˆã‚’表示ã—ã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:141
+#: ../data/gtkpod.glade.h:139
msgid "Display a list of tracks that could not be updated."
-msgstr "¼ÂºÝ¤Ë¤Ï¹¹¿·¤µ¤ì¤Ê¤«¤Ã¤¿¶Ê¤Î¥ê¥¹¥È¤òɽ¼¨¤·¤Þ¤¹¡£"
+msgstr "実際ã«ã¯æ›´æ–°ã•ã‚Œãªã‹ã£ãŸæ›²ã®ãƒªã‚¹ãƒˆã‚’表示ã—ã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:142
+#: ../data/gtkpod.glade.h:140
msgid "Display conversion log"
msgstr ""
-#: ../data/gtkpod.glade.h:143
+#: ../data/gtkpod.glade.h:141
msgid "Display info about detected duplicates"
-msgstr "½ÅÊ£¤ò¸«¤Ä¤±¤¿ºÝ¤ËÊó¹ð¤¹¤ë"
+msgstr "é‡è¤‡ã‚’見ã¤ã‘ãŸéš›ã«å ±å‘Šã™ã‚‹"
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:142
msgid "Display info about non-updated tracks"
-msgstr "¹¹¿·¤µ¤ì¤Ê¤«¤Ã¤¿¶Ê¤òɽ¼¨¤¹¤ë"
+msgstr "æ›´æ–°ã•ã‚Œãªã‹ã£ãŸæ›²ã‚’表示ã™ã‚‹"
-#: ../data/gtkpod.glade.h:145
+#: ../data/gtkpod.glade.h:143
msgid "Display info about updated tracks"
-msgstr "¹¹¿·¤µ¤ì¤¿¶Ê¤Î¾ðÊó¤òɽ¼¨¤¹¤ë"
+msgstr "æ›´æ–°ã•ã‚ŒãŸæ›²ã®æƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹"
-#: ../data/gtkpod.glade.h:146
+#: ../data/gtkpod.glade.h:144
msgid "Display messages and warnings at startup"
-msgstr "µ¯Æ°»þ¤Ë¥á¥Ã¥»¡¼¥¸¤ä·Ù¹ð¤òɽ¼¨¤¹¤ë"
+msgstr "起動時ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚„è¦å‘Šã‚’表示ã™ã‚‹"
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:145
msgid ""
"Display the list of duplicates that have been detected after adding files."
-msgstr "¥Õ¥¡¥¤¥ë¤òÄɲä·¤¿ºÝ¤Ëȯ¸«¤·¤¿¡¢½ÅÊ£¤¹¤ë¶Ê¤Î¥ê¥¹¥È¤òɽ¼¨¤·¤Þ¤¹¡£"
+msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã—ãŸéš›ã«ç™ºè¦‹ã—ãŸã€é‡è¤‡ã™ã‚‹æ›²ã®ãƒªã‚¹ãƒˆã‚’表示ã—ã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:148
+#: ../data/gtkpod.glade.h:146
msgid "Display toolbar..."
-msgstr "¥Ä¡¼¥ë¥Ð¡¼¤Îɽ¼¨..."
+msgstr "ツールãƒãƒ¼ã®è¡¨ç¤º..."
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:147
msgid "Display tooltips in main window"
-msgstr "¥Ä¡¼¥ë¥Á¥Ã¥×¤ò¥á¥¤¥ó²èÌ̤Çɽ¼¨¤¹¤ë"
+msgstr "ツールãƒãƒƒãƒ—をメイン画é¢ã§è¡¨ç¤ºã™ã‚‹"
-#: ../data/gtkpod.glade.h:150
+#: ../data/gtkpod.glade.h:148
msgid "Display tooltips in prefs window"
-msgstr "¥Ä¡¼¥ë¥Á¥Ã¥×¤òÀßÄê²èÌ̤Çɽ¼¨¤¹¤ë"
+msgstr "ツールãƒãƒƒãƒ—ã‚’è¨å®šç”»é¢ã§è¡¨ç¤ºã™ã‚‹"
-#: ../data/gtkpod.glade.h:151
+#: ../data/gtkpod.glade.h:149
msgid "Display tracks that match the criteria entered above."
-msgstr "¾å¤Ç»ØÄꤵ¤ì¤¿¾ò·ï¤Ë¹çÃפ¹¤ë¶Ê¤òɽ¼¨¤·¤Þ¤¹."
+msgstr "上ã§æŒ‡å®šã•ã‚ŒãŸæ¡ä»¶ã«åˆè‡´ã™ã‚‹æ›²ã‚’表示ã—ã¾ã™."
-#: ../data/gtkpod.glade.h:152
+#: ../data/gtkpod.glade.h:150
msgid ""
"Displayed\n"
"Tracks"
msgstr ""
-"ɽ¼¨¤µ¤ì\n"
-"¤Æ¤¤¤ë¶Ê"
+"表示ã•ã‚Œ\n"
+"ã¦ã„る曲"
-#: ../data/gtkpod.glade.h:154
+#: ../data/gtkpod.glade.h:152
+#, fuzzy
+msgid "Displayed:"
+msgstr "表示(_D)"
+
+#: ../data/gtkpod.glade.h:153
msgid "Don't allow file duplication"
-msgstr "¥Õ¥¡¥¤¥ë¤Î½ÅÊ£¤òµö¤µ¤Ê¤¤"
+msgstr "ファイルã®é‡è¤‡ã‚’許ã•ãªã„"
-#: ../data/gtkpod.glade.h:155
+#: ../data/gtkpod.glade.h:154
#, fuzzy
msgid "Don't automatically sync on startup"
-msgstr "µ¯Æ°»þ¤Ë¼«Æ°Åª¤Ë iTunesDB ¤òÆɤ߹þ¤à"
+msgstr "起動時ã«è‡ªå‹•çš„ã« iTunesDB ã‚’èªã¿è¾¼ã‚€"
-#: ../data/gtkpod.glade.h:156
-msgid "Download Cover"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:157
+#: ../data/gtkpod.glade.h:155
#, fuzzy
msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
-msgstr "md5¤òÍøÍѤ·¤¿½ÅÊ£¥Á¥§¥Ã¥¯¤ò¹Ô¤¦¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£"
+msgstr "md5を利用ã—ãŸé‡è¤‡ãƒã‚§ãƒƒã‚¯ã‚’è¡Œã†ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:158
+#: ../data/gtkpod.glade.h:156
msgid "Edit Repository/iPod Options"
-msgstr "iPod ¤ÎÀßÄê"
+msgstr "iPod ã®è¨å®š"
-#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:659
+#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
msgid "Edit Smart Playlist"
-msgstr "¥¹¥Þ¡¼¥È¥×¥ì¥¤¥ê¥¹¥È¤ÎÊÔ½¸"
+msgstr "スマートプレイリストã®ç·¨é›†"
-#: ../data/gtkpod.glade.h:160 ../src/context_menus.c:746
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
msgid "Edit Track Details"
-msgstr "¶Ê¾ðÊó¤òÊÔ½¸"
+msgstr "æ›²æƒ…å ±ã‚’ç·¨é›†"
-#: ../data/gtkpod.glade.h:161
+#: ../data/gtkpod.glade.h:159
msgid "Edit _Preferences"
-msgstr "ÀßÄê(_P)"
+msgstr "è¨å®š(_P)"
-#: ../data/gtkpod.glade.h:162
+#: ../data/gtkpod.glade.h:160
msgid "Effective free space"
-msgstr "¶õ¤ÍÆÎÌ"
+msgstr "空ã容é‡"
-#: ../data/gtkpod.glade.h:163
+#: ../data/gtkpod.glade.h:161
msgid "Empty Playlist"
-msgstr "¶õ¥ê¥¹¥È"
+msgstr "空リスト"
-#: ../data/gtkpod.glade.h:164
+#: ../data/gtkpod.glade.h:162
msgid "Exclude file mask(s)"
-msgstr "ŬÍѤ·¤Ê¤¤¥Õ¥¡¥¤¥ë"
+msgstr "é©ç”¨ã—ãªã„ファイル"
-#: ../data/gtkpod.glade.h:165
+#: ../data/gtkpod.glade.h:163
+#, fuzzy
+msgid "Export can be continued at a later time if canceled."
+msgstr ""
+"ボタンを押ã™ã¨ä¸æ–ã—ã¾ã™ã€‚\n"
+"ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã¯å¾Œã§å†é–‹ã™ã‚‹äº‹ãŒã§ãã¾ã™ã€‚"
+
+#: ../data/gtkpod.glade.h:164
msgid "File size"
-msgstr "¥Õ¥¡¥¤¥ë¥µ¥¤¥º"
+msgstr "ファイルサイズ"
-#: ../data/gtkpod.glade.h:166
+#: ../data/gtkpod.glade.h:165
msgid "File size (deleted)"
-msgstr "ºï½ü¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥µ¥¤¥º"
+msgstr "削除ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚º"
-#: ../data/gtkpod.glade.h:167
+#: ../data/gtkpod.glade.h:166
msgid "File size (non-transferred)"
-msgstr "̤žÁ÷¤Î¥Õ¥¡¥¤¥ë¥µ¥¤¥º"
+msgstr "未転é€ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚º"
-#: ../data/gtkpod.glade.h:168
+#: ../data/gtkpod.glade.h:167
msgid "Filename Format: "
-msgstr "¥Õ¥¡¥¤¥ë̾¤Î½ñ¼°: "
+msgstr "ファイルåã®æ›¸å¼: "
-#: ../data/gtkpod.glade.h:169
-msgid "Files"
-msgstr "¥Õ¥¡¥¤¥ë"
-
-#: ../data/gtkpod.glade.h:170
+#: ../data/gtkpod.glade.h:168
#, fuzzy
msgid ""
"Find orphan files (files with no track info in DB) and dangling tracks "
"(tracks with no corresponding files on iPod)"
msgstr ""
-"¤ß¤Ê¤·¤´¥Õ¥¡¥¤¥ë (¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ë¶Ê¾ðÊó¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤Ê¤¤¥Õ¥¡¥¤¥ë) ¤ä¤Ö¤é¤µ¤¬"
-"¤ê¶Ê (¶Ê¾ðÊ󤬤¢¤ë¤Î¤Ë¥Õ¥¡¥¤¥ë¼«ÂΤ¬ iPod ¾å¤Ë¸ºß¤·¤Ê¤¤) ¤òõ¤¹"
+"ã¿ãªã—ã”ファイル (データベースã«æ›²æƒ…å ±ãŒç™»éŒ²ã•ã‚Œã¦ã„ãªã„ファイル) ã‚„ã¶ã‚‰ã•ãŒ"
+"り曲 (æ›²æƒ…å ±ãŒã‚ã‚‹ã®ã«ãƒ•ã‚¡ã‚¤ãƒ«è‡ªä½“㌠iPod 上ã«å˜åœ¨ã—ãªã„) を探ã™"
-#: ../data/gtkpod.glade.h:171
+#: ../data/gtkpod.glade.h:169
#, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
-msgstr "ºÇ½é¤Ë <i>folder.jpg</i> ¤ò»î¤·¡¢Ìµ¤±¤ì¤Ð <i><artist>.jpg</i>"
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgstr "最åˆã« <i>folder.jpg</i> を試ã—ã€ç„¡ã‘れ㰠<i><artist>.jpg</i>"
-#: ../data/gtkpod.glade.h:172
+#: ../data/gtkpod.glade.h:170
msgid "Flac with :"
msgstr ""
-#: ../data/gtkpod.glade.h:174
+#: ../data/gtkpod.glade.h:172
#, fuzzy, no-c-format
msgid ""
"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
"tracks and start playing."
msgstr ""
-"Î㤨¤Ð 'xmms -p %s' ¤È¤¹¤ë¤È¡¢xmms ¤Î¤½¤Î»þ¤Î¥×¥ì¥¤¥ê¥¹¥È¤ò¥¯¥ê¥¢¤·¡¢ÁªÂò¤·¤¿"
-"¶Ê¤ò¥×¥ì¥¤¥ê¥¹¥È¤ÎÀèƬ¤Ë²Ã¤¨¤Æ±éÁÕ¤ò»Ï¤á¤Þ¤¹¡£"
+"例ãˆã° 'xmms -p %s' ã¨ã™ã‚‹ã¨ã€xmms ã®ãã®æ™‚ã®ãƒ—レイリストをクリアã—ã€é¸æŠžã—ãŸ"
+"曲をプレイリストã®å…ˆé ã«åŠ ãˆã¦æ¼”å¥ã‚’始ã‚ã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:176
+#: ../data/gtkpod.glade.h:174
#, no-c-format
msgid ""
"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
"current playlist."
msgstr ""
-"Î㤨¤Ð 'xmms -e %s' ¤È¤¹¤ë¤È¡¢ÁªÂò¤µ¤ì¤¿¶Ê¤ò xmms ¤Î¤½¤Î»þ¤Î¥×¥ì¥¤¥ê¥¹¥È¤ÎºÇ"
-"¸åÈø¤ËÄɲä·¤Þ¤¹"
+"例ãˆã° 'xmms -e %s' ã¨ã™ã‚‹ã¨ã€é¸æŠžã•ã‚ŒãŸæ›²ã‚’ xmms ã®ãã®æ™‚ã®ãƒ—レイリストã®æœ€"
+"後尾ã«è¿½åŠ ã—ã¾ã™"
-#: ../data/gtkpod.glade.h:177 ../src/display_sorttabs.c:2957
+#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
msgid "Genre"
-msgstr "¥¸¥ã¥ó¥ë"
+msgstr "ジャンル"
-#: ../data/gtkpod.glade.h:178
+#: ../data/gtkpod.glade.h:176
msgid "Group artists on compilation CDs"
msgstr ""
-#: ../data/gtkpod.glade.h:179
+#: ../data/gtkpod.glade.h:177
#, fuzzy
msgid ""
"Highly recommended for faster import when taking advantage of the "
@@ -778,37 +806,37 @@
"case of file system corruption (change the \"transferred=\" entries in your "
"backuped database)."
msgstr ""
-"½ÅÊ£¥Á¥§¥Ã¥¯¤ò¹â®²½¤¹¤ë¤¿¤á¤Ë¤Ï¡¢¤³¤Î¹àÌܤò͸ú¤Ë¤¹¤ë»ö¤¬¶¯¤¯¿ä¾©¤µ¤ì¤Þ¤¹¡£"
-"¤Þ¤¿¡¢¥Õ¥¡¥¤¥ë̾¤òÊÝ»ý¤¹¤ë»ö¤ÇID3¥¿¥°¤ÎÊѹ¹¤òiPod¤ËÈ¿±Ç¤µ¤»¤ë»ö¤¬²Äǽ¤Ë¤Ê¤ê¡¢"
-"²¾¤ËiPod¤ÎÃæ¿È¤¬²õ¤ì¤¿¤ê¤·¤¿¾ì¹ç¤Ë¤â¡¢ºÆ¹½À®¤òÍưפˤ·¤Þ¤¹¡£(¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î"
-"¥Ð¥Ã¥¯¥¢¥Ã¥×¥Õ¥¡¥¤¥ë¤ÎÃæ¤Î \"transferred=\" ¤Î¹àÌܤòÊѹ¹¤¹¤ì¤Ð¤è¤¤)"
+"é‡è¤‡ãƒã‚§ãƒƒã‚¯ã‚’高速化ã™ã‚‹ãŸã‚ã«ã¯ã€ã“ã®é …目を有効ã«ã™ã‚‹äº‹ãŒå¼·ã推奨ã•ã‚Œã¾ã™ã€‚"
+"ã¾ãŸã€ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ä¿æŒã™ã‚‹äº‹ã§ID3ã‚¿ã‚°ã®å¤‰æ›´ã‚’iPodã«åæ˜ ã•ã›ã‚‹äº‹ãŒå¯èƒ½ã«ãªã‚Šã€"
+"ä»®ã«iPodã®ä¸èº«ãŒå£Šã‚ŒãŸã‚Šã—ãŸå ´åˆã«ã‚‚ã€å†æ§‹æˆã‚’容易ã«ã—ã¾ã™ã€‚(データベースã®"
+"ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ファイルã®ä¸ã® \"transferred=\" ã®é …目を変更ã™ã‚Œã°ã‚ˆã„)"
-#: ../data/gtkpod.glade.h:180 ../src/context_menus.c:682
-#: ../src/context_menus.c:700 ../src/context_menus.c:824
+#: ../data/gtkpod.glade.h:178 ../src/context_menus.c:685
+#: ../src/context_menus.c:703 ../src/context_menus.c:820
msgid "I'm sure"
msgstr ""
-#: ../data/gtkpod.glade.h:181
+#: ../data/gtkpod.glade.h:179
msgid ""
"If available, the local copy of the track is referenced in the playlist. "
"Otherwise the file on the iPod is used."
msgstr ""
-"²Äǽ¤Ç¤¢¤ì¤Ð, ¥×¥ì¥¤¥ê¥¹¥È¤Ï¤³¤Î¶Ê¤Î¥Ï¡¼¥É¥Ç¥£¥¹¥¯¾å¤Î¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Þ¤¹.¸«"
-"¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ë¤Ï iPod ¾å¤Î¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Þ¤¹."
+"å¯èƒ½ã§ã‚ã‚Œã°, プレイリストã¯ã“ã®æ›²ã®ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ä¸Šã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‚ç…§ã—ã¾ã™.見"
+"ã¤ã‹ã‚‰ãªã„å ´åˆã«ã¯ iPod 上ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‚ç…§ã—ã¾ã™."
-#: ../data/gtkpod.glade.h:182
+#: ../data/gtkpod.glade.h:180
msgid "If both options are selected, embedded APIC data takes precedence."
msgstr ""
-#: ../data/gtkpod.glade.h:183
+#: ../data/gtkpod.glade.h:181
msgid ""
"If checked, sorting will be case sensitive. Please note that case sensitive "
"sorting will not work well with most charsets."
msgstr ""
-"ʤٴ¹¤¨¤ÎºÝ¤Ë, ¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È¤ÎÂçʸ»ú¤È¾®Ê¸»ú¤ò¶èÊ̤·¤Þ¤¹. ¤³¤Îµ¡Ç½¤Ï¥¢¥ë"
-"¥Õ¥¡¥Ù¥Ã¥È°Ê³°¤Î¤Û¤È¤ó¤É¤Îʸ»ú¤Ë¤ÏÂбþ¤·¤Æ¤¤¤Þ¤»¤ó."
+"並ã¹æ›ãˆã®éš›ã«, アルファベットã®å¤§æ–‡å—ã¨å°æ–‡å—を区別ã—ã¾ã™. ã“ã®æ©Ÿèƒ½ã¯ã‚¢ãƒ«"
+"ファベット以外ã®ã»ã¨ã‚“ã©ã®æ–‡å—ã«ã¯å¯¾å¿œã—ã¦ã„ã¾ã›ã‚“."
-#: ../data/gtkpod.glade.h:184
+#: ../data/gtkpod.glade.h:182
msgid ""
"If the filename (full path) of an existing track matches that of a track to "
"be added, this option allows you to update the information about the "
@@ -816,151 +844,158 @@
"will take place if the file hasn't changed and you have selected the 'Don't "
"allow file duplication' option above."
msgstr ""
-"¤¹¤Ç¤ËµÏ¿¤µ¤ì¤Æ¤¤¤ë¶Ê¤ÈƱ¤¸¥Õ¥¡¥¤¥ë̾(¥Õ¥ë¥Ñ¥¹¤Ç)¤ò»ý¤Ä¶Ê¤òÄɲ䷤褦¤È¤·¤¿"
-"¾ì¹ç¡¢¤³¤Î¹àÌܤ¬Í¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤È¡¢¤½¤Î¶Ê¤ò̵»ë¤¹¤ëÂå¤ï¤ê¤ËµÏ¿¤µ¤ì¤Æ¤¤¤ë¶Ê"
-"¤Î¾ðÊó¤ò¹¹¿·¤·¤Þ¤¹¡£¤â¤·¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤¬¤Ê¤¯¡¢¡Ö¥Õ¥¡¥¤¥ë¤Î½ÅÊ£¤òµö¤µ¤Ê¤¤¡×¤Î"
-"¹àÌܤò͸ú¤Ë¤·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢¹¹¿·¤Ï¤Ê¤µ¤ì¤Þ¤»¤ó¡£"
+"ã™ã§ã«è¨˜éŒ²ã•ã‚Œã¦ã„る曲ã¨åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«å(フルパスã§)ã‚’æŒã¤æ›²ã‚’è¿½åŠ ã—よã†ã¨ã—ãŸ"
+"å ´åˆã€ã“ã®é …ç›®ãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã‚‹ã¨ã€ãã®æ›²ã‚’無視ã™ã‚‹ä»£ã‚ã‚Šã«è¨˜éŒ²ã•ã‚Œã¦ã„る曲"
+"ã®æƒ…å ±ã‚’æ›´æ–°ã—ã¾ã™ã€‚ã‚‚ã—ファイルã«å¤‰æ›´ãŒãªãã€ã€Œãƒ•ã‚¡ã‚¤ãƒ«ã®é‡è¤‡ã‚’許ã•ãªã„ã€ã®"
+"é …ç›®ã‚’æœ‰åŠ¹ã«ã—ã¦ã„ã‚‹å ´åˆã¯ã€æ›´æ–°ã¯ãªã•ã‚Œã¾ã›ã‚“。"
-#: ../data/gtkpod.glade.h:185
+#: ../data/gtkpod.glade.h:183
msgid "If you check this, gtkpod will descend into subdirectories recursively."
-msgstr "¤³¤Î¹àÌܤò͸ú¤Ë¤¹¤ë¤È¡¢gtkpod¤Ï¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤òºÆµ¢Åª¤Ëé¤ê¤Þ¤¹¡£"
+msgstr "ã“ã®é …目を有効ã«ã™ã‚‹ã¨ã€gtkpodã¯ã‚µãƒ–ディレクトリをå†å¸°çš„ã«è¾¿ã‚Šã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:186
+#: ../data/gtkpod.glade.h:184
msgid ""
"If you check this, information (cover art and meta information) changed for "
"this track will be copied to all other selected tracks as well. Use with "
"care."
msgstr ""
-#: ../data/gtkpod.glade.h:187
+#: ../data/gtkpod.glade.h:185
msgid ""
"If you don't select the master playlist automatically, the initial database "
"import is much faster because the display dosn't have to be updated."
msgstr ""
-"¥Þ¥¹¥¿¡¼¥×¥ì¥¤¥ê¥¹¥È¤ò¼«Æ°Åª¤ËÁªÂò¤·¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤È¡¢µ¯Æ°»þ¤Ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò"
-"Æɤ߹þ¤àºÝ¤Ë¤Ï²¿¤âɽ¼¨¤·¤Ê¤¯¤Ê¤ë¤Î¤Ç¡¢¥¹¥Ô¡¼¥É¤¬Â®¤¯¤Ê¤ê¤Þ¤¹¡£"
+"マスタープレイリストを自動的ã«é¸æŠžã—ãªã„よã†ã«ã™ã‚‹ã¨ã€èµ·å‹•æ™‚ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’"
+"èªã¿è¾¼ã‚€éš›ã«ã¯ä½•ã‚‚表示ã—ãªããªã‚‹ã®ã§ã€ã‚¹ãƒ”ードãŒé€Ÿããªã‚Šã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:188
+#: ../data/gtkpod.glade.h:186
msgid ""
"If you select several tracks in the track list and edit a tag of the first "
"track, the tags in the other tracks are updated as well."
msgstr ""
-"¶Ê¥ê¥¹¥È¤Î¶Ê¤òÆó¤Ä°Ê¾åÁªÂò¤·¤Æ¡¢ºÇ½é¤Î¶Ê¤Î¥¿¥°¤òÊѹ¹¤¹¤ë¤È¾¤Î¶Ê¤Ë¤â¤½¤ÎÊѹ¹"
-"¤òŬÍѤ·¤Þ¤¹¡£"
+"曲リストã®æ›²ã‚’二ã¤ä»¥ä¸Šé¸æŠžã—ã¦ã€æœ€åˆã®æ›²ã®ã‚¿ã‚°ã‚’変更ã™ã‚‹ã¨ä»–ã®æ›²ã«ã‚‚ãã®å¤‰æ›´"
+"ã‚’é©ç”¨ã—ã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:189
+#: ../data/gtkpod.glade.h:187
msgid "Ignore these words when at the beginning of the following fields:"
-msgstr "¤³¤ì¤é¤Î¸ì¤¬°Ê²¼¤Î¹àÌܤÎËÁƬ¤Ë¤¢¤Ã¤¿¾ì¹ç¤Ë¤Ï̵»ë¤·¤Þ¤¹:"
+msgstr "ã“れらã®èªžãŒä»¥ä¸‹ã®é …ç›®ã®å†’é ã«ã‚ã£ãŸå ´åˆã«ã¯ç„¡è¦–ã—ã¾ã™:"
-#: ../data/gtkpod.glade.h:190
+#: ../data/gtkpod.glade.h:188
msgid ""
"In order to save the displayed track order to the iPod choose 'Save "
"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
msgstr ""
-"ɽ¼¨¤µ¤ì¤Æ¤¤¤ë¶Ê½ç¤ò iPod ¤ËÊݸ¤¹¤ë¤Ë¤Ï,¡ÖÊÔ½¸¡×¥á¥Ë¥å¡¼¤«¤é¡Ö¸½ºß¤Î¶Ê½ç¤òÊÝ"
-"¸¡×¤òÁªÂò¤¹¤ë¤«, ¤³¤Î²¼¤Î¡Ö¼«Æ°Êݸ¡×¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤."
+"表示ã•ã‚Œã¦ã„ã‚‹æ›²é †ã‚’ iPod ã«ä¿å˜ã™ã‚‹ã«ã¯,「編集ã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‹ã‚‰ã€Œç¾åœ¨ã®æ›²é †ã‚’ä¿"
+"å˜ã€ã‚’é¸æŠžã™ã‚‹ã‹, ã“ã®ä¸‹ã®ã€Œè‡ªå‹•ä¿å˜ã€ã‚’é¸æŠžã—ã¦ãã ã•ã„."
-#: ../data/gtkpod.glade.h:191
+#: ../data/gtkpod.glade.h:189
msgid "Initialize iPod"
msgstr ""
-#: ../data/gtkpod.glade.h:192
+#: ../data/gtkpod.glade.h:190
msgid ""
"Insert before\n"
"Insert after"
msgstr ""
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:192
msgid "Keeps all compilation CDs grouped together in the artists sort tab."
msgstr ""
-#: ../data/gtkpod.glade.h:195
+#: ../data/gtkpod.glade.h:193
msgid "Live _updating"
msgstr ""
-#: ../data/gtkpod.glade.h:196
+#: ../data/gtkpod.glade.h:194
msgid "Load iPod(s)"
-msgstr "iPod ¤«¤éÆɤ߹þ¤ß"
+msgstr "iPod ã‹ã‚‰èªã¿è¾¼ã¿"
-#: ../data/gtkpod.glade.h:197
+#: ../data/gtkpod.glade.h:195
msgid "Lower Margin"
-msgstr "²¼¸Â"
+msgstr "下é™"
-#: ../data/gtkpod.glade.h:198
+#: ../data/gtkpod.glade.h:196
msgid "M4A with :"
msgstr ""
-#: ../data/gtkpod.glade.h:199
+#: ../data/gtkpod.glade.h:197
msgid "MP3 with :"
msgstr ""
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:198
msgid "Match al_l of the following"
-msgstr "°Ê²¼¤Î¤¹¤Ù¤Æ¤Ë³ºÅö¤¹¤ë¤â¤Î(_l)"
+msgstr "以下ã®ã™ã¹ã¦ã«è©²å½“ã™ã‚‹ã‚‚ã®(_l)"
-#: ../data/gtkpod.glade.h:201
+#: ../data/gtkpod.glade.h:199
msgid "Match an_y of the following"
-msgstr "°Ê²¼¤Î¤¤¤º¤ì¤«¤Ë³ºÅö¤¹¤ë¤â¤Î(_y)"
+msgstr "以下ã®ã„ãšã‚Œã‹ã«è©²å½“ã™ã‚‹ã‚‚ã®(_y)"
-#: ../data/gtkpod.glade.h:202
+#: ../data/gtkpod.glade.h:200
msgid "Match only _checked tracks"
msgstr ""
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:201
msgid "Maximum number of background threads:"
msgstr ""
-#: ../data/gtkpod.glade.h:204
+#: ../data/gtkpod.glade.h:202
msgid "Maximum size of cache directory (in GB):"
msgstr ""
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:203
msgid "Model:"
msgstr ""
-#: ../data/gtkpod.glade.h:206 ../src/display_tracks.c:1993
+#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
msgid "Modified"
-msgstr "Êѹ¹Æü"
+msgstr "変更日"
-#: ../data/gtkpod.glade.h:207
+#: ../data/gtkpod.glade.h:205
msgid "Most Recently Played Tracks"
-msgstr "ºÇ¶áºÆÀ¸¤µ¤ì¤¿¶Ê"
+msgstr "最近å†ç”Ÿã•ã‚ŒãŸæ›²"
-#: ../data/gtkpod.glade.h:208
+#: ../data/gtkpod.glade.h:206
+msgid "Move selected attributes to the displayed list"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:207
msgid "Music Root:"
msgstr ""
-#: ../data/gtkpod.glade.h:209
+#: ../data/gtkpod.glade.h:208
msgid ""
"Music files can have images embedded in the APIC tag. Currently this is only "
"supported for MP3 files."
msgstr ""
-#: ../data/gtkpod.glade.h:210
+#: ../data/gtkpod.glade.h:209
msgid "Never show this dialogue again"
-msgstr "¤³¤Î¼ÁÌä¤òÆóÅÙ¤Èɽ¼¨¤·¤Ê¤¤"
+msgstr "ã“ã®è³ªå•ã‚’二度ã¨è¡¨ç¤ºã—ãªã„"
+#: ../data/gtkpod.glade.h:210 ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66 ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93 ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428 ../src/misc_playlist.c:430
+msgid "New Playlist"
+msgstr "æ–°è¦ãƒ—レイリスト"
+
#: ../data/gtkpod.glade.h:211
-msgid "New PL"
-msgstr "¿·µ¬¥×¥ì¥¤¥ê¥¹¥È"
+msgid "No lower margin"
+msgstr "下é™ã‚’指定ã—ãªã„"
#: ../data/gtkpod.glade.h:212
-msgid "No lower margin"
-msgstr "²¼¸Â¤ò»ØÄꤷ¤Ê¤¤"
+msgid "No upper margin"
+msgstr "上é™ã‚’指定ã—ãªã„"
#: ../data/gtkpod.glade.h:213
-msgid "No upper margin"
-msgstr "¾å¸Â¤ò»ØÄꤷ¤Ê¤¤"
+msgid "Non-transferred tracks"
+msgstr "未転é€ã®æ›²æ•°"
#: ../data/gtkpod.glade.h:214
-msgid "Non-transferred tracks"
-msgstr "̤žÁ÷¤Î¶Ê¿ô"
+msgid "None"
+msgstr "無指定"
#: ../data/gtkpod.glade.h:215
-msgid "None"
-msgstr "̵»ØÄê"
-
-#: ../data/gtkpod.glade.h:216
msgid ""
"Normally the charset specified when first importing the track will be used "
"for the filename. If you set this option you can set a different charset "
@@ -969,14 +1004,14 @@
"Preferences/'Writing of the iTunesDB'). Tracks imported before V0.51 will "
"have no charset stored. Instead the charset specified will be used."
msgstr ""
-"Ä̾ï¤Ï, ºÇ½é¤Ë¶Ê¤òÅÐÏ¿¤·¤¿»þ¤Ë»ØÄꤵ¤ì¤¿Ê¸»ú¥³¡¼¥É¤ò¥Õ¥¡¥¤¥ë̾¤Ë¤â»ÈÍѤ·¤Þ¤¹"
-"¤¬, ¤³¤Î¹àÌܤò͸ú¤Ë¤¹¤ë¤È, ÀßÄê¥á¥Ë¥å¡¼¤Î¡ÖÄɲÃ/¹¹¿·/Ʊ´ü¡×¤Î¹àÌܤǻØÄꤷ¤¿"
-"ʸ»ú¥³¡¼¥É¤ò¤«¤ï¤ê¤Ë»ÈÍѤǤ¤Þ¤¹. Ãí°Õ: ʸ»ú¥³¡¼¥É¤Î¾ðÊó¤Ï³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë "
-"(¡ÖiTunesDB¤Ø¤Î½ñ¤¹þ¤ß¡×¤ò»²¾È)¤ËµÏ¿¤µ¤ì¤Þ¤¹. ¥Ð¡¼¥¸¥ç¥ó0.51°ÊÁ°¤Î gtkpod "
-"¤ÇÅÐÏ¿¤µ¤ì¤¿¶Ê¤Ë¤Ï¤³¤Î¾ðÊ󤬵Ͽ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó. ¤³¤Î¾ì¹ç, ¾å¤Ç»ØÄꤵ¤ì¤¿Ê¸»ú"
-"¥³¡¼¥É¤¬º£¸å»È¤ï¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹."
+"通常ã¯, 最åˆã«æ›²ã‚’登録ã—ãŸæ™‚ã«æŒ‡å®šã•ã‚ŒãŸæ–‡å—コードをファイルåã«ã‚‚使用ã—ã¾ã™"
+"ãŒ, ã“ã®é …目を有効ã«ã™ã‚‹ã¨, è¨å®šãƒ¡ãƒ‹ãƒ¥ãƒ¼ã®ã€Œè¿½åŠ /æ›´æ–°/åŒæœŸã€ã®é …ç›®ã§æŒ‡å®šã—ãŸ"
+"æ–‡å—コードをã‹ã‚ã‚Šã«ä½¿ç”¨ã§ãã¾ã™. 注æ„: æ–‡å—コードã®æƒ…å ±ã¯æ‹¡å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ« "
+"(「iTunesDBã¸ã®æ›¸ãè¾¼ã¿ã€ã‚’å‚ç…§)ã«è¨˜éŒ²ã•ã‚Œã¾ã™. ãƒãƒ¼ã‚¸ãƒ§ãƒ³0.51以å‰ã® gtkpod "
+"ã§ç™»éŒ²ã•ã‚ŒãŸæ›²ã«ã¯ã“ã®æƒ…å ±ãŒè¨˜éŒ²ã•ã‚Œã¦ã„ã¾ã›ã‚“. ã“ã®å ´åˆ, 上ã§æŒ‡å®šã•ã‚ŒãŸæ–‡å—"
+"コードãŒä»Šå¾Œä½¿ã‚れるよã†ã«ãªã‚Šã¾ã™."
-#: ../data/gtkpod.glade.h:217
+#: ../data/gtkpod.glade.h:216
msgid ""
"Normally the charset specified when first importing the track will be used "
"to update the track information. If you have chosen a wrong charset when "
@@ -986,14 +1021,14 @@
"imported before V0.51 will have no charset stored. Instead the charset "
"specified above will be used then."
msgstr ""
-"Ä̾ï¤Ï, ¶Ê¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ëºÝ¤Ë»ØÄꤵ¤ì¤¿Ê¸»ú¥³¡¼¥É¤¬¤½¤Î¸å¤â»È¤ï¤ì¤Þ¤¹¤¬, ¤â"
-"¤·¤½¤Î»þ¤Ë´Ö°ã¤Ã¤¿Ê¸»ú¥³¡¼¥É¤ò»ØÄꤷ¤Æ¤·¤Þ¤Ã¤Æ¤¤¤Æ,¡Ö¶Ê¤Î¹¹¿·¡×¤ò»È¤Ã¤Æ¤½¤ì¤ò"
-"ľ¤·¤¿¤¤¤Î¤Ç¤¢¤ì¤Ð, ¤³¤Î¹àÌܤò͸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤. Ãí°Õ: ʸ»ú¥³¡¼¥É¤Î¾ðÊó¤Ï³È"
-"Ä¥¾ðÊó¥Õ¥¡¥¤¥ë¤ËµÏ¿¤µ¤ì¤Þ¤¹¤¬(¡ÖiTunesDB¤Ø¤Î½ñ¤¹þ¤ß¡×¤Î¹àÌܤò»²¾È), ¥Ð¡¼"
-"¥¸¥ç¥ó0.51°ÊÁ°¤Î gtkpod ¤Ç¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤¿¶Ê¤Ï¤³¤Î¾ðÊ󤬵Ͽ¤µ¤Æ¤¤¤Þ¤»¤ó. ¤³"
-"¤Î¾ì¹ç, ¤³¤³¤Ç»ØÄꤵ¤ì¤¿Ê¸»ú¥³¡¼¥É¤¬º£¸å»È¤ï¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹."
+"通常ã¯, 曲をインãƒãƒ¼ãƒˆã™ã‚‹éš›ã«æŒ‡å®šã•ã‚ŒãŸæ–‡å—コードãŒãã®å¾Œã‚‚使ã‚ã‚Œã¾ã™ãŒ, ã‚‚"
+"ã—ãã®æ™‚ã«é–“é•ã£ãŸæ–‡å—コードを指定ã—ã¦ã—ã¾ã£ã¦ã„ã¦,「曲ã®æ›´æ–°ã€ã‚’使ã£ã¦ãれを"
+"ç›´ã—ãŸã„ã®ã§ã‚ã‚Œã°, ã“ã®é …目を有効ã«ã—ã¦ãã ã•ã„. 注æ„: æ–‡å—コードã®æƒ…å ±ã¯æ‹¡"
+"å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ«ã«è¨˜éŒ²ã•ã‚Œã¾ã™ãŒ(「iTunesDBã¸ã®æ›¸ãè¾¼ã¿ã€ã®é …目をå‚ç…§), ãƒãƒ¼"
+"ジョン0.51以å‰ã® gtkpod ã§ã‚¤ãƒ³ãƒãƒ¼ãƒˆã•ã‚ŒãŸæ›²ã¯ã“ã®æƒ…å ±ãŒè¨˜éŒ²ã•ã¦ã„ã¾ã›ã‚“. ã“"
+"ã®å ´åˆ, ã“ã“ã§æŒ‡å®šã•ã‚ŒãŸæ–‡å—コードãŒä»Šå¾Œä½¿ã‚れるよã†ã«ãªã‚Šã¾ã™."
-#: ../data/gtkpod.glade.h:218
+#: ../data/gtkpod.glade.h:217
msgid ""
"Normally the charset specified when first importing the track will be used "
"to write the tags. If you have chosen a wrong charset when first importing a "
@@ -1003,15 +1038,15 @@
"before V0.51 will have no charset stored -- the charset specified on the "
"'Input/Output' page will be used."
msgstr ""
-"Ä̾ï¤Ï¡¢ºÇ½é¤Ë¶Ê¤òÊݸ¤·¤¿»þ¤Ë»ØÄꤵ¤ì¤¿Ê¸»ú¥³¡¼¥É¤ò¥¿¥°¤ò½ñ¤¹þ¤à»þ¤Ë¤â»ÈÍÑ"
-"¤·¤Þ¤¹¡£¤â¤·ºÇ½é¤Ë´Ö°ã¤Ã¤¿Ê¸»ú¥³¡¼¥É¤ò»ØÄꤷ¤Æ¤·¤Þ¤Ã¤¿¾ì¹ç¤Ë¤Ï¡¢Àµ¤·¤¤Ê¸»ú"
-"¥³¡¼¥É¤òÁªÂò¤·¤¿¸å¤Ë¤³¤Î¥ª¥×¥·¥ç¥ó¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£Ãí°Õ: ʸ»ú¥³¡¼¥É¤Î¾ðÊó"
-"¤òÊݸ¤¹¤ë¤¿¤á¤Ë¡¢³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤(¡ÖÆþ½ÐÎϡפΥڡ¼¥¸¤Î"
-"¡ÖiTunesDB¤Ø¤Î½ñ¤¹þ¤ß¡×¤Î¹à¤ò»²¾È)¡£¤Þ¤¿¡¢¥Ð¡¼¥¸¥ç¥ó0.51°ÊÁ°¤ËÅÐÏ¿¤µ¤ì¤¿¶Ê¤Ë"
-"¤Ä¤¤¤Æ¤Ïʸ»ú¥³¡¼¥É¾ðÊó¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£¡ÖÆþ½ÐÎϡפιàÌܤǻØÄꤵ¤ì¤¿Ê¸»ú"
-"¥³¡¼¥É¤¬Å¬ÍѤµ¤ì¤Þ¤¹¡£"
+"通常ã¯ã€æœ€åˆã«æ›²ã‚’ä¿å˜ã—ãŸæ™‚ã«æŒ‡å®šã•ã‚ŒãŸæ–‡å—コードをタグを書ã込む時ã«ã‚‚使用"
+"ã—ã¾ã™ã€‚ã‚‚ã—最åˆã«é–“é•ã£ãŸæ–‡å—コードを指定ã—ã¦ã—ã¾ã£ãŸå ´åˆã«ã¯ã€æ£ã—ã„æ–‡å—"
+"コードをé¸æŠžã—ãŸå¾Œã«ã“ã®ã‚ªãƒ—ションをé¸æŠžã—ã¦ãã ã•ã„。注æ„: æ–‡å—コードã®æƒ…å ±"
+"ã‚’ä¿å˜ã™ã‚‹ãŸã‚ã«ã€æ‹¡å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ä½¿ç”¨ã—ã¦ãã ã•ã„(「入出力ã€ã®ãƒšãƒ¼ã‚¸ã®"
+"「iTunesDBã¸ã®æ›¸ãè¾¼ã¿ã€ã®é …ã‚’å‚ç…§)。ã¾ãŸã€ãƒãƒ¼ã‚¸ãƒ§ãƒ³0.51以å‰ã«ç™»éŒ²ã•ã‚ŒãŸæ›²ã«"
+"ã¤ã„ã¦ã¯æ–‡å—ã‚³ãƒ¼ãƒ‰æƒ…å ±ãŒä¿å˜ã•ã‚Œã¦ã„ã¾ã›ã‚“。「入出力ã€ã®é …ç›®ã§æŒ‡å®šã•ã‚ŒãŸæ–‡å—"
+"コードãŒé©ç”¨ã•ã‚Œã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:219
+#: ../data/gtkpod.glade.h:218
msgid ""
"Normally, if a track is no longer present in the sync directory, it will be "
"removed from the playlist, but not from the iPod or local repository.\n"
@@ -1023,447 +1058,448 @@
"means removing from the iPod."
msgstr ""
-#: ../data/gtkpod.glade.h:222
+#: ../data/gtkpod.glade.h:221
msgid "Notes sync command:"
msgstr ""
-#: ../data/gtkpod.glade.h:223
+#: ../data/gtkpod.glade.h:222
msgid "Number of playlists"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤Î¿ô"
+msgstr "プレイリストã®æ•°"
-#: ../data/gtkpod.glade.h:224
+#: ../data/gtkpod.glade.h:223
msgid "Number of tracks"
-msgstr "¶Ê¿ô"
+msgstr "曲数"
-#: ../data/gtkpod.glade.h:225
+#: ../data/gtkpod.glade.h:224
msgid "Number of tracks in generated playlists:"
-msgstr "À¸À®¤¹¤ë¥×¥ì¥¤¥ê¥¹¥È¤Ë²Ã¤¨¤ë¶Ê¿ô:"
+msgstr "生æˆã™ã‚‹ãƒ—レイリストã«åŠ ãˆã‚‹æ›²æ•°:"
-#: ../data/gtkpod.glade.h:226
+#: ../data/gtkpod.glade.h:225
msgid ""
"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
msgstr ""
-"¥×¥ì¥¤¥ê¥¹¥È¤Î¿·µ¬ºîÀ®¤Ç¡¢¡ÖºÆÀ¸²ó¿ô¤Î¿¤¤¶Ê¡×¡Öɾ²Á¤Î¹â¤¤¶Ê¡×¡ÖºÇ¶áºÆÀ¸¤µ¤ì"
-"¤¿¶Ê¡×¤òÁªÂò¤·¤¿ºÝ¤Ë¥ê¥¹¥È¤ËÅÐÏ¿¤¹¤ë¶Ê¤Î¿ô¤ò»ØÄꤷ¤Þ¤¹¡£0¤ò»ØÄꤹ¤ë¤È¡¢¶Ê¿ô¤ò"
-"À©¸Â¤·¤Þ¤»¤ó¡£"
+"プレイリストã®æ–°è¦ä½œæˆã§ã€ã€Œå†ç”Ÿå›žæ•°ã®å¤šã„曲ã€ã€Œè©•ä¾¡ã®é«˜ã„曲ã€ã€Œæœ€è¿‘å†ç”Ÿã•ã‚Œ"
+"ãŸæ›²ã€ã‚’é¸æŠžã—ãŸéš›ã«ãƒªã‚¹ãƒˆã«ç™»éŒ²ã™ã‚‹æ›²ã®æ•°ã‚’指定ã—ã¾ã™ã€‚0を指定ã™ã‚‹ã¨ã€æ›²æ•°ã‚’"
+"制é™ã—ã¾ã›ã‚“。"
-#: ../data/gtkpod.glade.h:227
+#: ../data/gtkpod.glade.h:226
msgid "Ogg with :"
msgstr ""
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:227
msgid "On startup automatically sync with playlist directories"
msgstr ""
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:228
#, fuzzy
msgid "On startup automatically sync with the following directory"
-msgstr "°Ê²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ÇƱ´ü½èÍý¤ò¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?"
+msgstr "以下ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§åŒæœŸå‡¦ç†ã‚’ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹?"
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:229
msgid "On startup automatically update (Live Playlist)"
msgstr ""
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:230
msgid "One for each Album"
-msgstr "³Æ¥¢¥ë¥Ð¥à¤´¤È¤Î¥ê¥¹¥È"
+msgstr "å„アルãƒãƒ ã”ã¨ã®ãƒªã‚¹ãƒˆ"
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:231
msgid "One for each Artist"
-msgstr "³Æ¥¢¡¼¥Æ¥£¥¹¥È¤´¤È¤Î¥ê¥¹¥È"
+msgstr "å„アーティストã”ã¨ã®ãƒªã‚¹ãƒˆ"
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:232
msgid "One for each Composer"
-msgstr "³Æºî¶Ê¼Ô¤´¤È¤Î¥ê¥¹¥È"
+msgstr "å„作曲者ã”ã¨ã®ãƒªã‚¹ãƒˆ"
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:233
msgid "One for each Genre"
-msgstr "³Æ¥¸¥ã¥ó¥ë¤´¤È¤Î¥ê¥¹¥È"
+msgstr "å„ジャンルã”ã¨ã®ãƒªã‚¹ãƒˆ"
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:234
msgid "One for each Rating"
-msgstr "³Æɾ²ÁÃͤ´¤È¤Î¥ê¥¹¥È"
+msgstr "å„評価値ã”ã¨ã®ãƒªã‚¹ãƒˆ"
-#: ../data/gtkpod.glade.h:236
+#: ../data/gtkpod.glade.h:235
msgid "One for each Year"
-msgstr "³Æǯ¤´¤È¤Î¥ê¥¹¥È"
+msgstr "å„å¹´ã”ã¨ã®ãƒªã‚¹ãƒˆ"
-#: ../data/gtkpod.glade.h:237
+#: ../data/gtkpod.glade.h:236
msgid "Overwrite tags that are already set"
-msgstr "¤¹¤Ç¤Ë¤¢¥¿¥°¾ðÊó¤ò¾å½ñ¤¤¹¤ë"
+msgstr "ã™ã§ã«ã‚ã‚¿ã‚°æƒ…å ±ã‚’ä¸Šæ›¸ãã™ã‚‹"
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:237
msgid "Password:"
msgstr ""
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:238
msgid "Path:"
msgstr ""
-#: ../data/gtkpod.glade.h:240
+#: ../data/gtkpod.glade.h:239
+#, fuzzy
+msgid "Photo Window"
+msgstr "æƒ…å ±(_I)"
+
+#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
msgid "Play time"
-msgstr "±éÁÕ»þ´Ö"
+msgstr "æ¼”å¥æ™‚é–“"
#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
#: ../src/misc_conversion.c:77
msgid "Playcount"
-msgstr "ºÆÀ¸²ó¿ô"
+msgstr "å†ç”Ÿå›žæ•°"
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:1990
+#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
msgid "Played"
-msgstr "±éÁÕÆü"
+msgstr "æ¼”å¥æ—¥"
-#: ../data/gtkpod.glade.h:243 ../src/display_spl.c:105
-msgid "Playlist"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È"
+#: ../data/gtkpod.glade.h:243
+msgid "Playlist name:"
+msgstr "プレイリストã®åå‰:"
#: ../data/gtkpod.glade.h:244
-msgid "Playlist name:"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤Î̾Á°:"
-
-#: ../data/gtkpod.glade.h:245
#, fuzzy
msgid "Playlist type:"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "プレイリスト"
-#: ../data/gtkpod.glade.h:246 ../src/display_playlists.c:2176
+#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
msgid "Playlists"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "プレイリスト"
-#: ../data/gtkpod.glade.h:247
+#: ../data/gtkpod.glade.h:246
msgid "Please refer to the notice below."
-msgstr "²¼µ¤ÎÃí°Õ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£"
+msgstr "下記ã®æ³¨æ„ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:247
msgid "Please specify a time interval"
-msgstr "´ü´Ö¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
+msgstr "期間を指定ã—ã¦ãã ã•ã„"
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:248
msgid "Preferences"
-msgstr "ÀßÄê"
+msgstr "è¨å®š"
+#: ../data/gtkpod.glade.h:249
+#, fuzzy
+msgid "Progress Information"
+msgstr "æƒ…å ±"
+
#: ../data/gtkpod.glade.h:250
-msgid ""
-"Press button to abort.\n"
-"Export can be continued at a later time."
+msgid "R_ename Album"
msgstr ""
-"¥Ü¥¿¥ó¤ò²¡¤¹¤ÈÃæÃǤ·¤Þ¤¹¡£\n"
-"¥Õ¥¡¥¤¥ë¤Î¥¨¥¯¥¹¥Ý¡¼¥È¤Ï¸å¤ÇºÆ³«¤¹¤ë»ö¤¬¤Ç¤¤Þ¤¹¡£"
-#: ../data/gtkpod.glade.h:252
-msgid "Previous"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:253
-#, fuzzy
-msgid "Progress Information"
-msgstr "¾ðÊó"
-
-#: ../data/gtkpod.glade.h:254
+#: ../data/gtkpod.glade.h:251
msgid "Random Playlist from Displayed Tracks"
-msgstr "ɽ¼¨¤µ¤ì¤Æ¤¤¤ë¶Ê¤«¤é¥é¥ó¥À¥à¤ËºîÀ®"
+msgstr "表示ã•ã‚Œã¦ã„る曲ã‹ã‚‰ãƒ©ãƒ³ãƒ€ãƒ ã«ä½œæˆ"
-#: ../data/gtkpod.glade.h:255
+#: ../data/gtkpod.glade.h:252
msgid "Randomize Current Playlist"
-msgstr "¸½ºß¤Î¥×¥ì¥¤¥ê¥¹¥È¤ò¥é¥ó¥À¥à¤Ëʤٴ¹¤¨¤ë"
+msgstr "ç¾åœ¨ã®ãƒ—レイリストをランダムã«ä¸¦ã¹æ›ãˆã‚‹"
-#: ../data/gtkpod.glade.h:256 ../src/display_spl.c:101
+#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
#: ../src/misc_conversion.c:78
msgid "Rating"
-msgstr "ɾ²Á"
+msgstr "評価"
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:254
msgid "Read coverart from embedded APIC data"
msgstr ""
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:255
msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
-msgstr "¥Õ¥¡¥¤¥ë¤«¤é¥¿¥°¾ðÊó¤òÆɤ߹þ¤à (MP3 ¥Õ¥¡¥¤¥ë¤Î ID3 ¥¿¥°¤Ê¤É)"
+msgstr "ファイルã‹ã‚‰ã‚¿ã‚°æƒ…å ±ã‚’èªã¿è¾¼ã‚€ (MP3 ファイル㮠ID3 ã‚¿ã‚°ãªã©)"
-#: ../data/gtkpod.glade.h:259
-msgid "Remove Cover Art"
-msgstr "¥«¥Ð¡¼¥¢¡¼¥È¤òºï½ü"
+#: ../data/gtkpod.glade.h:256
+#, fuzzy
+msgid "Remove selected attributes from the displayed list"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²ã‚’プレイリストã‹ã‚‰å‰Šé™¤ã™ã‚‹"
-#: ../data/gtkpod.glade.h:260
+#: ../data/gtkpod.glade.h:257
#, fuzzy
msgid "Repository Options"
-msgstr "¥½¡¼¥È¤ÎÀßÄê"
+msgstr "ソートã®è¨å®š"
-#: ../data/gtkpod.glade.h:261
+#: ../data/gtkpod.glade.h:258
#, fuzzy
msgid "Repository name:"
-msgstr "¥½¡¼¥È¤ÎÀßÄê"
+msgstr "ソートã®è¨å®š"
-#: ../data/gtkpod.glade.h:262
+#: ../data/gtkpod.glade.h:259
#, fuzzy
msgid "Repository type:"
-msgstr "¥½¡¼¥È¤ÎÀßÄê"
+msgstr "ソートã®è¨å®š"
-#: ../data/gtkpod.glade.h:263
+#: ../data/gtkpod.glade.h:260
msgid "Root directory of mserv database (trackinfo root)."
-msgstr "mserv ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¡£(trackinfo root)"
+msgstr "mserv データベースã®ã‚るディレクトリ。(trackinfo root)"
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:261
msgid "Rules"
-msgstr "¥ë¡¼¥ë"
+msgstr "ルール"
-#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:808
+#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
msgid "Save Changes"
-msgstr "Êѹ¹¤òÊݸ"
+msgstr "変更をä¿å˜"
-#: ../data/gtkpod.glade.h:266
+#: ../data/gtkpod.glade.h:263
#, fuzzy
msgid "Scrobble Tracks?"
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê(_T)"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²(_T)"
-#: ../data/gtkpod.glade.h:267
+#: ../data/gtkpod.glade.h:264
msgid "Select '-1' for no upper limit."
-msgstr "¾å¸Â¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ï '-1' ¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£"
+msgstr "上é™ã‚’指定ã—ãªã„å ´åˆã¯ '-1' ã‚’é¸ã‚“ã§ãã ã•ã„。"
-#: ../data/gtkpod.glade.h:268
+#: ../data/gtkpod.glade.h:265
msgid "Select '0' for no lower limit."
-msgstr "²¼¸Â¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ï '0' ¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤."
+msgstr "下é™ã‚’指定ã—ãªã„å ´åˆã¯ '0' ã‚’é¸ã‚“ã§ãã ã•ã„."
-#: ../data/gtkpod.glade.h:269
+#: ../data/gtkpod.glade.h:266
msgid ""
"Selected\n"
"Playlist"
msgstr ""
-"ÁªÂò¤µ¤ì¤¿\n"
-"¥×¥ì¥¤¥ê¥¹¥È"
+"é¸æŠžã•ã‚ŒãŸ\n"
+"プレイリスト"
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:268
msgid ""
"Selected\n"
"Tracks"
msgstr ""
-"ÁªÂò¤µ¤ì\n"
-"¤Æ¤¤¤ë¶Ê"
+"é¸æŠžã•ã‚Œ\n"
+"ã¦ã„る曲"
+#: ../data/gtkpod.glade.h:270
+#, fuzzy
+msgid "Selected Filter Tab Entry from Database"
+msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ–ã§æŒ‡å®šã—ãŸæ›²ã‚’データベースã‹ã‚‰å‰Šé™¤ã™ã‚‹"
+
+#: ../data/gtkpod.glade.h:271
+#, fuzzy
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ–ã§æŒ‡å®šã—ãŸæ›²ã‚’ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å‰Šé™¤ã™ã‚‹"
+
+#: ../data/gtkpod.glade.h:272
+#, fuzzy
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ–ã§æŒ‡å®šã—ãŸæ›²ã‚’プレイリストã‹ã‚‰å‰Šé™¤ã™ã‚‹"
+
#: ../data/gtkpod.glade.h:273
-msgid "Selected Tab _Entry"
-msgstr "ÁªÂò¤µ¤ì¤¿¥½¡¼¥È¥¿¥Ö(_E)"
+#, fuzzy
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ–ã§æŒ‡å®šã—ãŸæ›²ã‚’ iPod ã‹ã‚‰å‰Šé™¤ã™ã‚‹"
#: ../data/gtkpod.glade.h:274
-msgid "Selected _Playlist"
-msgstr "ÁªÂò¤µ¤ì¤¿¥×¥ì¥¤¥ê¥¹¥È(_P)"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from Database"
+msgstr "é¸æŠžã•ã‚ŒãŸãƒ—レイリストを曲ã”ã¨ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‹ã‚‰å‰Šé™¤ã™ã‚‹"
#: ../data/gtkpod.glade.h:275
-msgid "Selected _Tracks"
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê(_T)"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "é¸æŠžã•ã‚ŒãŸãƒ—レイリストを曲ã”ã¨ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‹ã‚‰å‰Šé™¤ã™ã‚‹"
#: ../data/gtkpod.glade.h:276
-msgid "Selected filter tab entry from database"
-msgstr "ÁªÂò¤µ¤ì¤¿¥¿¥Ö¤Ç»ØÄꤷ¤¿¶Ê¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤¹¤ë"
+#, fuzzy
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "é¸æŠžã•ã‚ŒãŸãƒ—レイリストを曲ã”㨠iPod ã‹ã‚‰å‰Šé™¤ã™ã‚‹"
#: ../data/gtkpod.glade.h:277
-msgid "Selected filter tab entry from harddisk"
-msgstr "ÁªÂò¤µ¤ì¤¿¥¿¥Ö¤Ç»ØÄꤷ¤¿¶Ê¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤éºï½ü¤¹¤ë"
+msgid "Selected Tab _Entry"
+msgstr "é¸æŠžã•ã‚ŒãŸã‚½ãƒ¼ãƒˆã‚¿ãƒ–(_E)"
#: ../data/gtkpod.glade.h:278
-msgid "Selected filter tab entry from iPod"
-msgstr "ÁªÂò¤µ¤ì¤¿¥¿¥Ö¤Ç»ØÄꤷ¤¿¶Ê¤ò iPod ¤«¤éºï½ü¤¹¤ë"
+#, fuzzy
+msgid "Selected Tracks from Database"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²ã‚’データベースã‹ã‚‰å‰Šé™¤ã™ã‚‹"
#: ../data/gtkpod.glade.h:279
-msgid "Selected filter tab entry from playlist"
-msgstr "ÁªÂò¤µ¤ì¤¿¥¿¥Ö¤Ç»ØÄꤷ¤¿¶Ê¤ò¥×¥ì¥¤¥ê¥¹¥È¤«¤éºï½ü¤¹¤ë"
+#, fuzzy
+msgid "Selected Tracks from Hard Disk"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²ã‚’ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å‰Šé™¤ã™ã‚‹"
#: ../data/gtkpod.glade.h:280
-msgid "Selected playlist"
-msgstr "ÁªÂò¤µ¤ì¤¿¥×¥ì¥¤¥ê¥¹¥È"
+#, fuzzy
+msgid "Selected Tracks from Playlist"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²ã‚’プレイリストã‹ã‚‰å‰Šé™¤ã™ã‚‹"
#: ../data/gtkpod.glade.h:281
-msgid "Selected playlist including tracks from database"
-msgstr "ÁªÂò¤µ¤ì¤¿¥×¥ì¥¤¥ê¥¹¥È¤ò¶Ê¤´¤È¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤¹¤ë"
+#, fuzzy
+msgid "Selected Tracks from iPod"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²ã‚’ iPod ã‹ã‚‰å‰Šé™¤ã™ã‚‹"
#: ../data/gtkpod.glade.h:282
-msgid "Selected playlist including tracks from harddisk"
-msgstr "ÁªÂò¤µ¤ì¤¿¥×¥ì¥¤¥ê¥¹¥È¤ò¶Ê¤´¤È¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤¹¤ë"
+msgid "Selected _Playlist"
+msgstr "é¸æŠžã•ã‚ŒãŸãƒ—レイリスト(_P)"
#: ../data/gtkpod.glade.h:283
-msgid "Selected playlist including tracks from iPod"
-msgstr "ÁªÂò¤µ¤ì¤¿¥×¥ì¥¤¥ê¥¹¥È¤ò¶Ê¤´¤È iPod ¤«¤éºï½ü¤¹¤ë"
+msgid "Selected _Tracks"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²(_T)"
#: ../data/gtkpod.glade.h:284
-msgid "Selected tracks from database"
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤¹¤ë"
+msgid "Selected playlist"
+msgstr "é¸æŠžã•ã‚ŒãŸãƒ—レイリスト"
#: ../data/gtkpod.glade.h:285
-msgid "Selected tracks from harddisk"
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤éºï½ü¤¹¤ë"
-
-#: ../data/gtkpod.glade.h:286
-msgid "Selected tracks from iPod"
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê¤ò iPod ¤«¤éºï½ü¤¹¤ë"
-
-#: ../data/gtkpod.glade.h:287
-msgid "Selected tracks from playlist"
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê¤ò¥×¥ì¥¤¥ê¥¹¥È¤«¤éºï½ü¤¹¤ë"
-
-#: ../data/gtkpod.glade.h:288
#, fuzzy
msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
-msgstr "¥»¥ß¥³¥í¥ó¤Ç¶èÀÚ¤é¤ì¤¿, ŬÍѤ·¤Ê¤¤¥Õ¥¡¥¤¥ë¤Î¥Þ¥¹¥¯¥ê¥¹¥È. Îã: '*.mp3'"
+msgstr "セミコãƒãƒ³ã§åŒºåˆ‡ã‚‰ã‚ŒãŸ, é©ç”¨ã—ãªã„ファイルã®ãƒžã‚¹ã‚¯ãƒªã‚¹ãƒˆ. 例: '*.mp3'"
-#: ../data/gtkpod.glade.h:289
+#: ../data/gtkpod.glade.h:286
#, fuzzy
-msgid "Set Cover Art from File"
-msgstr "mserv ¥Ç¡¼¥¿¤ò¹¹¿·¤¹¤ë(_m)"
+msgid "Set Cover Art from _File"
+msgstr "mserv データを更新ã™ã‚‹(_m)"
-#: ../data/gtkpod.glade.h:290
-msgid "Set Cover Art from Web"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:291
+#: ../data/gtkpod.glade.h:287
msgid "Set mountpoint or edit repository options"
msgstr ""
-#: ../data/gtkpod.glade.h:292
+#: ../data/gtkpod.glade.h:288
msgid "Set options for Calendar/Contacts/Notes"
msgstr ""
-#: ../data/gtkpod.glade.h:293
+#: ../data/gtkpod.glade.h:289
msgid ""
"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
"files will be calculated and written to your music file using this command."
msgstr ""
-#: ../data/gtkpod.glade.h:294
+#: ../data/gtkpod.glade.h:290
msgid ""
"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for mp3 files "
"will be calculated and written to your mp3 file using this command."
msgstr ""
-#: ../data/gtkpod.glade.h:295
+#: ../data/gtkpod.glade.h:291
msgid "Set this to your last.fm password"
msgstr ""
-#: ../data/gtkpod.glade.h:296
+#: ../data/gtkpod.glade.h:292
msgid "Set this to your last.fm username"
msgstr ""
-#: ../data/gtkpod.glade.h:297
+#: ../data/gtkpod.glade.h:293
msgid ""
"Set to 0 to effectively disable caching (a maximum of one track will be "
"cached at a time)."
msgstr ""
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:294
msgid ""
"Set to 0 to use as many background threads as CPUs are available on your "
"system."
msgstr ""
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:295
msgid "Show information about problems when accessing mserv"
-msgstr "mserv ¤Ø¥¢¥¯¥»¥¹¤¹¤ë¤È¤¡¢ÌäÂê¤ÎÊó¹ð¤òɽ¼¨¤¹¤ë"
+msgstr "mserv ã¸ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã¨ãã€å•é¡Œã®å ±å‘Šã‚’表示ã™ã‚‹"
-#: ../data/gtkpod.glade.h:300
+#: ../data/gtkpod.glade.h:296
msgid "Show summary of sync result"
msgstr ""
-#: ../data/gtkpod.glade.h:301 ../src/misc_playlist.c:96
+#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
#: ../src/repository.c:1356
msgid "Smart Playlist"
-msgstr "¥¹¥Þ¡¼¥È¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "スマートプレイリスト"
-#: ../data/gtkpod.glade.h:302
+#: ../data/gtkpod.glade.h:298
msgid "Sort tracks according to: "
-msgstr "¶Ê½ç¤ò¼¡¤Î½ç¤Çʤٴ¹¤¨¤ë: "
+msgstr "æ›²é †ã‚’æ¬¡ã®é †ã§ä¸¦ã¹æ›ãˆã‚‹: "
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:299
msgid "Sorting Options"
-msgstr "¥½¡¼¥È¤ÎÀßÄê"
+msgstr "ソートã®è¨å®š"
-#: ../data/gtkpod.glade.h:304
+#: ../data/gtkpod.glade.h:300
msgid "Sorting case sensitive"
-msgstr "ʤٴ¹¤¨¤ÎºÝ¤ËÂçʸ»ú¾®Ê¸»ú¤ò¶èÊ̤¹¤ë"
+msgstr "並ã¹æ›ãˆã®éš›ã«å¤§æ–‡å—å°æ–‡å—を区別ã™ã‚‹"
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:301
msgid "Sorttab: "
-msgstr "¥½¡¼¥È¥¿¥Ö: "
+msgstr "ソートタブ: "
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:302
msgid "Sorttabs"
-msgstr "¥½¡¼¥È¥¿¥Ö"
+msgstr "ソートタブ"
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:303
msgid "Source:"
-msgstr "»²¾ÈÀè:"
+msgstr "å‚照先:"
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:305
#, no-c-format
msgid ""
"Specify exact path including command line options. '%i' will be replaced "
"with the mount point of the iPod."
msgstr ""
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:306
msgid "Specify interval"
-msgstr "ÈϰϤò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤"
+msgstr "範囲を指定ã—ã¦ãã ã•ã„"
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:307
msgid "Start display automatically"
-msgstr "¼«Æ°Åª¤Ëɽ¼¨¤ò¹¹¿·¤¹¤ë"
+msgstr "自動的ã«è¡¨ç¤ºã‚’æ›´æ–°ã™ã‚‹"
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:308
msgid "Synchronise Contacts, Calendar and Notes"
-msgstr "¥¢¥É¥ì¥¹¥Ç¡¼¥¿,¥«¥ì¥ó¥À¡¼,¥á¥â¤òƱ´ü¤¹¤ë"
+msgstr "アドレスデータ,カレンダー,メモをåŒæœŸã™ã‚‹"
-#: ../data/gtkpod.glade.h:313
+#: ../data/gtkpod.glade.h:309
msgid "Synchronize All"
-msgstr "¤¹¤Ù¤ÆƱ´ü"
+msgstr "ã™ã¹ã¦åŒæœŸ"
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:310
msgid "Synchronize Calendar"
-msgstr "¥«¥ì¥ó¥À¡¼¤òƱ´ü"
+msgstr "カレンダーをåŒæœŸ"
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:311
msgid "Synchronize Contacts"
-msgstr "¥¢¥É¥ì¥¹¥Ç¡¼¥¿¤òƱ´ü"
+msgstr "アドレスデータをåŒæœŸ"
-#: ../data/gtkpod.glade.h:316
+#: ../data/gtkpod.glade.h:312
msgid "Synchronize Notes"
-msgstr "¥á¥â¤òƱ´ü"
+msgstr "メモをåŒæœŸ"
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:313
msgid "Template for info field: "
msgstr ""
-#: ../data/gtkpod.glade.h:318
+#: ../data/gtkpod.glade.h:314
msgid ""
"The local copy of the track is referenced in the playlist. If the track is "
"not available locally, an error message is displayed."
msgstr ""
-"¥Ï¡¼¥É¥Ç¥£¥¹¥¯¾å¤Ë¤¢¤ëÂбþ¤¹¤ë¶Ê¤ò¾ï¤Ë»²¾È¤·¤Þ¤¹. ¸«¤Ä¤«¤é¤Ê¤¤¾ì¹ç¤Ë¤Ï¥¨¥é¡¼"
-"¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¤Þ¤¹."
+"ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ä¸Šã«ã‚る対応ã™ã‚‹æ›²ã‚’常ã«å‚ç…§ã—ã¾ã™. 見ã¤ã‹ã‚‰ãªã„å ´åˆã«ã¯ã‚¨ãƒ©ãƒ¼"
+"メッセージを表示ã—ã¾ã™."
-#: ../data/gtkpod.glade.h:319
+#: ../data/gtkpod.glade.h:315
msgid ""
"The output of the background conversion scripts is copied below. Each page "
"of the notebook corresponds to one background thread."
msgstr ""
-#: ../data/gtkpod.glade.h:320
+#: ../data/gtkpod.glade.h:316
#, fuzzy
msgid ""
"The tags are written to the files on your harddrive and on the iPod (if "
"available)."
msgstr ""
-"¥¿¥°¤Ï»È¤Ã¤Æ¤¤¤ë¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤È(²Äǽ¤Ç¤¢¤ì¤Ð)iPod¤ÎξÊý¤Ç½¤Àµ¤µ¤ì¤Þ¤¹¡£"
+"ã‚¿ã‚°ã¯ä½¿ã£ã¦ã„ã‚‹ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã¨(å¯èƒ½ã§ã‚ã‚Œã°)iPodã®ä¸¡æ–¹ã§ä¿®æ£ã•ã‚Œã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:317
msgid "The track on the iPod is referenced in the playlist file."
-msgstr "iPod ¾å¤Î¶Ê¤ò¾ï¤Ë»²¾È¤·¤Þ¤¹."
+msgstr "iPod 上ã®æ›²ã‚’常ã«å‚ç…§ã—ã¾ã™."
-#: ../data/gtkpod.glade.h:322
+#: ../data/gtkpod.glade.h:318
msgid "This is the same option as in 'Edit/Delete Confirmation'"
-msgstr "¡ÖÊÔ½¸/ºï½ü¤Î³Îǧ¡×¤Î¹àÌܤÈƱ¤¸¤Ç¤¹"
+msgstr "「編集/削除ã®ç¢ºèªã€ã®é …ç›®ã¨åŒã˜ã§ã™"
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:319
msgid ""
"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
"uses unicode to store the tags, so you won't have to worry about charsets "
@@ -1472,424 +1508,458 @@
"present in the file to write to."
msgstr ""
-#: ../data/gtkpod.glade.h:324
+#: ../data/gtkpod.glade.h:320
msgid "This option will be re-activated when you upgrade gtkpod."
msgstr ""
-#: ../data/gtkpod.glade.h:325
+#: ../data/gtkpod.glade.h:321
msgid "Time:"
-msgstr "»þ¹ï:"
+msgstr "時刻:"
-#: ../data/gtkpod.glade.h:326 ../src/display_sorttabs.c:2963
+#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
msgid "Title"
-msgstr "¥¿¥¤¥È¥ë"
+msgstr "タイトル"
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:323
msgid ""
"Total\n"
"(iPod)"
msgstr ""
-"¹ç·×\n"
+"åˆè¨ˆ\n"
"(iPod)"
-#: ../data/gtkpod.glade.h:329
+#: ../data/gtkpod.glade.h:325
msgid ""
"Total\n"
"(local)"
msgstr ""
-"¹ç·×\n"
-"(¥í¡¼¥«¥ë)"
+"åˆè¨ˆ\n"
+"(ãƒãƒ¼ã‚«ãƒ«)"
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:327
msgid "Tracks"
-msgstr "¶Ê¥ê¥¹¥È"
+msgstr "曲リスト"
-#: ../data/gtkpod.glade.h:332
+#: ../data/gtkpod.glade.h:328
msgid "Tracks Most Often Listened To"
-msgstr "ºÆÀ¸²ó¿ô¤Î¿¤¤¶Ê"
+msgstr "å†ç”Ÿå›žæ•°ã®å¤šã„曲"
-#: ../data/gtkpod.glade.h:333
+#: ../data/gtkpod.glade.h:329
msgid ""
"Tracks can be transferred in the background as soon as they are added to an "
"iPod repository. Otherwise they will be transferred when ejecting the "
"contents of the iPod completely unchanged until then."
msgstr ""
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:330
msgid "Tracks in Selected Tab _Entry"
-msgstr "ÁªÂò¤µ¤ì¤¿¥¿¥Ö¤Î¶Ê(_E)"
+msgstr "é¸æŠžã•ã‚ŒãŸã‚¿ãƒ–ã®æ›²(_E)"
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:331
msgid "Tracks in Selected _Playlist"
-msgstr "ÁªÂò¤µ¤ì¤¿¥×¥ì¥¤¥ê¥¹¥È¤Î¶Ê(_P)"
+msgstr "é¸æŠžã•ã‚ŒãŸãƒ—レイリストã®æ›²(_P)"
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:332
msgid "Transfer tracks to the iPod in the background"
msgstr ""
-#: ../data/gtkpod.glade.h:337
+#: ../data/gtkpod.glade.h:333
msgid "Translators"
-msgstr "ËÝÌõôÅö"
+msgstr "翻訳担当"
-#: ../data/gtkpod.glade.h:338
+#: ../data/gtkpod.glade.h:334
msgid ""
"Try to load contents of all connected iPods. For each iPod a separate "
"repository must be set up."
msgstr ""
-"Àܳ¤µ¤ì¤Æ¤¤¤ë¤¹¤Ù¤Æ¤Î iPod ¤ÎÆâÍƤòÆɤ߹þ¤ß¤Þ¤¹. ¤½¤ì¤¾¤ì¤Î iPod ¤´¤È¤Ë¸ÄÊÌ"
-"¤ËÀßÄê¤ò¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹."
+"接続ã•ã‚Œã¦ã„ã‚‹ã™ã¹ã¦ã® iPod ã®å†…容をèªã¿è¾¼ã¿ã¾ã™. ãã‚Œãžã‚Œã® iPod ã”ã¨ã«å€‹åˆ¥"
+"ã«è¨å®šã‚’ã—ã¦ãŠãå¿…è¦ãŒã‚ã‚Šã¾ã™."
-#: ../data/gtkpod.glade.h:339
+#: ../data/gtkpod.glade.h:335
+#, fuzzy
+msgid "Undo _Track"
+msgstr "未評価ã®æ›²"
+
+#: ../data/gtkpod.glade.h:336
msgid "Update _mserv Data from File"
-msgstr "mserv ¥Ç¡¼¥¿¤ò¹¹¿·¤¹¤ë(_m)"
+msgstr "mserv データを更新ã™ã‚‹(_m)"
-#: ../data/gtkpod.glade.h:340
+#: ../data/gtkpod.glade.h:337
msgid "Update/Sync all playlists now"
msgstr ""
-#: ../data/gtkpod.glade.h:341
+#: ../data/gtkpod.glade.h:338
msgid "Update/Sync playlist now"
msgstr ""
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:339
msgid "Upper margin"
-msgstr "¾å¸Â"
+msgstr "上é™"
-#: ../data/gtkpod.glade.h:343
+#: ../data/gtkpod.glade.h:340
msgid "Use 'Multi-Edit' also for title field"
-msgstr "¥¿¥¤¥È¥ë¤Î¹àÌܤâ¡Ö°ìÀÆÊÔ½¸¡×¤ò²Äǽ¤Ë¤¹¤ë"
+msgstr "タイトルã®é …目も「一斉編集ã€ã‚’å¯èƒ½ã«ã™ã‚‹"
-#: ../data/gtkpod.glade.h:344
+#: ../data/gtkpod.glade.h:341
msgid "Use 'Multi-Edit' for tracks selections"
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê¤ò¡Ö°ìÀÆÊÔ½¸¡×¤¹¤ë"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²ã‚’「一斉編集ã€ã™ã‚‹"
-#: ../data/gtkpod.glade.h:345
+#: ../data/gtkpod.glade.h:342
#, fuzzy
-msgid "Use <i><Album>.jpg</i> in the parent directory"
-msgstr "¿Æ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¢¤ë <i><Album>.jpg</i> ¤ò»È¤¦"
+msgid "Use <i><Album>.jpg</i> in the parent directory"
+msgstr "親ディレクトリã«ã‚ã‚‹ <i><Album>.jpg</i> を使ã†"
-#: ../data/gtkpod.glade.h:346
+#: ../data/gtkpod.glade.h:343
#, fuzzy
-msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
-msgstr "<i><Album>.jpg</i>, <i><Album>.png</i> ¤Ê¤É"
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+msgstr "<i><Album>.jpg</i>, <i><Album>.png</i> ãªã©"
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:344
msgid "Use <i>folder.jpg</i> as cover art."
-msgstr "<i>folder.jpg</i> ¤ò¥«¥Ð¡¼¥¢¡¼¥È¤Ë»È¤¦"
+msgstr "<i>folder.jpg</i> ã‚’ã‚«ãƒãƒ¼ã‚¢ãƒ¼ãƒˆã«ä½¿ã†"
-#: ../data/gtkpod.glade.h:348
+#: ../data/gtkpod.glade.h:345
msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
-msgstr "<i>folder.jpg</i>, <i>folder.png</i> ¤Ê¤É"
+msgstr "<i>folder.jpg</i>, <i>folder.png</i> ãªã©"
-#: ../data/gtkpod.glade.h:349
+#: ../data/gtkpod.glade.h:346
msgid "Use mserv database to fill additional information"
-msgstr "mserv ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éÄɲþðÊó¤ò¼èÆÀ¤¹¤ë"
+msgstr "mserv ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‹ã‚‰è¿½åŠ æƒ…å ±ã‚’å–å¾—ã™ã‚‹"
-#: ../data/gtkpod.glade.h:350
+#: ../data/gtkpod.glade.h:347
msgid ""
"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
"for this filename."
msgstr ""
-"»ØÄꤵ¤ì¤¿Ê¸»ú¥³¡¼¥É (¡ÖÀßÄê¡×Æâ¡ÖÅÐÏ¿/¹¹¿·/Ʊ´ü¡×¤ò»²¾È)\n"
-"¤ò¥Õ¥¡¥¤¥ë̾¤Ë¤â»ÈÍѤ¹¤ë¡£"
+"指定ã•ã‚ŒãŸæ–‡å—コード (「è¨å®šã€å†…「登録/æ›´æ–°/åŒæœŸã€ã‚’å‚ç…§)\n"
+"をファイルåã«ã‚‚使用ã™ã‚‹ã€‚"
-#: ../data/gtkpod.glade.h:352
+#: ../data/gtkpod.glade.h:349
#, fuzzy
msgid ""
"Use selected encoding (on the 'General' page)\n"
"when writing tags"
msgstr ""
-"¡Ö´ðËÜÀßÄê¡×¤Î¥Ú¡¼¥¸¤Ç»ØÄꤵ¤ì¤¿Ê¸»ú¥³¡¼¥É¤ò\n"
-"¥¿¥°¤ÎÆɤ߽ñ¤¤Ë¤â»ÈÍѤ¹¤ë"
+"「基本è¨å®šã€ã®ãƒšãƒ¼ã‚¸ã§æŒ‡å®šã•ã‚ŒãŸæ–‡å—コードを\n"
+"ã‚¿ã‚°ã®èªã¿æ›¸ãã«ã‚‚使用ã™ã‚‹"
-#: ../data/gtkpod.glade.h:354
+#: ../data/gtkpod.glade.h:351
#, fuzzy
msgid "Use selected encoding also when updating or syncing tracks"
-msgstr "ÁªÂò¤µ¤ì¤¿Ê¸»ú¥³¡¼¥É¤ò¹¹¿·¡¦Æ±´ü½èÍý¤Ç¤â»ÈÍѤ¹¤ë"
+msgstr "é¸æŠžã•ã‚ŒãŸæ–‡å—コードを更新・åŒæœŸå‡¦ç†ã§ã‚‚使用ã™ã‚‹"
-#: ../data/gtkpod.glade.h:355
+#: ../data/gtkpod.glade.h:352
msgid "Use this template to parse filename for tag information:"
-msgstr "°Ê²¼¤Î¥Æ¥ó¥×¥ì¡¼¥È¤ò¡¢¥Õ¥¡¥¤¥ë̾¤«¤é¥¿¥°¾ðÊó¤òÃê½Ð¤¹¤ë¤Î¤Ë»ÈÍѤ¹¤ë:"
+msgstr "以下ã®ãƒ†ãƒ³ãƒ—レートをã€ãƒ•ã‚¡ã‚¤ãƒ«åã‹ã‚‰ã‚¿ã‚°æƒ…å ±ã‚’æŠ½å‡ºã™ã‚‹ã®ã«ä½¿ç”¨ã™ã‚‹:"
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:353
msgid "Username to be used for mserv database lookup."
-msgstr "¥æ¡¼¥¶¡¼Ì¾¤Ï mserv ¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î»²¾È¤Ë»È¤¤¤Þ¤¹¡£"
+msgstr "ユーザーå㯠mserv データベースã®å‚ç…§ã«ä½¿ã„ã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:357
+#: ../data/gtkpod.glade.h:354
msgid "Username:"
-msgstr "¥æ¡¼¥¶¡¼Ì¾:"
+msgstr "ユーザーå:"
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:355
msgid ""
"Usually you don't want to set the title of several tracks to the same text. "
"This option might avoid unwanted results (especially since there is no "
"'undo' yet)."
msgstr ""
-"ÉáÄ̤ÏÊ£¿ô¤Î¶Ê¤Î¥¿¥¤¥È¥ë¤òƱ¤¸¤â¤Î¤Ë¤¹¤ëɬÍפϤʤ¤¤Ç¤·¤ç¤¦¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò"
-"ÁªÂò¤¹¤ë¤ÈÂçÄñ¤Ï˾¤Þ¤·¤¯¤Ê¤¤·ë²Ì¤òÆÀ¤ë»ö¤Ë¤Ê¤ê¤Þ¤¹¡£(Æäˡ¢º£¤Î¤È¤³¤í¡Ö¤ä¤êľ"
-"¤·¡×¤Ï¸ú¤«¤Ê¤¤¤Î¤Ç¡¢ÁªÂò¤¹¤ë¤Ù¤¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó)"
+"普通ã¯è¤‡æ•°ã®æ›²ã®ã‚¿ã‚¤ãƒˆãƒ«ã‚’åŒã˜ã‚‚ã®ã«ã™ã‚‹å¿…è¦ã¯ãªã„ã§ã—ょã†ã€‚ã“ã®ã‚ªãƒ—ションを"
+"é¸æŠžã™ã‚‹ã¨å¤§æŠµã¯æœ›ã¾ã—ããªã„çµæžœã‚’得る事ã«ãªã‚Šã¾ã™ã€‚(特ã«ã€ä»Šã®ã¨ã“ã‚「やり直"
+"ã—ã€ã¯åŠ¹ã‹ãªã„ã®ã§ã€é¸æŠžã™ã‚‹ã¹ãã§ã¯ã‚ã‚Šã¾ã›ã‚“)"
-#: ../data/gtkpod.glade.h:359
+#: ../data/gtkpod.glade.h:356
+#, fuzzy
+msgid "View Full Size"
+msgstr "ファイルサイズ"
+
+#: ../data/gtkpod.glade.h:357
msgid "WAV with :"
msgstr ""
-#: ../data/gtkpod.glade.h:360
+#: ../data/gtkpod.glade.h:358
msgid ""
"When adding dirs/files, update information of\n"
"existing tracks with identical filenames"
msgstr ""
-"¥Õ¥¡¥¤¥ë¤ä¥Ç¥£¥ì¥¯¥È¥ê¤òÄɲ乤ëºÝ¤Ë¡¢Æ±¤¸¥Õ¥¡¥¤¥ë̾¤Î\n"
-"¶Ê¤¬¤¹¤Ç¤Ë¤¢¤Ã¤¿¤é¾ì¹ç¤Ë¤Ï¡¢¤½¤Á¤é¤ò¹¹¿·¤¹¤ë"
+"ãƒ•ã‚¡ã‚¤ãƒ«ã‚„ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’è¿½åŠ ã™ã‚‹éš›ã«ã€åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«åã®\n"
+"曲ãŒã™ã§ã«ã‚ã£ãŸã‚‰å ´åˆã«ã¯ã€ãã¡ã‚‰ã‚’æ›´æ–°ã™ã‚‹"
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:360
msgid ""
"When copying from iPod no check is performed on whether the destination file "
"exists. Enabling this option will make gtkpod check whether the length of "
"the destination file is the same as the file in the iPod. If so the file is "
"skipped, allowing a quick sync of the iPod's contents."
msgstr ""
-"iPod ¤«¤é¶Ê¤ò¥³¥Ô¡¼¤¹¤ëºÝ¤Ë¤Ï, Ʊ¤¸Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤Ã¤Æ¤âñ½ã¤Ë¾å½ñ¤¤·¤Þ"
-"¤¹. ¤³¤Î¹àÌܤòÁªÂò¤¹¤ë¤È gtkpod ¤ÏƱ¤¸Ì¾Á°¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¤½¤Î¥µ¥¤¥º"
-"¤ò iPod ¾å¤Î¥Õ¥¡¥¤¥ë¤ÈÈæ³Ó¤·¤Æ, Ʊ¤¸¤À¤Ã¤¿¾ì¹ç¤Ë¤ÏÈô¤Ð¤·¤Þ¤¹. ·ë²Ì¤È¤·¤ÆƱ´ü"
-"½èÍý¤ò¹â®¤Ë¹Ô¤¨¤Þ¤¹."
+"iPod ã‹ã‚‰æ›²ã‚’コピーã™ã‚‹éš›ã«ã¯, åŒã˜åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã£ã¦ã‚‚å˜ç´”ã«ä¸Šæ›¸ãã—ã¾"
+"ã™. ã“ã®é …目をé¸æŠžã™ã‚‹ã¨ gtkpod ã¯åŒã˜åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã£ãŸå ´åˆã«ãã®ã‚µã‚¤ã‚º"
+"ã‚’ iPod 上ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨æ¯”較ã—ã¦, åŒã˜ã ã£ãŸå ´åˆã«ã¯é£›ã°ã—ã¾ã™. çµæžœã¨ã—ã¦åŒæœŸ"
+"処ç†ã‚’高速ã«è¡Œãˆã¾ã™."
-#: ../data/gtkpod.glade.h:363
+#: ../data/gtkpod.glade.h:361
#, fuzzy
msgid "When syncing playlists"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎƱ´ü½èÍý»þ"
+msgstr "ディレクトリã®åŒæœŸå‡¦ç†æ™‚"
-#: ../data/gtkpod.glade.h:364
+#: ../data/gtkpod.glade.h:362
msgid ""
"Will show a list of tracks removed and a list of tracks newly added or "
"updated."
msgstr ""
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:363
msgid "Write ID3 tags to disk when modified in gtkpod"
-msgstr "gtkpodÆâ¤ÇÊѹ¹¤¬¤¢¤Ã¤¿ID3¥¿¥°¤ò¥Ç¥£¥¹¥¯¤Ë½ñ¤¹þ¤à"
+msgstr "gtkpod内ã§å¤‰æ›´ãŒã‚ã£ãŸID3タグをディスクã«æ›¸ã込む"
-#: ../data/gtkpod.glade.h:366
+#: ../data/gtkpod.glade.h:364
msgid "Write all changes made to the disk and the iPod(s)."
-msgstr "¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤È iPod ¤ËÂФ¹¤ëÊѹ¹¤ò¤¹¤Ù¤ÆÊݸ¤·¤Þ¤¹."
+msgstr "ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã¨ iPod ã«å¯¾ã™ã‚‹å¤‰æ›´ã‚’ã™ã¹ã¦ä¿å˜ã—ã¾ã™."
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:365
#, fuzzy
msgid ""
"Write extended information (PC filenames, SHA1 hashes,\n"
"encoding...). Recommended."
msgstr ""
-"³ÈÄ¥¾ðÊó(PC¾å¤Î¥Õ¥¡¥¤¥ë̾,MD5ÃÍ,ʸ»ú¥³¡¼¥É)¤ò½ñ¤¹þ¤à¡£\n"
-"¿ä¾©¤µ¤ì¤ëÀßÄê¤Ç¤¹¡£"
+"æ‹¡å¼µæƒ…å ±(PC上ã®ãƒ•ã‚¡ã‚¤ãƒ«å,MD5値,æ–‡å—コード)を書ã込む。\n"
+"推奨ã•ã‚Œã‚‹è¨å®šã§ã™ã€‚"
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:367
msgid ""
"You can also use the table headers, but this allows you to sort according to "
"a column that is not displayed."
msgstr ""
-"ɽ¤Î¥Ø¥Ã¥À¤òÁàºî¤·¤Æ¤âʤٴ¹¤¨¤Ï¤Ç¤¤Þ¤¹¤¬, ¤³¤Îµ¡Ç½¤ò»È¤¦¤Èɽ¼¨¤µ¤ì¤Æ¤¤¤Ê¤¤"
-"¹àÌܤò»È¤Ã¤Æʤٴ¹¤¨¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹."
+"表ã®ãƒ˜ãƒƒãƒ€ã‚’æ“作ã—ã¦ã‚‚並ã¹æ›ãˆã¯ã§ãã¾ã™ãŒ, ã“ã®æ©Ÿèƒ½ã‚’使ã†ã¨è¡¨ç¤ºã•ã‚Œã¦ã„ãªã„"
+"é …ç›®ã‚’ä½¿ã£ã¦ä¸¦ã¹æ›ãˆã‚‹ã“ã¨ãŒã§ãã¾ã™."
+#: ../data/gtkpod.glade.h:368
+#, fuzzy
+msgid "_About gtkpod"
+msgstr "gtkpod ã«ã¤ã„ã¦"
+
+#: ../data/gtkpod.glade.h:369
+#, fuzzy
+msgid "_Add Album"
+msgstr "アルãƒãƒ "
+
#: ../data/gtkpod.glade.h:370
-msgid "_About"
-msgstr "gtkpod¤Ë¤Ä¤¤¤Æ(_A)"
+msgid "_Add Image"
+msgstr ""
#: ../data/gtkpod.glade.h:371
+#, fuzzy
+msgid "_Album"
+msgstr "アルãƒãƒ "
+
+#: ../data/gtkpod.glade.h:372
msgid "_All Tracks"
-msgstr "¤¹¤Ù¤Æ¤Î¶Ê(_A)"
+msgstr "ã™ã¹ã¦ã®æ›²(_A)"
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:373
msgid "_Arrange Sort Tabs"
-msgstr "¥½¡¼¥È¥¿¥Ö¤òºÆÇÛÃÖ(_A)"
+msgstr "ソートタブをå†é…ç½®(_A)"
-#: ../data/gtkpod.glade.h:373
+#: ../data/gtkpod.glade.h:374
msgid "_Check iPod's Files"
-msgstr "iPod ¤Î¥Õ¥¡¥¤¥ë¤ò¥Á¥§¥Ã¥¯(_C)"
+msgstr "iPod ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒã‚§ãƒƒã‚¯(_C)"
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:375
msgid "_Conversion Log"
msgstr ""
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:376
msgid "_Create Playlists"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤òºîÀ®(_C)"
+msgstr "プレイリストを作æˆ(_C)"
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:377
msgid "_Create iPod's Directories"
-msgstr "iPod¤Î½é´üÀßÄê(_C)"
+msgstr "iPodã®åˆæœŸè¨å®š(_C)"
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:378
msgid "_Delete"
-msgstr "ºï½ü(_D)"
+msgstr "削除(_D)"
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:379
msgid "_Display"
-msgstr "ɽ¼¨(_D)"
+msgstr "表示(_D)"
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:380
msgid "_Displayed Tracks"
-msgstr "ɽ¼¨¤µ¤ì¤Æ¤¤¤ë¶Ê(_D)"
+msgstr "表示ã•ã‚Œã¦ã„る曲(_D)"
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:381
msgid "_Edit"
-msgstr "ÊÔ½¸(_E)"
+msgstr "編集(_E)"
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:382
msgid "_Encoding (ID3, files):"
-msgstr "ʸ»ú¥³¡¼¥É(_E) (ID3, ¥Õ¥¡¥¤¥ë):"
+msgstr "æ–‡å—コード(_E) (ID3, ファイル):"
-#: ../data/gtkpod.glade.h:382
+#: ../data/gtkpod.glade.h:383
msgid "_Enqueue"
-msgstr "±éÁÕ¥¥å¡¼¤ËÆþ¤ì¤ë(_E)"
+msgstr "æ¼”å¥ã‚ューã«å…¥ã‚Œã‚‹(_E)"
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:384
msgid "_Export Tracks from Database"
-msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¶Ê¤ò¼è¤ê½Ð¤¹(_E)"
+msgstr "データベースã‹ã‚‰æ›²ã‚’å–り出ã™(_E)"
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:385
msgid "_File"
-msgstr "¥Õ¥¡¥¤¥ë(_F)"
+msgstr "ファイル(_F)"
-#: ../data/gtkpod.glade.h:385
-msgid "_Find New"
-msgstr ""
-
#: ../data/gtkpod.glade.h:386
msgid "_General"
-msgstr "´ðËÜÀßÄê(_G)"
+msgstr "基本è¨å®š(_G)"
#: ../data/gtkpod.glade.h:387
msgid "_Help"
-msgstr "¥Ø¥ë¥×(_H)"
+msgstr "ヘルプ(_H)"
#: ../data/gtkpod.glade.h:388
msgid "_Ignore rules"
-msgstr "¥ë¡¼¥ë¤ò̵»ë(_I)"
+msgstr "ルールを無視(_I)"
#: ../data/gtkpod.glade.h:389
+msgid "_Image"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:390
msgid "_Info Window"
-msgstr "¾ðÊó(_I)"
+msgstr "æƒ…å ±(_I)"
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:391
msgid "_Last.FM"
msgstr ""
-#: ../data/gtkpod.glade.h:391
+#: ../data/gtkpod.glade.h:392
msgid "_Less Sort Tabs"
-msgstr "¥½¡¼¥È¥¿¥Ö¤Îºï½ü(_L)"
+msgstr "ソートタブã®å‰Šé™¤(_L)"
-#: ../data/gtkpod.glade.h:392
+#: ../data/gtkpod.glade.h:393
msgid "_Limit to"
-msgstr "À©¸Â(_L)"
+msgstr "制é™(_L)"
-#: ../data/gtkpod.glade.h:393
+#: ../data/gtkpod.glade.h:394
msgid "_Load iPod(s)"
-msgstr "iPod ¤«¤éÆɤ߹þ¤ß(_L)"
+msgstr "iPod ã‹ã‚‰èªã¿è¾¼ã¿(_L)"
-#: ../data/gtkpod.glade.h:394
+#: ../data/gtkpod.glade.h:395
msgid "_Local"
-msgstr "¥Ç¥£¥¹¥¯(_L)"
+msgstr "ディスク(_L)"
-#: ../data/gtkpod.glade.h:395
+#: ../data/gtkpod.glade.h:396
msgid "_M3U"
msgstr ""
-#: ../data/gtkpod.glade.h:396
-msgid "_More Sort Tabs"
-msgstr "¥½¡¼¥È¥¿¥Ö¤ÎÄɲÃ(_M)"
-
#: ../data/gtkpod.glade.h:397
-msgid "_Newly Added Tracks"
-msgstr "¿·¤¿¤ËÄɲ䵤줿¶Ê(_N)"
+msgid "_Misc."
+msgstr ""
#: ../data/gtkpod.glade.h:398
-msgid "_Normalize Volume"
-msgstr "¥Ü¥ê¥å¡¼¥à¤ÎÊ¿¶Ñ²½"
+msgid "_More Sort Tabs"
+msgstr "ソートタブã®è¿½åŠ (_M)"
#: ../data/gtkpod.glade.h:399
-msgid "_Number of sort tabs:"
-msgstr "¥½¡¼¥È¥¿¥Ö¤Î¿ô(_N):"
+msgid "_Newly Added Tracks"
+msgstr "æ–°ãŸã«è¿½åŠ ã•ã‚ŒãŸæ›²(_N)"
#: ../data/gtkpod.glade.h:400
-msgid "_Other"
-msgstr ""
+msgid "_Normalize Volume"
+msgstr "ボリュームã®å¹³å‡åŒ–"
#: ../data/gtkpod.glade.h:401
+msgid "_Number of sort tabs:"
+msgstr "ソートタブã®æ•°(_N):"
+
+#: ../data/gtkpod.glade.h:402
msgid "_PLS"
msgstr ""
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
msgid "_Play Now"
-msgstr "º£¤¹¤°±éÁÕ(_P)"
+msgstr "今ã™ãæ¼”å¥(_P)"
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
msgid "_Podcasts"
msgstr ""
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:405
msgid "_Prefer Local"
-msgstr "¤Ç¤¤ì¤Ð¥Ç¥£¥¹¥¯(_P)"
+msgstr "ã§ãã‚Œã°ãƒ‡ã‚£ã‚¹ã‚¯(_P)"
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:406
+#, fuzzy
+msgid "_Remove Album"
+msgstr "アルãƒãƒ "
+
+#: ../data/gtkpod.glade.h:407
+#, fuzzy
+msgid "_Remove Cover Art"
+msgstr "ã‚«ãƒãƒ¼ã‚¢ãƒ¼ãƒˆã‚’削除"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:409
msgid "_Save Changes"
-msgstr "Êѹ¹¤ÎÊݸ(_S)"
+msgstr "変更ã®ä¿å˜(_S)"
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:410
msgid "_Save Displayed Track Order"
-msgstr "¸½ºß¤Î¶Ê½ç¤òÊݸ(_S)"
+msgstr "ç¾åœ¨ã®æ›²é †ã‚’ä¿å˜(_S)"
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:411
msgid "_Sorting"
-msgstr "ʤٴ¹¤¨(_S)"
+msgstr "並ã¹æ›ãˆ(_S)"
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:412
#, fuzzy
msgid "_Synchronize Playlist with Dir(s)"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤òƱ´ü¤¹¤ë(_S)"
+msgstr "プレイリストをåŒæœŸã™ã‚‹(_S)"
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:413
msgid "_Toolbar"
-msgstr "¥Ä¡¼¥ë¥Ð¡¼(_T)"
+msgstr "ツールãƒãƒ¼(_T)"
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:414
msgid "_Tools"
-msgstr "¥Ä¡¼¥ë(_T)"
+msgstr "ツール(_T)"
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:415
msgid "_Tooltips"
-msgstr "¥Ä¡¼¥ë¥Á¥Ã¥×(_T)"
+msgstr "ツールãƒãƒƒãƒ—(_T)"
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:416
msgid "_Track Info"
-msgstr "¶Ê¾ðÊó(_T)"
+msgstr "æ›²æƒ…å ±(_T)"
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:417
msgid "_Undo All"
-msgstr "¤¹¤Ù¤Æ¤ä¤êľ¤·(_U)"
+msgstr "ã™ã¹ã¦ã‚„ã‚Šç›´ã—(_U)"
-#: ../data/gtkpod.glade.h:414
-#, fuzzy
-msgid "_Undo Track"
-msgstr "̤ɾ²Á¤Î¶Ê"
-
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:418
msgid "_Update Tracks from File"
-msgstr "¥Õ¥¡¥¤¥ë¤ò¸µ¤Ë¶Ê¤ò¹¹¿·¤¹¤ë(_U)"
+msgstr "ファイルを元ã«æ›²ã‚’æ›´æ–°ã™ã‚‹(_U)"
-#: ../data/gtkpod.glade.h:416
+#: ../data/gtkpod.glade.h:419
#, fuzzy
msgid "_Video"
-msgstr "ɽ¼¨(_V)"
+msgstr "表示(_V)"
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:420
msgid "_View"
-msgstr "ɽ¼¨(_V)"
+msgstr "表示(_V)"
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:421
msgid "_iPod"
msgstr "iPod(_i)"
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:423
#, no-c-format
msgid ""
"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
@@ -1897,232 +1967,251 @@
"several templates by a ';'. The first one matching the filename will be "
"used. Example: '%a - %A/%T %t.mp3;%t.wav'."
msgstr ""
-"¥¢¡¼¥Æ¥£¥¹¥È: %a, ¥¢¥ë¥Ð¥à: %A, ºî¶Ê¼Ô: %c, ¥¿¥¤¥È¥ë: %t, ¥¸¥ã¥ó¥ë: %G, ¥È"
-"¥é¥Ã¥¯ÈÖ¹æ: %T, CD ÈÖ¹æ: %C, ǯ: %Y, ¥¹¥¥Ã¥×: %*, ¥Ñ¡¼¥»¥ó¥Èµ¹æ: %%¡£¤¤¤¯¤Ä"
-"¤«¤Î¥Æ¥ó¥×¥ì¡¼¥È¤ò';' ¤Ç¶èÀڤäÆʤ٤뤳¤È¤¬¤Ç¤¤Þ¤¹¡£ºÇ½é¤Ë¹ç¤Ã¤¿¥Æ¥ó¥×¥ì¡¼"
-"¥È¤¬»È¤ï¤ì¤Þ¤¹¡£Îã: '%a - %A/%T %t.mp3;%t.wav'."
+"アーティスト: %a, アルãƒãƒ : %A, 作曲者: %c, タイトル: %t, ジャンル: %G, ト"
+"ラック番å·: %T, CD 番å·: %C, å¹´: %Y, スã‚ップ: %*, パーセント記å·: %%。ã„ãã¤"
+"ã‹ã®ãƒ†ãƒ³ãƒ—レートを';' ã§åŒºåˆ‡ã£ã¦ä¸¦ã¹ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚最åˆã«åˆã£ãŸãƒ†ãƒ³ãƒ—レー"
+"トãŒä½¿ã‚ã‚Œã¾ã™ã€‚例: '%a - %A/%T %t.mp3;%t.wav'."
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:424
msgid "folder"
msgstr ""
-#: ../data/gtkpod.glade.h:422
+#: ../data/gtkpod.glade.h:425
msgid "folder.jpg"
msgstr ""
-#: ../data/gtkpod.glade.h:424
+#: ../data/gtkpod.glade.h:427
#, no-c-format
msgid "folder.jpg;%a.jpg"
msgstr ""
-#: ../data/gtkpod.glade.h:425
+#: ../data/gtkpod.glade.h:428
msgid "gtkpod"
msgstr "gtkpod"
-#: ../data/gtkpod.glade.h:426
+#: ../data/gtkpod.glade.h:429
#, fuzzy
msgid "gtkpod Info"
msgstr "gtkpod"
-#: ../data/gtkpod.glade.h:427
+#: ../data/gtkpod.glade.h:430
msgid ""
"gtkpod expects the ID3 tags and the filenames to be in the encoding "
"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
"operation. 'System Charset' is the charset used by your current locale."
msgstr ""
-"gtkpod ¤Ï¤³¤³¤Ç»ØÄꤵ¤ì¤¿Ê¸»ú¥³¡¼¥É¤¬, ID3¤Î¥¿¥°¤ä¥Õ¥¡¥¤¥ë̾¤Ë»È¤ï¤ì¤Æ¤¤¤ë¤â"
-"¤Î¤È¤·¤Æ½èÍý¤·¤Þ¤¹.¡Ö¥Õ¥¡¥¤¥ë¤ÎÄɲáפä¡Ö¥Ç¥£¥ì¥¯¥È¥ê¤´¤ÈÄɲáפò¼Â¹Ô¤¹¤ëÁ°¤Ë"
-"¤³¤ÎÀßÄê¤òÊѹ¹¤¹¤ì¤Ð, ¤³¤ì¤é¤Î½èÍý¤ËÀßÄ꤬ȿ±Ç¤µ¤ì¤Þ¤¹.¡Ö¥·¥¹¥Æ¥àʸ»ú¡×¤òÁªÂò"
-"¤¹¤ë¤È, ¥í¥±¡¼¥ë¤Ç»ØÄꤵ¤ì¤¿¥³¡¼¥É¤¬»È¤ï¤ì¤Þ¤¹."
+"gtkpod ã¯ã“ã“ã§æŒ‡å®šã•ã‚ŒãŸæ–‡å—コードãŒ, ID3ã®ã‚¿ã‚°ã‚„ファイルåã«ä½¿ã‚ã‚Œã¦ã„ã‚‹ã‚‚"
+"ã®ã¨ã—ã¦å‡¦ç†ã—ã¾ã™.「ファイルã®è¿½åŠ ã€ã‚„「ディレクトリã”ã¨è¿½åŠ ã€ã‚’実行ã™ã‚‹å‰ã«"
+"ã“ã®è¨å®šã‚’変更ã™ã‚Œã°, ã“れらã®å‡¦ç†ã«è¨å®šãŒåæ˜ ã•ã‚Œã¾ã™.「システム文å—ã€ã‚’é¸æŠž"
+"ã™ã‚‹ã¨, ãƒã‚±ãƒ¼ãƒ«ã§æŒ‡å®šã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ãŒä½¿ã‚ã‚Œã¾ã™."
-#: ../data/gtkpod.glade.h:428
+#: ../data/gtkpod.glade.h:431
msgid "gtkpod options"
-msgstr "gtkpod ¤Î¥ª¥×¥·¥ç¥ó"
+msgstr "gtkpod ã®ã‚ªãƒ—ション"
#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
-#: ../data/gtkpod.glade.h:430
+#: ../data/gtkpod.glade.h:433
msgid ""
"iPod\n"
"Local Repository (Standard)\n"
"Local Repository (Podcasts)\n"
msgstr ""
-#: ../data/gtkpod.glade.h:434
+#: ../data/gtkpod.glade.h:437
#, fuzzy
msgid "iPod mountpoint:"
-msgstr "iPod¤Î¥Þ¥¦¥ó¥È¾ì½ê(_P):"
+msgstr "iPodã®ãƒžã‚¦ãƒ³ãƒˆå ´æ‰€(_P):"
-#: ../data/gtkpod.glade.h:435
+#: ../data/gtkpod.glade.h:438
msgid "iTunesDB backup:"
msgstr ""
-#: ../data/gtkpod.glade.h:436
-msgid "label"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:439
msgid "mserv Root:"
msgstr ""
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:440
msgid "mserv database lookup will be done for music in this directory."
-msgstr "¤³¤Î¥Ç¥£¥ì¥¯¥È¥êÆâ¤Î¶Ê¤ËÂФ·¡¢mserv ¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»²¾È¤·¤Þ¤¹¡£"
+msgstr "ã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå†…ã®æ›²ã«å¯¾ã—ã€mserv ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’å‚ç…§ã—ã¾ã™ã€‚"
-#: ../data/gtkpod.glade.h:439 ../src/details.c:1175
+#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
msgid "n/a"
-msgstr "ÉÔ²Ä"
+msgstr "ä¸å¯"
-#: ../data/gtkpod.glade.h:440
+#: ../data/gtkpod.glade.h:442
msgid "special_sorttab -- Don't translate!"
msgstr ""
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr ""
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr ""
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+
+#: ../src/autodetection.c:416
+#, fuzzy
+msgid "New iPod"
+msgstr "æ–°è¦ãƒ—レイリスト"
+
#: ../src/charset.c:53
msgid "Arabic (IBM-864)"
-msgstr "¥¢¥é¥Ó¥¢¸ì (IBM-864)"
+msgstr "アラビア語 (IBM-864)"
#: ../src/charset.c:54
msgid "Arabic (ISO-8859-6)"
-msgstr "¥¢¥é¥Ó¥¢¸ì (ISO-8859-6)"
+msgstr "アラビア語 (ISO-8859-6)"
#: ../src/charset.c:55
msgid "Arabic (Windows-1256)"
-msgstr "¥¢¥é¥Ó¥¢¸ì (Windows-1256)"
+msgstr "アラビア語 (Windows-1256)"
#: ../src/charset.c:56
msgid "Baltic (ISO-8859-13)"
-msgstr "¥Ð¥ë¥È¸ì (ISO-8859-13)"
+msgstr "ãƒãƒ«ãƒˆèªž (ISO-8859-13)"
#: ../src/charset.c:57
msgid "Baltic (ISO-8859-4)"
-msgstr "¥Ð¥ë¥È¸ì (ISO-8859-4)"
+msgstr "ãƒãƒ«ãƒˆèªž (ISO-8859-4)"
#: ../src/charset.c:58
msgid "Baltic (Windows-1257)"
-msgstr "¥Ð¥ë¥È¸ì (Windows-1257)"
+msgstr "ãƒãƒ«ãƒˆèªž (Windows-1257)"
#: ../src/charset.c:59
msgid "Celtic (ISO-8859-14)"
-msgstr "¥±¥ë¥È¸ì (ISO-8859-14)"
+msgstr "ケルト語 (ISO-8859-14)"
#: ../src/charset.c:60
msgid "Central European (IBM-852)"
-msgstr "Ãæ±û¥è¡¼¥í¥Ã¥Ñ (IBM-852)"
+msgstr "ä¸å¤®ãƒ¨ãƒ¼ãƒãƒƒãƒ‘ (IBM-852)"
#: ../src/charset.c:61
msgid "Central European (ISO-8859-2)"
-msgstr "Ãæ±û¥è¡¼¥í¥Ã¥Ñ (ISO-8859-2)"
+msgstr "ä¸å¤®ãƒ¨ãƒ¼ãƒãƒƒãƒ‘ (ISO-8859-2)"
#: ../src/charset.c:62
msgid "Central European (Windows-1250)"
-msgstr "Ãæ±û¥è¡¼¥í¥Ã¥Ñ (Windows-1250)"
+msgstr "ä¸å¤®ãƒ¨ãƒ¼ãƒãƒƒãƒ‘ (Windows-1250)"
#: ../src/charset.c:63
msgid "Chinese Simplified (GB18030)"
-msgstr "Ãæ¹ñ¸ì ´ÊÂλú (GB18030)"
+msgstr "ä¸å›½èªž ç°¡ä½“å— (GB18030)"
#: ../src/charset.c:64
msgid "Chinese Simplified (GB2312)"
-msgstr "Ãæ¹ñ¸ì ´ÊÂλú (GB2312)"
+msgstr "ä¸å›½èªž ç°¡ä½“å— (GB2312)"
#: ../src/charset.c:65
msgid "Chinese Traditional (Big5)"
-msgstr "Ãæ¹ñ¸ì ÈËÂλú (Big5)"
+msgstr "ä¸å›½èªž ç¹ä½“å— (Big5)"
#: ../src/charset.c:66
msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Ãæ¹ñ¸ì ÈËÂλú (Big5-HKSCS)"
+msgstr "ä¸å›½èªž ç¹ä½“å— (Big5-HKSCS)"
#: ../src/charset.c:67
msgid "Cyrillic (IBM-855)"
-msgstr "¥¥ê¥ë¸ì (IBM-855)"
+msgstr "ã‚リル語 (IBM-855)"
#: ../src/charset.c:68
msgid "Cyrillic (ISO-8859-5)"
-msgstr "¥¥ê¥ë¸ì (ISO-8859-5)"
+msgstr "ã‚リル語 (ISO-8859-5)"
#: ../src/charset.c:69
msgid "Cyrillic (ISO-IR-111)"
-msgstr "¥¥ê¥ë¸ì (ISO-IR-111)"
+msgstr "ã‚リル語 (ISO-IR-111)"
#: ../src/charset.c:70
msgid "Cyrillic (KOI8-R)"
-msgstr "¥¥ê¥ë¸ì (KOI8-R)"
+msgstr "ã‚リル語 (KOI8-R)"
#: ../src/charset.c:71
msgid "Cyrillic (Windows-1251)"
-msgstr "¥¥ê¥ë¸ì (Windows-1251)"
+msgstr "ã‚リル語 (Windows-1251)"
#: ../src/charset.c:72
msgid "Cyrillic/Russian (CP-866)"
-msgstr "¥¥ê¥ë/¥í¥·¥¢¸ì (CP-866)"
+msgstr "ã‚リル/ãƒã‚·ã‚¢èªž (CP-866)"
#: ../src/charset.c:73
msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "¥¥ê¥ë/¥¦¥¯¥é¥¤¥Ê¸ì (KOI8-U)"
+msgstr "ã‚リル/ウクライナ語 (KOI8-U)"
#: ../src/charset.c:74
msgid "English (US-ASCII)"
-msgstr "±Ñ¸ì (US-ASCII)"
+msgstr "英語 (US-ASCII)"
#: ../src/charset.c:75
msgid "Greek (ISO-8859-7)"
-msgstr "¥®¥ê¥·¥¢¸ì (ISO-8859-7)"
+msgstr "ギリシア語 (ISO-8859-7)"
#: ../src/charset.c:76
msgid "Greek (Windows-1253)"
-msgstr "¥®¥ê¥·¥¢¸ì (Windows-1253)"
+msgstr "ギリシア語 (Windows-1253)"
#: ../src/charset.c:77
msgid "Hebrew (IBM-862)"
-msgstr "¥Ø¥Ö¥é¥¤¸ì (IBM-862)"
+msgstr "ヘブライ語 (IBM-862)"
#: ../src/charset.c:78
msgid "Hebrew (Windows-1255)"
-msgstr "¥Ø¥Ö¥é¥¤¸ì (Windows-1255)"
+msgstr "ヘブライ語 (Windows-1255)"
#: ../src/charset.c:79
msgid "Japanese (automatic detection)"
-msgstr "ÆüËܸì (¼«Æ°È½ÊÌ)"
+msgstr "日本語 (自動判別)"
#: ../src/charset.c:80
msgid "Japanese (EUC-JP)"
-msgstr "ÆüËܸì (EUC-JP)"
+msgstr "日本語 (EUC-JP)"
#: ../src/charset.c:81
msgid "Japanese (ISO-2022-JP)"
-msgstr "ÆüËܸì (ISO-2022-JP)"
+msgstr "日本語 (ISO-2022-JP)"
#: ../src/charset.c:82
msgid "Japanese (Shift_JIS)"
-msgstr "ÆüËܸì (Shift_JIS)"
+msgstr "日本語 (Shift_JIS)"
#: ../src/charset.c:83
msgid "Korean (EUC-KR)"
-msgstr "´Ú¹ñ¸ì (EUC-KR)"
+msgstr "韓国語 (EUC-KR)"
#: ../src/charset.c:84
msgid "Nordic (ISO-8859-10)"
-msgstr "Ë̲¤¸ì (ISO-8859-10)"
+msgstr "北欧語 (ISO-8859-10)"
#: ../src/charset.c:85
msgid "South European (ISO-8859-3)"
-msgstr "ÆîÉô¥è¡¼¥í¥Ã¥Ñ¸ì (ISO-8859-3)"
+msgstr "å—部ヨーãƒãƒƒãƒ‘語 (ISO-8859-3)"
#: ../src/charset.c:86
msgid "Thai (TIS-620)"
-msgstr "¥¿¥¤¸ì (TIS-620)"
+msgstr "タイ語 (TIS-620)"
#: ../src/charset.c:87
msgid "Turkish (IBM-857)"
-msgstr "¥È¥ë¥³¸ì (IBM-857)"
+msgstr "トルコ語 (IBM-857)"
#: ../src/charset.c:88
msgid "Turkish (ISO-8859-9)"
-msgstr "¥È¥ë¥³¸ì (ISO-8859-9)"
+msgstr "トルコ語 (ISO-8859-9)"
#: ../src/charset.c:89
msgid "Turkish (Windows-1254)"
-msgstr "¥È¥ë¥³¸ì (Windows-1254)"
+msgstr "トルコ語 (Windows-1254)"
#: ../src/charset.c:90
msgid "Unicode (UTF-7)"
@@ -2150,380 +2239,548 @@
#: ../src/charset.c:96
msgid "Vietnamese (VISCII)"
-msgstr "¥Ù¥È¥Ê¥à¸ì (VISCII)"
+msgstr "ベトナム語 (VISCII)"
#: ../src/charset.c:97
msgid "Vietnamese (Windows-1258)"
-msgstr "¥Ù¥È¥Ê¥à¸ì (Windows-1258)"
+msgstr "ベトナム語 (Windows-1258)"
#: ../src/charset.c:98
msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "»ë³Ð·Ý½Ñ¸þ¤±¥Ø¥Ö¥é¥¤¸ì (ISO-8859-8)"
+msgstr "視覚芸術å‘ã‘ヘブライ語 (ISO-8859-8)"
#: ../src/charset.c:99
msgid "Western (IBM-850)"
-msgstr "À¾ÍÎ (IBM-850)"
+msgstr "西洋 (IBM-850)"
#: ../src/charset.c:100
msgid "Western (ISO-8859-1)"
-msgstr "À¾ÍÎ (ISO-8859-1)"
+msgstr "西洋 (ISO-8859-1)"
#: ../src/charset.c:101
msgid "Western (ISO-8859-15)"
-msgstr "À¾ÍÎ (ISO-8859-15)"
+msgstr "西洋 (ISO-8859-15)"
#: ../src/charset.c:102
msgid "Western (Windows-1252)"
-msgstr "À¾ÍÎ (Windows-1252)"
+msgstr "西洋 (Windows-1252)"
#. sanity!
#. check for "System Charset" and return NULL
#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
msgid "System Charset"
-msgstr "¥·¥¹¥Æ¥àʸ»ú"
+msgstr "システム文å—"
#. we are not the first instance of gtkpod -- the socket is
#. already being used, so we pass
#: ../src/clientserver.c:214
msgid ""
"Another instance of gtkpod was detected. Playcount server not started.\n"
-msgstr "gtkpod ¤¬¤¹¤Ç¤ËÆ°ºîÃæ¤Ç¤¹¡£¥×¥ì¥¤¥«¥¦¥ó¥È¥µ¡¼¥Ð¡¼¤Ïµ¯Æ°¤·¤Þ¤»¤ó¡£\n"
+msgstr "gtkpod ãŒã™ã§ã«å‹•ä½œä¸ã§ã™ã€‚プレイカウントサーãƒãƒ¼ã¯èµ·å‹•ã—ã¾ã›ã‚“。\n"
#: ../src/confirmation.c:377
msgid "Confirmation Dialogue"
-msgstr "³Îǧ"
+msgstr "確èª"
-#: ../src/context_menus.c:359
+#: ../src/context_menus.c:362
#, c-format
msgid "Copied \"%s\" playlist to %s"
msgstr ""
-#: ../src/context_menus.c:398
+#: ../src/context_menus.c:401
#, fuzzy, c-format
msgid "Copied %d track to '%s'"
msgid_plural "Copied %d tracks to '%s'"
-msgstr[0] "%2$d¶ÊÃæ %1$d¶Ê¤ò¥³¥Ô¡¼¤·¤Þ¤·¤¿¡£"
+msgstr[0] "%2$dæ›²ä¸ %1$d曲をコピーã—ã¾ã—ãŸã€‚"
-#: ../src/context_menus.c:426
+#: ../src/context_menus.c:429
#, c-format
msgid "Copied '%s' playlist to '%s' in '%s'"
msgstr ""
-#: ../src/context_menus.c:459
+#: ../src/context_menus.c:462
#, fuzzy, c-format
msgid "Copied %d track to '%s' in '%s'"
msgid_plural "Copied %d tracks to %s in '%s'"
-msgstr[0] "¥×¥ì¥¤¥ê¥¹¥È '%2$s' ¤«¤é %1$d ¶Êºï½ü¤·¤Þ¤·¤¿"
+msgstr[0] "プレイリスト '%2$s' ã‹ã‚‰ %1$d 曲削除ã—ã¾ã—ãŸ"
-#: ../src/context_menus.c:619 ../src/tools.c:854
+#: ../src/context_menus.c:622 ../src/tools.c:854
msgid "Play Now"
-msgstr "º£¤¹¤°±éÁÕ"
+msgstr "今ã™ãæ¼”å¥"
-#: ../src/context_menus.c:625 ../src/tools.c:867
+#: ../src/context_menus.c:628 ../src/tools.c:867
msgid "Enqueue"
-msgstr "±éÁÕ¥¥å¡¼¤Ë²Ã¤¨¤ë"
+msgstr "æ¼”å¥ã‚ューã«åŠ ãˆã‚‹"
-#: ../src/context_menus.c:631
+#: ../src/context_menus.c:634
msgid "Copy Tracks to Filesystem"
-msgstr "¶Ê¤ò¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¥³¥Ô¡¼¤¹¤ë"
+msgstr "曲をファイルシステムã«ã‚³ãƒ”ーã™ã‚‹"
-#: ../src/context_menus.c:638 ../src/file_export.c:1085
+#: ../src/context_menus.c:641 ../src/file_export.c:1085
msgid "Create Playlist File"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤òºîÀ®"
+msgstr "プレイリストファイルを作æˆ"
-#: ../src/context_menus.c:645
+#: ../src/context_menus.c:648
msgid "Create new Playlist"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤Î¿·µ¬ºîÀ®"
+msgstr "プレイリストã®æ–°è¦ä½œæˆ"
-#: ../src/context_menus.c:652
+#: ../src/context_menus.c:655
#, fuzzy
msgid "Update Tracks from File"
-msgstr "¥Õ¥¡¥¤¥ë¤ò¸µ¤Ë¶Ê¤ò¹¹¿·¤¹¤ë(_U)"
+msgstr "ファイルを元ã«æ›²ã‚’æ›´æ–°ã™ã‚‹(_U)"
-#: ../src/context_menus.c:666
+#: ../src/context_menus.c:669
msgid "Sync Playlist with Dir(s)"
msgstr ""
-#: ../src/context_menus.c:676
+#: ../src/context_menus.c:679
msgid "Remove All Tracks from iPod"
-msgstr "iPod¤«¤é¶Ê¤òºï½ü"
+msgstr "iPodã‹ã‚‰æ›²ã‚’削除"
-#: ../src/context_menus.c:694
+#: ../src/context_menus.c:697
msgid "Remove All Podcasts from iPod"
-msgstr "¤¹¤Ù¤Æ¤Î Podcast ¤ò iPod ¤«¤éºï½ü"
+msgstr "ã™ã¹ã¦ã® Podcast ã‚’ iPod ã‹ã‚‰å‰Šé™¤"
-#: ../src/context_menus.c:709
+#: ../src/context_menus.c:712
msgid "Delete Including Tracks"
-msgstr "Ãæ¤Î¶Ê¤´¤Èºï½ü"
+msgstr "ä¸ã®æ›²ã”ã¨å‰Šé™¤"
-#: ../src/context_menus.c:717
+#: ../src/context_menus.c:720
msgid "Delete But Keep Tracks"
-msgstr "¶Ê¤Ï»Ä¤·¤¿¤Þ¤Þºï½ü"
+msgstr "曲ã¯æ®‹ã—ãŸã¾ã¾å‰Šé™¤"
-#: ../src/context_menus.c:725
+#: ../src/context_menus.c:728
#, fuzzy
msgid "Edit iPod Properties"
-msgstr "iPod¤Î½é´üÀßÄê"
+msgstr "iPodã®åˆæœŸè¨å®š"
-#: ../src/context_menus.c:732
+#: ../src/context_menus.c:735
#, fuzzy
msgid "Edit Repository Properties"
-msgstr "iPod¤Î½é´üÀßÄê"
+msgstr "iPodã®åˆæœŸè¨å®š"
-#: ../src/context_menus.c:739
+#: ../src/context_menus.c:742
#, fuzzy
msgid "Edit Playlist Properties"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò¥Õ¥¡¥¤¥ë¤«¤éÆɤ߹þ¤ó¤ÇÄɲä·¤Þ¤¹"
+msgstr "プレイリストをファイルã‹ã‚‰èªã¿è¾¼ã‚“ã§è¿½åŠ ã—ã¾ã™"
-#: ../src/context_menus.c:767
+#: ../src/context_menus.c:770
msgid "View Full Size Artwork"
msgstr ""
-#: ../src/context_menus.c:774
+#: ../src/context_menus.c:777
#, fuzzy
msgid "Select Cover From File"
-msgstr "iPod¤«¤éºï½ü"
+msgstr "iPodã‹ã‚‰å‰Šé™¤"
-#: ../src/context_menus.c:781
-msgid "Find Cover on Web"
-msgstr ""
-
-#: ../src/context_menus.c:794
+#: ../src/context_menus.c:790
#, fuzzy
msgid "Load iPod"
-msgstr "iPod ¥Õ¥¡¥¤¥ë"
+msgstr "iPod ファイル"
-#: ../src/context_menus.c:801
+#: ../src/context_menus.c:797
msgid "Eject iPod"
msgstr ""
-#: ../src/context_menus.c:818
+#: ../src/context_menus.c:814
msgid "Remove All Tracks from Database"
-msgstr "¤¹¤Ù¤Æ¤Î¶Ê¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü"
+msgstr "ã™ã¹ã¦ã®æ›²ã‚’データベースã‹ã‚‰å‰Šé™¤"
-#: ../src/context_menus.c:833
+#: ../src/context_menus.c:829
msgid "Delete Including Tracks (Harddisk)"
-msgstr "Ãæ¤Î¶Ê¤´¤Èºï½ü (¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤é)"
+msgstr "ä¸ã®æ›²ã”ã¨å‰Šé™¤ (ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰)"
-#: ../src/context_menus.c:841
+#: ../src/context_menus.c:837
msgid "Delete Including Tracks (Database)"
-msgstr "Ãæ¤Î¶Ê¤´¤Èºï½ü (¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é)"
+msgstr "ä¸ã®æ›²ã”ã¨å‰Šé™¤ (データベースã‹ã‚‰)"
-#: ../src/context_menus.c:849
+#: ../src/context_menus.c:845
msgid "Delete From iPod"
-msgstr "iPod¤«¤éºï½ü"
+msgstr "iPodã‹ã‚‰å‰Šé™¤"
-#: ../src/context_menus.c:857
+#: ../src/context_menus.c:853
msgid "Delete From Playlist"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤«¤éºï½ü"
+msgstr "プレイリストã‹ã‚‰å‰Šé™¤"
-#: ../src/context_menus.c:865
+#: ../src/context_menus.c:861
msgid "Delete From Harddisk"
-msgstr "¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤éºï½ü"
+msgstr "ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å‰Šé™¤"
-#: ../src/context_menus.c:873
+#: ../src/context_menus.c:869
msgid "Delete From Database"
-msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü"
+msgstr "データベースã‹ã‚‰å‰Šé™¤"
-#: ../src/context_menus.c:881
+#: ../src/context_menus.c:877
msgid "Alphabetize"
-msgstr "ʤٴ¹¤¨"
+msgstr "並ã¹æ›ãˆ"
-#: ../src/context_menus.c:949 ../src/context_menus.c:998
+#: ../src/context_menus.c:895
#, fuzzy
+msgid "Remove Album"
+msgstr "アルãƒãƒ "
+
+#: ../src/context_menus.c:905
+#, fuzzy
+msgid "Remove Photo"
+msgstr "ã‚«ãƒãƒ¼ã‚¢ãƒ¼ãƒˆã‚’削除"
+
+#: ../src/context_menus.c:922
+msgid "Rename Album"
+msgstr ""
+
+#: ../src/context_menus.c:981 ../src/context_menus.c:1030
+#, fuzzy
msgid "Copy selected playlist to..."
-msgstr "ÁªÂò¤µ¤ì¤¿¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "é¸æŠžã•ã‚ŒãŸãƒ—レイリスト"
-#: ../src/context_menus.c:1051
+#: ../src/context_menus.c:1083
#, fuzzy
msgid "Copy selected track(s) to..."
-msgstr "ºï½ü¤µ¤ì¤¿¶Ê"
+msgstr "削除ã•ã‚ŒãŸæ›²"
#: ../src/date_parser.l:269
#, c-format
msgid "Date format error: unrecognized character: '%s'\n"
-msgstr "¥Ç¡¼¥¿¥¨¥é¡¼: ¼¡¤Îʸ»ú¤Ï»ÈÍѤǤ¤Þ¤»¤ó: '%s'\n"
+msgstr "データエラー: 次ã®æ–‡å—ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“: '%s'\n"
-#: ../src/details.c:700
+#: ../src/details.c:82
+msgid "Audio/Video"
+msgstr ""
+
+#: ../src/details.c:83
+msgid "Audio"
+msgstr ""
+
+#: ../src/details.c:84
+#, fuzzy
+msgid "Video"
+msgstr "表示(_V)"
+
+#: ../src/details.c:85
+msgid "Podcast"
+msgstr ""
+
+#: ../src/details.c:86
+msgid "Video Podcast"
+msgstr ""
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr ""
+
+#: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
+msgid "Music Video"
+msgstr ""
+
+#: ../src/details.c:89 ../src/display_spl.c:107 ../src/display_spl.c:210
+#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
+msgid "TV Show"
+msgstr ""
+
+#: ../src/details.c:90
+msgid "TV Show & Music Video"
+msgstr ""
+
+#: ../src/details.c:836
#, c-format
msgid "%s (image data corrupted or unreadable)"
msgstr ""
-#: ../src/details.c:1246
+#: ../src/details.c:973
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr ""
+
+#: ../src/details.c:1418
msgid "<b>n/a</b>"
-msgstr "<b>ÉÔ²Ä</b>"
+msgstr "<b>ä¸å¯</b>"
-#: ../src/display.c:647
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr ""
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr ""
+
+#: ../src/display.c:490
+#, c-format
+msgid "<b>Image Dimensions: %s</b>"
+msgstr ""
+
+#: ../src/display.c:744
msgid "Edit selected entry of which sort tab?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¤â¤Î¤òÊÔ½¸¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸã‚‚ã®ã‚’編集ã—ã¾ã™ã‹ï¼Ÿ"
#. no entry selected
-#: ../src/display.c:654 ../src/misc_confirm.c:435 ../src/misc_track.c:2059
+#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
msgid "No entry selected."
-msgstr "²¿¤âÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
+msgstr "何もé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: ../src/display.c:813 ../src/display.c:1133 ../src/display.c:1189
-#: ../src/display.c:1243 ../src/display.c:1298 ../src/display.c:1559
+#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
+#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
#, c-format
msgid "No entry selected in Sort Tab %d"
-msgstr "¥½¡¼¥È¥¿¥Ö %d Æâ¤Ç¤Ï²¿¤âÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
+msgstr "ソートタブ %d 内ã§ã¯ä½•ã‚‚é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: ../src/display.c:852
+#: ../src/display.c:949
msgid "Remove entry of which sort tab from database?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¤â¤Î¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸã‚‚ã®ã‚’データベースã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:860
+#: ../src/display.c:957
msgid "Remove tracks in selected entry of which filter tab from the iPod?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¶Ê¤òiPod¤«¤éºï½ü¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸæ›²ã‚’iPodã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:882
+#: ../src/display.c:979
msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¶Ê¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤éºï½ü¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸæ›²ã‚’ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:912
+#: ../src/display.c:1009
msgid "Remove tracks in selected entry of which filter tab from playlist?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¶Ê¤ò¥×¥ì¥¤¥ê¥¹¥È¤«¤éºï½ü¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸæ›²ã‚’プレイリストã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:939 ../src/display.c:977
+#: ../src/display.c:1036 ../src/display.c:1074
#, c-format
msgid ""
"iPod at '%s' is not loaded.\n"
"Please load it first."
msgstr ""
-#: ../src/display.c:1014 ../src/display.c:1041
+#: ../src/display.c:1111 ../src/display.c:1138
msgid "Update selected entry of which sort tab?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¤â¤Î¤ò¹¹¿·¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸã‚‚ã®ã‚’æ›´æ–°ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:1127
+#: ../src/display.c:1224
msgid "Export selected entry of which sort tab?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¤â¤Î¤ò¥¨¥¯¥¹¥Ý¡¼¥È¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸã‚‚ã®ã‚’エクスãƒãƒ¼ãƒˆã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:1183
+#: ../src/display.c:1280
msgid "Create playlist file from selected entry of which sort tab?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¤â¤Î¤«¤é¥×¥ì¥¤¥ê¥¹¥È¤òºîÀ®¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸã‚‚ã®ã‹ã‚‰ãƒ—レイリストを作æˆã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:1237
+#: ../src/display.c:1334
msgid "Play tracks in selected entry of which sort tab?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¶Ê¤ò±éÁÕ¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸæ›²ã‚’æ¼”å¥ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:1292
+#: ../src/display.c:1389
msgid "Enqueue tracks in selected entry of which sort tab?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¶Ê¤ò±éÁÕ¥¥å¡¼¤Ë²Ã¤¨¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸæ›²ã‚’æ¼”å¥ã‚ューã«åŠ ãˆã¾ã™ã‹ï¼Ÿ"
-#: ../src/display.c:1549
+#: ../src/display.c:1646
msgid "Normalize tracks in selected entry of which sort tab?"
-msgstr "¤É¤Î¥½¡¼¥È¥¿¥Ö¤ÇÁªÂò¤µ¤ì¤¿¶Ê¤òÊ¿¶Ñ²½¤·¤Þ¤¹¤«¡©"
+msgstr "ã©ã®ã‚½ãƒ¼ãƒˆã‚¿ãƒ–ã§é¸æŠžã•ã‚ŒãŸæ›²ã‚’å¹³å‡åŒ–ã—ã¾ã™ã‹ï¼Ÿ"
-#: ../src/display_coverart.c:1714
+#: ../src/display_coverart.c:1713
msgid "Failed to remove the album from the album hash store."
msgstr ""
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr ""
+
#: ../src/display_itdb.c:376
#, fuzzy, c-format
msgid "Failed to set cover art: '%s'\n"
-msgstr "¥«¥Ð¡¼¥¢¡¼¥È¤¬ÀßÄê¤Ç¤¤Þ¤»¤ó: '%s'"
+msgstr "ã‚«ãƒãƒ¼ã‚¢ãƒ¼ãƒˆãŒè¨å®šã§ãã¾ã›ã‚“: '%s'"
-#: ../src/display_itdb.c:851 ../src/display_itdb.c:984
+#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
msgid "Local"
msgstr ""
#. add podcast playlist
-#: ../src/display_itdb.c:859 ../src/display_itdb.c:982
-#: ../src/display_itdb.c:1010
+#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
+#: ../src/display_itdb.c:1025
msgid "Podcasts"
msgstr ""
-#: ../src/display_itdb.c:868 ../src/display_itdb.c:986
+#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
#: ../src/repository.c:1186
#, fuzzy
msgid "iPod"
-msgstr "iPod ¥Õ¥¡¥¤¥ë"
+msgstr "iPod ファイル"
-#: ../src/display_itdb.c:1069
+#: ../src/display_itdb.c:1084
#, c-format
msgid "Increased playcount for '%s'"
-msgstr "'%s' ¤ÎºÆÀ¸²ó¿ô¤òÁý¤ä¤·¤Þ¤·¤¿"
+msgstr "'%s' ã®å†ç”Ÿå›žæ•°ã‚’増やã—ã¾ã—ãŸ"
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr ""
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr ""
+
+#: ../src/display_photo.c:238
+msgid "Could not access the iPod's photo database."
+msgstr ""
+
+#: ../src/display_photo.c:441
+#, fuzzy
+msgid "Photo Albums"
+msgstr "アルãƒãƒ "
+
+#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+msgid "<Unnamed>"
+msgstr ""
+
+#: ../src/display_photo.c:939
+msgid "The Photo Library album cannot be removed"
+msgstr ""
+
+#: ../src/display_photo.c:961
+#, fuzzy
+msgid "Do you want to remove the album's photos too?"
+msgstr "ã™ã¹ã¦ã® Podcast ã‚’ iPod ã‹ã‚‰å‰Šé™¤ã—ã¦ã‚‚本当ã«ã‚ˆã‚ã—ã„ã§ã™ã‹?"
+
+#: ../src/display_photo.c:967
+msgid "Yes. Do Not Display Again"
+msgstr ""
+
+#: ../src/display_photo.c:1038
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr ""
+
+#: ../src/display_photo.c:1053
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr ""
+
+#: ../src/display_photo.c:1128
+msgid "New Photo Album Name"
+msgstr ""
+
+#: ../src/display_photo.c:1129
+#, fuzzy
+msgid "Please enter a new name for the photo album"
+msgstr "æ–°ã—ã„プレイリストã®åå‰ã‚’入力ã—ã¦ãã ã•ã„"
+
+#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+msgid "An album with that name already exists."
+msgstr ""
+
+#: ../src/display_photo.c:1210
+#, fuzzy
+msgid "New Photo Album"
+msgstr "アルãƒãƒ "
+
+#: ../src/display_photo.c:1211
+#, fuzzy
+msgid "Please enter a name for the new photo album"
+msgstr "æ–°ã—ã„プレイリストã®åå‰ã‚’入力ã—ã¦ãã ã•ã„"
+
+#: ../src/display_photo.c:1232
+msgid "The new album failed to be created."
+msgstr ""
+
+#: ../src/display_photo.c:1256
+msgid "Add Image to iPod"
+msgstr ""
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1311
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr ""
+
+#: ../src/display_photo.c:1699
+#, c-format
+msgid "<No members>\n"
+msgstr ""
+
#. give a notice on the statusbar -- otherwise the user
#. * will never know why the drag is not possible
-#: ../src/display_playlists.c:500 ../src/display_playlists.c:542
+#: ../src/display_playlists.c:516 ../src/display_playlists.c:558
msgid "Error: drag from iPod not possible in offline mode."
-msgstr "¥¨¥é¡¼: ¥ª¥Õ¥é¥¤¥ó¥â¡¼¥É¤Ç¤Ï iPod ¤«¤é¤Î¥É¥é¥Ã¥°Áàºî¤Ï¤Ç¤¤Þ¤»¤ó¡£"
+msgstr "エラー: オフラインモードã§ã¯ iPod ã‹ã‚‰ã®ãƒ‰ãƒ©ãƒƒã‚°æ“作ã¯ã§ãã¾ã›ã‚“。"
-#: ../src/display_playlists.c:569 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
#, c-format
msgid "Copied one track"
msgid_plural "Copied %d tracks"
-msgstr[0] "%d¶Ê¥³¥Ô¡¼¤·¤Þ¤·¤¿"
+msgstr[0] "%d曲コピーã—ã¾ã—ãŸ"
-#: ../src/display_playlists.c:849 ../src/display_playlists.c:861
+#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
msgid "Can't reorder sorted treeview."
-msgstr "¥½¡¼¥È¤µ¤ì¤Æ¤¤¤ë½çÈÖ¤òÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó"
+msgstr "ソートã•ã‚Œã¦ã„ã‚‹é †ç•ªã‚’å¤‰æ›´ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
-#: ../src/display_playlists.c:938
+#: ../src/display_playlists.c:954
#, c-format
msgid ""
"This DND type (%d) is not (yet) supported. If you feel implementing this "
"would be useful, please contact the author.\n"
"\n"
msgstr ""
-"¤³¤Î¼ïÎà¤Î¥É¥é¥Ã¥°&¥É¥í¥Ã¥× (DND type %d) ¤Ï̤Âбþ¤Ç¤¹¡£¤â¤·¤³¤ÎÁàºî¤ò¥µ¥Ý¡¼"
-"¥È¤¹¤ë¤³¤È¤¬ÍÍѤÀ¤È¤ª¹Í¤¨¤Ç¤·¤¿¤é¡¢ºî¼Ô¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"ã“ã®ç¨®é¡žã®ãƒ‰ãƒ©ãƒƒã‚°&ドãƒãƒƒãƒ— (DND type %d) ã¯æœªå¯¾å¿œã§ã™ã€‚ã‚‚ã—ã“ã®æ“作をサãƒãƒ¼"
+"トã™ã‚‹ã“ã¨ãŒæœ‰ç”¨ã ã¨ãŠè€ƒãˆã§ã—ãŸã‚‰ã€ä½œè€…ã«é€£çµ¡ã—ã¦ãã ã•ã„。\n"
"\n"
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr ""
+
#: ../src/display_sorttabs.c:473
msgid "'Played' condition ignored because of error."
-msgstr "¡Ö±éÁÕÆü¡×¤Î¾ò·ï¤Ï¥¨¥é¡¼¤Î¤¿¤á¤Ë̵»ë¤µ¤ì¤Þ¤·¤¿¡£"
+msgstr "「演å¥æ—¥ã€ã®æ¡ä»¶ã¯ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã«ç„¡è¦–ã•ã‚Œã¾ã—ãŸã€‚"
#: ../src/display_sorttabs.c:476
msgid "'Modified' condition ignored because of error."
-msgstr "¡ÖÊѹ¹Æü¡×¤Î¾ò·ï¤Ï¥¨¥é¡¼¤Î¤¿¤á¤Ë̵»ë¤µ¤ì¤Þ¤·¤¿¡£"
+msgstr "「変更日ã€ã®æ¡ä»¶ã¯ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã«ç„¡è¦–ã•ã‚Œã¾ã—ãŸã€‚"
#: ../src/display_sorttabs.c:479
msgid "'Added' condition ignored because of error."
-msgstr "¡ÖÅÐÏ¿Æü¡×¤Î¾ò·ï¤Ï¥¨¥é¡¼¤Î¤¿¤á¤Ë̵»ë¤µ¤ì¤Þ¤·¤¿¡£"
+msgstr "「登録日ã€ã®æ¡ä»¶ã¯ã‚¨ãƒ©ãƒ¼ã®ãŸã‚ã«ç„¡è¦–ã•ã‚Œã¾ã—ãŸã€‚"
-#: ../src/display_sorttabs.c:1563 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
msgid "All"
-msgstr "¤¹¤Ù¤Æ"
+msgstr "ã™ã¹ã¦"
-#: ../src/display_sorttabs.c:1589
+#: ../src/display_sorttabs.c:1588
msgid "Compilations"
-msgstr "¥³¥ó¥Ô¥ì¡¼¥·¥ç¥ó"
+msgstr "コンピレーション"
-#: ../src/display_sorttabs.c:2960
+#: ../src/display_sorttabs.c:2988
msgid "Comp."
-msgstr "ºî¶Ê¼Ô"
+msgstr "作曲者"
-#: ../src/display_sorttabs.c:2966 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2002 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
msgid "Year"
-msgstr "ǯ"
+msgstr "å¹´"
-#: ../src/display_sorttabs.c:2969
+#: ../src/display_sorttabs.c:2997
msgid "Special"
-msgstr "¥¹¥Ú¥·¥ã¥ë"
+msgstr "スペシャル"
-#: ../src/display_sorttabs.c:3230
+#: ../src/display_sorttabs.c:3245
msgid "Last Played"
-msgstr "ºÇ¸å¤Ë±éÁÕ¤·¤¿Æü"
+msgstr "最後ã«æ¼”å¥ã—ãŸæ—¥"
-#: ../src/display_sorttabs.c:3231
+#: ../src/display_sorttabs.c:3246
msgid "Last Modified"
-msgstr "ºÇ¸å¤ËÊѹ¹¤·¤¿Æü"
+msgstr "最後ã«å¤‰æ›´ã—ãŸæ—¥"
#: ../src/display_spl.c:64
msgid "days"
-msgstr "Æü"
+msgstr "æ—¥"
#: ../src/display_spl.c:65
msgid "weeks"
-msgstr "½µ"
+msgstr "週"
#: ../src/display_spl.c:66
msgid "months"
-msgstr "·î"
+msgstr "月"
#: ../src/display_spl.c:73
msgid "kbps"
@@ -2533,62 +2790,58 @@
msgid "Hz"
msgstr ""
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:777
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
msgid "MB"
msgstr ""
#: ../src/display_spl.c:76
msgid "secs"
-msgstr "ÉÃ"
+msgstr "秒"
#: ../src/display_spl.c:86 ../src/misc_conversion.c:74
msgid "Bitrate"
-msgstr "¥Ó¥Ã¥È¥ì¡¼¥È"
+msgstr "ビットレート"
#. 15
#: ../src/display_spl.c:87 ../src/misc_conversion.c:75
msgid "Samplerate"
-msgstr "¥µ¥ó¥×¥ê¥ó¥°¥ì¡¼¥È"
+msgstr "サンプリングレート"
#: ../src/display_spl.c:90
msgid "Kind"
-msgstr "¼ïÎà"
+msgstr "種類"
#: ../src/display_spl.c:91 ../src/misc_conversion.c:81
msgid "Date modified"
-msgstr "Êѹ¹Æü"
+msgstr "変更日"
#: ../src/display_spl.c:92
msgid "Track number"
-msgstr "¶ÊÈÖ¹æ"
+msgstr "曲番å·"
#: ../src/display_spl.c:93
msgid "Size"
-msgstr "¥µ¥¤¥º"
+msgstr "サイズ"
-#: ../src/display_spl.c:94 ../src/display_tracks.c:1984
-msgid "Time"
-msgstr "±éÁÕ»þ´Ö"
-
#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
msgid "Comment"
-msgstr "¥³¥á¥ó¥È"
+msgstr "コメント"
#: ../src/display_spl.c:96 ../src/misc_conversion.c:79
msgid "Date added"
-msgstr "ÅÐÏ¿Æü"
+msgstr "登録日"
#: ../src/display_spl.c:99
msgid "Last played"
-msgstr "ºÇ¸å¤Ë±éÁÕ¤·¤¿Æü"
+msgstr "最後ã«æ¼”å¥ã—ãŸæ—¥"
#: ../src/display_spl.c:100
msgid "Disc number"
-msgstr "CD ÈÖ¹æ"
+msgstr "CD 番å·"
#: ../src/display_spl.c:102 ../src/misc_conversion.c:87
msgid "Compilation"
-msgstr "¥³¥ó¥Ô¥ì¡¼¥·¥ç¥ó"
+msgstr "コンピレーション"
#: ../src/display_spl.c:103 ../src/misc_conversion.c:76
msgid "BPM"
@@ -2596,21 +2849,20 @@
#: ../src/display_spl.c:104 ../src/misc_conversion.c:86
msgid "Grouping"
-msgstr "¥°¥ë¡¼¥×"
+msgstr "グループ"
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "プレイリスト"
+
#: ../src/display_spl.c:106
msgid "Video Kind"
msgstr ""
-#: ../src/display_spl.c:107 ../src/display_spl.c:210 ../src/display_spl.c:219
-#: ../src/misc_conversion.c:101
-msgid "TV Show"
-msgstr ""
-
#: ../src/display_spl.c:108
#, fuzzy
msgid "Season number"
-msgstr "CD ÈÖ¹æ"
+msgstr "CD 番å·"
#: ../src/display_spl.c:109
msgid "Skip count"
@@ -2619,183 +2871,172 @@
#: ../src/display_spl.c:110
#, fuzzy
msgid "Last skipped"
-msgstr "ºÇ¸å¤Ë±éÁÕ¤·¤¿Æü"
+msgstr "最後ã«æ¼”å¥ã—ãŸæ—¥"
#: ../src/display_spl.c:111
#, fuzzy
msgid "Album artist"
-msgstr "¥¢¡¼¥Æ¥£¥¹¥È"
+msgstr "アーティスト"
#: ../src/display_spl.c:117
msgid "contains"
-msgstr "¤¬¼¡¤Î¤â¤Î¤ò´Þ¤à"
+msgstr "ãŒæ¬¡ã®ã‚‚ã®ã‚’å«ã‚€"
#: ../src/display_spl.c:118
msgid "does not contain"
-msgstr "¤¬¼¡¤Î¤â¤Î¤ò´Þ¤Þ¤Ê¤¤"
+msgstr "ãŒæ¬¡ã®ã‚‚ã®ã‚’å«ã¾ãªã„"
#: ../src/display_spl.c:119 ../src/display_spl.c:128 ../src/display_spl.c:138
#: ../src/display_spl.c:157 ../src/display_spl.c:164
msgid "is"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Ç¤¢¤ë"
+msgstr "ãŒæ¬¡ã®ã‚‚ã®ã§ã‚ã‚‹"
#: ../src/display_spl.c:120 ../src/display_spl.c:129 ../src/display_spl.c:139
#: ../src/display_spl.c:158 ../src/display_spl.c:165
msgid "is not"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Ç¤Ê¤¤"
+msgstr "ãŒæ¬¡ã®ã‚‚ã®ã§ãªã„"
#: ../src/display_spl.c:121
msgid "starts with"
-msgstr "¤¬¼¡¤Î¤â¤Î¤«¤é»Ï¤Þ¤ë"
+msgstr "ãŒæ¬¡ã®ã‚‚ã®ã‹ã‚‰å§‹ã¾ã‚‹"
#: ../src/display_spl.c:122
msgid "ends with"
-msgstr "¤¬¼¡¤Î¤â¤Î¤Ç½ª¤ï¤ë"
+msgstr "ãŒæ¬¡ã®ã‚‚ã®ã§çµ‚ã‚ã‚‹"
#: ../src/display_spl.c:130
msgid "is greater than"
-msgstr "¤¬¼¡¤ÎÃͤè¤êÂ礤¤"
+msgstr "ãŒæ¬¡ã®å€¤ã‚ˆã‚Šå¤§ãã„"
#: ../src/display_spl.c:131
msgid "is less than"
-msgstr "¤¬¼¡¤ÎÃͤè¤ê¾®¤µ¤¤"
+msgstr "ãŒæ¬¡ã®å€¤ã‚ˆã‚Šå°ã•ã„"
#: ../src/display_spl.c:132 ../src/display_spl.c:144
msgid "is in the range"
-msgstr "¤¬¼¡¤ÎÈϰϤËÆþ¤ë"
+msgstr "ãŒæ¬¡ã®ç¯„囲ã«å…¥ã‚‹"
#: ../src/display_spl.c:140
msgid "is after"
-msgstr "¤¬¼¡¤Î¤â¤Î°Ê¹ß"
+msgstr "ãŒæ¬¡ã®ã‚‚ã®ä»¥é™"
#: ../src/display_spl.c:141
msgid "is before"
-msgstr "¤¬¼¡¤Î¤â¤Î°ÊÁ°"
+msgstr "ãŒæ¬¡ã®ã‚‚ã®ä»¥å‰"
#: ../src/display_spl.c:142
msgid "in the last"
-msgstr "¤¬¼¡¤ÎÃÍ°ÊÆâ"
+msgstr "ãŒæ¬¡ã®å€¤ä»¥å†…"
#: ../src/display_spl.c:143
msgid "not in the last"
-msgstr "¤¬¼¡¤ÎÃͤè¤ê¸Å¤¤"
+msgstr "ãŒæ¬¡ã®å€¤ã‚ˆã‚Šå¤ã„"
#: ../src/display_spl.c:150
msgid "is set"
-msgstr "¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ë"
+msgstr "ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹"
#: ../src/display_spl.c:151
msgid "is not set"
-msgstr "¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤"
+msgstr "ãŒè¨å®šã•ã‚Œã¦ã„ãªã„"
#: ../src/display_spl.c:171
#, fuzzy
msgid "Not supported"
-msgstr "¥ê¥¹¥È¤ËºÜ¤Ã¤Æ¤Ê¤¤¶Ê"
+msgstr "リストã«è¼‰ã£ã¦ãªã„曲"
#: ../src/display_spl.c:178
msgid "minutes"
-msgstr "ʬ"
+msgstr "分"
#: ../src/display_spl.c:180
msgid "tracks"
-msgstr "¶Ê"
+msgstr "曲"
#: ../src/display_spl.c:181
msgid "hours"
-msgstr "»þ´Ö"
+msgstr "時間"
-#: ../src/display_spl.c:182 ../src/info.c:777
+#: ../src/display_spl.c:182 ../src/info.c:780
msgid "GB"
msgstr ""
#: ../src/display_spl.c:189
msgid "random order"
-msgstr "¥é¥ó¥À¥à¤Ê½ç"
+msgstr "ランダムãªé †"
#: ../src/display_spl.c:190
msgid "title"
-msgstr "¥¿¥¤¥È¥ë"
+msgstr "タイトル"
#: ../src/display_spl.c:191
msgid "album"
-msgstr "¥¢¥ë¥Ð¥à"
+msgstr "アルãƒãƒ "
#: ../src/display_spl.c:192
msgid "artist"
-msgstr "¥¢¡¼¥Æ¥£¥¹¥È"
+msgstr "アーティスト"
#: ../src/display_spl.c:193
msgid "genre"
-msgstr "¥¸¥ã¥ó¥ë"
+msgstr "ジャンル"
#: ../src/display_spl.c:194
msgid "most recently added"
-msgstr "ºÇ¶áÅÐÏ¿¤µ¤ì¤¿¶Ê"
+msgstr "最近登録ã•ã‚ŒãŸæ›²"
#: ../src/display_spl.c:195
msgid "least recently added"
-msgstr "¸Å¤¯¤ËÅÐÏ¿¤µ¤ì¤¿¶Ê"
+msgstr "å¤ãã«ç™»éŒ²ã•ã‚ŒãŸæ›²"
#: ../src/display_spl.c:196
msgid "most often played"
-msgstr "¤è¤¯ºÆÀ¸¤µ¤ì¤ë¶Ê"
+msgstr "よãå†ç”Ÿã•ã‚Œã‚‹æ›²"
#: ../src/display_spl.c:197
msgid "least often played"
-msgstr "¤¢¤Þ¤êºÆÀ¸¤µ¤ì¤Ê¤¤¶Ê"
+msgstr "ã‚ã¾ã‚Šå†ç”Ÿã•ã‚Œãªã„曲"
#: ../src/display_spl.c:198
msgid "most recently played"
-msgstr "ºÇ¶áºÆÀ¸¤µ¤ì¤¿¶Ê"
+msgstr "最近å†ç”Ÿã•ã‚ŒãŸæ›²"
#: ../src/display_spl.c:199
msgid "least recently played"
-msgstr "ºÇ¶áºÆÀ¸¤µ¤ì¤Ê¤¤¶Ê"
+msgstr "最近å†ç”Ÿã•ã‚Œãªã„曲"
#: ../src/display_spl.c:200
msgid "highest rating"
-msgstr "ɾ²Á¤Î¹â¤¤¶Ê"
+msgstr "評価ã®é«˜ã„曲"
#: ../src/display_spl.c:201
msgid "lowest rating"
-msgstr "ɾ²Á¤ÎÄ㤤¶Ê"
+msgstr "評価ã®ä½Žã„曲"
#: ../src/display_spl.c:208 ../src/display_spl.c:217
#, fuzzy
msgid "Movie"
-msgstr "Êѹ¹Æü"
+msgstr "変更日"
-#: ../src/display_spl.c:209 ../src/display_spl.c:218
-msgid "Music Video"
-msgstr ""
-
-#: ../src/display_spl.c:1162 ../src/display_spl.c:1177
+#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
msgid "to"
-msgstr "¤«¤é"
+msgstr "ã‹ã‚‰"
-#: ../src/display_spl.c:1455
+#: ../src/display_spl.c:1485
msgid "-"
msgstr ""
-#: ../src/display_spl.c:1470
+#: ../src/display_spl.c:1500
msgid "+"
msgstr ""
-#: ../src/display_spl.c:1689 ../src/misc_playlist.c:66
-#: ../src/misc_playlist.c:68 ../src/misc_playlist.c:93
-#: ../src/misc_playlist.c:95 ../src/misc_playlist.c:428
-#: ../src/misc_playlist.c:430
-msgid "New Playlist"
-msgstr "¿·µ¬¥×¥ì¥¤¥ê¥¹¥È"
-
#: ../src/display_tracks.c:281
#, c-format
msgid "Moved one track"
msgid_plural "Moved %d tracks"
-msgstr[0] "%d¶Ê¤ò°ÜÆ°¤·¤Þ¤·¤¿"
+msgstr[0] "%d曲を移動ã—ã¾ã—ãŸ"
-#: ../src/display_tracks.c:1717
+#: ../src/display_tracks.c:1810
#, c-format
msgid ""
"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -2803,58 +3044,78 @@
"unsorted state.\n"
"\n"
msgstr ""
-"»È¤ï¤ì¤Æ¤¤¤ë GTK+ ¥é¥¤¥Ö¥é¥ê %d.%d.%d < 2.5.4) ¤Î¥Ð¥°¤Î¤¿¤á¡¢¥½¡¼¥Èɽ¼¨¤ò²ò½ü"
-"¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£°ìÅÙ¥½¡¼¥Èɽ¼¨¤òÁª¤ó¤Ç¤·¤Þ¤¦¤È¡¢È󥽡¼¥Èɽ¼¨¤ËÌ᤹¤³¤È"
-"¤Ï¤Ç¤¤Þ¤»¤ó¡£\n"
+"使ã‚ã‚Œã¦ã„ã‚‹ GTK+ ライブラリ %d.%d.%d < 2.5.4) ã®ãƒã‚°ã®ãŸã‚ã€ã‚½ãƒ¼ãƒˆè¡¨ç¤ºã‚’解除"
+"ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。一度ソート表示をé¸ã‚“ã§ã—ã¾ã†ã¨ã€éžã‚½ãƒ¼ãƒˆè¡¨ç¤ºã«æˆ»ã™ã“ã¨"
+"ã¯ã§ãã¾ã›ã‚“。\n"
"\n"
-#: ../src/display_tracks.c:1962
+#: ../src/display_tracks.c:2069
msgid "Rtng"
-msgstr "ɾ²Á"
+msgstr "評価"
-#: ../src/display_tracks.c:1965
+#: ../src/display_tracks.c:2072
msgid "#"
msgstr "#"
-#: ../src/display_tracks.c:1968
+#: ../src/display_tracks.c:2075
msgid "CD"
msgstr ""
-#: ../src/display_tracks.c:1971
+#: ../src/display_tracks.c:2078
msgid "ID"
msgstr "ID"
-#: ../src/display_tracks.c:1974
+#: ../src/display_tracks.c:2081
msgid "Trnsfrd"
-msgstr "žÁ÷ºÑ¤ß"
+msgstr "転é€æ¸ˆã¿"
-#: ../src/display_tracks.c:1978
+#: ../src/display_tracks.c:2085
msgid "Cmpl"
-msgstr "¥³¥ó¥Ô"
+msgstr "コンピ"
-#: ../src/display_tracks.c:1987
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "æ¼”å¥æ™‚é–“"
+
+#: ../src/display_tracks.c:2094
msgid "Plycnt"
-msgstr "ºÆÀ¸²ó¿ô"
+msgstr "å†ç”Ÿå›žæ•°"
-#: ../src/display_tracks.c:1999
+#: ../src/display_tracks.c:2106
msgid "Released"
-msgstr "¸ø³«Æü"
+msgstr "公開日"
-#: ../src/display_tracks.c:2005
+#: ../src/display_tracks.c:2112
msgid "Vol."
-msgstr "²»ÎÌ"
+msgstr "音é‡"
-#: ../src/display_tracks.c:2008
+#: ../src/display_tracks.c:2115
msgid "Sndchk."
-msgstr "¥µ¥¦¥ó¥É¥Á¥§¥Ã¥¯"
+msgstr "サウンドãƒã‚§ãƒƒã‚¯"
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr ""
+
+#: ../src/fetchcover.c:371
+#, c-format
+msgid ""
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
+"\n"
+"- Clicking Yes will overwrite the existing file, possibly associating\n"
+" other music files in the same directory with this coverart file.\n"
+"- Clicking No will save the file with a unique file name.\n"
+"- Clicking Cancel will abort the fetchcover operation."
+msgstr ""
+
#: ../src/file.c:236
#, c-format
msgid ""
"'%s' is a directory, not a playlist file.\n"
"\n"
msgstr ""
-"'%s' ¤Ï¥×¥ì¥¤¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¯¡¢¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤¹¡£\n"
+"'%s' ã¯ãƒ—レイリストファイルã§ã¯ãªãã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚\n"
"\n"
#: ../src/file.c:266
@@ -2863,249 +3124,246 @@
"'%s' is a not a known playlist file.\n"
"\n"
msgstr ""
-"'%s' ¤Ï ¥×¥ì¥¤¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
+"'%s' 㯠プレイリストファイルã§ã¯ãªã„よã†ã§ã™ã€‚\n"
"\n"
-#: ../src/file.c:283
+#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/wavfile.c:107
#, c-format
-msgid ""
-"Cannot open '%s' for reading.\n"
-"\n"
-msgstr ""
-"¥Õ¥¡¥¤¥ë '%s' ¤òÆɤ߹þ¤â¤¦¤È¤·¤Þ¤·¤¿¤¬¡¢³«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
-"\n"
+msgid "Could not open '%s' for reading.\n"
+msgstr "ファイル '%s' ã‚’èªã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸãŒã€é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“。\n"
#: ../src/file.c:369
#, c-format
msgid "Skipping '%s' because it is a directory.\n"
-msgstr "'%s' ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ê¤Î¤ÇÈô¤Ð¤·¤Þ¤¹¡£\n"
+msgstr "'%s' ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãªã®ã§é£›ã°ã—ã¾ã™ã€‚\n"
#: ../src/file.c:374
#, c-format
msgid "Skipping '%s' to avoid adding playlist file recursively\n"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¥Õ¥¡¥¤¥ë¤ÎºÆµ¢Åª¤ÊÅÐÏ¿¤òÈò¤±¤ë¤¿¤á¡¢'%s' ¤ÏÈô¤Ð¤·¤Þ¤¹¡£\n"
+msgstr "プレイリストファイルã®å†å¸°çš„ãªç™»éŒ²ã‚’é¿ã‘ã‚‹ãŸã‚ã€'%s' ã¯é£›ã°ã—ã¾ã™ã€‚\n"
#: ../src/file.c:629
#, c-format
msgid "Unknown token '%s' in template '%s'\n"
-msgstr "̤ÃΤΥȡ¼¥¯¥ó '%s' ¤¬¥Æ¥ó¥×¥ì¡¼¥È '%s' Ãæ¤Ë¤¢¤ê¤Þ¤¹¡£\n"
+msgstr "未知ã®ãƒˆãƒ¼ã‚¯ãƒ³ '%s' ãŒãƒ†ãƒ³ãƒ—レート '%s' ä¸ã«ã‚ã‚Šã¾ã™ã€‚\n"
-#: ../src/file.c:890
+#: ../src/file.c:923
#, c-format
msgid "Local filename not valid (%s)"
-msgstr "¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ë̾¤¬ÉÔÀµ¤Ç¤¹ (%s)"
+msgstr "ãƒãƒ¼ã‚«ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ«åãŒä¸æ£ã§ã™ (%s)"
-#: ../src/file.c:949
+#: ../src/file.c:982
#, c-format
msgid "No information found for user '%s' in '%s'"
-msgstr "¥æ¡¼¥¶¡¼ '%s' ¤Î¾ðÊó¤¬ '%s' Æâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+msgstr "ユーザー '%s' ã®æƒ…å ±ãŒ '%s' 内ã«è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/file.c:958
+#: ../src/file.c:991
#, c-format
msgid "mserv data file (%s) not available for track (%s)"
-msgstr "¤³¤Î¶Ê (%2$s) ÍѤΠmserv ¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë (%1$s) ¤¬¤¢¤ê¤Þ¤»¤ó"
+msgstr "ã“ã®æ›² (%2$s) 用㮠mserv データファイル (%1$s) ãŒã‚ã‚Šã¾ã›ã‚“"
-#: ../src/file.c:966
+#: ../src/file.c:999
#, c-format
msgid "Track (%s) not in mserv music root directory (%s)"
-msgstr "¤³¤Î¶Ê (%s) ¤Ï mserv ¤Î¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê (%s) ¤Ë¤ÏÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó"
+msgstr "ã“ã®æ›² (%s) 㯠mserv ã®ãƒ«ãƒ¼ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª (%s) ã«ã¯å…¥ã£ã¦ã„ã¾ã›ã‚“"
-#: ../src/file.c:1090
+#: ../src/file.c:1123
#, c-format
msgid ""
"The following track could not be processed (file does not exist): '%s'\n"
-msgstr "°Ê²¼¤Î¶Ê¤ò½èÍý¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿ (¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¤¿¤á): '%s'\n"
+msgstr "以下ã®æ›²ã‚’処ç†ã§ãã¾ã›ã‚“ã§ã—㟠(ファイルãŒå˜åœ¨ã—ãªã„ãŸã‚): '%s'\n"
-#: ../src/file.c:1169
+#: ../src/file.c:1209
#, c-format
msgid "The following track could not be processed (filetype unknown): '%s'\n"
-msgstr "°Ê²¼¤Î¶Ê¤ò½èÍý¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿ (¥Õ¥¡¥¤¥ë·Á¼°¤¬ÉÔÌÀ¤Ê¤¿¤á): '%s'\n"
+msgstr "以下ã®æ›²ã‚’処ç†ã§ãã¾ã›ã‚“ã§ã—㟠(ファイル形å¼ãŒä¸æ˜ŽãªãŸã‚): '%s'\n"
-#: ../src/file.c:1262
+#: ../src/file.c:1307
#, c-format
msgid ""
"The following track could not be processed (filetype is known but analysis "
"failed): '%s'\n"
msgstr ""
-"°Ê²¼¤Î¶Ê¤ò½èÍý¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿ (¥Õ¥¡¥¤¥ë·Á¼°¤Ï´ûÃΤÀ¤¬²òÀϤ˼ºÇÔ¤·¤¿¤¿¤á): '%"
+"以下ã®æ›²ã‚’処ç†ã§ãã¾ã›ã‚“ã§ã—㟠(ファイル形å¼ã¯æ—¢çŸ¥ã ãŒè§£æžã«å¤±æ•—ã—ãŸãŸã‚): '%"
"s'\n"
-#: ../src/file.c:1292 ../src/file.c:1346
+#: ../src/file.c:1337 ../src/file.c:1391
msgid "Nothing to update"
-msgstr "¹¹¿·¤µ¤ì¤ë¥Ç¡¼¥¿¤Ï¤¢¤ê¤Þ¤»¤ó"
+msgstr "æ›´æ–°ã•ã‚Œã‚‹ãƒ‡ãƒ¼ã‚¿ã¯ã‚ã‚Šã¾ã›ã‚“"
-#: ../src/file.c:1313
+#: ../src/file.c:1358
#, c-format
msgid "Updating %s"
-msgstr "%s ¤ò¹¹¿·Ãæ"
+msgstr "%s ã‚’æ›´æ–°ä¸"
-#: ../src/file.c:1327
+#: ../src/file.c:1372
msgid "Updated selected tracks with info from file."
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê¤Î¾ðÊó¤ò¡¢¥Õ¥¡¥¤¥ë¤ò¸µ¤Ë¹¹¿·¤·¤Þ¤·¤¿¡£"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²ã®æƒ…å ±ã‚’ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…ƒã«æ›´æ–°ã—ã¾ã—ãŸã€‚"
-#: ../src/file.c:1361
+#: ../src/file.c:1406
#, c-format
msgid "Retrieving mserv data %s"
-msgstr "mserv data %s ¤ò¼èÆÀÃæ"
+msgstr "mserv data %s ã‚’å–å¾—ä¸"
-#: ../src/file.c:1366
+#: ../src/file.c:1411
msgid "no filename available"
-msgstr "¥Õ¥¡¥¤¥ë̾¤¬¤ï¤«¤ê¤Þ¤»¤ó"
+msgstr "ファイルåãŒã‚ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/file.c:1371
+#: ../src/file.c:1416
msgid "Updated selected tracks with data from mserv."
-msgstr "ÁªÂò¤µ¤ì¤¿¶Ê¤ò mserv ¤Î¥Ç¡¼¥¿¤ò¸µ¤Ë¹¹¿·¤·¤Þ¤·¤¿¡£"
+msgstr "é¸æŠžã•ã‚ŒãŸæ›²ã‚’ mserv ã®ãƒ‡ãƒ¼ã‚¿ã‚’å…ƒã«æ›´æ–°ã—ã¾ã—ãŸã€‚"
-#: ../src/file.c:1392
+#: ../src/file.c:1437
#, c-format
msgid "The following track could not be updated"
msgid_plural "The following %d tracks could not be updated"
-msgstr[0] "°Ê²¼¤Î%d¶Ê¤ò¹¹¿·¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr[0] "以下ã®%d曲を更新ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1398
+#: ../src/file.c:1443
msgid "Failed Track Update"
-msgstr "¶Ê¤Î¹¹¿·¤Ë¼ºÇÔ"
+msgstr "曲ã®æ›´æ–°ã«å¤±æ•—"
-#: ../src/file.c:1456
+#: ../src/file.c:1501
#, c-format
msgid "The following track has been updated"
msgid_plural "The following %d tracks have been updated"
-msgstr[0] "°Ê²¼¤Î%d¶Ê¤ò¹¹¿·¤·¤Þ¤·¤¿"
+msgstr[0] "以下ã®%d曲を更新ã—ã¾ã—ãŸ"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1462
+#: ../src/file.c:1507
msgid "Successful Track Update"
-msgstr "¶Ê¤Î¹¹¿·¤ò´°Î»"
+msgstr "曲ã®æ›´æ–°ã‚’完了"
-#: ../src/file.c:1521
+#: ../src/file.c:1566
#, c-format
msgid "No mserv information could be retrieved for the following track"
msgid_plural ""
"No mserv information could be retrieved for the following %d tracks"
-msgstr[0] "°Ê²¼¤Î%d¶Ê¤Ë¤Ä¤¤¤Æ¡¢mserv ¤«¤é¾ðÊó¤ò¼èÆÀ¤Ç¤¤Þ¤»¤ó"
+msgstr[0] "以下ã®%d曲ã«ã¤ã„ã¦ã€mserv ã‹ã‚‰æƒ…å ±ã‚’å–å¾—ã§ãã¾ã›ã‚“"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1527
+#: ../src/file.c:1572
msgid "mserv data retrieval problem"
-msgstr "mserv ¤«¤é¤Î¥Ç¡¼¥¿¼èÆÀ¤ËÌäÂ꤬¤¢¤ê¤Þ¤¹"
+msgstr "mserv ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿å–å¾—ã«å•é¡ŒãŒã‚ã‚Šã¾ã™"
-#: ../src/file.c:1616
+#: ../src/file.c:1661
msgid "no local filename available, file on the iPod will be used instead"
msgstr ""
-#: ../src/file.c:1622
+#: ../src/file.c:1667
msgid "no local filename available and copy on iPod cannot be found"
msgstr ""
-#: ../src/file.c:1626 ../src/file.c:1644
+#: ../src/file.c:1671 ../src/file.c:1689
#, fuzzy
msgid "no local filename available"
-msgstr "¥Õ¥¡¥¤¥ë̾¤¬¤ï¤«¤ê¤Þ¤»¤ó"
+msgstr "ファイルåãŒã‚ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/file.c:1634
+#: ../src/file.c:1679
msgid "local file could not be found, file on the iPod will be used instead"
msgstr ""
-#: ../src/file.c:1640
+#: ../src/file.c:1685
msgid "local file as well as copy on the iPod cannot be found"
msgstr ""
#. update not successful -- log this track for later display
-#: ../src/file.c:1728
+#: ../src/file.c:1788
#, fuzzy
-msgid "update failed (format no supported?)"
-msgstr "Âбþ¤·¤Æ¤¤¤Ê¤¤·Á¼°¤Ç¤¹"
+msgid "update failed (format not supported?)"
+msgstr "対応ã—ã¦ã„ãªã„å½¢å¼ã§ã™"
-#: ../src/file.c:1813
+#: ../src/file.c:1873 ../src/misc_playlist.c:916
#, c-format
msgid "Processing '%s'..."
-msgstr "'%s' ¤Î½èÍýÃæ..."
+msgstr "'%s' ã®å‡¦ç†ä¸..."
-#: ../src/file.c:1819
-#, c-format
-msgid "File skipped. match exclude masks: '%s'\n"
-msgstr ""
+#: ../src/file.c:1879
+#, fuzzy, c-format
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "'%s' ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãªã®ã§é£›ã°ã—ã¾ã™ã€‚\n"
-#: ../src/file.c:1939 ../src/misc_track.c:1694 ../src/misc_track.c:1799
+#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
#, c-format
msgid ""
"Podcast already present: '%s'\n"
"\n"
msgstr ""
-"Podcast ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Þ¤¹: '%s'\n"
+"Podcast ã¯ã™ã§ã«å˜åœ¨ã—ã¾ã™: '%s'\n"
"\n"
-#: ../src/file.c:2004
+#: ../src/file.c:2064
#, c-format
msgid ""
"Writing to video files not yet supported (%s).\n"
"\n"
msgstr ""
-"¥Ó¥Ç¥ª¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤¹þ¤ß¤Ï¤Þ¤À¤Ç¤¤Þ¤»¤ó (%s).\n"
+"ビデオファイルã¸ã®æ›¸ãè¾¼ã¿ã¯ã¾ã ã§ãã¾ã›ã‚“ (%s).\n"
"\n"
-#: ../src/file.c:2056 ../src/file.c:2070
+#: ../src/file.c:2116 ../src/file.c:2130
#, c-format
msgid "Couldn't change tags of file: %s\n"
-msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥°¤òÊѹ¹¤Ç¤¤Þ¤»¤ó: %s\n"
+msgstr "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¿ã‚°ã‚’変更ã§ãã¾ã›ã‚“: %s\n"
-#: ../src/file.c:2172
+#: ../src/file.c:2232
#, c-format
msgid "Could not open '%s' for reading and writing.\n"
-msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ÎÆɤ߹þ¤ß¤ª¤è¤Ó½ñ¤¹þ¤ß¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
+msgstr "ファイル '%s' ã®èªã¿è¾¼ã¿ãŠã‚ˆã³æ›¸ãè¾¼ã¿ãŒã§ãã¾ã›ã‚“。\n"
-#: ../src/file.c:2179
+#: ../src/file.c:2239
#, c-format
msgid "Could not obtain lock on '%s'.\n"
-msgstr "'%s' ¤ò¥í¥Ã¥¯¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
+msgstr "'%s' ã‚’ãƒãƒƒã‚¯ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚\n"
#. error!
-#: ../src/file.c:2196 ../src/file.c:2205 ../src/file.c:2216 ../src/file.c:2226
+#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
#, c-format
msgid "Malformed line in '%s': %s\n"
-msgstr "'%s' ¤Ë¤ª¤«¤·¤Ê¹Ô¤¬¤¢¤ê¤Þ¤¹: %s\n"
+msgstr "'%s' ã«ãŠã‹ã—ãªè¡ŒãŒã‚ã‚Šã¾ã™: %s\n"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:2255
+#: ../src/file.c:2315
msgid "Remove offline playcounts?"
-msgstr "¥ª¥Õ¥é¥¤¥ó¤Ç¤ÎºÆÀ¸²ó¿ô¤òºï½ü¤·¤Þ¤¹¤«"
+msgstr "オフラインã§ã®å†ç”Ÿå›žæ•°ã‚’削除ã—ã¾ã™ã‹"
#. title
-#: ../src/file.c:2256
+#: ../src/file.c:2316
msgid ""
"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
"remove them from the offline playcount file, 'Cancel' to keep them."
msgstr ""
-"¥ª¥Õ¥é¥¤¥ó¤Ç±éÁÕ¤µ¤ì¤¿¤¤¤¯¤Ä¤«¤Î¶Ê¤¬ iTunesDB ¤Ë¤Ï¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£'OK' ¤ò²¡¤¹"
-"¤È¤½¤ì¤é¤Î¶Ê¤ÎºÆÀ¸²ó¿ô¤Ï¥Õ¥¡¥¤¥ë¤«¤éºï½ü¤µ¤ì¤Þ¤¹¡£'¥¥ã¥ó¥»¥ë' ¤ò²¡¤»¤Ðºï½ü¤µ"
-"¤ì¤º»Ä¤ê¤Þ¤¹¡£"
+"オフラインã§æ¼”å¥ã•ã‚ŒãŸã„ãã¤ã‹ã®æ›²ãŒ iTunesDB ã«ã¯è¦‹ä»˜ã‹ã‚Šã¾ã›ã‚“。'OK' を押ã™"
+"ã¨ãれらã®æ›²ã®å†ç”Ÿå›žæ•°ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰å‰Šé™¤ã•ã‚Œã¾ã™ã€‚'ã‚ャンセル' を押ã›ã°å‰Šé™¤ã•"
+"ã‚Œãšæ®‹ã‚Šã¾ã™ã€‚"
-#: ../src/file.c:2273
+#: ../src/file.c:2333
#, c-format
msgid "Error writing to '%s'.\n"
-msgstr "'%s'¤Î½ñ¤¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
+msgstr "'%s'ã®æ›¸ãè¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚\n"
-#: ../src/file.c:2330 ../src/tools.c:271
+#: ../src/file.c:2390 ../src/tools.c:270
#, c-format
msgid ""
"Normalization failed: file type not supported (%s).\n"
"\n"
msgstr ""
-"Ê¿¶Ñ²½¤Ë¼ºÇÔ: ¤³¤Î¥Õ¥¡¥¤¥ë·Á¼°¤Ï°·¤¨¤Þ¤»¤ó (%s).\n"
+"å¹³å‡åŒ–ã«å¤±æ•—: ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼ã¯æ‰±ãˆã¾ã›ã‚“ (%s).\n"
"\n"
-#: ../src/file.c:2346 ../src/tools.c:288
+#: ../src/file.c:2406 ../src/tools.c:287
#, c-format
msgid ""
"Normalization failed: file not available (%s).\n"
"\n"
msgstr ""
-"Ê¿¶Ñ²½¤Ë¼ºÇÔ: ¥Õ¥¡¥¤¥ë¤¬¼èÆÀ¤Ç¤¤Þ¤»¤ó (%s).\n"
+"å¹³å‡åŒ–ã«å¤±æ•—: ファイルãŒå–å¾—ã§ãã¾ã›ã‚“ (%s).\n"
"\n"
#: ../src/file_convert.c:316
@@ -3125,27 +3383,27 @@
msgid "Active threads: %d. Scheduled tracks: %d."
msgstr ""
-#: ../src/file_convert.c:1061
+#: ../src/file_convert.c:1071
#, fuzzy, c-format
msgid "Original filename not available for '%s.'\n"
msgstr ""
-"Ê¿¶Ñ²½¤Ë¼ºÇÔ: ¥Õ¥¡¥¤¥ë¤¬¼èÆÀ¤Ç¤¤Þ¤»¤ó (%s).\n"
+"å¹³å‡åŒ–ã«å¤±æ•—: ファイルãŒå–å¾—ã§ãã¾ã›ã‚“ (%s).\n"
"\n"
-#: ../src/file_convert.c:1076
+#: ../src/file_convert.c:1086
#, c-format
msgid "Filename '%s' is no longer valid for '%s'.\n"
msgstr ""
-#: ../src/file_convert.c:1127
+#: ../src/file_convert.c:1137
msgid "Ogg Vorbis"
msgstr ""
-#: ../src/file_convert.c:1133
+#: ../src/file_convert.c:1143
msgid "FLAC"
msgstr ""
-#: ../src/file_convert.c:1188
+#: ../src/file_convert.c:1198
#, c-format
msgid ""
"Files of type '%s' are not supported by the iPod. Please go to the "
@@ -3153,67 +3411,67 @@
"\n"
msgstr ""
-#: ../src/file_convert.c:1274
+#: ../src/file_convert.c:1284
#, fuzzy
msgid "No information available"
-msgstr "¥Õ¥¡¥¤¥ë̾¤¬¤ï¤«¤ê¤Þ¤»¤ó"
+msgstr "ファイルåãŒã‚ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/file_convert.c:1313
+#: ../src/file_convert.c:1323
#, c-format
msgid "Could not create '%s'. Filetype conversion will not work.\n"
msgstr ""
-#: ../src/file_convert.c:1631 ../src/file_convert.c:3040
+#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
#, c-format
msgid ""
"Transfer of '%s' failed. %s\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2035 ../src/file_convert.c:2313
+#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
#, c-format
msgid ""
"Conversion of '%s' failed: '%s'.\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2050
+#: ../src/file_convert.c:2062
#, c-format
msgid ""
"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2079
+#: ../src/file_convert.c:2091
#, c-format
msgid ""
-"Conversion of '%s' failed: '%s %s' did not return filename extension as "
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
"expected.\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2155
+#: ../src/file_convert.c:2167
#, c-format
msgid ""
-"Covnersion of '%s' failed: Could not access original file '%s' (%s).\n"
+"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2210
+#: ../src/file_convert.c:2222
#, c-format
msgid ""
"Conversion of '%s' failed: Could not create directory '%s'.\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2344
+#: ../src/file_convert.c:2356
#, c-format
msgid ""
"Conversion of '%s' failed: '%s' returned exit status %d.\n"
"\n"
msgstr ""
-#: ../src/file_convert.c:2383
+#: ../src/file_convert.c:2395
#, c-format
msgid ""
"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -3223,81 +3481,76 @@
#: ../src/file_export.c:182
#, c-format
msgid "Skipping existing file with same length: '%s'\n"
-msgstr "Ʊ¤¸Â礤µ¤Î¥Õ¥¡¥¤¥ë¤òÈô¤Ð¤·¤Þ¤¹: '%s'\n"
+msgstr "åŒã˜å¤§ãã•ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’飛ã°ã—ã¾ã™: '%s'\n"
#: ../src/file_export.c:190
#, c-format
msgid "Overwriting existing file: '%s'\n"
-msgstr "¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤¤·¤Þ¤¹: '%s'\n"
+msgstr "ファイルを上書ãã—ã¾ã™: '%s'\n"
#: ../src/file_export.c:207
#, c-format
msgid "Error copying '%s' to '%s': Permission Error (%s)\n"
-msgstr "'%s' ¤ò '%s' ¤Ë¥³¥Ô¡¼Ãæ¤Ë¥¨¥é¡¼È¯À¸: µö²Ä¤¬¤¢¤ê¤Þ¤»¤ó (%s)\n"
+msgstr "'%s' ã‚’ '%s' ã«ã‚³ãƒ”ーä¸ã«ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ: 許å¯ãŒã‚ã‚Šã¾ã›ã‚“ (%s)\n"
#: ../src/file_export.c:209
#, c-format
msgid "Error copying '%s' to '%s' (%s)\n"
-msgstr "'%s' ¤ò '%s' ¤Ë¥³¥Ô¡¼Ãæ¤Ë¥¨¥é¡¼È¯À¸: (%s)\n"
+msgstr "'%s' ã‚’ '%s' ã«ã‚³ãƒ”ーä¸ã«ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ: (%s)\n"
-#: ../src/file_export.c:217
-#, c-format
-msgid "Unable to open '%s' for reading\n"
-msgstr "'%s' ¤òÆɤ߹þ¤ßÍѤ˳«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó\n"
-
#: ../src/file_export.c:327
#, c-format
msgid "Could find file for '%s' on the iPod\n"
-msgstr "iPod ¾å¤Î '%s' ¤ËÁêÅö¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+msgstr "iPod 上㮠'%s' ã«ç›¸å½“ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n"
#. create the dialog window
-#: ../src/file_export.c:395 ../src/tools.c:361
+#: ../src/file_export.c:395 ../src/tools.c:360
msgid "Information"
-msgstr "¾ðÊó"
+msgstr "æƒ…å ±"
-#: ../src/file_export.c:406 ../src/tools.c:373
+#: ../src/file_export.c:406 ../src/tools.c:372
msgid "Press button to abort."
-msgstr "¥Ü¥¿¥ó¤ò²¡¤¹¤ÈÃæ»ß¤·¤Þ¤¹¡£"
+msgstr "ボタンを押ã™ã¨ä¸æ¢ã—ã¾ã™ã€‚"
#: ../src/file_export.c:419
msgid "copying..."
-msgstr "¥³¥Ô¡¼Ãæ..."
+msgstr "コピーä¸..."
#: ../src/file_export.c:476
#, c-format
msgid "Failed to write '%s-%s'\n"
-msgstr "Êݸ¤¬¤Ç¤¤Þ¤»¤ó '%s-%s'\n"
+msgstr "ä¿å˜ãŒã§ãã¾ã›ã‚“ '%s-%s'\n"
#: ../src/file_export.c:489
#, c-format
msgid "Copied %d of %d track."
msgid_plural "Copied %d of %d tracks."
-msgstr[0] "%2$d¶ÊÃæ %1$d¶Ê¤ò¥³¥Ô¡¼¤·¤Þ¤·¤¿¡£"
+msgstr[0] "%2$dæ›²ä¸ %1$d曲をコピーã—ã¾ã—ãŸã€‚"
-#: ../src/file_export.c:505 ../src/tools.c:519
+#: ../src/file_export.c:505 ../src/tools.c:518
#, c-format
msgid "%d%% (%d:%02d:%02d left)"
-msgstr "%d%% (»Ä¤ê %d:%02d:%02d)"
+msgstr "%d%% (残り %d:%02d:%02d)"
#: ../src/file_export.c:514
msgid "Some tracks were not copied."
-msgstr "°ìÉô¤Î¶Ê¤¬¥³¥Ô¡¼¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+msgstr "一部ã®æ›²ãŒã‚³ãƒ”ーã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚"
#: ../src/file_export.c:579
msgid "Export from iPod database not possible in offline mode."
-msgstr "¥ª¥Õ¥é¥¤¥ó¥â¡¼¥É¤Ç¤Ï iPod ¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¤Î¥¨¥¯¥¹¥Ý¡¼¥È¤Ï¤Ç¤¤Þ¤»¤ó¡£"
+msgstr "オフラインモードã§ã¯ iPod データベースã‹ã‚‰ã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã¯ã§ãã¾ã›ã‚“。"
#: ../src/file_export.c:587
msgid "Select Export Destination Directory"
-msgstr "¥Õ¥¡¥¤¥ë¤Î¥¨¥¯¥¹¥Ý¡¼¥ÈÀè¥Ç¥£¥ì¥¯¥È¥ê¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤"
+msgstr "ファイルã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆå…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„"
#: ../src/file_export.c:736
msgid "Drag from iPod database not possible in offline mode."
-msgstr "¥ª¥Õ¥é¥¤¥ó¥â¡¼¥É¤Ç¤Ï iPod ¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¤Î¥É¥é¥Ã¥°Áàºî¤Ï¤Ç¤¤Þ¤»¤ó¡£"
+msgstr "オフラインモードã§ã¯ iPod データベースã‹ã‚‰ã®ãƒ‰ãƒ©ãƒƒã‚°æ“作ã¯ã§ãã¾ã›ã‚“。"
#: ../src/file_export.c:770
msgid "The following tracks have to be copied to your harddisk"
-msgstr "°Ê²¼¤Î¶Ê¤¬¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤·¤¿"
+msgstr "以下ã®æ›²ãŒãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã«ã‚³ãƒ”ーã•ã‚Œã¾ã—ãŸ"
#: ../src/file_export.c:815
msgid ""
@@ -3305,21 +3558,21 @@
"included in the current drag and drop operation.\n"
"\n"
msgstr ""
-"°ìÉô¤Î¶Ê¤Ï¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£¥³¥Ô¡¼¤µ¤ì¤¿¶Ê¤Î¤ß¤¬¡¢º£¤Î"
-"¥É¥é¥Ã¥°&¥É¥í¥Ã¥×Áàºî¤Ë´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
+"一部ã®æ›²ã¯ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã«ã‚³ãƒ”ーã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚コピーã•ã‚ŒãŸæ›²ã®ã¿ãŒã€ä»Šã®"
+"ドラッグ&ドãƒãƒƒãƒ—æ“作ã«å«ã¾ã‚Œã¦ã„ã¾ã™ã€‚\n"
#: ../src/file_export.c:1010
#, c-format
msgid ""
"No valid filename for: %s\n"
"\n"
-msgstr "'%s' ¤Î¥Õ¥¡¥¤¥ë̾¤¬ÉÔÀµ¤Ç¤¹¡£\n"
+msgstr "'%s' ã®ãƒ•ã‚¡ã‚¤ãƒ«åãŒä¸æ£ã§ã™ã€‚\n"
#: ../src/file_export.c:1026
#, c-format
msgid "Created playlist with one track."
msgid_plural "Created playlist with %d tracks."
-msgstr[0] "¿·µ¬¥×¥ì¥¤¥ê¥¹¥È¤Ë %d¶ÊÅÐÏ¿¤·¤Þ¤·¤¿¡£"
+msgstr[0] "æ–°è¦ãƒ—レイリスト㫠%d曲登録ã—ã¾ã—ãŸã€‚"
#: ../src/file_export.c:1031
#, c-format
@@ -3327,28 +3580,29 @@
"Could not open '%s' for writing (%s).\n"
"\n"
msgstr ""
-"'%s' ¤ò½ñ¤¹þ¤ßÍѤ˳«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£(%s)\n"
+"'%s' を書ãè¾¼ã¿ç”¨ã«é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“。(%s)\n"
"\n"
-#: ../src/file_itunesdb.c:127
+#: ../src/file_itunesdb.c:129
#, fuzzy, c-format
msgid "Matching SHA1 checksum for file %d/%d"
-msgstr "MD5 ¥Á¥§¥Ã¥¯¥µ¥à¤Î¾È¹çÃæ %d/%d"
+msgstr "MD5 ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã®ç…§åˆä¸ %d/%d"
-#: ../src/file_itunesdb.c:234
-msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
-msgstr "³ÈÄ¥¾ðÊó¤ò³ÊǼ¤·¤¿¥Õ¥¡¥¤¥ë \"iTunesDB.ext\" ¤ò³«¤±¤Þ¤»¤ó¡£\n"
+#: ../src/file_itunesdb.c:236
+#, fuzzy, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "'%s' ã‚’é–‹ã‘ãªã„ãŸã‚ã€æ‹¡å¼µæƒ…å ±ã‚’è¨˜éŒ²ã§ãã¾ã›ã‚“。\n"
-#: ../src/file_itunesdb.c:241
+#: ../src/file_itunesdb.c:243
msgid "Could not create hash value from itunesdb\n"
-msgstr "itunesdb ¤«¤é¥Ï¥Ã¥·¥åÃͤòÆɤ߹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
+msgstr "itunesdb ã‹ã‚‰ãƒãƒƒã‚·ãƒ¥å€¤ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚\n"
-#: ../src/file_itunesdb.c:255
+#: ../src/file_itunesdb.c:259
#, c-format
msgid "Error while reading extended info: %s\n"
-msgstr "³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ßÃæ¤Ë°Ê²¼¤Î¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿: %s\n"
+msgstr "æ‹¡å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ«ã®èªã¿è¾¼ã¿ä¸ã«ä»¥ä¸‹ã®ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s\n"
-#: ../src/file_itunesdb.c:272
+#: ../src/file_itunesdb.c:276
#, fuzzy, c-format
msgid ""
"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -3356,30 +3610,30 @@
"a long time.\n"
"\n"
msgstr ""
-"iTunesDB '%s' ¤È¡¢³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë '%s' ¤È¤Ç¥Á¥§¥Ã¥¯¥µ¥à¤¬¹ç¤¤¤Þ¤»¤ó¡£\n"
-"gtkpod ¤Ï MD5 ¥Á¥§¥Ã¥¯¥µ¥à¤ò»È¤Ã¤Æ¤µ¤é¤Ë¾È¹ç¤ò¿Ê¤á¤Þ¤¹¡£¤³¤ì¤Ë¤Ï»þ´Ö¤¬¤«¤«¤ê"
-"¤Þ¤¹¡£\n"
+"iTunesDB '%s' ã¨ã€æ‹¡å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ« '%s' ã¨ã§ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒåˆã„ã¾ã›ã‚“。\n"
+"gtkpod 㯠MD5 ãƒã‚§ãƒƒã‚¯ã‚µãƒ を使ã£ã¦ã•ã‚‰ã«ç…§åˆã‚’進ã‚ã¾ã™ã€‚ã“ã‚Œã«ã¯æ™‚é–“ãŒã‹ã‹ã‚Š"
+"ã¾ã™ã€‚\n"
"\n"
-#: ../src/file_itunesdb.c:284
+#: ../src/file_itunesdb.c:288
#, c-format
msgid ""
"%s:\n"
"Expected \"itunesdb_hash=\" but got:\"%s\"\n"
msgstr ""
"%s:\n"
-"\"itunesdb_hash=\" ¤¬½ñ¤«¤ì¤Æ¤¤¤ë¤Ù¤²Õ½ê¤Ë°ã¤¦ÆâÍƤ¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹: \"%s\"\n"
+"\"itunesdb_hash=\" ãŒæ›¸ã‹ã‚Œã¦ã„ã‚‹ã¹ã箇所ã«é•ã†å†…容ãŒæ›¸ã‹ã‚Œã¦ã„ã¾ã™: \"%s\"\n"
-#: ../src/file_itunesdb.c:344
+#: ../src/file_itunesdb.c:348
#, c-format
msgid ""
"%s:\n"
"Format error: %s\n"
msgstr ""
"%s:\n"
-"½ñ¼°¥¨¥é¡¼: %s\n"
+"書å¼ã‚¨ãƒ©ãƒ¼: %s\n"
-#: ../src/file_itunesdb.c:387
+#: ../src/file_itunesdb.c:393
#, fuzzy
msgid ""
"No SHA1 checksums on individual tracks are available.\n"
@@ -3389,107 +3643,107 @@
"than gtkpod.\n"
"\n"
msgstr ""
-"³Æ¶Ê¤ÎMD5 ¥Á¥§¥Ã¥¯¥µ¥à¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
+"å„曲ã®MD5 ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒä¿å˜ã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
"\n"
-"°Ê¹ß¤³¤Î¾õ¶·¤ò²óÈò¤¹¤ë¤Ë¤Ï¡¢½ÅÊ£¸¡½Ð¤ò͸ú¤Ë¤¹¤ë¤«(¤½¤ì¤Ë¤è¤êMD5¥Á¥§¥Ã¥¯¥µ¥à"
-"¤¬Êݸ¤µ¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹)¡¢gtkpod °Ê³°¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÇiPod¤ò»ÈÍѤ·¤Ê¤¤¤è¤¦"
-"¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"以é™ã“ã®çŠ¶æ³ã‚’回é¿ã™ã‚‹ã«ã¯ã€é‡è¤‡æ¤œå‡ºã‚’有効ã«ã™ã‚‹ã‹(ãã‚Œã«ã‚ˆã‚ŠMD5ãƒã‚§ãƒƒã‚¯ã‚µãƒ "
+"ãŒä¿å˜ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™)ã€gtkpod 以外ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§iPodを使用ã—ãªã„よã†"
+"ã«ã—ã¦ãã ã•ã„。\n"
"\n"
-#: ../src/file_itunesdb.c:451
+#: ../src/file_itunesdb.c:457
msgid ""
"Extended info will not be used. If you have non-transferred tracks,\n"
"these will be lost.\n"
msgstr ""
-"³ÈÄ¥¾ðÊó¤Ï»ÈÍѤµ¤ì¤Þ¤»¤ó¡£iPodËÜÂΤˤޤÀžÁ÷¤·¤Æ¤¤¤Ê¤¤¶Ê¤Î¾ðÊó¤Ï\n"
-"½ªÎ»»þ¤Ë¼º¤ï¤ì¤Þ¤¹¡£\n"
+"æ‹¡å¼µæƒ…å ±ã¯ä½¿ç”¨ã•ã‚Œã¾ã›ã‚“。iPod本体ã«ã¾ã 転é€ã—ã¦ã„ãªã„曲ã®æƒ…å ±ã¯\n"
+"終了時ã«å¤±ã‚ã‚Œã¾ã™ã€‚\n"
-#: ../src/file_itunesdb.c:459
+#: ../src/file_itunesdb.c:465
msgid "Offline iPod database successfully imported"
-msgstr "¥ª¥Õ¥é¥¤¥ó¤ÇiPod¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÆɤ߹þ¤ß¤Þ¤·¤¿"
+msgstr "オフラインã§iPodデータベースをèªã¿è¾¼ã¿ã¾ã—ãŸ"
-#: ../src/file_itunesdb.c:462
+#: ../src/file_itunesdb.c:468
msgid "Local database successfully imported"
-msgstr "¥í¡¼¥«¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÆɤ߹þ¤ß¤Þ¤·¤¿"
+msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã¿ã¾ã—ãŸ"
-#: ../src/file_itunesdb.c:470
+#: ../src/file_itunesdb.c:476
#, c-format
msgid ""
"Offline iPod database import failed: '%s'\n"
"\n"
msgstr ""
-"¥ª¥Õ¥é¥¤¥ó¤Ç¤ÎiPod¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: '%s'\n"
+"オフラインã§ã®iPodデータベースã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:474
+#: ../src/file_itunesdb.c:480
#, c-format
msgid ""
"Local database import failed: '%s'\n"
"\n"
msgstr ""
-"¥í¡¼¥«¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: '%s'\n"
+"ãƒãƒ¼ã‚«ãƒ«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:481
+#: ../src/file_itunesdb.c:487
msgid ""
"Offline iPod database import failed: \n"
"\n"
msgstr ""
-"¥ª¥Õ¥é¥¤¥ó¤Ç¤ÎiPod¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+"オフラインã§ã®iPodデータベースã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ\n"
"\n"
-#: ../src/file_itunesdb.c:484
+#: ../src/file_itunesdb.c:490
msgid ""
"Local database import failed: \n"
"\n"
msgstr ""
-"¥í¡¼¥«¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: \n"
+"ãƒãƒ¼ã‚«ãƒ«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: \n"
"\n"
-#: ../src/file_itunesdb.c:491
+#: ../src/file_itunesdb.c:497
#, c-format
msgid ""
"'%s' does not exist. Import aborted.\n"
"\n"
msgstr ""
-"'%s' ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£Æɤ߹þ¤ß¤òÃæ»ß¤·¤Þ¤¹¡£\n"
+"'%s' ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。èªã¿è¾¼ã¿ã‚’ä¸æ¢ã—ã¾ã™ã€‚\n"
"\n"
-#: ../src/file_itunesdb.c:514
+#: ../src/file_itunesdb.c:520
msgid "Extended info will not be used.\n"
-msgstr "³ÈÄ¥¾ðÊó¤Ï»ÈÍѤµ¤ì¤Þ¤»¤ó¡£\n"
+msgstr "æ‹¡å¼µæƒ…å ±ã¯ä½¿ç”¨ã•ã‚Œã¾ã›ã‚“。\n"
-#: ../src/file_itunesdb.c:521
+#: ../src/file_itunesdb.c:527
msgid "iPod Database Successfully Imported"
-msgstr "iPod ¤«¤é¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÆɤ߹þ¤ß¤Þ¤·¤¿"
+msgstr "iPod ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’èªã¿è¾¼ã¿ã¾ã—ãŸ"
-#: ../src/file_itunesdb.c:528
+#: ../src/file_itunesdb.c:534
#, c-format
msgid ""
"iPod Database Import Failed: '%s'\n"
"\n"
msgstr ""
-"iPod ¤«¤é¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: '%s'\n"
+"iPod ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:540
msgid ""
"iPod Database Import Failed.\n"
"\n"
msgstr ""
-"iPod¤«¤é¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
+"iPodã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n"
"\n"
-#: ../src/file_itunesdb.c:543
+#: ../src/file_itunesdb.c:549
#, fuzzy, c-format
msgid ""
"'%s' (or similar) does not exist. Import aborted.\n"
"\n"
msgstr ""
-"'%s' ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£Æɤ߹þ¤ß¤òÃæ»ß¤·¤Þ¤¹¡£\n"
+"'%s' ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。èªã¿è¾¼ã¿ã‚’ä¸æ¢ã—ã¾ã™ã€‚\n"
"\n"
-#: ../src/file_itunesdb.c:859
+#: ../src/file_itunesdb.c:865
#, c-format
msgid ""
"Could not find iPod directory structure at '%s'.\n"
@@ -3499,39 +3753,39 @@
"Do you want to create the directory structure now?\n"
msgstr ""
-#: ../src/file_itunesdb.c:1140
+#: ../src/file_itunesdb.c:1180
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
-msgstr "'%s' ¤ò³«¤±¤Ê¤¤¤¿¤á¡¢³ÈÄ¥¾ðÊó¤òµÏ¿¤Ç¤¤Þ¤»¤ó¡£\n"
+msgstr "'%s' ã‚’é–‹ã‘ãªã„ãŸã‚ã€æ‹¡å¼µæƒ…å ±ã‚’è¨˜éŒ²ã§ãã¾ã›ã‚“。\n"
-#: ../src/file_itunesdb.c:1155
+#: ../src/file_itunesdb.c:1195
msgid "Aborted writing of extended info.\n"
-msgstr "³ÈÄ¥¾ðÊó¤Î½ñ¤¹þ¤ß¤ÏÃæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n"
+msgstr "æ‹¡å¼µæƒ…å ±ã®æ›¸ãè¾¼ã¿ã¯ä¸æ¢ã•ã‚Œã¾ã—ãŸã€‚\n"
-#: ../src/file_itunesdb.c:1356
+#: ../src/file_itunesdb.c:1397
#, c-format
msgid "%d%%"
msgstr ""
-#: ../src/file_itunesdb.c:1370
+#: ../src/file_itunesdb.c:1411
#, fuzzy, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left)"
-msgstr "%d%% (»Ä¤ê %d:%02d:%02d)"
+msgstr "%d%% (残り %d:%02d:%02d)"
-#: ../src/file_itunesdb.c:1412
+#: ../src/file_itunesdb.c:1463
msgid "Status: Deleting File"
msgstr ""
-#: ../src/file_itunesdb.c:1473
+#: ../src/file_itunesdb.c:1524
#, fuzzy, c-format
msgid ""
"Could not remove the following file: '%s'\n"
"\n"
msgstr ""
-"'%s' ¤ò½ñ¤¹þ¤ßÍѤ˳«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£(%s)\n"
+"'%s' を書ãè¾¼ã¿ç”¨ã«é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“。(%s)\n"
"\n"
-#: ../src/file_itunesdb.c:1581
+#: ../src/file_itunesdb.c:1632
#, fuzzy
msgid ""
"The following track could not be converted successfully:\n"
@@ -3539,9 +3793,9 @@
msgid_plural ""
"The following tracks could not be converted successfully:\n"
"\n"
-msgstr[0] "°Ê²¼¤Î%d¶Ê¤ò¹¹¿·¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr[0] "以下ã®%d曲を更新ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
-#: ../src/file_itunesdb.c:1591
+#: ../src/file_itunesdb.c:1642
#, fuzzy
msgid ""
"The following track could not be transferred successfully:\n"
@@ -3549,37 +3803,40 @@
msgid_plural ""
"The following tracks could not be transferred successfully:\n"
"\n"
-msgstr[0] "°Ê²¼¤Î%d¶Ê¤ò¹¹¿·¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿"
+msgstr[0] "以下ã®%d曲を更新ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸ"
#. ID
#. modal,
#. gint id,
#. gboolean modal,
-#: ../src/file_itunesdb.c:1600 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
msgid "Warning"
-msgstr "·Ù¹ð"
+msgstr "è¦å‘Š"
#. title
-#: ../src/file_itunesdb.c:1601
+#: ../src/file_itunesdb.c:1652
msgid ""
"The iPod could not be ejected. Please fix the problems mentioned below and "
"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
"for conversion and transfer."
msgstr ""
-#: ../src/file_itunesdb.c:1663
+#: ../src/file_itunesdb.c:1715
+#, c-format
msgid "Status: Copying track"
msgstr ""
-#: ../src/file_itunesdb.c:1669
+#: ../src/file_itunesdb.c:1721
+#, c-format
msgid "Status: Waiting for conversion to complete"
msgstr ""
-#: ../src/file_itunesdb.c:1673
+#: ../src/file_itunesdb.c:1725
+#, c-format
msgid "Status: Finished transfer"
msgstr ""
-#: ../src/file_itunesdb.c:1714
+#: ../src/file_itunesdb.c:1770
#, c-format
msgid ""
"One track could not be transferred because your iPod is full. Either delete "
@@ -3591,7 +3848,7 @@
"again."
msgstr[0] ""
-#: ../src/file_itunesdb.c:1792
+#: ../src/file_itunesdb.c:1852
#, c-format
msgid ""
"You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -3601,224 +3858,246 @@
"cancel, you can import the existing database before calling this function "
"again.\n"
msgstr ""
-"¤¢¤Ê¤¿¤Ï´û¤Ë¤¢¤ë iTunesDB ('%s') ¤òÆɤ߹þ¤Þ¤º¤Ë¤³¤ÎÁàºî¤ò¤·¤Æ¤¤¤Þ¤¹¡£¤³¤ì¤ÏÉá"
-"Ä̤ϹԤï¤Ê¤¤»ö¤Ç¤¢¤ê¡¢º£¤¢¤ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï¼º¤ï¤ì¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
+"ã‚ãªãŸã¯æ—¢ã«ã‚ã‚‹ iTunesDB ('%s') ã‚’èªã¿è¾¼ã¾ãšã«ã“ã®æ“作をã—ã¦ã„ã¾ã™ã€‚ã“ã‚Œã¯æ™®"
+"通ã¯è¡Œã‚ãªã„事ã§ã‚ã‚Šã€ä»Šã‚るデータベースã¯å¤±ã‚れるã“ã¨ã«ãªã‚Šã¾ã™ã€‚\n"
"\n"
-"¤â¤·¤½¤ì¤Ç¤â¤è¤±¤ì¤Ð¡¢'OK' ¤ò¡¢Êݸ¤ò¼è¤ê»ß¤á¤ë¤Ê¤é '¥¥ã¥ó¥»¥ë' ¤ò²¡¤·¤Æ¤¯¤À"
-"¤µ¤¤¡£¥¥ã¥ó¥»¥ë¤·¤¿¾ì¹ç¤Ï¡¢´û¤Ë¤¢¤ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¼è¤ê¹þ¤ó¤Ç¤«¤éºÆ¤Ó¤³¤ÎÁàºî"
-"¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤¤Þ¤¹¡£\n"
+"ã‚‚ã—ãã‚Œã§ã‚‚よã‘ã‚Œã°ã€'OK' ã‚’ã€ä¿å˜ã‚’å–ã‚Šæ¢ã‚ã‚‹ãªã‚‰ 'ã‚ャンセル' を押ã—ã¦ãã "
+"ã•ã„。ã‚ャンセルã—ãŸå ´åˆã¯ã€æ—¢ã«ã‚るデータベースをå–り込んã§ã‹ã‚‰å†ã³ã“ã®æ“作"
+"ã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
-#: ../src/file_itunesdb.c:1827
+#: ../src/file_itunesdb.c:1887
msgid ""
"iPod directory structure must be present before synching to the iPod can be "
"performed.\n"
msgstr ""
-"iPod ¤Ø¤ÎƱ´ü¤ò¹Ô¤¦¤¿¤á¤Ë¤Ï¡¢¤Þ¤º iPod ¤Î¥Ç¥£¥ì¥¯¥È¥ê¹½Â¤¤ò¤¢¤é¤«¤¸¤áºîÀ®¤·¤Æ"
-"¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡£\n"
+"iPod ã¸ã®åŒæœŸã‚’è¡Œã†ãŸã‚ã«ã¯ã€ã¾ãš iPod ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæ§‹é€ ã‚’ã‚らã‹ã˜ã‚作æˆã—ã¦"
+"ãŠãå¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: ../src/file_itunesdb.c:1836
+#: ../src/file_itunesdb.c:1896
msgid "Some tracks could not be deleted from the iPod. Export aborted!"
-msgstr "°ìÉô¤Î¶Ê¤òiPod¤«¤éºï½ü¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£¥¨¥¯¥¹¥Ý¡¼¥È¤òÃæÃǤ·¤Þ¤¹¡£"
+msgstr "一部ã®æ›²ã‚’iPodã‹ã‚‰å‰Šé™¤ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚エクスãƒãƒ¼ãƒˆã‚’ä¸æ–ã—ã¾ã™ã€‚"
-#: ../src/file_itunesdb.c:1854
-#, fuzzy
-msgid "Now writing database. Please wait..."
-msgstr "iTunesDB¤Î½ñ¤¹þ¤ßÃæ¡£¤·¤Ð¤é¤¯¤ªÂÔ¤Á¤¯¤À¤µ¤¤..."
+#: ../src/file_itunesdb.c:1914
+#, fuzzy, c-format
+msgid "Now writing database '%s'. Please wait..."
+msgstr "iTunesDBã®æ›¸ãè¾¼ã¿ä¸ã€‚ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„..."
-#: ../src/file_itunesdb.c:1901
+#: ../src/file_itunesdb.c:1963
#, c-format
msgid "Extended information file not deleted: '%s'"
-msgstr "³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤¤Þ¤»¤ó: '%s'"
+msgstr "æ‹¡å¼µæƒ…å ±ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã§ãã¾ã›ã‚“: '%s'"
-#: ../src/file_itunesdb.c:1987
+#: ../src/file_itunesdb.c:2070
#, fuzzy, c-format
msgid "%s: Database saved"
-msgstr "iPod¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÊݸ¤·¤Þ¤·¤¿"
+msgstr "iPodデータベースをä¿å˜ã—ã¾ã—ãŸ"
-#: ../src/file_itunesdb.c:1991
+#: ../src/file_itunesdb.c:2074
#, c-format
msgid "%s: Changes saved"
msgstr ""
-#: ../src/fileselection.c:128
+#: ../src/fileselection.c:129
msgid "Successfully added files"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÄɲäËÀ®¸ù¤·¤Þ¤·¤¿"
+msgstr "ファイルã®è¿½åŠ ã«æˆåŠŸã—ã¾ã—ãŸ"
-#: ../src/fileselection.c:130
+#: ../src/fileselection.c:131
msgid "Some files were not added successfully"
-msgstr "°ìÉô¤Î¥Õ¥¡¥¤¥ë¤ÎÄɲä˼ºÇÔ¤·¤Þ¤·¤¿"
+msgstr "一部ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®è¿½åŠ ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:160
-msgid "Add Files"
-msgstr "¥Õ¥¡¥¤¥ë¤òÄɲ乤ë"
+#: ../src/fileselection.c:164 ../src/fileselection.c:305
+#: ../src/fileselection.c:792
+msgid "Please select a playlist or repository before adding tracks."
+msgstr ""
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:253
-msgid "Add Playlists"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤òÄɲ乤ë"
+#: ../src/fileselection.c:175 ../src/fileselection.c:314
+#: ../src/fileselection.c:803
+msgid "Please load the iPod before adding tracks."
+msgstr ""
+#: ../src/fileselection.c:185
+#, fuzzy, c-format
+msgid "Add files to '%s'"
+msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¿½åŠ ã™ã‚‹"
+
+#: ../src/fileselection.c:189
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr ""
+
+#. Create window title
+#: ../src/fileselection.c:322
+#, fuzzy, c-format
+msgid "Add playlist files to '%s'"
+msgstr "プレイリストをファイルã‹ã‚‰èªã¿è¾¼ã‚“ã§è¿½åŠ ã—ã¾ã™"
+
#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:300
+#: ../src/fileselection.c:378
msgid "Set Cover"
-msgstr "¥«¥Ð¡¼¥¢¡¼¥È¤òÀßÄê"
+msgstr "ã‚«ãƒãƒ¼ã‚¢ãƒ¼ãƒˆã‚’è¨å®š"
-#: ../src/fileselection.c:721
-msgid "Select directory to add recursively"
-msgstr "ºÆµ¢Åª¤ËÄɲ乤ë¥Ç¥£¥ì¥¯¥È¥ê¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤"
+#: ../src/fileselection.c:816
+#, fuzzy, c-format
+msgid "Add directories to '%s'"
+msgstr "ディレクトリをå†å¸°çš„ã«è¿½åŠ ã™ã‚‹"
-#: ../src/fileselection.c:992
+#: ../src/fileselection.c:820
+#, fuzzy, c-format
+msgid "Add directories to '%s/%s'"
+msgstr "ディレクトリをå†å¸°çš„ã«è¿½åŠ ã™ã‚‹"
+
+#: ../src/fileselection.c:1097
msgid "Ok"
msgstr "OK"
-#: ../src/fileselection.c:1001
+#: ../src/fileselection.c:1106
msgid "Cancel"
-msgstr "¥¥ã¥ó¥»¥ë"
+msgstr "ã‚ャンセル"
-#: ../src/flacfile.c:33
+#: ../src/flacfile.c:62
#, fuzzy, c-format
msgid "'%s' does not appear to be an FLAC audio file.\n"
-msgstr "'%s' ¤Ï mp4 ¥ª¡¼¥Ç¥£¥ª¥Õ¥¡¥¤¥ë¤È¤Ïǧ¼±¤Ç¤¤Þ¤»¤ó¡£\n"
+msgstr "'%s' 㯠mp4 オーディオファイルã¨ã¯èªè˜ã§ãã¾ã›ã‚“。\n"
-#: ../src/flacfile.c:52
+#: ../src/flacfile.c:78
#, fuzzy, c-format
msgid "Error retrieving tags for '%s'.\n"
-msgstr "'%s'¤Î½ñ¤¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
+msgstr "'%s'ã®æ›¸ãè¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚\n"
-#: ../src/flacfile.c:119
+#: ../src/flacfile.c:165
#, fuzzy, c-format
msgid ""
"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
"compile the gtkpod source together with the FLAC library.\n"
msgstr ""
-"'%s'¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: m4a/m4p ¤Î¼è¤ê°·¤¤¤Ë¤Ï mp4v2 ¥é¥¤¥Ö¥é¥ê¤¬É¬ÍפǤ¹¡£"
-"mp4v2 ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ gtkpod ¤òºÆÅÙ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"'%s'ã®èªã¿è¾¼ã¿ã«å¤±æ•—: m4a/m4p ã®å–り扱ã„ã«ã¯ mp4v2 ライブラリãŒå¿…è¦ã§ã™ã€‚"
+"mp4v2 ライブラリを使ã£ã¦ gtkpod ã‚’å†åº¦ã‚³ãƒ³ãƒ‘イルã—ã¦ãã ã•ã„。\n"
-#: ../src/flacfile.c:125
+#: ../src/flacfile.c:171
#, fuzzy, c-format
msgid ""
"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
"library. You must compile the gtkpod source together with the FLAC library.\n"
msgstr ""
-"'%s' ¤Î m4a/m4p ¥á¥¿¥Ç¡¼¥¿¤Î¹¹¿·¤Ë¼ºÇÔ: m4a/m4p ¤Î¼è¤ê°·¤¤¤Ë¤Ï mp4v2 ¥é¥¤¥Ö¥é"
-"¥ê¤¬É¬ÍפǤ¹¡£mp4v2 ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ gtkpod ¤òºÆÅÙ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ"
-"¤¤¡£\n"
+"'%s' ã® m4a/m4p メタデータã®æ›´æ–°ã«å¤±æ•—: m4a/m4p ã®å–り扱ã„ã«ã¯ mp4v2 ライブラ"
+"リãŒå¿…è¦ã§ã™ã€‚mp4v2 ライブラリを使ã£ã¦ gtkpod ã‚’å†åº¦ã‚³ãƒ³ãƒ‘イルã—ã¦ãã ã•"
+"ã„。\n"
#: ../src/getopt.c:681
#, c-format
msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: »ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó `%s' ¤Ç¤Ïµ½Ò¤¬Û£Ëæ¤Ç¤¹\n"
+msgstr "%s: 指定ã•ã‚ŒãŸã‚ªãƒ—ション `%s' ã§ã¯è¨˜è¿°ãŒæ›–昧ã§ã™\n"
#: ../src/getopt.c:706
#, c-format
msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: »ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó\n"
+msgstr "%s: 指定ã•ã‚ŒãŸã‚ªãƒ—ション `--%s' ã¯å¼•æ•°ã‚’å–ã‚Šã¾ã›ã‚“\n"
#: ../src/getopt.c:711
#, c-format
msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: »ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó\n"
+msgstr "%s: 指定ã•ã‚ŒãŸã‚ªãƒ—ション `%c%s' ã¯å¼•æ•°ã‚’å–ã‚Šã¾ã›ã‚“\n"
#: ../src/getopt.c:729 ../src/getopt.c:902
#, c-format
msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: »ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹\n"
+msgstr "%s: 指定ã•ã‚ŒãŸã‚ªãƒ—ション `%s' ã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™\n"
#. --option
#: ../src/getopt.c:758
#, c-format
msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ǧ¼±¤Ç¤¤Ê¤¤¥ª¥×¥·¥ç¥ó `--%s' ¤Ç¤¹\n"
+msgstr "%s: èªè˜ã§ããªã„オプション `--%s' ã§ã™\n"
#. +option or -option
#: ../src/getopt.c:762
#, c-format
msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ǧ¼±¤Ç¤¤Ê¤¤¥ª¥×¥·¥ç¥ó `%c%s' ¤Ç¤¹\n"
+msgstr "%s: èªè˜ã§ããªã„オプション `%c%s' ã§ã™\n"
#. 1003.2 specifies the format of this message.
#: ../src/getopt.c:788
#, c-format
msgid "%s: illegal option -- %c\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó¤¬°ã¤¤¤Þ¤¹ -- %c\n"
+msgstr "%s: オプションãŒé•ã„ã¾ã™ -- %c\n"
#: ../src/getopt.c:791
#, c-format
msgid "%s: invalid option -- %c\n"
-msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹ -- %c\n"
+msgstr "%s: ä¸æ£ãªã‚ªãƒ—ションã§ã™ -- %c\n"
#. 1003.2 specifies the format of this message.
#: ../src/getopt.c:821 ../src/getopt.c:951
#, c-format
msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: »ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹ -- %c\n"
+msgstr "%s: 指定ã•ã‚ŒãŸã‚ªãƒ—ションã«ã¯å¼•æ•°ãŒå¿…è¦ã§ã™ -- %c\n"
#: ../src/getopt.c:868
#, c-format
msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: »ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó `-W %s' ¤Ç¤Ïµ½Ò¤¬Û£Ëæ¤Ç¤¹\n"
+msgstr "%s: 指定ã•ã‚ŒãŸã‚ªãƒ—ション `-W %s' ã§ã¯è¨˜è¿°ãŒæ›–昧ã§ã™\n"
#: ../src/getopt.c:886
#, c-format
msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: »ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥ó `-W %s' ¤Ï°ú¿ô¤ò¼è¤ê¤Þ¤»¤ó\n"
+msgstr "%s: 指定ã•ã‚ŒãŸã‚ªãƒ—ション `-W %s' ã¯å¼•æ•°ã‚’å–ã‚Šã¾ã›ã‚“\n"
#: ../src/info.c:383
msgid "n/c"
msgstr ""
-#: ../src/info.c:388 ../src/info.c:835
+#: ../src/info.c:388 ../src/info.c:838
msgid "offline"
-msgstr "¥ª¥Õ¥é¥¤¥ó"
+msgstr "オフライン"
-#: ../src/info.c:483
+#: ../src/info.c:486
#, c-format
msgid " P:%d T:%d/%d"
msgstr ""
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "B"
msgstr ""
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "kB"
msgstr ""
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "TB"
msgstr ""
-#: ../src/info.c:820
+#: ../src/info.c:823
#, c-format
msgid " %s Free"
-msgstr "%s ¶õ¤"
+msgstr "%s 空ã"
-#: ../src/info.c:825
+#: ../src/info.c:828
#, c-format
msgid " %s Pending"
-msgstr "%s ÉÔÂ"
+msgstr "%s ä¸è¶³"
-#: ../src/info.c:830
+#: ../src/info.c:833
msgid " disconnected"
-msgstr "̤Àܳ"
+msgstr "未接続"
-#: ../src/info.c:881
+#: ../src/info.c:884
#, fuzzy
msgid "No database or playlist selected"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "プレイリストãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: ../src/info.c:886
+#: ../src/info.c:889
msgid "No tracks selected"
-msgstr "¶Ê¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
+msgstr "曲ãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: ../src/info.c:891
+#: ../src/info.c:894
msgid "No playlist selected"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "プレイリストãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: ../src/info.c:896
+#: ../src/info.c:899
#, fuzzy
msgid "No iPod or iPod playlist selected"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "プレイリストãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
#. Strings used several times
#: ../src/ipod_init.c:48
@@ -3828,12 +4107,12 @@
#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
#, fuzzy
msgid "Select mountpoint"
-msgstr "iPod¤Î¥Þ¥¦¥ó¥È¾ì½ê(_P):"
+msgstr "iPodã®ãƒžã‚¦ãƒ³ãƒˆå ´æ‰€(_P):"
#: ../src/ipod_init.c:359
#, fuzzy, c-format
msgid "Error initialising iPod: %s\n"
-msgstr "'%s'¤Î½ñ¤¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
+msgstr "'%s'ã®æ›¸ãè¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚\n"
#: ../src/ipod_init.c:366
msgid "Error initialising iPod, unknown error\n"
@@ -3844,304 +4123,328 @@
msgid "<b>Please select your iPod model at </b><i>%s</i>"
msgstr ""
-#: ../src/misc.c:86
-#, c-format
+#: ../src/ipod_init.c:463
msgid ""
-"gtkpod Version %s: Cross-Platform Multi-Lingual Interface to Apple's iPod"
-"(tm)."
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
msgstr ""
-#: ../src/misc.c:90
+#: ../src/misc.c:70
msgid ""
-"(C) 2002 - 2007\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
"Corey Donohoe (atmos at atmos dot org)\n"
-"\n"
-"\n"
msgstr ""
-#: ../src/misc.c:96
+#: ../src/misc.c:74
msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-msgstr ""
-"¤³¤Î¥×¥í¥°¥é¥à¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£¤¢¤Ê¤¿¤Ï¤³¤ì¤ò¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâ"
-"ÃĤˤè¤Ã¤Æȯ¹Ô¤µ¤ì¤¿ GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ(¥Ð¡¼¥¸¥ç¥ó2¤«¡¢´õ˾¤Ë¤è¤Ã¤Æ¤Ï"
-"¤½¤ì°Ê¹ß¤Î¥Ð¡¼¥¸¥ç¥ó¤Î¤¦¤Á¤É¤ì¤«)¤ÎÄê¤á¤ë¾ò·ï¤Î²¼¤ÇºÆÈÒÉÛ¤Þ¤¿¤Ï²þÊѤ¹¤ë¤³¤È¤¬"
-"¤Ç¤¤Þ¤¹¡£\n"
-"\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤ÏÍÍѤǤ¢¤ë¤³¤È¤ò´ê¤Ã¤ÆÈÒÉÛ¤µ¤ì¤Þ¤¹¤¬¡¢*Á´¤¯¤Î̵ÊݾÚ*¤Ç¤¹¡£¾¦"
-"¶È²ÄǽÀ¤ÎÊݾڤäÆÃÄê¤ÎÌÜŪ¤Ø¤ÎŬ¹çÀ¤Ï¡¢¸À³°¤Ë¼¨¤µ¤ì¤¿¤â¤Î¤â´Þ¤áÁ´¤¯Â¸ºß¤·¤Þ"
-"¤»¤ó¡£¾Ü¤·¤¯¤ÏGNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£\n"
-"\n"
-"¤¢¤Ê¤¿¤Ï¤³¤Î¥×¥í¥°¥é¥à¤È¶¦¤Ë¡¢GNU °ìÈ̸ø½°ÍøÍѵöÂú·ÀÌó½ñ¤ÎÊ£À½Êª¤ò°ìÉô¼õ¤±"
-"¼è¤Ã¤¿¤Ï¤º¤Ç¤¹¡£¤â¤·¼õ¤±¼è¤Ã¤Æ¤¤¤Ê¤±¤ì¤Ð¡¢¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤޤÇÀÁµá¤·¤Æ"
-"¤¯¤À¤µ¤¤(°¸Àè¤Ï the Free Software Foundation, Inc., 59 Temple Place,Suite "
-"330, Boston, MA 02111-1307 USA)¡£\n"
-"\n"
-"\n"
-
-#: ../src/misc.c:104
-msgid ""
"Patches were supplied by the following people (list may be incomplete -- "
"please contact me)\n"
-"\n"
msgstr ""
-#: ../src/misc.c:106
-msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)\n"
+#: ../src/misc.c:75
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
msgstr ""
-#: ../src/misc.c:108
-msgid "Hiroshi Kawashima: Japanese charset autodetecion feature\n"
+#: ../src/misc.c:76
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
msgstr ""
-#: ../src/misc.c:110
-msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c\n"
+#: ../src/misc.c:77
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
msgstr ""
-#: ../src/misc.c:112
+#: ../src/misc.c:78
msgid ""
"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
-"newlines at the end\n"
+"newlines at the end"
msgstr ""
-#: ../src/misc.c:114
-msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod\n"
+#: ../src/misc.c:79
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
msgstr ""
-#: ../src/misc.c:116
-msgid "Chris Cutler: automatic creation of various playlist types\n"
+#: ../src/misc.c:80
+msgid "Chris Cutler: automatic creation of various playlist types"
msgstr ""
-#: ../src/misc.c:118
+#: ../src/misc.c:81
msgid ""
"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
-"dialogue during sync\n"
+"dialogue during sync"
msgstr ""
-#: ../src/misc.c:120
+#: ../src/misc.c:82
msgid ""
"Edward Matteucci: debugging, special playlist creation, most of the volume "
-"normalizing code\n"
+"normalizing code"
msgstr ""
-#: ../src/misc.c:122
-msgid "Jens Lautenbach: some optical improvements\n"
+#: ../src/misc.c:83
+msgid "Jens Lautenbach: some optical improvements"
msgstr ""
-#: ../src/misc.c:124
-msgid "Alex Tribble: iPod eject patch\n"
+#: ../src/misc.c:84
+msgid "Alex Tribble: iPod eject patch"
msgstr ""
-#: ../src/misc.c:126
-msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling\n"
+#: ../src/misc.c:85
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
msgstr ""
-#: ../src/misc.c:128
+#: ../src/misc.c:86
msgid ""
-"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes\n"
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
msgstr ""
-#: ../src/misc.c:130
+#: ../src/misc.c:87
msgid ""
"Ero Carrera: Filename validation and quick sync when copying tracks from the "
-"iPod\n"
+"iPod"
msgstr ""
-#: ../src/misc.c:132
-msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume\n"
+#: ../src/misc.c:88
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
msgstr ""
-#: ../src/misc.c:134
-msgid "Armando Atienza: Support with external playcounts\n"
+#: ../src/misc.c:89
+msgid "Armando Atienza: Support with external playcounts"
msgstr ""
-#: ../src/misc.c:136
-msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)\n"
+#: ../src/misc.c:90
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
msgstr ""
-#: ../src/misc.c:138
-msgid "Jim Hall: Decent INSTALL file\n"
+#: ../src/misc.c:91
+msgid "Jim Hall: Decent INSTALL file"
msgstr ""
-#: ../src/misc.c:140
+#: ../src/misc.c:92
msgid ""
"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
-"contacts to the iPod\n"
+"contacts to the iPod"
msgstr ""
#. J"urgen!
-#: ../src/misc.c:142
-msgid "Flavio Stanchina: bugfixes\n"
+#: ../src/misc.c:93
+msgid "Flavio Stanchina: bugfixes"
msgstr ""
-#: ../src/misc.c:144
+#: ../src/misc.c:94
msgid ""
"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title\n"
+"the title"
msgstr ""
-#: ../src/misc.c:146
-msgid "Steve Jay: use statvfs() instead of df (better portability, faster)\n"
+#: ../src/misc.c:95
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
msgstr ""
-#: ../src/misc.c:149
+#: ../src/misc.c:97
msgid ""
"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
-"tags\n"
+"tags"
msgstr ""
-#: ../src/misc.c:152
+#: ../src/misc.c:99
msgid ""
"James Liggett:\n"
-" replacement of old GTK file selection dialogs with new GTK filechooser "
+"replacement of old GTK file selection dialogs with new GTK filechooser "
"dialogs\n"
-" refactored user preferences system.\n"
+"refactored user preferences system."
msgstr ""
-#: ../src/misc.c:157
-msgid "Daniel Kercher: sync scripts for abook and webcalendar\n"
+#: ../src/misc.c:103
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
msgstr ""
-#: ../src/misc.c:160
-msgid "Clinton Gormley: sync scripts for thunderbird\n"
+#: ../src/misc.c:105
+msgid "Clinton Gormley: sync scripts for thunderbird"
msgstr ""
-#: ../src/misc.c:163
-msgid "Sebastien Beridot: sync script for ldif addressbook format\n"
+#: ../src/misc.c:107
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
msgstr ""
-#: ../src/misc.c:166
-msgid "Sebastian Scherer: sync script for kNotes\n"
+#: ../src/misc.c:109
+msgid "Sebastian Scherer: sync script for kNotes"
msgstr ""
-#: ../src/misc.c:169
-msgid "Nick Piper: sync script for Palm, type-ahead search\n"
+#: ../src/misc.c:111
+msgid "Nick Piper: sync script for Palm, type-ahead search"
msgstr ""
-#: ../src/misc.c:172
-msgid "Uwe Hermann: help with support for iPod Video\n"
+#: ../src/misc.c:113
+msgid "Uwe Hermann: help with support for iPod Video"
msgstr ""
-#: ../src/misc.c:175
+#: ../src/misc.c:115
msgid ""
"Iain Benson: support for compilation tag in mp3 files and separate display "
-"of compilations in the sort tab.\n"
+"of compilations in the sort tab."
msgstr ""
-#: ../src/misc.c:177
+#: ../src/misc.c:116
msgid ""
"Nicolas Chariot: icons of buttons\n"
"\n"
-"\n"
msgstr ""
-#: ../src/misc.c:181
-msgid "This program borrows code from the following projects:\n"
+#: ../src/misc.c:118
+msgid "This program borrows code from the following projects:"
msgstr ""
-#: ../src/misc.c:183
+#: ../src/misc.c:119
msgid ""
-" gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB "
-"(http://www.gnu.org/software/gnupod/)\n"
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
msgstr ""
-#: ../src/misc.c:185
+#: ../src/misc.c:120
msgid ""
-" iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some "
-"code for smart playlists is based on his C++-classes.\n"
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
msgstr ""
-#: ../src/misc.c:187
-msgid " mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)\n"
+#: ../src/misc.c:121
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
msgstr ""
-#: ../src/misc.c:189
-msgid ""
-" xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)\n"
+#: ../src/misc.c:122
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
msgstr ""
-#: ../src/misc.c:192
-msgid ""
-"The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"
+#: ../src/misc.c:124
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
msgstr ""
-#: ../src/misc.c:207
-msgid "French: David Le Brun (david at dyn-ns dot net)\n"
+#: ../src/misc.c:128
+msgid "French: David Le Brun (david at dyn-ns dot net)"
msgstr ""
-#: ../src/misc.c:209
-msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+#: ../src/misc.c:129
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
msgstr ""
-#: ../src/misc.c:211
-msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)\n"
+#: ../src/misc.c:130
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
msgstr ""
-#: ../src/misc.c:213
+#: ../src/misc.c:131
+msgid "German: Kai-Ove"
+msgstr ""
+
+#: ../src/misc.c:132
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+msgstr ""
+
+#: ../src/misc.c:133
msgid ""
-"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net)\n"
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
msgstr ""
-#: ../src/misc.c:215
-msgid "Japanese: Ayako Sano\n"
+#: ../src/misc.c:134
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
msgstr ""
-#: ../src/misc.c:217
-msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
+#: ../src/misc.c:135
+msgid "Japanese: Ayako Sano"
msgstr ""
-#: ../src/misc.c:219
-msgid "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
+#: ../src/misc.c:136
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
msgstr ""
-#: ../src/misc.c:975
+#: ../src/misc.c:137
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr ""
+
+#: ../src/misc.c:138
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr ""
+
+#: ../src/misc.c:139
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
+msgstr ""
+
+#: ../src/misc.c:144
+#, fuzzy
+msgid ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+msgstr ""
+"ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚ã‚ãªãŸã¯ã“れをã€ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢è²¡"
+"団ã«ã‚ˆã£ã¦ç™ºè¡Œã•ã‚ŒãŸ GNU 一般公衆利用許諾契約書(ãƒãƒ¼ã‚¸ãƒ§ãƒ³2ã‹ã€å¸Œæœ›ã«ã‚ˆã£ã¦ã¯"
+"ãれ以é™ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã†ã¡ã©ã‚Œã‹)ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§å†é ’布ã¾ãŸã¯æ”¹å¤‰ã™ã‚‹ã“ã¨ãŒ"
+"ã§ãã¾ã™ã€‚\n"
+"\n"
+"ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã¯æœ‰ç”¨ã§ã‚ã‚‹ã“ã¨ã‚’願ã£ã¦é ’布ã•ã‚Œã¾ã™ãŒã€*å…¨ãã®ç„¡ä¿è¨¼*ã§ã™ã€‚商"
+"æ¥å¯èƒ½æ€§ã®ä¿è¨¼ã‚„特定ã®ç›®çš„ã¸ã®é©åˆæ€§ã¯ã€è¨€å¤–ã«ç¤ºã•ã‚ŒãŸã‚‚ã®ã‚‚å«ã‚å…¨ãå˜åœ¨ã—ã¾"
+"ã›ã‚“。詳ã—ãã¯GNU 一般公衆利用許諾契約書をã”覧ãã ã•ã„。\n"
+"\n"
+"ã‚ãªãŸã¯ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã¨å…±ã«ã€GNU 一般公衆利用許諾契約書ã®è¤‡è£½ç‰©ã‚’一部å—ã‘"
+"å–ã£ãŸã¯ãšã§ã™ã€‚ã‚‚ã—å—ã‘å–ã£ã¦ã„ãªã‘ã‚Œã°ã€ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢è²¡å›£ã¾ã§è«‹æ±‚ã—ã¦"
+"ãã ã•ã„(宛先㯠the Free Software Foundation, Inc., 59 Temple Place,Suite "
+"330, Boston, MA 02111-1307 USA)。\n"
+"\n"
+"\n"
+
+#: ../src/misc.c:159
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+msgstr ""
+
+#: ../src/misc.c:167
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr ""
+
+#: ../src/misc.c:934
#, fuzzy, c-format
msgid "Could not process '%s' (no filename available)"
-msgstr "¥Õ¥¡¥¤¥ë̾¤¬¤ï¤«¤ê¤Þ¤»¤ó"
+msgstr "ファイルåãŒã‚ã‹ã‚Šã¾ã›ã‚“"
-#: ../src/misc.c:1129
+#: ../src/misc.c:1088
#, c-format
msgid "Unknown token '%%%c' in template '%s'"
-msgstr "̤ÃΤΥȡ¼¥¯¥ó '%%%c' ¤¬¥Æ¥ó¥×¥ì¡¼¥È '%s' Ãæ¤Ë¤¢¤ê¤Þ¤¹"
+msgstr "未知ã®ãƒˆãƒ¼ã‚¯ãƒ³ '%%%c' ãŒãƒ†ãƒ³ãƒ—レート '%s' ä¸ã«ã‚ã‚Šã¾ã™"
-#: ../src/misc.c:1212
+#: ../src/misc.c:1171
#, c-format
msgid "Template ('%s') does not match file type '%s'\n"
-msgstr "¥Æ¥ó¥×¥ì¡¼¥È ('%s') ¤¬¥Õ¥¡¥¤¥ë·Á¼° '%s' ¤Ë¹ç¤¤¤Þ¤»¤ó¡£\n"
+msgstr "テンプレート ('%s') ãŒãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼ '%s' ã«åˆã„ã¾ã›ã‚“。\n"
-#: ../src/misc.c:1298
+#: ../src/misc.c:1257
#, c-format
msgid "Error creating %s: %s\n"
-msgstr "'%s'¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n"
+msgstr "'%s'ã®ä½œæˆã«å¤±æ•—: %s\n"
-#: ../src/misc.c:1777
+#: ../src/misc.c:1691
#, c-format
msgid ""
"Writing preferences file '%s' failed (%s).\n"
"\n"
msgstr ""
-#: ../src/misc.c:1779
+#: ../src/misc.c:1693
msgid "unspecified error"
msgstr ""
-#: ../src/misc.c:1787
+#: ../src/misc.c:1701
#, c-format
msgid ""
"Writing preferences to the iPod (%s) failed: could not get path to Control "
@@ -4153,7 +4456,7 @@
#: ../src/misc_confirm.c:71
#, fuzzy
msgid "The following has occurred:"
-msgstr "°Ê²¼¤ÎÌäÂ꤬ȯÀ¸¤·¤Þ¤·¤¿:"
+msgstr "以下ã®å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸ:"
#: ../src/misc_confirm.c:122
msgid ""
@@ -4165,13 +4468,13 @@
"iPod? The number of playlists the tracks are member of is indicated in "
"parentheses."
msgstr[0] ""
-"°Ê²¼¤Î¶Ê¤ò iPod ¤«¤é´°Á´¤Ëºï½ü¤·¤Æ¤âËÜÅö¤Ë¤è¤í¤·¤¤¤Ç¤¹¤«? ³ç¸Ì¤ÎÃæ¤Î¿ô»ú¤Ï¡¢"
-"¤³¤Î¶Ê¤¬¤¤¤¯¤Ä¤Î¥×¥ì¥¤¥ê¥¹¥È¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£"
+"以下ã®æ›²ã‚’ iPod ã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã—ã¦ã‚‚本当ã«ã‚ˆã‚ã—ã„ã§ã™ã‹? 括弧ã®ä¸ã®æ•°å—ã¯ã€"
+"ã“ã®æ›²ãŒã„ãã¤ã®ãƒ—レイリストã«ç™»éŒ²ã•ã‚Œã¦ã„ã‚‹ã‹ã‚’示ã—ã¦ã„ã¾ã™ã€‚"
#: ../src/misc_confirm.c:126
msgid "Delete Track Completely from iPod?"
msgid_plural "Delete Tracks Completely from iPod?"
-msgstr[0] "iPod ¤«¤é´°Á´¤Ëºï½ü¤·¤Þ¤¹¤«?"
+msgstr[0] "iPod ã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã—ã¾ã™ã‹?"
#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
#, c-format
@@ -4180,12 +4483,12 @@
msgid_plural ""
"Are you sure you want to remove the following tracks from the playlist \"%s"
"\"?"
-msgstr[0] "°Ê²¼¤Î¶Ê¤ò¥×¥ì¥¤¥ê¥¹¥È \"%s\" ¤«¤éºï½ü¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?"
+msgstr[0] "以下ã®æ›²ã‚’プレイリスト \"%s\" ã‹ã‚‰å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹?"
#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
msgid "Remove Track From Playlist?"
msgid_plural "Remove Tracks From Playlist?"
-msgstr[0] "¤³¤ì¤é¶Ê¤ò¥×¥ì¥¤¥ê¥¹¥È¤«¤éºï½ü¤·¤Þ¤¹¤«?"
+msgstr[0] "ã“れら曲をプレイリストã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹?"
#: ../src/misc_confirm.c:163
msgid ""
@@ -4197,13 +4500,13 @@
"harddisk? The number of playlists the tracks are member of is indicated in "
"parentheses."
msgstr[0] ""
-"°Ê²¼¤Î¶Ê¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤é´°Á´¤Ëºï½ü¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«? ³ç¸Ì¤ÎÃæ¤Î¿ô»ú"
-"¤Ï¡¢¤³¤Î¶Ê¤¬¤¤¤¯¤Ä¤Î¥×¥ì¥¤¥ê¥¹¥È¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£"
+"以下ã®æ›²ã‚’ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? 括弧ã®ä¸ã®æ•°å—"
+"ã¯ã€ã“ã®æ›²ãŒã„ãã¤ã®ãƒ—レイリストã«ç™»éŒ²ã•ã‚Œã¦ã„ã‚‹ã‹ã‚’示ã—ã¦ã„ã¾ã™ã€‚"
#: ../src/misc_confirm.c:167
msgid "Delete Track from Harddisk?"
msgid_plural "Delete Tracks from Harddisk?"
-msgstr[0] "¤³¤ì¤é¤Î¶Ê¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤éºï½ü¤·¤Þ¤¹¤«?"
+msgstr[0] "ã“れらã®æ›²ã‚’ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹?"
#: ../src/misc_confirm.c:192
msgid ""
@@ -4215,101 +4518,104 @@
"local database? The number of playlists the tracks are member of is "
"indicated in parentheses."
msgstr[0] ""
-"°Ê²¼¤Î¶Ê¤ò¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é´°Á´¤Ëºï½ü¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«? ³ç¸Ì¤ÎÃæ"
-"¤Î¿ô»ú¤Ï¡¢¤³¤ì¤é¤Î¶Ê¤¬¤¤¤¯¤Ä¤Î¥×¥ì¥¤¥ê¥¹¥È¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£"
+"以下ã®æ›²ã‚’ãƒãƒ¼ã‚«ãƒ«ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‹ã‚‰å®Œå…¨ã«å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? 括弧ã®ä¸"
+"ã®æ•°å—ã¯ã€ã“れらã®æ›²ãŒã„ãã¤ã®ãƒ—レイリストã«ç™»éŒ²ã•ã‚Œã¦ã„ã‚‹ã‹ã‚’示ã—ã¦ã„ã¾ã™ã€‚"
#: ../src/misc_confirm.c:196
msgid "Remove Track from Local Database?"
msgid_plural "Remove Tracks from Local Database?"
-msgstr[0] "¤³¤ì¤é¤Î¶Ê¤ò¥í¡¼¥«¥ë¤Î¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤·¤Þ¤¹¤«?"
+msgstr[0] "ã“れらã®æ›²ã‚’ãƒãƒ¼ã‚«ãƒ«ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‹ã‚‰å‰Šé™¤ã—ã¾ã™ã‹?"
#: ../src/misc_confirm.c:261
#, c-format
msgid "Deleted one track completely from iPod"
msgid_plural "Deleted %d tracks completely from iPod"
-msgstr[0] "iPod¤«¤é%d¶Ê´°Á´¤Ëºï½ü¤·¤Þ¤·¤¿"
+msgstr[0] "iPodã‹ã‚‰%d曲完全ã«å‰Šé™¤ã—ã¾ã—ãŸ"
#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
#, c-format
msgid "Deleted %d track from playlist '%s'"
msgid_plural "Deleted %d tracks from playlist '%s'"
-msgstr[0] "¥×¥ì¥¤¥ê¥¹¥È '%2$s' ¤«¤é %1$d ¶Êºï½ü¤·¤Þ¤·¤¿"
+msgstr[0] "プレイリスト '%2$s' ã‹ã‚‰ %1$d 曲削除ã—ã¾ã—ãŸ"
#: ../src/misc_confirm.c:285
#, c-format
msgid "Deleted one track from harddisk"
msgid_plural "Deleted %d tracks from harddisk"
-msgstr[0] "¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤é%d¶Êºï½ü¤·¤Þ¤·¤¿"
+msgstr[0] "ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰%d曲削除ã—ã¾ã—ãŸ"
#: ../src/misc_confirm.c:297
#, c-format
msgid "Deleted track from local database"
msgid_plural "Deleted %d tracks from local database"
-msgstr[0] "¥í¡¼¥«¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é%d¶Êºï½ü¤·¤Þ¤·¤¿"
+msgstr[0] "ãƒãƒ¼ã‚«ãƒ«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‹ã‚‰%d曲削除ã—ã¾ã—ãŸ"
#: ../src/misc_confirm.c:442
msgid "Cannot remove entry 'All'"
-msgstr "'¤¹¤Ù¤Æ' ¤Î¹àÌܤòºï½ü¤¹¤ë¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó"
+msgstr "'ã™ã¹ã¦' ã®é …目を削除ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
#: ../src/misc_confirm.c:536
#, c-format
msgid "Removed all %d tracks from the iPod"
-msgstr "Á´%d¶Ê¤ò iPod ¤«¤éºï½ü¤·¤Þ¤·¤¿"
+msgstr "å…¨%d曲を iPod ã‹ã‚‰å‰Šé™¤ã—ã¾ã—ãŸ"
#: ../src/misc_confirm.c:541
+#, c-format
msgid "Removed all podcasts from the iPod"
-msgstr "¤¹¤Ù¤Æ¤Î Podcast ¤ò iPod ¤«¤éºï½ü¤·¤Þ¤·¤¿"
+msgstr "ã™ã¹ã¦ã® Podcast ã‚’ iPod ã‹ã‚‰å‰Šé™¤ã—ã¾ã—ãŸ"
#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
#, c-format
msgid "Deleted playlist '%s' including %d member track"
msgid_plural "Deleted playlist '%s' including %d member tracks"
-msgstr[0] "¥×¥ì¥¤¥ê¥¹¥È '%s' (%d¶Ê) ¤òºï½ü¤·¤Þ¤·¤¿"
+msgstr[0] "プレイリスト '%s' (%d曲) を削除ã—ã¾ã—ãŸ"
#. first use playlist name
#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
#, c-format
msgid "Deleted playlist '%s'"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È '%s' ¤òºï½ü"
+msgstr "プレイリスト '%s' を削除"
#: ../src/misc_confirm.c:600
#, c-format
msgid "Deleted playlist '%s' including %d member track on harddisk"
msgid_plural "Deleted playlist '%s' including %d member tracks on harddisk"
-msgstr[0] "¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤é¥×¥ì¥¤¥ê¥¹¥È '%s' (%d¶Ê) ¤òºï½ü¤·¤Þ¤·¤¿"
+msgstr[0] "ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰ãƒ—レイリスト '%s' (%d曲) を削除ã—ã¾ã—ãŸ"
#: ../src/misc_confirm.c:617
#, c-format
msgid "Removed all %d tracks from the database"
-msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éÁ´%d¶Ê¤òºï½ü¤·¤Þ¤·¤¿"
+msgstr "データベースã‹ã‚‰å…¨%d曲を削除ã—ã¾ã—ãŸ"
#: ../src/misc_confirm.c:695
+#, c-format
msgid "Are you sure you want to remove all tracks from your iPod?"
-msgstr "iPod ¤Î¤¹¤Ù¤Æ¤Î¶Ê¤òºï½ü¤·¤Æ¤âËÜÅö¤Ë¤è¤í¤·¤¤¤Ç¤¹¤«?"
+msgstr "iPod ã®ã™ã¹ã¦ã®æ›²ã‚’削除ã—ã¦ã‚‚本当ã«ã‚ˆã‚ã—ã„ã§ã™ã‹?"
#: ../src/misc_confirm.c:700
+#, c-format
msgid "Are you sure you want to remove all podcasts from your iPod?"
-msgstr "¤¹¤Ù¤Æ¤Î Podcast ¤ò iPod ¤«¤éºï½ü¤·¤Æ¤âËÜÅö¤Ë¤è¤í¤·¤¤¤Ç¤¹¤«?"
+msgstr "ã™ã¹ã¦ã® Podcast ã‚’ iPod ã‹ã‚‰å‰Šé™¤ã—ã¦ã‚‚本当ã«ã‚ˆã‚ã—ã„ã§ã™ã‹?"
#: ../src/misc_confirm.c:708
-#, c-format
+#, fuzzy, c-format
msgid ""
"Are you sure you want to delete playlist '%s' and the following track "
-"completely from your ipod? The number of playlists this track is a member of "
+"completely from your iPod? The number of playlists this track is a member of "
"is indicated in parentheses."
msgid_plural ""
"Are you sure you want to delete playlist '%s' and the following tracks "
-"completely from your ipod? The number of playlists the tracks are member of "
+"completely from your iPod? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
-"¥×¥ì¥¤¥ê¥¹¥È '%s' µÚ¤Ó¤½¤ì¤Ë´Þ¤Þ¤ì¤ë°Ê²¼¤Î¶Ê¤ò iPod ¤«¤éºï½ü¤·¤Æ¤âËÜÅö¤Ë¤è¤í"
-"¤·¤¤¤Ç¤¹¤«? ³ç¸Ì¤ÎÃæ¤Î¿ô»ú¤Ï¡¢¤½¤ì¤¾¤ì¤Î¶Ê¤¬¤¤¤¯¤Ä¤Î¥×¥ì¥¤¥ê¥¹¥È¤ËÅÐÏ¿¤µ¤ì¤Æ"
-"¤¤¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£"
+"プレイリスト '%s' åŠã³ãã‚Œã«å«ã¾ã‚Œã‚‹ä»¥ä¸‹ã®æ›²ã‚’ iPod ã‹ã‚‰å‰Šé™¤ã—ã¦ã‚‚本当ã«ã‚ˆã‚"
+"ã—ã„ã§ã™ã‹? 括弧ã®ä¸ã®æ•°å—ã¯ã€ãã‚Œãžã‚Œã®æ›²ãŒã„ãã¤ã®ãƒ—レイリストã«ç™»éŒ²ã•ã‚Œã¦"
+"ã„ã‚‹ã‹ã‚’示ã—ã¦ã„ã¾ã™ã€‚"
#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
#, c-format
msgid "Are you sure you want to delete the playlist '%s'?"
-msgstr "¥×¥ì¥¤¥ê¥¹¥È '%s' ¤òËÜÅö¤Ëºï½ü¤·¤Æ¤â¤¤¤¤¤Ç¤¹¤«?"
+msgstr "プレイリスト '%s' を本当ã«å‰Šé™¤ã—ã¦ã‚‚ã„ã„ã§ã™ã‹?"
#: ../src/misc_confirm.c:745
#, c-format
@@ -4322,13 +4628,14 @@
"tracks from your harddisk? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
-"¥×¥ì¥¤¥ê¥¹¥È '%s' µÚ¤Ó¤½¤ì¤Ë´Þ¤Þ¤ì¤ë°Ê²¼¤Î¶Ê¤ò¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤éºï½ü¤·¤Æ¤âËÜ"
-"Åö¤Ë¤è¤í¤·¤¤¤Ç¤¹¤«? ³ç¸Ì¤ÎÃæ¤Î¿ô»ú¤Ï¡¢¤½¤ì¤¾¤ì¤Î¶Ê¤¬¤¤¤¯¤Ä¤Î¥×¥ì¥¤¥ê¥¹¥È¤ËÅÐ"
-"Ï¿¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£"
+"プレイリスト '%s' åŠã³ãã‚Œã«å«ã¾ã‚Œã‚‹ä»¥ä¸‹ã®æ›²ã‚’ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‹ã‚‰å‰Šé™¤ã—ã¦ã‚‚本"
+"当ã«ã‚ˆã‚ã—ã„ã§ã™ã‹? 括弧ã®ä¸ã®æ•°å—ã¯ã€ãã‚Œãžã‚Œã®æ›²ãŒã„ãã¤ã®ãƒ—レイリストã«ç™»"
+"録ã•ã‚Œã¦ã„ã‚‹ã‹ã‚’示ã—ã¦ã„ã¾ã™ã€‚"
#: ../src/misc_confirm.c:753
+#, c-format
msgid "Are you sure you want to remove all tracks from the database?"
-msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é¤¹¤Ù¤Æ¤Î¶Ê¤òºï½ü¤·¤Æ¤âËÜÅö¤Ë¤è¤í¤·¤¤¤Ç¤¹¤«?"
+msgstr "データベースã‹ã‚‰ã™ã¹ã¦ã®æ›²ã‚’削除ã—ã¦ã‚‚本当ã«ã‚ˆã‚ã—ã„ã§ã™ã‹?"
#: ../src/misc_confirm.c:762
#, c-format
@@ -4341,29 +4648,29 @@
"tracks from the database? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
-"¥×¥ì¥¤¥ê¥¹¥È '%s' µÚ¤Ó¤½¤ì¤Ë´Þ¤Þ¤ì¤ë°Ê²¼¤Î¶Ê¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤·¤Æ¤âËÜÅö"
-"¤Ë¤è¤í¤·¤¤¤Ç¤¹¤«? ³ç¸Ì¤ÎÃæ¤Î¿ô»ú¤Ï¡¢¤½¤ì¤¾¤ì¤Î¶Ê¤¬¤¤¤¯¤Ä¤Î¥×¥ì¥¤¥ê¥¹¥È¤ËÅÐÏ¿"
-"¤µ¤ì¤Æ¤¤¤ë¤«¤ò¼¨¤·¤Æ¤¤¤Þ¤¹¡£"
+"プレイリスト '%s' åŠã³ãã‚Œã«å«ã¾ã‚Œã‚‹ä»¥ä¸‹ã®æ›²ã‚’データベースã‹ã‚‰å‰Šé™¤ã—ã¦ã‚‚本当"
+"ã«ã‚ˆã‚ã—ã„ã§ã™ã‹? 括弧ã®ä¸ã®æ•°å—ã¯ã€ãã‚Œãžã‚Œã®æ›²ãŒã„ãã¤ã®ãƒ—レイリストã«ç™»éŒ²"
+"ã•ã‚Œã¦ã„ã‚‹ã‹ã‚’示ã—ã¦ã„ã¾ã™ã€‚"
#: ../src/misc_confirm.c:841
msgid ""
"Data has been changed and not been saved.\n"
"OK to exit gtkpod?"
msgstr ""
-"Êѹ¹¤Î¤¢¤Ã¤¿¥Ç¡¼¥¿¤Ï¥»¡¼¥Ö¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
-"ËÜÅö¤Ë½ªÎ»¤·¤Þ¤¹¤«?"
+"変更ã®ã‚ã£ãŸãƒ‡ãƒ¼ã‚¿ã¯ã‚»ãƒ¼ãƒ–ã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
+"本当ã«çµ‚了ã—ã¾ã™ã‹?"
#: ../src/misc_conversion.c:66
msgid "File type"
-msgstr "¥Õ¥¡¥¤¥ë·Á¼°"
+msgstr "ファイル形å¼"
#: ../src/misc_conversion.c:67
msgid "PC File"
-msgstr "PC¥Õ¥¡¥¤¥ë"
+msgstr "PCファイル"
#: ../src/misc_conversion.c:68
msgid "iPod File"
-msgstr "iPod ¥Õ¥¡¥¤¥ë"
+msgstr "iPod ファイル"
#: ../src/misc_conversion.c:69
msgid "iPod ID"
@@ -4372,45 +4679,45 @@
#. 10
#: ../src/misc_conversion.c:70
msgid "Track Nr (#)"
-msgstr "¥È¥é¥Ã¥¯No.(#)"
+msgstr "トラックNo.(#)"
#: ../src/misc_conversion.c:71
msgid "Transferred"
-msgstr "žÁ÷ºÑ¤ß"
+msgstr "転é€æ¸ˆã¿"
#: ../src/misc_conversion.c:72
msgid "File Size"
-msgstr "¥Õ¥¡¥¤¥ë¥µ¥¤¥º"
+msgstr "ファイルサイズ"
#: ../src/misc_conversion.c:73
msgid "Play Time"
-msgstr "±éÁÕ»þ´Ö"
+msgstr "æ¼”å¥æ™‚é–“"
#. 20
#: ../src/misc_conversion.c:80
msgid "Date played"
-msgstr "ºÇ¸å¤Ë±éÁÕ¤·¤¿Æü"
+msgstr "最後ã«æ¼”å¥ã—ãŸæ—¥"
#: ../src/misc_conversion.c:82
msgid "Volume"
-msgstr "²»ÎÌ"
+msgstr "音é‡"
#: ../src/misc_conversion.c:83
msgid "Soundcheck"
-msgstr "¥µ¥¦¥ó¥É¥Á¥§¥Ã¥¯"
+msgstr "サウンドãƒã‚§ãƒƒã‚¯"
#. 25
#: ../src/misc_conversion.c:85
msgid "CD Nr"
-msgstr "CDÈÖ¹æ"
+msgstr "CD番å·"
#: ../src/misc_conversion.c:88
msgid "Category"
-msgstr "¥«¥Æ¥´¥ê"
+msgstr "カテゴリ"
#: ../src/misc_conversion.c:89
msgid "Description"
-msgstr "ÀâÌÀ"
+msgstr "説明"
#. 30
#: ../src/misc_conversion.c:90
@@ -4423,26 +4730,26 @@
#: ../src/misc_conversion.c:92
msgid "Subtitle"
-msgstr "¥µ¥Ö¥¿¥¤¥È¥ë"
+msgstr "サブタイトル"
#: ../src/misc_conversion.c:93
msgid "Date released"
-msgstr "¸ø³«Æü"
+msgstr "公開日"
#: ../src/misc_conversion.c:94
msgid "Checked"
-msgstr "¥Á¥§¥Ã¥¯ºÑ¤ß"
+msgstr "ãƒã‚§ãƒƒã‚¯æ¸ˆã¿"
#. 35
#: ../src/misc_conversion.c:95
#, fuzzy
msgid "Start time"
-msgstr "Á°²ó°Ê¹ß"
+msgstr "å‰å›žä»¥é™"
#: ../src/misc_conversion.c:96
#, fuzzy
msgid "Stop time"
-msgstr "̾ȧ"
+msgstr "ä¸æ¢"
#: ../src/misc_conversion.c:97
msgid "Remember Playback Position"
@@ -4478,109 +4785,154 @@
msgid "Episode Nr"
msgstr ""
-#: ../src/misc_conversion.c:118
+#: ../src/misc_conversion.c:106
+#, fuzzy
+msgid "Album Artist"
+msgstr "アーティスト"
+
+#: ../src/misc_conversion.c:107
+#, fuzzy
+msgid "Sort Artist"
+msgstr "アーティスト"
+
+#: ../src/misc_conversion.c:108
+#, fuzzy
+msgid "Sort Title"
+msgstr "サブタイトル"
+
+#: ../src/misc_conversion.c:109
+#, fuzzy
+msgid "Sort Album"
+msgstr "アルãƒãƒ "
+
+#. 50
+#: ../src/misc_conversion.c:110
+#, fuzzy
+msgid "Sort Album Artist"
+msgstr "アーティスト"
+
+#: ../src/misc_conversion.c:111
+#, fuzzy
+msgid "Sort Composer"
+msgstr "作曲者"
+
+#: ../src/misc_conversion.c:112
+msgid "Sort TV Show"
+msgstr ""
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr ""
+
+#: ../src/misc_conversion.c:126
msgid "Name of file on PC, if available"
-msgstr "PC ¾å¤Ç¤Î¥Õ¥¡¥¤¥ë̾ (ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¾ì¹ç)"
+msgstr "PC 上ã§ã®ãƒ•ã‚¡ã‚¤ãƒ«å (登録ã•ã‚Œã¦ã„ã‚‹å ´åˆ)"
-#: ../src/misc_conversion.c:119
+#: ../src/misc_conversion.c:127
msgid "Name of file on the iPod"
-msgstr "iPod ¾å¤Ç¤Î¥Õ¥¡¥¤¥ë̾"
+msgstr "iPod 上ã§ã®ãƒ•ã‚¡ã‚¤ãƒ«å"
#. 10
-#: ../src/misc_conversion.c:121
+#: ../src/misc_conversion.c:129
msgid "Track Nr. and total number of tracks on CD"
-msgstr "¶ÊÈֹ椪¤è¤Ó CD ¤ÎÁí¶Ê¿ô"
+msgstr "曲番å·ãŠã‚ˆã³ CD ã®ç·æ›²æ•°"
-#: ../src/misc_conversion.c:122
+#: ../src/misc_conversion.c:130
msgid "Whether the file has already been transferred to the iPod or not"
-msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤¬ iPod ¤ËžÁ÷ºÑ¤ß¤«¤É¤¦¤«¤ò¼¨¤¹"
+msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ iPod ã«è»¢é€æ¸ˆã¿ã‹ã©ã†ã‹ã‚’示ã™"
-#: ../src/misc_conversion.c:128
-msgid ""
-"Supposedly something that tells the iPod to increase or decrease the "
-"playback speed"
-msgstr "¤ª¤½¤é¤¯¡¢iPod ¤ËºÆÀ¸Â®ÅÙ¤ÎÊѹ¹¤òÅÁ¤¨¤ë¤¿¤á¤ÎÃÍ"
+#: ../src/misc_conversion.c:136
+msgid "Beats per minute"
+msgstr ""
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:137
msgid "Number of times the track has been played"
-msgstr "¶Ê¤¬±éÁÕ¤µ¤ì¤¿²ó¿ô"
+msgstr "曲ãŒæ¼”å¥ã•ã‚ŒãŸå›žæ•°"
-#: ../src/misc_conversion.c:131
+#: ../src/misc_conversion.c:138
msgid "Star rating from 0 to 5"
-msgstr "ɾ²Á (0¤«¤é5)"
+msgstr "評価 (0ã‹ã‚‰5)"
-#: ../src/misc_conversion.c:132
+#: ../src/misc_conversion.c:139
msgid "Date and time track has been added"
-msgstr "ÅÐÏ¿¤µ¤ì¤¿¤È¤¤ÎÆüÉդȻþ¹ï"
+msgstr "登録ã•ã‚ŒãŸã¨ãã®æ—¥ä»˜ã¨æ™‚刻"
#. 20
-#: ../src/misc_conversion.c:133
+#: ../src/misc_conversion.c:140
msgid "Date and time track has last been played"
-msgstr "ºÇ¸å¤Ë±éÁÕ¤µ¤ì¤¿¤È¤¤ÎÆüÉդȻþ¹ï"
+msgstr "最後ã«æ¼”å¥ã•ã‚ŒãŸã¨ãã®æ—¥ä»˜ã¨æ™‚刻"
-#: ../src/misc_conversion.c:134
+#: ../src/misc_conversion.c:141
msgid "Date and time track has last been modified"
-msgstr "ºÇ¸å¤ËÊѹ¹¤µ¤ì¤¿¤È¤¤ÎÆüÉդȻþ¹ï"
+msgstr "最後ã«å¤‰æ›´ã•ã‚ŒãŸã¨ãã®æ—¥ä»˜ã¨æ™‚刻"
-#: ../src/misc_conversion.c:135
+#: ../src/misc_conversion.c:142
msgid "Manual volume adjust"
-msgstr "²»Î̤ÎÄ´À°ÃÍ"
+msgstr "音é‡ã®èª¿æ•´å€¤"
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:143
msgid ""
"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
"the iPod"
msgstr ""
-"²»Î̤ÎÄ´À°ÃÍ (dB) ¡½ iPod ¤ÎÀßÄê¤Ç¡Ö¥µ¥¦¥ó¥É¥Á¥§¥Ã¥¯¡×¤ò ON ¤Ë¤·¤Æ¤ª¤¯É¬Íפ¬"
-"¤¢¤ê¤Þ¤¹"
+"音é‡ã®èª¿æ•´å€¤ (dB) ― iPod ã®è¨å®šã§ã€Œã‚µã‚¦ãƒ³ãƒ‰ãƒã‚§ãƒƒã‚¯ã€ã‚’ ON ã«ã—ã¦ãŠãå¿…è¦ãŒã‚"
+"ã‚Šã¾ã™"
#. 25
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:146
msgid "CD Nr. and total number of CDS in set"
-msgstr "CD ÈÖ¹æ¤È¡¢¥»¥Ã¥È¤Ë´Þ¤Þ¤ì¤ë CD ¤ÎÁíËç¿ô"
+msgstr "CD 番å·ã¨ã€ã‚»ãƒƒãƒˆã«å«ã¾ã‚Œã‚‹ CD ã®ç·æžšæ•°"
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:149
msgid ""
"The category (e.g. 'Technology' or 'Music') where the podcast was located."
-msgstr "Podcast ¤Î¥«¥Æ¥´¥ê (Îã: 'µ»½Ñ·Ï' ¤ä '²»³Ú')"
+msgstr "Podcast ã®ã‚«ãƒ†ã‚´ãƒª (例: '技術系' ã‚„ '音楽')"
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:150
msgid "Accessible by selecting the center button on the iPod."
-msgstr "iPod ¤Î¿¿Ãæ¤Î¥Ü¥¿¥ó¤ò²¡¤¹¤È¸«¤ë¤³¤È¤¬¤Ç¤¤ë"
+msgstr "iPod ã®çœŸä¸ã®ãƒœã‚¿ãƒ³ã‚’押ã™ã¨è¦‹ã‚‹ã“ã¨ãŒã§ãã‚‹"
-#: ../src/misc_conversion.c:147
+#: ../src/misc_conversion.c:154
msgid "Release date (for podcasts displayed next to the title on the iPod)"
-msgstr "¸ø³«Æü (Podcast ÍÑ¡£iPod ¾å¤Ç¥¿¥¤¥È¥ë¤Î²£¤Ëɽ¼¨¤µ¤ì¤ë)"
+msgstr "公開日 (Podcast 用。iPod 上ã§ã‚¿ã‚¤ãƒˆãƒ«ã®æ¨ªã«è¡¨ç¤ºã•ã‚Œã‚‹)"
-#: ../src/misc_conversion.c:713
+#. 50
+#: ../src/misc_conversion.c:168 ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170 ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172 ../src/misc_conversion.c:173
+#, fuzzy
+msgid "Used for sorting on the iPod"
+msgstr "iPod 上ã§ã®ãƒ•ã‚¡ã‚¤ãƒ«å"
+
+#: ../src/misc_conversion.c:735
#, c-format
msgid "The URI '%s' is not an absolute URI using the file scheme"
-msgstr "»ØÄꤵ¤ì¤¿URI '%s' ¤Ï file ¥¹¥¡¼¥à¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡¢ÉÔ´°Á´¤ÊURI¤Ç¤¹"
+msgstr "指定ã•ã‚ŒãŸURI '%s' 㯠file スã‚ームãŒè¨å®šã•ã‚Œã¦ã„ãªã„ã€ä¸å®Œå…¨ãªURIã§ã™"
-#: ../src/misc_conversion.c:723
+#: ../src/misc_conversion.c:745
#, c-format
msgid "The local file URI '%s' may not include a '#'"
-msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¤ò»Ø¤¹URI '%s' ¤Ë¤Ï '#' ¤Ï´Þ¤Þ¤ì¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
+msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指ã™URI '%s' ã«ã¯ '#' ã¯å«ã¾ã‚Œã¦ã¯ãªã‚Šã¾ã›ã‚“"
-#: ../src/misc_conversion.c:740
+#: ../src/misc_conversion.c:762
#, c-format
msgid "The URI '%s' is invalid"
-msgstr "»ØÄꤵ¤ì¤¿URI '%s' ¤ÏÉÔÀµ¤Ç¤¹"
+msgstr "指定ã•ã‚ŒãŸURI '%s' ã¯ä¸æ£ã§ã™"
-#: ../src/misc_conversion.c:752
+#: ../src/misc_conversion.c:774
#, c-format
msgid "The hostname of the URI '%s' is invalid"
-msgstr "»ØÄꤵ¤ì¤¿URI '%s' ¤Î¥Û¥¹¥È̾¤¬ÉÔÀµ¤Ç¤¹"
+msgstr "指定ã•ã‚ŒãŸURI '%s' ã®ãƒ›ã‚¹ãƒˆåãŒä¸æ£ã§ã™"
-#: ../src/misc_conversion.c:768
+#: ../src/misc_conversion.c:790
#, c-format
msgid "The URI '%s' contains invalidly escaped characters"
-msgstr "»ØÄꤵ¤ì¤¿URI '%s' ¤ÏÉÔÀµ¤Ê¥¨¥¹¥±¡¼¥×ʸ»ú¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹"
+msgstr "指定ã•ã‚ŒãŸURI '%s' ã¯ä¸æ£ãªã‚¨ã‚¹ã‚±ãƒ¼ãƒ—æ–‡å—ã‚’å«ã‚“ã§ã„ã¾ã™"
#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
#: ../src/misc_playlist.c:429
msgid "Please enter a name for the new playlist"
-msgstr "¿·¤·¤¤¥×¥ì¥¤¥ê¥¹¥È¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤"
+msgstr "æ–°ã—ã„プレイリストã®åå‰ã‚’入力ã—ã¦ãã ã•ã„"
#: ../src/misc_playlist.c:154
msgid "AR:"
@@ -4604,67 +4956,68 @@
#: ../src/misc_playlist.c:194
msgid "Unknown"
-msgstr "ÉÔÌÀ"
+msgstr "ä¸æ˜Ž"
#: ../src/misc_playlist.c:272
#, c-format
msgid "Random (%d)"
-msgstr "¥é¥ó¥À¥à (%d)"
+msgstr "ランダム(%d)"
#: ../src/misc_playlist.c:297
msgid ""
"Auto Store of track view disabled.\n"
"\n"
msgstr ""
-"¶Ê½ç¤Î¼«Æ°Êݸ¤¬Ìµ¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
+"æ›²é †ã®è‡ªå‹•ä¿å˜ãŒç„¡åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚\n"
"\n"
#: ../src/misc_playlist.c:356
msgid "Not Listed"
-msgstr "¥ê¥¹¥È¤ËºÜ¤Ã¤Æ¤Ê¤¤¶Ê"
+msgstr "リストã«è¼‰ã£ã¦ãªã„曲"
#: ../src/misc_playlist.c:406
#, c-format
msgid "Created playlist '%s' with %d track."
msgid_plural "Created playlist '%s' with %d tracks."
-msgstr[0] "¿·¤·¤¯¥×¥ì¥¤¥ê¥¹¥È'%s'(%d¶Ê)¤òºîÀ®¤·¤Þ¤·¤¿"
+msgstr[0] "æ–°ã—ãプレイリスト'%s'(%d曲)を作æˆã—ã¾ã—ãŸ"
#. n==0
#: ../src/misc_playlist.c:417
msgid "No tracks available, playlist not created"
-msgstr "¶Ê¤¬¸«ÉÕ¤«¤é¤Ê¤¤¤Î¤Ç¡¢¥×¥ì¥¤¥ê¥¹¥È¤Ïºî¤ì¤Þ¤»¤ó"
+msgstr "曲ãŒè¦‹ä»˜ã‹ã‚‰ãªã„ã®ã§ã€ãƒ—レイリストã¯ä½œã‚Œã¾ã›ã‚“"
#: ../src/misc_playlist.c:543
#, c-format
msgid "Most Listened (%d)"
-msgstr "Îɤ¯Ä°¤¯¶Ê (%d)"
+msgstr "良ãè´ã曲 (%d)"
#: ../src/misc_playlist.c:584
+#, c-format
msgid "Never Listened"
-msgstr "Ä°¤¤¤¿¤³¤È¤¬¤Ê¤¤¶Ê"
+msgstr "è´ã„ãŸã“ã¨ãŒãªã„曲"
#: ../src/misc_playlist.c:624
#, c-format
msgid "Best Rated (%d)"
-msgstr "ɾ²Á¤Î¹â¤¤¶Ê (%d)"
+msgstr "評価ã®é«˜ã„曲 (%d)"
#: ../src/misc_playlist.c:666
msgid "Unrated tracks"
-msgstr "̤ɾ²Á¤Î¶Ê"
+msgstr "未評価ã®æ›²"
#: ../src/misc_playlist.c:671
#, c-format
msgid "Rated %d"
-msgstr "ɾ²Á¤µ¤ì¤¿¶Ê (%d)"
+msgstr "評価ã•ã‚ŒãŸæ›² (%d)"
#: ../src/misc_playlist.c:714
#, c-format
msgid "Recent (%d)"
-msgstr "ºÇ¶áÄ°¤¤¤¿¶Ê (%d)"
+msgstr "最近è´ã„ãŸæ›² (%d)"
#: ../src/misc_playlist.c:753
msgid "Last Time"
-msgstr "Á°²ó°Ê¹ß"
+msgstr "å‰å›žä»¥é™"
#: ../src/misc_playlist.c:844
msgid "Removal of dangling tracks with no files on PC was canceled."
@@ -4678,18 +5031,13 @@
msgid "Dangling tracks with no files on PC were removed."
msgstr ""
-#: ../src/misc_playlist.c:916
-#, c-format
-msgid "Processing '%s'"
-msgstr "'%s' ¤Î½èÍýÃæ"
-
#: ../src/misc_playlist.c:943
msgid "Dangling tracks with files on PC were handled."
msgstr ""
#: ../src/misc_playlist.c:976
msgid "Track"
-msgstr "¶Ê"
+msgstr "曲"
#: ../src/misc_playlist.c:1019
msgid ""
@@ -4767,13 +5115,13 @@
#, c-format
msgid "Hashed %d of %d track."
msgid_plural "Hashed %d of %d tracks."
-msgstr[0] "%2$d¶ÊÃæ %1$d¶Ê¤Î¥Ï¥Ã¥·¥å¤òÀ¸À®¤·¤Þ¤·¤¿¡£"
+msgstr[0] "%2$dæ›²ä¸ %1$d曲ã®ãƒãƒƒã‚·ãƒ¥ã‚’生æˆã—ã¾ã—ãŸã€‚"
#: ../src/misc_track.c:198
#, c-format
msgid "The following duplicate track has been removed."
msgid_plural "The following %d duplicate tracks have been removed."
-msgstr[0] "°Ê²¼¤Î½ÅÊ£¤·¤¿%d¶Ê¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿¡£"
+msgstr[0] "以下ã®é‡è¤‡ã—ãŸ%d曲ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚"
#: ../src/misc_track.c:205
#, c-format
@@ -4782,223 +5130,218 @@
msgid_plural ""
"The following %d duplicate tracks have not been added to the master play "
"list."
-msgstr[0] "°Ê²¼¤Î½ÅÊ£¤·¤¿%d¶Ê¤Ï¥Þ¥¹¥¿¡¼¥×¥ì¥¤¥ê¥¹¥È¤ËÄɲ䵤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+msgstr[0] "以下ã®é‡è¤‡ã—ãŸ%d曲ã¯ãƒžã‚¹ã‚¿ãƒ¼ãƒ—レイリストã«è¿½åŠ ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚"
#. gint id,
#. gboolean modal,
#: ../src/misc_track.c:212
msgid "Duplicate detection"
-msgstr "½ÅÊ£¤Î¸¡½Ð"
+msgstr "é‡è¤‡ã®æ¤œå‡º"
-#: ../src/misc_track.c:1269
+#: ../src/misc_track.c:1339
msgid "Local Database"
msgstr ""
#. artwork is set
-#: ../src/misc_track.c:1280
+#: ../src/misc_track.c:1350
msgid "Embedded or filename was lost"
msgstr ""
-#: ../src/misc_track.c:1284
+#: ../src/misc_track.c:1354
#, fuzzy
msgid "Artwork not set"
-msgstr "¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤"
+msgstr "ãŒè¨å®šã•ã‚Œã¦ã„ãªã„"
-#: ../src/misc_track.c:1737
+#: ../src/misc_track.c:1816
#, fuzzy, c-format
msgid "Could not find source file for '%s'. Track not copied."
-msgstr "iPod ¾å¤Î '%s' ¤ËÁêÅö¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
+msgstr "iPod 上㮠'%s' ã«ç›¸å½“ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n"
-#: ../src/misc_track.c:1973
+#: ../src/misc_track.c:2052
#, c-format
msgid "drag and drop: ignored '%s'\n"
-msgstr "¥É¥é¥Ã¥°¥¢¥ó¥É¥É¥í¥Ã¥×: '%s'¤Ï̵»ë¤·¤Þ¤¹\n"
+msgstr "ドラッグアンドドãƒãƒƒãƒ—: '%s'ã¯ç„¡è¦–ã—ã¾ã™\n"
-#: ../src/mp3file.c:1282
+#: ../src/mp3file.c:1336
#, fuzzy, c-format
msgid "Error setting ID3 field: %s\n"
-msgstr "'%s'¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n"
+msgstr "'%s'ã®ä½œæˆã«å¤±æ•—: %s\n"
-#: ../src/mp3file.c:1306 ../src/mp3file.c:1399 ../src/mp3file.c:1548
-#: ../src/mp3file.c:2186
+#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
#, c-format
msgid "ERROR while opening file: '%s' (%s).\n"
-msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤¯ºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£ (%s)\n"
+msgstr "ファイル '%s' ã‚’é–‹ãéš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ (%s)\n"
-#: ../src/mp3file.c:1619
+#: ../src/mp3file.c:1688
#, fuzzy, c-format
msgid "ERROR while writing tag to file: '%s' (%s).\n"
-msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤¯ºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£ (%s)\n"
+msgstr "ファイル '%s' ã‚’é–‹ãéš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚ (%s)\n"
#. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2352
+#: ../src/mp3file.c:2770
#, c-format
msgid "File \"%s\" has zero play length. Ignoring.\n"
-msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤ÏŤµ¤¬0¤Ê¤Î¤Ç̵»ë¤·¤Þ¤¹¡£\n"
+msgstr "ファイル \"%s\" ã¯é•·ã•ãŒ0ãªã®ã§ç„¡è¦–ã—ã¾ã™ã€‚\n"
-#: ../src/mp4file.c:227 ../src/mp4file.c:359
+#: ../src/mp4file.c:243 ../src/mp4file.c:404
#, fuzzy, c-format
msgid "'%s' does not appear to be a mp4 audio or video file.\n"
-msgstr "'%s' ¤Ï mp4 ¥ª¡¼¥Ç¥£¥ª¥Õ¥¡¥¤¥ë¤È¤Ïǧ¼±¤Ç¤¤Þ¤»¤ó¡£\n"
+msgstr "'%s' 㯠mp4 オーディオファイルã¨ã¯èªè˜ã§ãã¾ã›ã‚“。\n"
-#: ../src/mp4file.c:237 ../src/mp4file.c:369
+#: ../src/mp4file.c:253 ../src/mp4file.c:414
#, c-format
msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
-msgstr "'%s' ¤ÏÆɤ߹þ¤ß¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢mp4 ¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+msgstr "'%s' ã¯èªã¿è¾¼ã¿ãŒè¨±å¯ã•ã‚Œã¦ã„ãªã„ã‹ã€mp4 ファイルã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: ../src/mp4file.c:478
+#: ../src/mp4file.c:529
#, c-format
msgid "'%s' does not appear to be a mp4 audio file.\n"
-msgstr "'%s' ¤Ï mp4 ¥ª¡¼¥Ç¥£¥ª¥Õ¥¡¥¤¥ë¤È¤Ïǧ¼±¤Ç¤¤Þ¤»¤ó¡£\n"
+msgstr "'%s' 㯠mp4 オーディオファイルã¨ã¯èªè˜ã§ãã¾ã›ã‚“。\n"
-#: ../src/mp4file.c:489
+#: ../src/mp4file.c:540
#, c-format
msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
-msgstr "'%s' ¤Ï½ñ¤¹þ¤ß¤¬µö²Ä¤µ¤ì¤Æ¤¤¤Ê¤¤¤«¡¢mp4 ¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
+msgstr "'%s' ã¯æ›¸ãè¾¼ã¿ãŒè¨±å¯ã•ã‚Œã¦ã„ãªã„ã‹ã€mp4 ファイルã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: ../src/mp4file.c:502
+#: ../src/mp4file.c:553
#, fuzzy, c-format
msgid ""
"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
"You must compile the gtkpod source together with the mp4v2 library.\n"
msgstr ""
-"'%s'¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: m4a/m4p ¤Î¼è¤ê°·¤¤¤Ë¤Ï mp4v2 ¥é¥¤¥Ö¥é¥ê¤¬É¬ÍפǤ¹¡£"
-"mp4v2 ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ gtkpod ¤òºÆÅÙ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"'%s'ã®èªã¿è¾¼ã¿ã«å¤±æ•—: m4a/m4p ã®å–り扱ã„ã«ã¯ mp4v2 ライブラリãŒå¿…è¦ã§ã™ã€‚"
+"mp4v2 ライブラリを使ã£ã¦ gtkpod ã‚’å†åº¦ã‚³ãƒ³ãƒ‘イルã—ã¦ãã ã•ã„。\n"
-#: ../src/mp4file.c:508
+#: ../src/mp4file.c:559
#, fuzzy, c-format
msgid ""
"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
"without the mp4v2 library. You must compile the gtkpod source together with "
"the mp4v2 library.\n"
msgstr ""
-"'%s' ¤Î m4a/m4p ¥á¥¿¥Ç¡¼¥¿¤Î¹¹¿·¤Ë¼ºÇÔ: m4a/m4p ¤Î¼è¤ê°·¤¤¤Ë¤Ï mp4v2 ¥é¥¤¥Ö¥é"
-"¥ê¤¬É¬ÍפǤ¹¡£mp4v2 ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ gtkpod ¤òºÆÅÙ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ"
-"¤¤¡£\n"
+"'%s' ã® m4a/m4p メタデータã®æ›´æ–°ã«å¤±æ•—: m4a/m4p ã®å–り扱ã„ã«ã¯ mp4v2 ライブラ"
+"リãŒå¿…è¦ã§ã™ã€‚mp4v2 ライブラリを使ã£ã¦ gtkpod ã‚’å†åº¦ã‚³ãƒ³ãƒ‘イルã—ã¦ãã ã•"
+"ã„。\n"
-#: ../src/mp4file.c:514
+#: ../src/mp4file.c:565
#, fuzzy, c-format
msgid ""
"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
"without the mp4v2 library. You must compile the gtkpod source together with "
"the mp4v2 library.\n"
msgstr ""
-"'%s' ¤Î m4a/m4p ¥á¥¿¥Ç¡¼¥¿¤Î¹¹¿·¤Ë¼ºÇÔ: m4a/m4p ¤Î¼è¤ê°·¤¤¤Ë¤Ï mp4v2 ¥é¥¤¥Ö¥é"
-"¥ê¤¬É¬ÍפǤ¹¡£mp4v2 ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ gtkpod ¤òºÆÅÙ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ"
-"¤¤¡£\n"
+"'%s' ã® m4a/m4p メタデータã®æ›´æ–°ã«å¤±æ•—: m4a/m4p ã®å–り扱ã„ã«ã¯ mp4v2 ライブラ"
+"リãŒå¿…è¦ã§ã™ã€‚mp4v2 ライブラリを使ã£ã¦ gtkpod ã‚’å†åº¦ã‚³ãƒ³ãƒ‘イルã—ã¦ãã ã•"
+"ã„。\n"
-#: ../src/oggfile.c:62 ../src/wavfile.c:107
-#, c-format
-msgid "Could not open '%s' for reading.\n"
-msgstr "¥Õ¥¡¥¤¥ë '%s' ¤òÆɤ߹þ¤â¤¦¤È¤·¤Þ¤·¤¿¤¬¡¢³«¤¯¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
-
#: ../src/oggfile.c:73
#, fuzzy, c-format
msgid "'%s' does not appear to be an ogg audio file.\n"
-msgstr "'%s' ¤Ï mp4 ¥ª¡¼¥Ç¥£¥ª¥Õ¥¡¥¤¥ë¤È¤Ïǧ¼±¤Ç¤¤Þ¤»¤ó¡£\n"
+msgstr "'%s' 㯠mp4 オーディオファイルã¨ã¯èªè˜ã§ãã¾ã›ã‚“。\n"
-#: ../src/oggfile.c:150
+#: ../src/oggfile.c:154
#, fuzzy, c-format
msgid ""
"Import of '%s' failed: ogg not supported without the ogg library. You must "
"compile the gtkpod source together with the ogg library.\n"
msgstr ""
-"'%s'¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ: m4a/m4p ¤Î¼è¤ê°·¤¤¤Ë¤Ï mp4v2 ¥é¥¤¥Ö¥é¥ê¤¬É¬ÍפǤ¹¡£"
-"mp4v2 ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ gtkpod ¤òºÆÅÙ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
+"'%s'ã®èªã¿è¾¼ã¿ã«å¤±æ•—: m4a/m4p ã®å–り扱ã„ã«ã¯ mp4v2 ライブラリãŒå¿…è¦ã§ã™ã€‚"
+"mp4v2 ライブラリを使ã£ã¦ gtkpod ã‚’å†åº¦ã‚³ãƒ³ãƒ‘イルã—ã¦ãã ã•ã„。\n"
-#: ../src/oggfile.c:156
+#: ../src/oggfile.c:160
#, fuzzy, c-format
msgid ""
"ogg metadata update for '%s' failed: ogg not supported without the ogg "
"library. You must compile the gtkpod source together with the ogg library.\n"
msgstr ""
-"'%s' ¤Î m4a/m4p ¥á¥¿¥Ç¡¼¥¿¤Î¹¹¿·¤Ë¼ºÇÔ: m4a/m4p ¤Î¼è¤ê°·¤¤¤Ë¤Ï mp4v2 ¥é¥¤¥Ö¥é"
-"¥ê¤¬É¬ÍפǤ¹¡£mp4v2 ¥é¥¤¥Ö¥é¥ê¤ò»È¤Ã¤Æ gtkpod ¤òºÆÅÙ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ"
-"¤¤¡£\n"
+"'%s' ã® m4a/m4p メタデータã®æ›´æ–°ã«å¤±æ•—: m4a/m4p ã®å–り扱ã„ã«ã¯ mp4v2 ライブラ"
+"リãŒå¿…è¦ã§ã™ã€‚mp4v2 ライブラリを使ã£ã¦ gtkpod ã‚’å†åº¦ã‚³ãƒ³ãƒ‘イルã—ã¦ãã ã•"
+"ã„。\n"
-#: ../src/prefs.c:356
+#: ../src/prefs.c:357
#, c-format
msgid "gtkpod version %s usage:\n"
-msgstr "gtkpod version %s »È¤¤Êý:\n"
+msgstr "gtkpod version %s 使ã„æ–¹:\n"
-#: ../src/prefs.c:357
+#: ../src/prefs.c:358
msgid " -h, --help: display this message\n"
-msgstr " -h, --help: ¤³¤Î¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ¤¹\n"
+msgstr " -h, --help: ã“ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¾ã™\n"
-#: ../src/prefs.c:358
+#: ../src/prefs.c:359
msgid " -p <file>: increment playcount for file by one\n"
msgstr ""
-#: ../src/prefs.c:359
+#: ../src/prefs.c:360
msgid " --hash <file>:print gtkpod hash for file\n"
msgstr ""
-#: ../src/prefs.c:360
+#: ../src/prefs.c:361
msgid " -m path: define the mountpoint of your iPod\n"
-msgstr " -m path: iPod¤Î¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¤ò»ØÄꤷ¤Þ¤¹\n"
+msgstr " -m path: iPodã®ãƒžã‚¦ãƒ³ãƒˆãƒã‚¤ãƒ³ãƒˆã‚’指定ã—ã¾ã™\n"
-#: ../src/prefs.c:361
+#: ../src/prefs.c:362
msgid " --mountpoint: same as '-m'.\n"
-msgstr " --mountpoint: '-m'¤ÈƱ¤¸\n"
+msgstr " --mountpoint: '-m'ã¨åŒã˜\n"
-#: ../src/prefs.c:362
+#: ../src/prefs.c:363
msgid " -a: import database automatically after start.\n"
-msgstr " -a: µ¯Æ°»þ¤Ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¼«Æ°Åª¤ËÆɤ߹þ¤ß¤Þ¤¹\n"
+msgstr " -a: 起動時ã«ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’自動的ã«èªã¿è¾¼ã¿ã¾ã™\n"
-#: ../src/prefs.c:363
+#: ../src/prefs.c:364
msgid " --auto: same as '-a'.\n"
-msgstr " --auto: '-a'¤ÈƱ¤¸\n"
+msgstr " --auto: '-a'ã¨åŒã˜\n"
-#: ../src/prefs.c:560
+#: ../src/prefs.c:561
#, c-format
msgid "Couldn't create ~/.gtkpod\n"
msgstr ""
-#: ../src/prefs_window.c:134
+#: ../src/prefs_window.c:133
msgid "Please select command for 'Play Now'"
msgstr ""
-#: ../src/prefs_window.c:135
+#: ../src/prefs_window.c:134
msgid "Please select command for 'Enqueue'"
msgstr ""
-#: ../src/prefs_window.c:136
+#: ../src/prefs_window.c:135
msgid "Please select the mp3gain executable"
msgstr ""
-#: ../src/prefs_window.c:137
+#: ../src/prefs_window.c:136
msgid "Please select the aacgain executable"
msgstr ""
-#: ../src/prefs_window.c:138
+#: ../src/prefs_window.c:137
msgid "Select the mserv music root directory"
msgstr ""
-#: ../src/prefs_window.c:139
+#: ../src/prefs_window.c:138
msgid "Select the mserv trackinfo root directory"
msgstr ""
-#: ../src/prefs_window.c:140
+#: ../src/prefs_window.c:139
msgid "Select the ogg/vorbis converter command"
msgstr ""
-#: ../src/prefs_window.c:141
+#: ../src/prefs_window.c:140
msgid "Select the flac converter command"
msgstr ""
-#: ../src/prefs_window.c:142
+#: ../src/prefs_window.c:141
msgid "Select the m4a converter command."
msgstr ""
-#: ../src/prefs_window.c:143
+#: ../src/prefs_window.c:142
msgid "Select the mp3 converter command."
msgstr ""
-#: ../src/prefs_window.c:144
+#: ../src/prefs_window.c:143
msgid "Select the wav converter command."
msgstr ""
-#: ../src/prefs_window.c:211 ../src/repository.c:662
+#: ../src/prefs_window.c:201 ../src/repository.c:662
#, c-format
msgid ""
"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
@@ -5006,13 +5349,13 @@
"for inclusion into the next release.</i>"
msgstr ""
-#: ../src/prefs_window.c:986 ../src/prefs_window.c:1004
+#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
msgid "Preferences not updated"
-msgstr "ÀßÄê¤Ï¹¹¿·¤µ¤ì¤Þ¤»¤ó"
+msgstr "è¨å®šã¯æ›´æ–°ã•ã‚Œã¾ã›ã‚“"
-#: ../src/prefs_window.c:1013
+#: ../src/prefs_window.c:1232
msgid "Preferences applied"
-msgstr "ÀßÄê¤òŬÍѤ·¤Þ¤·¤¿"
+msgstr "è¨å®šã‚’é©ç”¨ã—ã¾ã—ãŸ"
#: ../src/repository.c:573 ../src/repository.c:2395
msgid "Set backup file"
@@ -5021,7 +5364,7 @@
#: ../src/repository.c:612
#, fuzzy
msgid "Select directory for synchronization"
-msgstr "ºÆµ¢Åª¤ËÄɲ乤ë¥Ç¥£¥ì¥¯¥È¥ê¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤"
+msgstr "å†å¸°çš„ã«è¿½åŠ ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„"
#: ../src/repository.c:638
msgid "Please select command to sync contacts"
@@ -5038,51 +5381,51 @@
#: ../src/repository.c:729
#, fuzzy
msgid "Smart playlist updated."
-msgstr "¥¹¥Þ¡¼¥È¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "スマートプレイリスト"
#: ../src/repository.c:1190
#, fuzzy
msgid "Podcasts Repository"
-msgstr "iPod¤«¤éºï½ü"
+msgstr "iPodã‹ã‚‰å‰Šé™¤"
#: ../src/repository.c:1194
#, fuzzy
msgid "Local Repository"
-msgstr "iPod¤«¤éºï½ü"
+msgstr "iPodã‹ã‚‰å‰Šé™¤"
#: ../src/repository.c:1348
#, fuzzy
msgid "Master Playlist"
-msgstr "...¥Þ¥¹¥¿¡¼¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "...マスタープレイリスト"
#: ../src/repository.c:1352
#, fuzzy
msgid "Podcasts Playlist"
-msgstr "¥¹¥Þ¡¼¥È¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "スマートプレイリスト"
#: ../src/repository.c:1360
#, fuzzy
msgid "Regular Playlist"
-msgstr "¥¹¥Þ¡¼¥È¥×¥ì¥¤¥ê¥¹¥È"
+msgstr "スマートプレイリスト"
#: ../src/repository.c:2423
#, fuzzy
msgid "Set local repository file"
-msgstr "iPod¤«¤éºï½ü"
+msgstr "iPodã‹ã‚‰å‰Šé™¤"
#: ../src/repository.c:2522
#, fuzzy
msgid "New Repository"
-msgstr "iPod¤«¤éºï½ü"
+msgstr "iPodã‹ã‚‰å‰Šé™¤"
#: ../src/sha1.c:186
msgid "Hashed file is 0 bytes long\n"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÂ礤µ¤¬ 0 ¥Ð¥¤¥È¤Ç¤¹\n"
+msgstr "ファイルã®å¤§ãã•ãŒ 0 ãƒã‚¤ãƒˆã§ã™\n"
#: ../src/sha1.c:239
#, fuzzy, c-format
msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
-msgstr "'%s' ¤ò³«¤±¤Ê¤¤¤¿¤á¡¢MD5 ¥Á¥§¥Ã¥¯¥µ¥à¤¬·×»»¤Ç¤¤Þ¤»¤ó: %s\n"
+msgstr "'%s' ã‚’é–‹ã‘ãªã„ãŸã‚ã€MD5 ãƒã‚§ãƒƒã‚¯ã‚µãƒ ãŒè¨ˆç®—ã§ãã¾ã›ã‚“: %s\n"
#: ../src/syncdir.c:237
#, c-format
@@ -5093,28 +5436,28 @@
#, fuzzy
msgid "The following track has been added or updated:\n"
msgid_plural "The following tracks have been added or updated:\n"
-msgstr[0] "°Ê²¼¤Î¶Ê¤ò¹¹¿·¤·¤Þ¤·¤¿"
-msgstr[1] "°Ê²¼¤Î%d¶Ê¤ò¹¹¿·¤·¤Þ¤·¤¿"
+msgstr[0] "以下ã®æ›²ã‚’æ›´æ–°ã—ã¾ã—ãŸ"
+msgstr[1] "以下ã®%d曲を更新ã—ã¾ã—ãŸ"
#: ../src/syncdir.c:255
#, fuzzy
msgid "The following track has been completely removed from the iPod:\n"
msgid_plural ""
"The following tracks have been completely removed from the iPod:\n"
-msgstr[0] "°Ê²¼¤Î¶Ê¤ò¹¹¿·¤·¤Þ¤·¤¿"
-msgstr[1] "°Ê²¼¤Î%d¶Ê¤ò¹¹¿·¤·¤Þ¤·¤¿"
+msgstr[0] "以下ã®æ›²ã‚’æ›´æ–°ã—ã¾ã—ãŸ"
+msgstr[1] "以下ã®%d曲を更新ã—ã¾ã—ãŸ"
#: ../src/syncdir.c:264
#, fuzzy
msgid "The following track has been removed from the repository:\n"
msgid_plural "The following tracks have been removed from the repository:\n"
-msgstr[0] "°Ê²¼¤Î½ÅÊ£¤·¤¿%d¶Ê¤¬ºï½ü¤µ¤ì¤Þ¤·¤¿¡£"
+msgstr[0] "以下ã®é‡è¤‡ã—ãŸ%d曲ãŒå‰Šé™¤ã•ã‚Œã¾ã—ãŸã€‚"
#: ../src/syncdir.c:271
#, fuzzy
msgid "The following track has been removed from the playlist:\n"
msgid_plural "The following tracks have been removed from the playlist:\n"
-msgstr[0] "°Ê²¼¤Î½ÅÊ£¤·¤¿%d¶Ê¤Ï¥Þ¥¹¥¿¡¼¥×¥ì¥¤¥ê¥¹¥È¤ËÄɲ䵤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£"
+msgstr[0] "以下ã®é‡è¤‡ã—ãŸ%d曲ã¯ãƒžã‚¹ã‚¿ãƒ¼ãƒ—レイリストã«è¿½åŠ ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚"
#: ../src/syncdir.c:277
msgid "Nothing was changed.\n"
@@ -5124,7 +5467,7 @@
msgid "Sync summary"
msgstr ""
-#: ../src/tools.c:119
+#: ../src/tools.c:118
#, c-format
msgid ""
"Could not find '%s'.\n"
@@ -5133,64 +5476,64 @@
"\n"
msgstr ""
-#: ../src/tools.c:204
+#: ../src/tools.c:203
#, c-format
msgid ""
"Execution of '%s' failed.\n"
"\n"
msgstr ""
-#: ../src/tools.c:249
+#: ../src/tools.c:248
#, c-format
msgid ""
"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
"preferences.\n"
msgstr ""
-#: ../src/tools.c:259
+#: ../src/tools.c:258
#, c-format
msgid ""
"Did not normalize '%s'. Set aacgain path in the Tools section of the "
"preferences.\n"
msgstr ""
-#: ../src/tools.c:386
+#: ../src/tools.c:385
msgid "Normalizing..."
-msgstr "Ê¿¶Ñ²½Ãæ..."
+msgstr "å¹³å‡åŒ–ä¸..."
-#: ../src/tools.c:436
+#: ../src/tools.c:435
#, c-format
msgid "%s - %s"
msgstr ""
-#: ../src/tools.c:462
+#: ../src/tools.c:461
msgid "Aborting..."
-msgstr "Ãæ»ß½èÍýÃæ..."
+msgstr "ä¸æ¢å‡¦ç†ä¸..."
-#: ../src/tools.c:466
+#: ../src/tools.c:465
msgid "Will abort after current mp3gain process ends."
-msgstr "¸½ºß¼Â¹ÔÃæ¤Î mp3gain ¤¬½ªÎ»¼¡Âè¡¢½èÍý¤òÃæ»ß¤·¤Þ¤¹¡£"
+msgstr "ç¾åœ¨å®Ÿè¡Œä¸ã® mp3gain ãŒçµ‚了次第ã€å‡¦ç†ã‚’ä¸æ¢ã—ã¾ã™ã€‚"
-#: ../src/tools.c:492
+#: ../src/tools.c:491
#, c-format
msgid ""
"'%s-%s' (%s) could not be normalized.\n"
"\n"
msgstr ""
-#: ../src/tools.c:531
+#: ../src/tools.c:530
#, c-format
msgid "Normalized %d of %d tracks."
msgid_plural "Normalized %d of %d tracks."
-msgstr[0] "%2$d¶ÊÃæ %1$d¶Ê¤Î²»Î̤òÊ¿¶Ñ²½¤·¤Þ¤·¤¿¡£"
+msgstr[0] "%2$dæ›²ä¸ %1$d曲ã®éŸ³é‡ã‚’å¹³å‡åŒ–ã—ã¾ã—ãŸã€‚"
-#: ../src/tools.c:634
+#: ../src/tools.c:633
msgid ""
"Please specify the command to be called on the 'Tools' section of the "
"preferences dialog.\n"
msgstr ""
-#: ../src/tools.c:646
+#: ../src/tools.c:645
#, c-format
msgid ""
"Could not find the command '%s'.\n"
@@ -5209,68 +5552,118 @@
#: ../src/tools.c:754
#, c-format
msgid "No command set for '%s'"
-msgstr "'%s' ¤Î¤¿¤á¤Î¥³¥Þ¥ó¥É¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
+msgstr "'%s' ã®ãŸã‚ã®ã‚³ãƒžãƒ³ãƒ‰ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
#: ../src/tools.c:774
#, c-format
msgid "Could not find command '%s' specified for '%s'"
-msgstr "'%s' ¤Î¤¿¤á¤Î¥³¥Þ¥ó¥É '%s' ¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó"
+msgstr "'%s' ã®ãŸã‚ã®ã‚³ãƒžãƒ³ãƒ‰ '%s' ãŒè¦‹ä»˜ã‹ã‚Šã¾ã›ã‚“"
#: ../src/wavfile.c:181
#, c-format
msgid "%s does not appear to be a supported wav file.\n"
msgstr ""
+#, fuzzy
+#~ msgid "<b>Resolution:</b>"
+#~ msgstr "<b>ツールãƒãƒƒãƒ—</b>"
+
+#~ msgid ""
+#~ "Cannot open '%s' for reading.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "ファイル '%s' ã‚’èªã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã—ãŸãŒã€é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“。\n"
+#~ "\n"
+
+#~ msgid "Unable to open '%s' for reading\n"
+#~ msgstr "'%s' ã‚’èªã¿è¾¼ã¿ç”¨ã«é–‹ãã“ã¨ãŒã§ãã¾ã›ã‚“\n"
+
+#~ msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
+#~ msgstr "æ‹¡å¼µæƒ…å ±ã‚’æ ¼ç´ã—ãŸãƒ•ã‚¡ã‚¤ãƒ« \"iTunesDB.ext\" ã‚’é–‹ã‘ã¾ã›ã‚“。\n"
+
+#~ msgid "Add _Directory"
+#~ msgstr "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’è¿½åŠ ã™ã‚‹(_D)"
+
+#~ msgid "Dirs"
+#~ msgstr "ディレクトリ"
+
+#~ msgid "Files"
+#~ msgstr "ファイル"
+
+#~ msgid "New PL"
+#~ msgstr "æ–°è¦ãƒ—レイリスト"
+
+#~ msgid "_About"
+#~ msgstr "gtkpodã«ã¤ã„ã¦(_A)"
+
+#, fuzzy
+#~ msgid "Set Cover Art from _Web"
+#~ msgstr "mserv データを更新ã™ã‚‹(_m)"
+
+#~ msgid "Add Playlists"
+#~ msgstr "ãƒ—ãƒ¬ã‚¤ãƒªã‚¹ãƒˆã‚’è¿½åŠ ã™ã‚‹"
+
+#~ msgid "Select directory to add recursively"
+#~ msgstr "å†å¸°çš„ã«è¿½åŠ ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„"
+
+#~ msgid ""
+#~ "Supposedly something that tells the iPod to increase or decrease the "
+#~ "playback speed"
+#~ msgstr "ãŠãらãã€iPod ã«å†ç”Ÿé€Ÿåº¦ã®å¤‰æ›´ã‚’ä¼ãˆã‚‹ãŸã‚ã®å€¤"
+
+#~ msgid "Processing '%s'"
+#~ msgstr "'%s' ã®å‡¦ç†ä¸"
+
#~ msgid "<b>Import</b>"
-#~ msgstr "<b>¥¤¥ó¥Ý¡¼¥È</b>"
+#~ msgstr "<b>インãƒãƒ¼ãƒˆ</b>"
#, fuzzy
#~ msgid "Automatically import iTunesDBs on startup"
-#~ msgstr "µ¯Æ°»þ¤Ë¼«Æ°Åª¤Ë iTunesDB ¤òÆɤ߹þ¤à"
+#~ msgstr "起動時ã«è‡ªå‹•çš„ã« iTunesDB ã‚’èªã¿è¾¼ã‚€"
#, fuzzy
#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥°¤òÊѹ¹¤Ç¤¤Þ¤»¤ó: %s\n"
+#~ msgstr "次ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¿ã‚°ã‚’変更ã§ãã¾ã›ã‚“: %s\n"
#~ msgid "Stop Display Update"
-#~ msgstr "ɽ¼¨¤Î¹¹¿·¤ò»ß¤á¤ë"
+#~ msgstr "表示ã®æ›´æ–°ã‚’æ¢ã‚ã‚‹"
#~ msgid "Stop"
-#~ msgstr "̾ȧ"
+#~ msgstr "ä¸æ¢"
#~ msgid ""
#~ "Temporarily disable sorting when changing playlist\n"
#~ "or tab entry (faster!)"
#~ msgstr ""
-#~ "¥×¥ì¥¤¥ê¥¹¥È¤ä¥½¡¼¥È¥¿¥Ö¤òÊѹ¹¤·¤¿»þ¤Î¼«Æ°Ê¤ٴ¹¤¨¤ò\n"
-#~ "ÍÞÀ©¤¹¤ë (Æ°ºî¤¬Â®¤¯¤Ê¤ë)"
+#~ "プレイリストやソートタブを変更ã—ãŸæ™‚ã®è‡ªå‹•ä¸¦ã¹æ›ãˆã‚’\n"
+#~ "抑制ã™ã‚‹ (動作ãŒé€Ÿããªã‚‹)"
#~ msgid ""
#~ "The display can be blocked after changing a selection. The display update "
#~ "is faster, but you have to wait until it's finished. When using this "
#~ "option, sorting is also temporarily disabled (see option above)."
#~ msgstr ""
-#~ "ÁªÂò¤òÊѹ¹¤·¤¿»þ¤Ë¡¢¶Ê¤Î¥ê¥¹¥È¤ò¹¹¿·¤·½ª¤ï¤ë¤Þ¤ÇÅÓÃæ·Ð²á¤òɽ¼¨¤·¤Þ¤»¤ó¡£¹¹"
-#~ "¿·¤Î¥¹¥Ô¡¼¥É¤Ï®¤¯¤Ê¤ê¤Þ¤¹¤¬¡¢¤½¤ì¤¬½ª¤ï¤ë¤Þ¤Ç¤Ï²¿¤â¤¹¤ë»ö¤¬¤Ç¤¤Ê¤¯¤Ê¤ê¤Þ"
-#~ "¤¹¡£¤³¤ÎÀßÄê¤ò͸ú¤Ë¤·¤¿¾ì¹ç¡¢Ê¤ٴ¹¤¨¤Ï°ì»þŪ¤Ë¤Ç¤¤Ê¤¯¤Ê¤ê¤Þ¤¹ (¾å¤ÎÀßÄê"
-#~ "¤ò»²¾È)¡£"
+#~ "é¸æŠžã‚’変更ã—ãŸæ™‚ã«ã€æ›²ã®ãƒªã‚¹ãƒˆã‚’æ›´æ–°ã—終ã‚ã‚‹ã¾ã§é€”ä¸çµŒéŽã‚’表示ã—ã¾ã›ã‚“。更"
+#~ "æ–°ã®ã‚¹ãƒ”ードã¯é€Ÿããªã‚Šã¾ã™ãŒã€ãã‚ŒãŒçµ‚ã‚ã‚‹ã¾ã§ã¯ä½•ã‚‚ã™ã‚‹äº‹ãŒã§ããªããªã‚Šã¾"
+#~ "ã™ã€‚ã“ã®è¨å®šã‚’有効ã«ã—ãŸå ´åˆã€ä¸¦ã¹æ›ãˆã¯ä¸€æ™‚çš„ã«ã§ããªããªã‚Šã¾ã™ (上ã®è¨å®š"
+#~ "ã‚’å‚ç…§)。"
#~ msgid ""
#~ "Block display when changing playlist or tab\n"
#~ " entry (faster!)"
#~ msgstr ""
-#~ "¥×¥ì¥¤¥ê¥¹¥È¤ä¥½¡¼¥È¥¿¥Ö¤òÊѹ¹¤·¤¿»þ¤ËÅÓÃæ·Ð²á¤Î\n"
-#~ "ɽ¼¨¤òÍÞÀ©¤¹¤ë(Æ°ºî¤¬Â®¤¯¤Ê¤ë)"
+#~ "プレイリストやソートタブを変更ã—ãŸæ™‚ã«é€”ä¸çµŒéŽã®\n"
+#~ "表示を抑制ã™ã‚‹(動作ãŒé€Ÿããªã‚‹)"
#~ msgid "deleting..."
-#~ msgstr "ºï½üÃæ..."
+#~ msgstr "削除ä¸..."
#~ msgid "preparing to copy..."
-#~ msgstr "¥³¥Ô¡¼¤Î½àÈ÷Ãæ..."
+#~ msgstr "コピーã®æº–å‚™ä¸..."
#~ msgid "Copied %d of %d new track."
#~ msgid_plural "Copied %d of %d new tracks."
-#~ msgstr[0] "%2$d¶ÊÃæ %1$d¶Ê¤ò¥³¥Ô¡¼¤·¤Þ¤·¤¿¡£"
+#~ msgstr[0] "%2$dæ›²ä¸ %1$d曲をコピーã—ã¾ã—ãŸã€‚"
#~ msgid "Some tracks were not written to iPod. Export aborted!"
-#~ msgstr "°ìÉô¤Î¶Ê¤òiPod¤ËžÁ÷¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£¥¨¥¯¥¹¥Ý¡¼¥È¤òÃæ»ß¤·¤Þ¤¹!"
+#~ msgstr "一部ã®æ›²ã‚’iPodã«è»¢é€ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚エクスãƒãƒ¼ãƒˆã‚’ä¸æ¢ã—ã¾ã™!"
Property changes on: gtkpod/branches/etch-bpo/po/ja.po
___________________________________________________________________
Name: svn:eol-style
- native
Copied: gtkpod/branches/etch-bpo/po/ro.po (from rev 305, gtkpod/tags/0.99.12-1/po/ro.po)
===================================================================
--- gtkpod/branches/etch-bpo/po/ro.po (rev 0)
+++ gtkpod/branches/etch-bpo/po/ro.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,5813 @@
+# Romanian translation for gtkpod
+# Copyright (C) 2003-2005 Jörg Schuler
+# Alex Eftimie <alexeftimie at gmail dot com>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ro\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-14 08:06-0500\n"
+"PO-Revision-Date: 2007-12-14 12:21+0200\n"
+"Last-Translator: Alex Eftimie <alexeftimie at gmail dot com>\n"
+"Language-Team: none\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-Poedit-Language: Romanian\n"
+
+#: ../data/gtkpod.desktop.in.h:1
+msgid "GtkPod"
+msgstr "GtkPod"
+
+#: ../data/gtkpod.desktop.in.h:2
+msgid "Manage music and video on an Apple iPod"
+msgstr "Administrează muzica şi filmele pe un iPod Apple"
+
+#: ../data/gtkpod.desktop.in.h:3
+msgid "iPod Manager"
+msgstr "Manager iPod"
+
+#: ../data/gtkpod.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../data/gtkpod.glade.h:2
+msgid " "
+msgstr " "
+
+#: ../data/gtkpod.glade.h:3
+msgid " "
+msgstr " "
+
+#: ../data/gtkpod.glade.h:4
+msgid " "
+msgstr " "
+
+#: ../data/gtkpod.glade.h:5
+msgid " Sort by:"
+msgstr " Sortare după:"
+
+#: ../data/gtkpod.glade.h:6
+msgid " <= cts <= "
+msgstr " <= nr. <= "
+
+#: ../data/gtkpod.glade.h:7
+msgid " Logic: "
+msgstr " Logică:"
+
+#: ../data/gtkpod.glade.h:9
+#, no-c-format
+msgid "%A"
+msgstr "%A"
+
+#: ../data/gtkpod.glade.h:10
+msgid ""
+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
+"finished."
+msgstr ""
+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' sau similar. Apasaţi 'enter' când "
+"este gata."
+
+#: ../data/gtkpod.glade.h:11
+msgid "'aacgain' executable:"
+msgstr "executabil 'aacgain':"
+
+#: ../data/gtkpod.glade.h:12
+msgid "'mp3gain' executable:"
+msgstr "executabil 'mp3gain'"
+
+#: ../data/gtkpod.glade.h:13
+msgid "(Checked)"
+msgstr "(Verificat)"
+
+#: ../data/gtkpod.glade.h:14
+msgid "...as icons"
+msgstr "...ca iconiţe"
+
+#: ../data/gtkpod.glade.h:15
+msgid "...as text"
+msgstr "...ca text"
+
+#: ../data/gtkpod.glade.h:16
+msgid "...both as icons and text"
+msgstr "...atât iconiţe cât şi text"
+
+#: ../data/gtkpod.glade.h:17
+msgid "...entry 'All' in sort tab..."
+msgstr "...intrarea 'Toate' în categorii..."
+
+#: ../data/gtkpod.glade.h:18
+msgid "...master playlist"
+msgstr "...listă de redare principală"
+
+#: ../data/gtkpod.glade.h:20
+#, no-c-format
+msgid "../%A.jpg"
+msgstr "../%A.jpg"
+
+#: ../data/gtkpod.glade.h:21
+msgid "0"
+msgstr "0"
+
+#: ../data/gtkpod.glade.h:22
+msgid "1"
+msgstr "1"
+
+#: ../data/gtkpod.glade.h:23
+msgid "2"
+msgstr "2"
+
+#: ../data/gtkpod.glade.h:24
+msgid "3"
+msgstr "3"
+
+#: ../data/gtkpod.glade.h:25
+msgid "4"
+msgstr "4"
+
+#: ../data/gtkpod.glade.h:26
+msgid "5"
+msgstr "5"
+
+#: ../data/gtkpod.glade.h:27
+msgid ":"
+msgstr ":"
+
+#: ../data/gtkpod.glade.h:28
+msgid "<"
+msgstr "<"
+
+#: ../data/gtkpod.glade.h:29
+msgid "<b>Account Information</b>"
+msgstr "<b>Informaţii cont</b>"
+
+#: ../data/gtkpod.glade.h:30
+msgid "<b>Adding/Updating/Syncing</b>"
+msgstr "<b>Adăugare/Actualizare/Sincronizare</b>"
+
+#: ../data/gtkpod.glade.h:31
+msgid "<b>Audioscrobbler</b>"
+msgstr "<b>Audioscrobbler</b>"
+
+#: ../data/gtkpod.glade.h:32
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>Liste de redare generate automat</b>"
+
+#: ../data/gtkpod.glade.h:33
+msgid "<b>Automatically select...</b>"
+msgstr "<b>Selectează automat...</b>"
+
+#: ../data/gtkpod.glade.h:34
+msgid "<b>Calendar/Contacts/Notes</b>"
+msgstr "<b>Calendar/Agendă/Notiţe</b>"
+
+#: ../data/gtkpod.glade.h:35
+msgid "<b>Coverart</b>"
+msgstr "<b>Copertă</b>"
+
+#: ../data/gtkpod.glade.h:36
+msgid "<b>Delete Confirmation</b>"
+msgstr "<b>Confirmare ÅŸtergere</b>"
+
+#: ../data/gtkpod.glade.h:37
+msgid "<b>Examples</b>"
+msgstr "<b>Exemple</b>"
+
+#: ../data/gtkpod.glade.h:38
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>Ignoră cuvintele frecvente</b>"
+
+#: ../data/gtkpod.glade.h:39
+msgid "<b>Misc</b>"
+msgstr "<b>Diverse</b>"
+
+#: ../data/gtkpod.glade.h:40
+msgid "<b>Mountpoint and individual repository/playlist options</b>"
+msgstr "<b>Opţiuni punct de montare şi listă de redare/depozit individual</b>"
+
+#: ../data/gtkpod.glade.h:41
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Conversie \"în zbor\"</b>"
+
+#: ../data/gtkpod.glade.h:42
+msgid "<b>Play</b>"
+msgstr "<b>Rulează</b>"
+
+#: ../data/gtkpod.glade.h:43
+msgid "<b>Playlists</b>"
+msgstr "<b>Liste de redare</b>"
+
+#: ../data/gtkpod.glade.h:44
+msgid "<b>Please select mountpoint and your iPod model</b>"
+msgstr "<b>Vă rugăm selectaţi punctul de montare şi modelul de iPod</b>"
+
+#: ../data/gtkpod.glade.h:45
+msgid "<b>Repositories</b>"
+msgstr "<b>Depozite</b>"
+
+#: ../data/gtkpod.glade.h:46
+msgid "<b>Sort Order</b>"
+msgstr "<b>Ordine sortare</b>"
+
+#: ../data/gtkpod.glade.h:47
+msgid "<b>Sort Tabs</b>"
+msgstr "<b>Categorii</b>"
+
+#: ../data/gtkpod.glade.h:48
+msgid "<b>Sync</b>"
+msgstr "<b>Sincronizare</b>"
+
+#: ../data/gtkpod.glade.h:49
+msgid "<b>Synchronization</b>"
+msgstr "<b>Sincronizare</b>"
+
+#: ../data/gtkpod.glade.h:50
+msgid "<b>Tag Reading</b>"
+msgstr "<b>Citire etichete</b>"
+
+#: ../data/gtkpod.glade.h:51
+msgid "<b>Toolbar</b>"
+msgstr "<b>Bară de unelte</b>"
+
+#: ../data/gtkpod.glade.h:52
+msgid "<b>Tooltips</b>"
+msgstr "<b>Indicii</b>"
+
+#: ../data/gtkpod.glade.h:53
+msgid "<b>Track Attributes</b>"
+msgstr "<b>Atribute piesă</b>"
+
+#: ../data/gtkpod.glade.h:54
+msgid "<b>Track Editing</b>"
+msgstr "<b>Editare piesă</b>"
+
+#: ../data/gtkpod.glade.h:55
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>Normalizare volum</b>"
+
+#: ../data/gtkpod.glade.h:56
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
+
+#: ../data/gtkpod.glade.h:57
+msgid ">"
+msgstr ">"
+
+#: ../data/gtkpod.glade.h:58
+msgid "About gtkpod"
+msgstr "Despre gtkpod"
+
+#: ../data/gtkpod.glade.h:59
+msgid "Add Directories Recursively"
+msgstr "Adaugă dosare recursiv"
+
+#: ../data/gtkpod.glade.h:60
+msgid "Add Files"
+msgstr "Adaugă fişiere"
+
+#: ../data/gtkpod.glade.h:61
+msgid "Add Files or Directories"
+msgstr "Adaugă fişiere sau dosare"
+
+#: ../data/gtkpod.glade.h:62
+msgid "Add Fol_der"
+msgstr "Adaugă _dosar"
+
+#: ../data/gtkpod.glade.h:63
+msgid "Add Folder"
+msgstr "Adaugă dosar"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Image_s"
+msgstr "Adaugă imagi_ni"
+
+#: ../data/gtkpod.glade.h:65
+msgid "Add Images from a Directory"
+msgstr "Adaugă imagini dintr-un dosar"
+
+#: ../data/gtkpod.glade.h:66
+msgid "Add Playlist"
+msgstr "Adaugă listă"
+
+#: ../data/gtkpod.glade.h:67
+msgid "Add _Files"
+msgstr "Adaugă _fişiere"
+
+#: ../data/gtkpod.glade.h:68
+msgid "Add _Playlist"
+msgstr "Adaugă _listă de redare"
+
+#: ../data/gtkpod.glade.h:69
+msgid "Add coverart from file using the following template"
+msgstr "Adaugă copertă din fişier folosind următorul şablon"
+
+#: ../data/gtkpod.glade.h:70
+msgid "Add directories recursively"
+msgstr "Adaugă dosare recursiv"
+
+#: ../data/gtkpod.glade.h:71
+msgid "Add new repository/iPod"
+msgstr "Adaugă un nou depozit/iPod"
+
+#: ../data/gtkpod.glade.h:72
+msgid "Add playlist from file"
+msgstr "Adaugă fișier listă de redare"
+
+#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
+msgid "Added"
+msgstr "Adăugat"
+
+#: ../data/gtkpod.glade.h:74
+msgid "Advanced Sorting Options"
+msgstr "Opţiuni de sortare avansate"
+
+#. 0
+#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
+#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
+msgid "Album"
+msgstr "Album"
+
+#: ../data/gtkpod.glade.h:76
+msgid "Album Art"
+msgstr "Copertă album"
+
+#: ../data/gtkpod.glade.h:77
+msgid "All (AND)"
+msgstr "Toate (AND)"
+
+#: ../data/gtkpod.glade.h:78
+msgid "All Tracks Never Listened To"
+msgstr "Toate piesele care nu au fost niciodată ascultate"
+
+#: ../data/gtkpod.glade.h:79
+msgid "All Tracks Played Since Last Time"
+msgstr "Toate piesele redate începând de ultima oară"
+
+#: ../data/gtkpod.glade.h:80
+msgid "All Tracks not Listed in any Playlist"
+msgstr "Toate piesele ne-listate în nicio listă de redare"
+
+#: ../data/gtkpod.glade.h:81
+msgid "Also include tracks never played in \"Best Rated\" playlist"
+msgstr ""
+"Include şi piesele care nu au fost redate în lista \"Cele mai apreciate\""
+
+#: ../data/gtkpod.glade.h:82
+msgid "Always write ID3v2.4 tags (only applies to MP3)"
+msgstr "Scrie mereu etichetele ID3v2.4 (se aplică numai pentru MP3)"
+
+#: ../data/gtkpod.glade.h:83
+msgid "Any (OR)"
+msgstr "Oricare (OR)"
+
+#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
+#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
+msgid "Artist"
+msgstr "Artist"
+
+#: ../data/gtkpod.glade.h:85
+msgid "Artwork Preview"
+msgstr "Previzualizare copertă"
+
+#: ../data/gtkpod.glade.h:86
+msgid ""
+"As a last resort set the following tags to the\n"
+"filename if they are (still) empty:"
+msgstr ""
+"Ca un ultim resort setează următoarele etichete \n"
+"la numele de fişier dacă sunt (încă) goale:"
+
+#: ../data/gtkpod.glade.h:88
+msgid "Ascending"
+msgstr "Crescător"
+
+#: ../data/gtkpod.glade.h:89
+msgid "Auto Store"
+msgstr "Memorare automată"
+
+#: ../data/gtkpod.glade.h:90
+msgid ""
+"Automatically start displaying tracks that match the criteria entered above. "
+"If not selected, you must press 'Display' to start displaying."
+msgstr ""
+"Porneşte automat afişarea pieselor care respectă criteriile introduse mai "
+"jos. Dacă nu este selectat, trebuie să apăsaţi 'Afişează' pentru aceasta."
+
+#: ../data/gtkpod.glade.h:91
+msgid "Available:"
+msgstr "Disponibil:"
+
+#: ../data/gtkpod.glade.h:92
+msgid "Before removing playlists or tracks from a playlist"
+msgstr "Înainte de a şterge liste de redare sau piese dintr-o listă de redare"
+
+#: ../data/gtkpod.glade.h:93
+msgid "Before removing tracks from the harddisk"
+msgstr "ÃŽnainte de a ÅŸterge piese de pe discul dur"
+
+#: ../data/gtkpod.glade.h:94
+msgid "Before removing tracks from the iPod"
+msgstr "ÃŽnainte de a ÅŸterge piese de pe iPod"
+
+#: ../data/gtkpod.glade.h:95
+msgid "Before removing tracks from the local database"
+msgstr "Înainte de a şterge piese din baza de date locală"
+
+#: ../data/gtkpod.glade.h:96
+msgid "Best Rated Tracks"
+msgstr "Piesele cele mai apreciate"
+
+#: ../data/gtkpod.glade.h:97
+msgid "Browse"
+msgstr "Răsfoieşte"
+
+#: ../data/gtkpod.glade.h:98
+msgid "Cache directory:"
+msgstr "Dosar cache"
+
+#: ../data/gtkpod.glade.h:99
+msgid "Calendar"
+msgstr "Calendar"
+
+#: ../data/gtkpod.glade.h:100
+msgid "Calendar sync command:"
+msgstr "Comandă sincronizare calendar:"
+
+#: ../data/gtkpod.glade.h:101
+msgid "Call automatically when synchronizing iTunesDB"
+msgstr "Apelează automat când se sincronizează iTunesDB"
+
+#: ../data/gtkpod.glade.h:102
+msgid "Category: "
+msgstr "Categorie:"
+
+#: ../data/gtkpod.glade.h:103
+msgid ""
+"Change all tracks\n"
+"simultaneously"
+msgstr ""
+"Modifică toate piesele\n"
+"simultan"
+
+#: ../data/gtkpod.glade.h:105
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr ""
+"Verifică înainte de a șterge imagini dintr-un album foto dacă\n"
+"ar trebui șterse din baza de date foto."
+
+#: ../data/gtkpod.glade.h:107
+msgid "Check for existing files when copying from iPod."
+msgstr "Verifică dacă fişierele există deja când copiez de pe iPod."
+
+#: ../data/gtkpod.glade.h:108
+msgid "Command for 'Enqueue':"
+msgstr "Comandă pentru 'Adaugă în coadă':"
+
+#: ../data/gtkpod.glade.h:109
+msgid "Command for 'Play now':"
+msgstr "Comandă 'Redare acum':"
+
+#. 5
+#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
+#: ../src/misc_conversion.c:65
+msgid "Composer"
+msgstr "Compozitor"
+
+#: ../data/gtkpod.glade.h:111
+msgid "Confirm before removing tracks from the iPod or repository"
+msgstr "Confirmă ştergerea pieselor de pe iPod sau din depozit"
+
+#: ../data/gtkpod.glade.h:112
+msgid ""
+"Confirm before removing tracks from the iPod or repository\n"
+"when syncing playlists"
+msgstr ""
+"Confirmă inainte de a şterge piese de pe iPod sau din depozit\n"
+"când se sincronizează listele de redare"
+
+#: ../data/gtkpod.glade.h:114
+msgid "Confirm lists of directories"
+msgstr "Confirmă listele de directoare"
+
+#: ../data/gtkpod.glade.h:115
+msgid "Contacts sync command:"
+msgstr "Comandă sincronizare agendă:"
+
+#: ../data/gtkpod.glade.h:116
+msgid "Containing Displayed Tracks"
+msgstr "Conţinând piesele afişate"
+
+#: ../data/gtkpod.glade.h:117
+msgid "Containing Selected Tracks"
+msgstr "Conţinând piesele selectate"
+
+#: ../data/gtkpod.glade.h:118
+msgid "Conversion Progress Display"
+msgstr "AfiÅŸare progres conversie"
+
+#: ../data/gtkpod.glade.h:119
+msgid "Cover"
+msgstr "Copertă"
+
+#: ../data/gtkpod.glade.h:120
+msgid "Create New Playlist"
+msgstr "Creează listă de redare nouă"
+
+#: ../data/gtkpod.glade.h:121
+msgid "Create Repository"
+msgstr "Creează depozit"
+
+#: ../data/gtkpod.glade.h:122
+msgid "Create _Playlist File"
+msgstr "Creează fişier _listă de redare"
+
+#: ../data/gtkpod.glade.h:123
+msgid "Credits"
+msgstr "Autori"
+
+#: ../data/gtkpod.glade.h:124
+msgid "Currently only rating is supported."
+msgstr "Momentan numai aprecierea este suportată"
+
+#: ../data/gtkpod.glade.h:125
+msgid "Delete repository"
+msgstr "Åžterge depozit"
+
+#: ../data/gtkpod.glade.h:126
+msgid ""
+"Delete tracks that are no longer present from the\n"
+"iPod or repository"
+msgstr ""
+"Åžterge piesele care nu mai sunt prezente de pe\n"
+"iPod sau din depozit"
+
+#: ../data/gtkpod.glade.h:128
+msgid "Deleted tracks"
+msgstr "Piese ÅŸterse"
+
+#: ../data/gtkpod.glade.h:129
+msgid "Descending"
+msgstr "Descrescător"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Details"
+msgstr "Detalii"
+
+#: ../data/gtkpod.glade.h:132
+#, no-c-format
+msgid ""
+"Determines how the string for the info field should be constructed, e.g '%a/%"
+"A/%T - %t.mp3' or '%o'. You can separate several templates by semicolons -- "
+"gtkpod will determine which one to use by the filename extension given. "
+"Artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
+"nr: %C, year: %Y, original filename (requires extended information file): %"
+"o, the character '%': %%."
+msgstr ""
+"Determină cum este construit şirul pentru câmpul de informaţii, e.g. '%a/%A/%"
+"T - %t.mp3' sau '%o'. Puteţi separa câteva şabloane prin punct şi virgulă -- "
+"gtkpod ca determina care să fie utilizată de către extensia fişierului dată. "
+"Artist: %a, album: %A, compozitor: %c, titlu: %t, gen: %G, număr pistă: %T, "
+"număr CD: %C, an: %Y, nume de fişier original (necesită fişier de informaţii "
+"extins): %o, caracterul '%': %%."
+
+#: ../data/gtkpod.glade.h:134
+#, no-c-format
+msgid ""
+"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
+"mp3' or '%o'. You can separate several patterns by semicolons -- gtkpod "
+"will determine which one to use by the filename extension given. Artist: %a, "
+"album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, "
+"year: %Y, original filename (requires extended information file): %o, "
+"current playlist: %p, the character '%': %%."
+msgstr ""
+"Determină numele de fişier al pieselor pe care le copiaţi de pe iPod, e.g. '%"
+"a/%A/%T - %t.mp3' sau '%o'. Puteţi separa câteva şabloane prin punct şi "
+"virgulă -- gtkpod ca determina care să fie utilizată de către extensia "
+"fişierului dată. Artist: %a, album: %A, compozitor: %c, titlu: %t, gen: %G, "
+"număr pistă: %T, număr CD: %C, an: %Y, nume de fişier original (necesită "
+"fişier de informaţii extins): %o, caracterul '%': %%."
+
+#: ../data/gtkpod.glade.h:136
+#, no-c-format
+msgid ""
+"Determines the name of the file with the cover art. You can separate several "
+"patterns by semicolons which will be tried in order. Artist: %a, album: %A, "
+"composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, year: %Y, "
+"original filename (requires extended information file): %o, original "
+"filename without file extension: %O, current playlist: %p, the character "
+"'%': %%."
+msgstr ""
+"Determină numele de fişier conţinând coverart. Puteţi separa câteva şabloane "
+"prin punct şi virgulă -- gtkpod ca determina care să fie utilizată de către "
+"extensia fişierului dată. Artist: %a, album: %A, compozitor: %c, titlu: %t, "
+"gen: %G, număr pistă: %T, număr CD: %C, an: %Y, nume de fişier original "
+"(necesită fişier de informaţii extins): %o, nume de fişier original fără "
+"extensie: %O, lista de redare curentă: %p, caracterul '%': %%."
+
+#: ../data/gtkpod.glade.h:137
+msgid ""
+"Directories to sync with are determined from the filenames of the tracks in "
+"the playlist."
+msgstr ""
+"Dosarele cu care sincronizez se obţin din numele de fişiere ale pieselor din "
+"lista de redare."
+
+#: ../data/gtkpod.glade.h:138
+msgid "Display a list of tracks that could actually be updated."
+msgstr "Afişează o listă a pieselor care pot fi actualizate."
+
+#: ../data/gtkpod.glade.h:139
+msgid "Display a list of tracks that could not be updated."
+msgstr "Afişează o listă a pieselor care nu pot fi actualizate."
+
+#: ../data/gtkpod.glade.h:140
+msgid "Display conversion log"
+msgstr "Afişează jurnalul conversiei"
+
+#: ../data/gtkpod.glade.h:141
+msgid "Display info about detected duplicates"
+msgstr "Afişează informaţii despre dublurile detectate"
+
+#: ../data/gtkpod.glade.h:142
+msgid "Display info about non-updated tracks"
+msgstr "Afişează informaţii despre piesele care nu au fost actualizate"
+
+#: ../data/gtkpod.glade.h:143
+msgid "Display info about updated tracks"
+msgstr "Afişează informaţii despre piesele actualizate"
+
+#: ../data/gtkpod.glade.h:144
+msgid "Display messages and warnings at startup"
+msgstr "Afişează mesaje şi avertizări la pornire"
+
+#: ../data/gtkpod.glade.h:145
+msgid ""
+"Display the list of duplicates that have been detected after adding files."
+msgstr ""
+"Afişează lista dublurilor care au fost detectate după adăugarea de fişiere."
+
+#: ../data/gtkpod.glade.h:146
+msgid "Display toolbar..."
+msgstr "Afişează bara de unelte..."
+
+#: ../data/gtkpod.glade.h:147
+msgid "Display tooltips in main window"
+msgstr "Afişează indicii în fereastra principală"
+
+#: ../data/gtkpod.glade.h:148
+msgid "Display tooltips in prefs window"
+msgstr "Afişează indicii în fereastra de preferinţe"
+
+#: ../data/gtkpod.glade.h:149
+msgid "Display tracks that match the criteria entered above."
+msgstr "Afişează piesele care se potrivesc criteriului introdus mai jos."
+
+#: ../data/gtkpod.glade.h:150
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"Piese\n"
+"afiÅŸate"
+
+#: ../data/gtkpod.glade.h:152
+msgid "Displayed:"
+msgstr "AfiÅŸate:"
+
+#: ../data/gtkpod.glade.h:153
+msgid "Don't allow file duplication"
+msgstr "Nu permite existenţa dublurilor"
+
+#: ../data/gtkpod.glade.h:154
+msgid "Don't automatically sync on startup"
+msgstr "Nu sincroniza automat la pornire"
+
+#: ../data/gtkpod.glade.h:155
+msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+msgstr ""
+"Recunoaşterea dublurilor este bazată pe o sumă binară de căutare sha1 "
+"(modificată) asupra fişierelor."
+
+#: ../data/gtkpod.glade.h:156
+msgid "Edit Repository/iPod Options"
+msgstr "Editare opţiuni depozit/iPod"
+
+#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
+msgid "Edit Smart Playlist"
+msgstr "Editare listă de redare inteligentă"
+
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
+msgid "Edit Track Details"
+msgstr "Editare detalii piesă"
+
+#: ../data/gtkpod.glade.h:159
+msgid "Edit _Preferences"
+msgstr "_Preferinţe"
+
+#: ../data/gtkpod.glade.h:160
+msgid "Effective free space"
+msgstr "Spaţiu liber efectiv"
+
+#: ../data/gtkpod.glade.h:161
+msgid "Empty Playlist"
+msgstr "Listă de redare goală"
+
+#: ../data/gtkpod.glade.h:162
+msgid "Exclude file mask(s)"
+msgstr "Exclude masca (măştile) de fişier"
+
+#: ../data/gtkpod.glade.h:163
+msgid "Export can be continued at a later time if canceled."
+msgstr "Exportarea poate continua mai târziu dacă este revocată"
+
+#: ../data/gtkpod.glade.h:164
+msgid "File size"
+msgstr "Dimensiune"
+
+#: ../data/gtkpod.glade.h:165
+msgid "File size (deleted)"
+msgstr "Dimensiune (ÅŸters)"
+
+#: ../data/gtkpod.glade.h:166
+msgid "File size (non-transferred)"
+msgstr "Dimensiune (netransferat)"
+
+#: ../data/gtkpod.glade.h:167
+msgid "Filename Format: "
+msgstr "Format nume de fiÅŸier:"
+
+#: ../data/gtkpod.glade.h:168
+msgid ""
+"Find orphan files (files with no track info in DB) and dangling tracks "
+"(tracks with no corresponding files on iPod)"
+msgstr ""
+"Găseşte fişiere orfane (care nu au informaţii în DB) şi piese agăţate (piese "
+"care nu au fişiere corespunzătoare pe iPod)"
+
+#: ../data/gtkpod.glade.h:169
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgstr "Încearcă mai întâi <i>folder.jpg</i>, apoi <i><artist>.jpg</i>"
+
+#: ../data/gtkpod.glade.h:170
+msgid "Flac with :"
+msgstr "Flac cu:"
+
+#: ../data/gtkpod.glade.h:172
+#, no-c-format
+msgid ""
+"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
+"tracks and start playing."
+msgstr ""
+"De exemplu, 'xmms %s' va goli lista de redare curentă a xmms, va adăuga la "
+"listă piesele selectate şi va porni redarea."
+
+#: ../data/gtkpod.glade.h:174
+#, no-c-format
+msgid ""
+"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
+"current playlist."
+msgstr ""
+"De exemplu, 'xmms -e %s' va adăuga în coadă piesele selectate la lista de "
+"redare curentă a xmms"
+
+#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
+#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
+msgid "Genre"
+msgstr "Gen"
+
+#: ../data/gtkpod.glade.h:176
+msgid "Group artists on compilation CDs"
+msgstr "Grupează artiştii pe CD-uri de tip compilaţie"
+
+#: ../data/gtkpod.glade.h:177
+msgid ""
+"Highly recommended for faster import when taking advantage of the "
+"duplication recognition. Also, having the PC filenames allows writing "
+"changed ID3 tags to disk, and even to reconstruct your iPod's contents in "
+"case of file system corruption (change the \"transferred=\" entries in your "
+"backuped database)."
+msgstr ""
+"Foarte recomandat pentru importul mai rapid când se poate folosi avantajul "
+"recunoaşterii dublurilor. De asemenea, având numele de fişiere de pe PC "
+"permite scrierea etichetelor ID3 modificate pe disc, şi chiar reconstrucţia "
+"conţinutului iPod-ului în cazul coruperii sistemului de fişiere (schimbă "
+"intrările \"transferred=\" în copia de siguranţă a bazei de date)."
+
+#: ../data/gtkpod.glade.h:178 ../src/context_menus.c:685
+#: ../src/context_menus.c:703 ../src/context_menus.c:820
+msgid "I'm sure"
+msgstr "Sunt sigur"
+
+#: ../data/gtkpod.glade.h:179
+msgid ""
+"If available, the local copy of the track is referenced in the playlist. "
+"Otherwise the file on the iPod is used."
+msgstr ""
+"Dacă este posibil, copia locală a pieselor este referenţiată în lista de "
+"redare. Altfel, este folosit fiÅŸierul de pe iPod."
+
+#: ../data/gtkpod.glade.h:180
+msgid "If both options are selected, embedded APIC data takes precedence."
+msgstr ""
+"Dacă ambele opţiuni sunt selectate, datele APIC înglobate au prioritate."
+
+#: ../data/gtkpod.glade.h:181
+msgid ""
+"If checked, sorting will be case sensitive. Please note that case sensitive "
+"sorting will not work well with most charsets."
+msgstr ""
+"Dacă este bifat, sortarea va fi cu majuscule semnificative. A se reţine că "
+"sortarea cu majuscule semnificative nu va funcţiona corect cu cele mai multe "
+"seturi de caractere."
+
+#: ../data/gtkpod.glade.h:182
+msgid ""
+"If the filename (full path) of an existing track matches that of a track to "
+"be added, this option allows you to update the information about the "
+"existing track rather than just skipping the track altogether. No update "
+"will take place if the file hasn't changed and you have selected the 'Don't "
+"allow file duplication' option above."
+msgstr ""
+"Dacă numele de fişier (calea completă) a unei piese existente deja se "
+"potriveşte cu cel al uneia care urmează să fie adăugată, această opţiune "
+"permite să actualizaţi informaţia despre fişierul existent mai degrabă decât "
+"să omiteţi cu totul piesa. Nici un fel de actualizare nu va avea loc dacă "
+"fişierul nu s-a modificat şi dvs aţi selectat opţiunea \"Nu permite "
+"existenţa dublurilor' de mai sus."
+
+#: ../data/gtkpod.glade.h:183
+msgid "If you check this, gtkpod will descend into subdirectories recursively."
+msgstr ""
+"Dacă bifaţi această opţiune, gtkpod va pătrunde în subdirectoare recursiv."
+
+#: ../data/gtkpod.glade.h:184
+msgid ""
+"If you check this, information (cover art and meta information) changed for "
+"this track will be copied to all other selected tracks as well. Use with "
+"care."
+msgstr ""
+"Dacă bifaţi această opţiune, informaţiile (coperta şi meta-informaţia) "
+"modificate pentru această piesă vor fi copiate la toate celelalte piese "
+"selectate. Folosiţi-o cu atenţie."
+
+#: ../data/gtkpod.glade.h:185
+msgid ""
+"If you don't select the master playlist automatically, the initial database "
+"import is much faster because the display dosn't have to be updated."
+msgstr ""
+"Dacă nu selectaţi lista de redare principală automat, importarea iniţială a "
+"bazei de date este mult mai rapidă deoarece afişajul nu trebuie actualizat."
+
+#: ../data/gtkpod.glade.h:186
+msgid ""
+"If you select several tracks in the track list and edit a tag of the first "
+"track, the tags in the other tracks are updated as well."
+msgstr ""
+"Dacă selectaţi mai multe piese în lista de piese şi editaţi o etichetă a "
+"primei piese, etichetele următoarelor piese sunt actualizate de asemenea."
+
+#: ../data/gtkpod.glade.h:187
+msgid "Ignore these words when at the beginning of the following fields:"
+msgstr "Ignoră aceste cuvinte la începutul următoarelor câmpuri:"
+
+#: ../data/gtkpod.glade.h:188
+msgid ""
+"In order to save the displayed track order to the iPod choose 'Save "
+"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
+msgstr ""
+"Pentru a salva ordinea de afişare a pieselor pe iPod alegeţi 'Salvează "
+"ordinea afişată a pieselor' din meniul 'Editare' sau selectaţi 'Memorare "
+"automată' de mai jos."
+
+#: ../data/gtkpod.glade.h:189
+msgid "Initialize iPod"
+msgstr "Iniţializează iPod"
+
+#: ../data/gtkpod.glade.h:190
+msgid ""
+"Insert before\n"
+"Insert after"
+msgstr ""
+"Inserează înainte\n"
+"inserează după"
+
+#: ../data/gtkpod.glade.h:192
+msgid "Keeps all compilation CDs grouped together in the artists sort tab."
+msgstr ""
+"Păstrează toate CD-urile de tip compilaţie grupate împreună în categoria "
+"artiÅŸti."
+
+#: ../data/gtkpod.glade.h:193
+msgid "Live _updating"
+msgstr "Act_ualizare imediată"
+
+#: ../data/gtkpod.glade.h:194
+msgid "Load iPod(s)"
+msgstr "Încarcă"
+
+#: ../data/gtkpod.glade.h:195
+msgid "Lower Margin"
+msgstr "Marginea inferioară"
+
+#: ../data/gtkpod.glade.h:196
+msgid "M4A with :"
+msgstr "M4A cu :"
+
+#: ../data/gtkpod.glade.h:197
+msgid "MP3 with :"
+msgstr "MP3 cu :"
+
+#: ../data/gtkpod.glade.h:198
+msgid "Match al_l of the following"
+msgstr "Potriveşte toate condiţii_le următoare"
+
+#: ../data/gtkpod.glade.h:199
+msgid "Match an_y of the following"
+msgstr "Potri_veşte oricare dintre condiţiile următoare"
+
+#: ../data/gtkpod.glade.h:200
+msgid "Match only _checked tracks"
+msgstr "PotriveÅŸte numai piesele bi_fate"
+
+#: ../data/gtkpod.glade.h:201
+msgid "Maximum number of background threads:"
+msgstr "Numărul maxim de fire de execuţie:"
+
+#: ../data/gtkpod.glade.h:202
+msgid "Maximum size of cache directory (in GB):"
+msgstr "Dimensiunea maximă a dosarului cache (în GO):"
+
+#: ../data/gtkpod.glade.h:203
+msgid "Model:"
+msgstr "Model:"
+
+#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
+msgid "Modified"
+msgstr "Modificat"
+
+#: ../data/gtkpod.glade.h:205
+msgid "Most Recently Played Tracks"
+msgstr "Piese redate recent"
+
+#: ../data/gtkpod.glade.h:206
+msgid "Move selected attributes to the displayed list"
+msgstr "Mută atributele selectate către lista afișată"
+
+#: ../data/gtkpod.glade.h:207
+msgid "Music Root:"
+msgstr "Dosar de muzică rădăcină:"
+
+#: ../data/gtkpod.glade.h:208
+msgid ""
+"Music files can have images embedded in the APIC tag. Currently this is only "
+"supported for MP3 files."
+msgstr ""
+"Fişierele muzicale pot avea imagini înglobate în eticheta APIC. Momentan "
+"acest lucru este suportat numai pentru fiÅŸiere MP3."
+
+#: ../data/gtkpod.glade.h:209
+msgid "Never show this dialogue again"
+msgstr "Nu afiÅŸa acest dialog din nou"
+
+#: ../data/gtkpod.glade.h:210 ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66 ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93 ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428 ../src/misc_playlist.c:430
+msgid "New Playlist"
+msgstr "Listă nouă"
+
+#: ../data/gtkpod.glade.h:211
+msgid "No lower margin"
+msgstr "Fără margine inferioară"
+
+#: ../data/gtkpod.glade.h:212
+msgid "No upper margin"
+msgstr "Fără margine superioară"
+
+#: ../data/gtkpod.glade.h:213
+msgid "Non-transferred tracks"
+msgstr "Piese ne-transferate"
+
+#: ../data/gtkpod.glade.h:214
+msgid "None"
+msgstr "Nimic"
+
+#: ../data/gtkpod.glade.h:215
+msgid ""
+"Normally the charset specified when first importing the track will be used "
+"for the filename. If you set this option you can set a different charset "
+"with the charset selector (Preferences/'Adding/Updating/Syncing'). Note: the "
+"charset info is stored in the extended information file (see "
+"Preferences/'Writing of the iTunesDB'). Tracks imported before V0.51 will "
+"have no charset stored. Instead the charset specified will be used."
+msgstr ""
+"ÃŽn mod normal, setul de caractere specificat la prima importare a piesei va "
+"fi utilizat pentru numele de fişier. Dacă stabiliţi această opţiune, puteţi "
+"stabili seturi de caractere diferite cu selectorul de seturi de caractere "
+"(Preferinţe/'Adăugare/Actualizare/Sincronizare'). Notă: informaţia despre "
+"setul de caractere este memorată în fişierul de informaţii extinse (vedeţi "
+"Preferinţe/'Scrierea iTunesDB'). Piesele importate înainte de versiunea "
+"V0.51 nu vor avea nici un set de caractere memorat. ÃŽn locul acestuia, setul "
+"de caractere specificat va fi folosit."
+
+#: ../data/gtkpod.glade.h:216
+msgid ""
+"Normally the charset specified when first importing the track will be used "
+"to update the track information. If you have chosen a wrong charset when "
+"first importing a track and want to correct it using the 'Update Track' "
+"function, you must check this option. Note: the charset info is stored in "
+"the extended information file (see 'Writing of iTunesDB' below) and tracks "
+"imported before V0.51 will have no charset stored. Instead the charset "
+"specified above will be used then."
+msgstr ""
+"ÃŽn mod normal, setul de caractere specificat la prima importare a piesei va "
+"fi utilizat pentru numele de fişier. Dacă stabiliţi un set de caractere "
+"greşit atunci când importaţi pentru prima oară o piesă şi doriţi să îl "
+"corectaţi folosind funcţia 'Actualizare piesă', bifaţi această opţiune. "
+"Notă: informaţia despre setul de caractere este memorată în fişierul de "
+"informaţii extinse (vedeţi Preferinţe/'Scrierea iTunesDB'). Piesele "
+"importate înainte de versiunea V0.51 nu vor avea nici un set de caractere "
+"memorat. ÃŽn locul acestuia, setul de caractere specificat va fi folosit."
+
+#: ../data/gtkpod.glade.h:217
+msgid ""
+"Normally the charset specified when first importing the track will be used "
+"to write the tags. If you have chosen a wrong charset when first importing a "
+"track, you should select this option along with the correct charset. Note: "
+"uses the extended information file to store the charset information (see "
+"'Writing of the iTunesDB' on the 'Input/Output' page) and tracks imported "
+"before V0.51 will have no charset stored -- the charset specified on the "
+"'Input/Output' page will be used."
+msgstr ""
+"ÃŽn mod normal, setul de caractere specificat la prima importare a piesei va "
+"fi utilizat pentru numele de fişier. Dacă stabiliţi un set de caractere "
+"greşit atunci când importaţi pentru prima oară o piesă, bifaţi această "
+"opţiune împreună cu setul de caractere corect. Notă: foloseşte fişierul de "
+"informaţii extinse pentru a memora informaţia despre setul de caractere "
+"(vedeţi Preferinţe/'Scrierea iTunesDB'). Piesele importate înainte de "
+"versiunea V0.51 nu vor avea nici un set de caractere memorat. ÃŽn locul "
+"acestuia, setul de caractere specificat va fi folosit."
+
+#: ../data/gtkpod.glade.h:218
+msgid ""
+"Normally, if a track is no longer present in the sync directory, it will be "
+"removed from the playlist, but not from the iPod or local repository.\n"
+"If this option is checked, tracks will be completely removed from the iPod "
+"or local repository, unless the track is a member of other playlists as "
+"well.\n"
+"NOTE: if you sync with the master playlist, you must check this option if "
+"you want tracks to be removed, because removing from the master playlist "
+"means removing from the iPod."
+msgstr ""
+"În mod normal, dacă o piesă nu mai este prezentă în dosarul de sincronizare, "
+"va fi ştearsă din lista de redare, dar nu şi de pe iPod, sau din depozitul "
+"local.\n"
+"Dacă această opţiune este bifată, piesele vor fi şterse complet de pe iPod "
+"sau din depozitul local, numai dacă piesa nu este membra şi a altei lsite de "
+"redare.\n"
+" NOTĂ: dacă sincronizaţi cu lista de redare principală, trebuie să bifaţi "
+"această opţiune dacă doriţi ca piesele să fie şterse, pentru că ştergerea "
+"lor din lista de redare principală înseamnă ştergerea de pe iPod."
+
+#: ../data/gtkpod.glade.h:221
+msgid "Notes sync command:"
+msgstr "Comandă sincronizare notiţe:"
+
+#: ../data/gtkpod.glade.h:222
+msgid "Number of playlists"
+msgstr "Număr liste de redare"
+
+#: ../data/gtkpod.glade.h:223
+msgid "Number of tracks"
+msgstr "Număr piese"
+
+#: ../data/gtkpod.glade.h:224
+msgid "Number of tracks in generated playlists:"
+msgstr "Număr piese în liste de redare generate:"
+
+#: ../data/gtkpod.glade.h:225
+msgid ""
+"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
+"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
+msgstr ""
+"Număr piese în listele de redare generate 'Cele mai ascultate', 'Cele mai "
+"apreciate' şi 'Piese redate recent'. Alegeţi '0' pentru 'nelimitat'."
+
+#: ../data/gtkpod.glade.h:226
+msgid "Ogg with :"
+msgstr "Ogg cu :"
+
+#: ../data/gtkpod.glade.h:227
+msgid "On startup automatically sync with playlist directories"
+msgstr "La pornire sincronizează automat cu dosarele listei de redare"
+
+#: ../data/gtkpod.glade.h:228
+msgid "On startup automatically sync with the following directory"
+msgstr "La pornire sincronizează automat cu următorul dosar"
+
+#: ../data/gtkpod.glade.h:229
+msgid "On startup automatically update (Live Playlist)"
+msgstr "La pornire actualizează automat (listă de redare 'live')"
+
+#: ../data/gtkpod.glade.h:230
+msgid "One for each Album"
+msgstr "Câte una din fiecare album"
+
+#: ../data/gtkpod.glade.h:231
+msgid "One for each Artist"
+msgstr "Câte una din fiecare artist"
+
+#: ../data/gtkpod.glade.h:232
+msgid "One for each Composer"
+msgstr "Câte una din fiecare compozitor"
+
+#: ../data/gtkpod.glade.h:233
+msgid "One for each Genre"
+msgstr "Câte una din fiecare gen"
+
+#: ../data/gtkpod.glade.h:234
+msgid "One for each Rating"
+msgstr "Câte una din fiecare nivel de apreciere"
+
+#: ../data/gtkpod.glade.h:235
+msgid "One for each Year"
+msgstr "Câte una din fiecare an"
+
+#: ../data/gtkpod.glade.h:236
+msgid "Overwrite tags that are already set"
+msgstr "Suprascrie etichetele care sunt definite deja"
+
+#: ../data/gtkpod.glade.h:237
+msgid "Password:"
+msgstr "Parolă:"
+
+#: ../data/gtkpod.glade.h:238
+msgid "Path:"
+msgstr "Cale:"
+
+#: ../data/gtkpod.glade.h:239
+msgid "Photo Window"
+msgstr "Fereastră foto"
+
+#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
+msgid "Play time"
+msgstr "Durată"
+
+#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
+#: ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "Număr redări"
+
+#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
+msgid "Played"
+msgstr "Redat"
+
+#: ../data/gtkpod.glade.h:243
+msgid "Playlist name:"
+msgstr "Nume listă de redare:"
+
+#: ../data/gtkpod.glade.h:244
+msgid "Playlist type:"
+msgstr "Tip listă de redare:"
+
+#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
+msgid "Playlists"
+msgstr "Liste de redare"
+
+#: ../data/gtkpod.glade.h:246
+msgid "Please refer to the notice below."
+msgstr "Vă rugăm să vă referiţi la notiţa de mai jos."
+
+#: ../data/gtkpod.glade.h:247
+msgid "Please specify a time interval"
+msgstr "Vă rugăm specificaţi un interval de timp"
+
+#: ../data/gtkpod.glade.h:248
+msgid "Preferences"
+msgstr "Preferinţe"
+
+#: ../data/gtkpod.glade.h:249
+msgid "Progress Information"
+msgstr "Informaţii progres"
+
+#: ../data/gtkpod.glade.h:250
+msgid "R_ename Album"
+msgstr "R_edenumește album"
+
+#: ../data/gtkpod.glade.h:251
+msgid "Random Playlist from Displayed Tracks"
+msgstr "Listă de redare aleatoare din piesele afişate"
+
+#: ../data/gtkpod.glade.h:252
+msgid "Randomize Current Playlist"
+msgstr "Fă aleatoare lista de redare curentă"
+
+#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
+#: ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "Apreciere"
+
+#: ../data/gtkpod.glade.h:254
+msgid "Read coverart from embedded APIC data"
+msgstr "Citeşte coverart din datele APIC înglobate"
+
+#: ../data/gtkpod.glade.h:255
+msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
+msgstr "CiteÅŸte etichete din fiÅŸier (e.g. etichete ID3 din fiÅŸiere MP3)"
+
+#: ../data/gtkpod.glade.h:256
+msgid "Remove selected attributes from the displayed list"
+msgstr "Șterge atributele selectate din lista afișată"
+
+#: ../data/gtkpod.glade.h:257
+msgid "Repository Options"
+msgstr "Opţiuni depozit"
+
+#: ../data/gtkpod.glade.h:258
+msgid "Repository name:"
+msgstr "Nume depozit:"
+
+#: ../data/gtkpod.glade.h:259
+msgid "Repository type:"
+msgstr "Tip depozit:"
+
+#: ../data/gtkpod.glade.h:260
+msgid "Root directory of mserv database (trackinfo root)."
+msgstr "Dosar rădăcină pentru baza de date mserv (trackinfo root)."
+
+#: ../data/gtkpod.glade.h:261
+msgid "Rules"
+msgstr "Reguli"
+
+#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
+msgid "Save Changes"
+msgstr "Salvează"
+
+#: ../data/gtkpod.glade.h:263
+msgid "Scrobble Tracks?"
+msgstr "Scrobble piese?"
+
+#: ../data/gtkpod.glade.h:264
+msgid "Select '-1' for no upper limit."
+msgstr "Selectaţi '-1' pentru lipsă limită superioară"
+
+#: ../data/gtkpod.glade.h:265
+msgid "Select '0' for no lower limit."
+msgstr "Selectaţi '0' pentru lipsă limită inferioară"
+
+#: ../data/gtkpod.glade.h:266
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"Listă redare\n"
+"selectată"
+
+#: ../data/gtkpod.glade.h:268
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"Piese\n"
+"selectate"
+
+#: ../data/gtkpod.glade.h:270
+msgid "Selected Filter Tab Entry from Database"
+msgstr "Categorie selectată din baza de date"
+
+#: ../data/gtkpod.glade.h:271
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "Categorie selectată de pe discul dur"
+
+#: ../data/gtkpod.glade.h:272
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "Categorie selectată din lista de redare"
+
+#: ../data/gtkpod.glade.h:273
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "Categorie selectată de pe iPod"
+
+#: ../data/gtkpod.glade.h:274
+msgid "Selected Playlist Including Tracks from Database"
+msgstr "Lista de redare selectată incluzând piesele din baza de date"
+
+#: ../data/gtkpod.glade.h:275
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "Lista de redare selectată incluzând piesele de pe discul dur"
+
+#: ../data/gtkpod.glade.h:276
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "Lista de redare selectată incluzând piesele de pe iPod"
+
+#: ../data/gtkpod.glade.h:277
+msgid "Selected Tab _Entry"
+msgstr "Cat_egoria selectată"
+
+#: ../data/gtkpod.glade.h:278
+msgid "Selected Tracks from Database"
+msgstr "Piese selectate din baza de date"
+
+#: ../data/gtkpod.glade.h:279
+msgid "Selected Tracks from Hard Disk"
+msgstr "Piese selectate de pe discul dur"
+
+#: ../data/gtkpod.glade.h:280
+msgid "Selected Tracks from Playlist"
+msgstr "Piese selectate din lista de redare"
+
+#: ../data/gtkpod.glade.h:281
+msgid "Selected Tracks from iPod"
+msgstr "Piese selectate de pe iPod "
+
+#: ../data/gtkpod.glade.h:282
+msgid "Selected _Playlist"
+msgstr "Lista de _redare selectată"
+
+#: ../data/gtkpod.glade.h:283
+msgid "Selected _Tracks"
+msgstr "P_iese selectate"
+
+#: ../data/gtkpod.glade.h:284
+msgid "Selected playlist"
+msgstr "Lista de redare selectată"
+
+#: ../data/gtkpod.glade.h:285
+msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
+msgstr ""
+"Măşti de fişiere pentru excludere, separate prin punct şi virgulă, e.g. '*."
+"mp3'"
+
+#: ../data/gtkpod.glade.h:286
+msgid "Set Cover Art from _File"
+msgstr "StabileÅŸte coperta din _fiÅŸier"
+
+#: ../data/gtkpod.glade.h:287
+msgid "Set mountpoint or edit repository options"
+msgstr "Stabileşte punct de montare sau editează opţiunile depozitului"
+
+#: ../data/gtkpod.glade.h:288
+msgid "Set options for Calendar/Contacts/Notes"
+msgstr "Stabileşte opţiuni pentru Calendar/Agendă/Notiţe"
+
+#: ../data/gtkpod.glade.h:289
+msgid ""
+"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
+"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
+"files will be calculated and written to your music file using this command."
+msgstr ""
+"Stabileşte la 'aacgain -q -k' pentru a folosi funcţionalitatea 'Normalizare "
+"volum' în meniul unelte. Dacă aceasta nu este definită, datele de "
+"normalizare lipsă pentru fişierele .m4a şi .m4b vor fi calculate şi scrise "
+"în fişierele dvs muzicale folosind această comandă."
+
+#: ../data/gtkpod.glade.h:290
+msgid ""
+"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
+"the Tools Menu. If this is set, missing normalization data for mp3 files "
+"will be calculated and written to your mp3 file using this command."
+msgstr ""
+"Stabileşte la 'mp3gain -q -k' pentru a folosi funcţionalitatea 'Normalizare "
+"volum' în meniul unelte. Dacă aceasta nu este definită, datele de "
+"normalizare lipsă pentru fişierele .m4a şi .m4b vor fi calculate şi scrise "
+"în fişierele dvs muzicale folosind această comandă."
+
+#: ../data/gtkpod.glade.h:291
+msgid "Set this to your last.fm password"
+msgstr "Stabiliţi parola dvs last.fm"
+
+#: ../data/gtkpod.glade.h:292
+msgid "Set this to your last.fm username"
+msgstr "Stabiliţi numele dvs de utilizator last.fm"
+
+#: ../data/gtkpod.glade.h:293
+msgid ""
+"Set to 0 to effectively disable caching (a maximum of one track will be "
+"cached at a time)."
+msgstr ""
+"Stabiliţi la 0 pentru a dezactiva efectiv stocarea temporară (cel mult o "
+"piesă va fi stocată temporar la un moment dat)."
+
+#: ../data/gtkpod.glade.h:294
+msgid ""
+"Set to 0 to use as many background threads as CPUs are available on your "
+"system."
+msgstr ""
+"Stabiliţi la 0 pentru a folosi la fel de multe fire de execuţie pe fundal ca "
+"numărul de procesoare disponibile pe sistemul dvs."
+
+#: ../data/gtkpod.glade.h:295
+msgid "Show information about problems when accessing mserv"
+msgstr "Afişează informaţii despre problemele la accesarea mserv"
+
+#: ../data/gtkpod.glade.h:296
+msgid "Show summary of sync result"
+msgstr "Afişează rezumatul rezultatului sincronizării"
+
+#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
+#: ../src/repository.c:1356
+msgid "Smart Playlist"
+msgstr "Listă de redare inteligentă"
+
+#: ../data/gtkpod.glade.h:298
+msgid "Sort tracks according to: "
+msgstr "Sortează piesele conform:"
+
+#: ../data/gtkpod.glade.h:299
+msgid "Sorting Options"
+msgstr "Opţiuni sortare"
+
+#: ../data/gtkpod.glade.h:300
+msgid "Sorting case sensitive"
+msgstr "Majuscule semnificative în sortare"
+
+#: ../data/gtkpod.glade.h:301
+msgid "Sorttab: "
+msgstr "Categorie:"
+
+#: ../data/gtkpod.glade.h:302
+msgid "Sorttabs"
+msgstr "Categorii"
+
+#: ../data/gtkpod.glade.h:303
+msgid "Source:"
+msgstr "Sursă:"
+
+#: ../data/gtkpod.glade.h:305
+#, no-c-format
+msgid ""
+"Specify exact path including command line options. '%i' will be replaced "
+"with the mount point of the iPod."
+msgstr ""
+"Specifică calea exactă incluzând opţiunile în linie de comandă. '%i' va fi "
+"înlocuit cu punctul de montare al iPod."
+
+#: ../data/gtkpod.glade.h:306
+msgid "Specify interval"
+msgstr "Specificaţi un interval"
+
+#: ../data/gtkpod.glade.h:307
+msgid "Start display automatically"
+msgstr "PorneÅŸte automat afiÅŸarea"
+
+#: ../data/gtkpod.glade.h:308
+msgid "Synchronise Contacts, Calendar and Notes"
+msgstr "Sincronizează agendă, calendar şi notiţe"
+
+#: ../data/gtkpod.glade.h:309
+msgid "Synchronize All"
+msgstr "Sincronizează tot"
+
+#: ../data/gtkpod.glade.h:310
+msgid "Synchronize Calendar"
+msgstr "Sincronizează calendar"
+
+#: ../data/gtkpod.glade.h:311
+msgid "Synchronize Contacts"
+msgstr "Sincronizează agendă"
+
+#: ../data/gtkpod.glade.h:312
+msgid "Synchronize Notes"
+msgstr "Sincronizează notiţe"
+
+#: ../data/gtkpod.glade.h:313
+msgid "Template for info field: "
+msgstr "Şablon pentru câmp informaţii:"
+
+#: ../data/gtkpod.glade.h:314
+msgid ""
+"The local copy of the track is referenced in the playlist. If the track is "
+"not available locally, an error message is displayed."
+msgstr ""
+"Copia locală a piesei este referenţiată în lista de redare. Dacă piesa nu "
+"este disponibilă local, un mesaj de eroare va fi afişat."
+
+#: ../data/gtkpod.glade.h:315
+msgid ""
+"The output of the background conversion scripts is copied below. Each page "
+"of the notebook corresponds to one background thread."
+msgstr ""
+"Ieşirea scripturilor de conversie din fundal este copiată mai jos. Fiecare "
+"pagină din carneţel corespunde unui fir de execuţie pe fundal."
+
+#: ../data/gtkpod.glade.h:316
+msgid ""
+"The tags are written to the files on your harddrive and on the iPod (if "
+"available)."
+msgstr ""
+"Etichetele sunt scrise în fişierele de pe discul dvs dur şi de pe iPod (dacă "
+"este disponibil)."
+
+#: ../data/gtkpod.glade.h:317
+msgid "The track on the iPod is referenced in the playlist file."
+msgstr "Piesa de pe iPod este referenţiată în fişierul listă de redare."
+
+#: ../data/gtkpod.glade.h:318
+msgid "This is the same option as in 'Edit/Delete Confirmation'"
+msgstr "Aceasta este aceeaşi opţiune cu cea din 'Editare/Confirmare ştergere'"
+
+#: ../data/gtkpod.glade.h:319
+msgid ""
+"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
+"uses unicode to store the tags, so you won't have to worry about charsets "
+"any more. gtkpod will use UTF8 encoding as this will not increase the size "
+"of pure ASCII tags. ID3v2.2/4 tags will also be written if they are already "
+"present in the file to write to."
+msgstr ""
+"Aceasta este alegerea corectă, dar poate că nu toate programele o suportă "
+"deocamdată. ID3v2.4 foloseşte Unicode pentru a memora etichetele, astfel că "
+"nu va mai trebui să vă faceţi probleme pentru seturi de caractere. gtkpod va "
+"folosi codarea UTF8 atâta timp cât aceasta nu va mări dimensiunea "
+"etichetelor pure ASCII. Etichetele ID3v2.2/4 vor fi verificate de asemenea "
+"dacă nu sunt prezente în fişierul în care se scrie."
+
+#: ../data/gtkpod.glade.h:320
+msgid "This option will be re-activated when you upgrade gtkpod."
+msgstr "Această opţiune va fi re-activată la actualizarea gtkpod."
+
+#: ../data/gtkpod.glade.h:321
+msgid "Time:"
+msgstr "Timp:"
+
+#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
+#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
+msgid "Title"
+msgstr "Titlu"
+
+#: ../data/gtkpod.glade.h:323
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"Total\n"
+"iPod"
+
+#: ../data/gtkpod.glade.h:325
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"Total\n"
+"(local)"
+
+#: ../data/gtkpod.glade.h:327
+msgid "Tracks"
+msgstr "Piese"
+
+#: ../data/gtkpod.glade.h:328
+msgid "Tracks Most Often Listened To"
+msgstr "Cele mai ascultate piese"
+
+#: ../data/gtkpod.glade.h:329
+msgid ""
+"Tracks can be transferred in the background as soon as they are added to an "
+"iPod repository. Otherwise they will be transferred when ejecting the "
+"contents of the iPod completely unchanged until then."
+msgstr ""
+"Piesele pot fi transferate pe fundal imediat ce sunt adăugate într-un "
+"depozit iPod. Altfel, ele vor fi transferate la deconectarea iPod, acesta "
+"fiind complet nemodificat până atunci."
+
+#: ../data/gtkpod.glade.h:330
+msgid "Tracks in Selected Tab _Entry"
+msgstr "Piese în cate_goria selectată"
+
+#: ../data/gtkpod.glade.h:331
+msgid "Tracks in Selected _Playlist"
+msgstr "Piese în _lista de redare selectată"
+
+#: ../data/gtkpod.glade.h:332
+msgid "Transfer tracks to the iPod in the background"
+msgstr "Transferă piesele către iPod pe fundal"
+
+#: ../data/gtkpod.glade.h:333
+msgid "Translators"
+msgstr "Traducători"
+
+#: ../data/gtkpod.glade.h:334
+msgid ""
+"Try to load contents of all connected iPods. For each iPod a separate "
+"repository must be set up."
+msgstr ""
+"Încearcă să încarce conţinutul tuturor iPodurilor conectate. Pentru fiecare "
+"iPod trebuie stabilit un depozit separat."
+
+#: ../data/gtkpod.glade.h:335
+msgid "Undo _Track"
+msgstr "Refacere _piesă"
+
+#: ../data/gtkpod.glade.h:336
+msgid "Update _mserv Data from File"
+msgstr "Actualizează date _mserv din fişier"
+
+#: ../data/gtkpod.glade.h:337
+msgid "Update/Sync all playlists now"
+msgstr "Actualizează/sincronizează toate listele de redare acum"
+
+#: ../data/gtkpod.glade.h:338
+msgid "Update/Sync playlist now"
+msgstr "Actualizează/sincronizează lista de redare acum"
+
+#: ../data/gtkpod.glade.h:339
+msgid "Upper margin"
+msgstr "Margine superioară"
+
+#: ../data/gtkpod.glade.h:340
+msgid "Use 'Multi-Edit' also for title field"
+msgstr "Foloseşte 'Editare multiplă' şi pentru câmpul titlu"
+
+#: ../data/gtkpod.glade.h:341
+msgid "Use 'Multi-Edit' for tracks selections"
+msgstr "Foloseşte 'Editare multiplă' pentru selecţii de piese"
+
+#: ../data/gtkpod.glade.h:342
+msgid "Use <i><Album>.jpg</i> in the parent directory"
+msgstr "Foloseşte <i><Album>.jpg</i> în dosarul părinte"
+
+#: ../data/gtkpod.glade.h:343
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+msgstr "FoloseÅŸte <i><Album>.jpg</i>, <i><Album>.png</i>..."
+
+#: ../data/gtkpod.glade.h:344
+msgid "Use <i>folder.jpg</i> as cover art."
+msgstr "Foloseşte <i>dosar.jpg</i> ca şi copertă."
+
+#: ../data/gtkpod.glade.h:345
+msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
+msgstr "FoloseÅŸte <i>dosar.jpg</i>, <i>dosar.png</i>..."
+
+#: ../data/gtkpod.glade.h:346
+msgid "Use mserv database to fill additional information"
+msgstr "Foloseşte baza de date mserv pentru a obţine informaţie suplimentară"
+
+#: ../data/gtkpod.glade.h:347
+msgid ""
+"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
+"for this filename."
+msgstr ""
+"Foloseşte setul de caractere selectat (Preferinţe/'Adăugare/Actualizare/"
+"Sincronizare')\n"
+"pentru acest nume de fiÅŸier."
+
+#: ../data/gtkpod.glade.h:349
+msgid ""
+"Use selected encoding (on the 'General' page)\n"
+"when writing tags"
+msgstr ""
+"Foloseşte tipul de codare selecatat (în pagina 'General')\n"
+"la scrierea etichetelor"
+
+#: ../data/gtkpod.glade.h:351
+msgid "Use selected encoding also when updating or syncing tracks"
+msgstr ""
+"FoloseÅŸte de asemenea tipul de codare selectat la actualizarea sau "
+"sincronizarea pieselor"
+
+#: ../data/gtkpod.glade.h:352
+msgid "Use this template to parse filename for tag information:"
+msgstr ""
+"FoloseÅŸte acest ÅŸablon pentru interpretarea numelor de fiÅŸiere pentru "
+"informaţii de etichete:"
+
+#: ../data/gtkpod.glade.h:353
+msgid "Username to be used for mserv database lookup."
+msgstr ""
+"Numele de utilizator va fi utilizat pentru căutarea în baza de date mserv."
+
+#: ../data/gtkpod.glade.h:354
+msgid "Username:"
+msgstr "Nume utilizator:"
+
+#: ../data/gtkpod.glade.h:355
+msgid ""
+"Usually you don't want to set the title of several tracks to the same text. "
+"This option might avoid unwanted results (especially since there is no "
+"'undo' yet)."
+msgstr ""
+"Uzual, nu veţi dori să stabiliţi titlul mai multor piese la acelaşi text. "
+"Această opţiune poate împiedica rezultate nedorite (mai ales atâta timp cât "
+"nu este nici o opţiune 'Refacere' deocamdată)."
+
+#: ../data/gtkpod.glade.h:356
+msgid "View Full Size"
+msgstr "Vizualizeză la dimensiunea reală"
+
+#: ../data/gtkpod.glade.h:357
+msgid "WAV with :"
+msgstr "WAV cu :"
+
+#: ../data/gtkpod.glade.h:358
+msgid ""
+"When adding dirs/files, update information of\n"
+"existing tracks with identical filenames"
+msgstr ""
+"Când adaug dosare/fişiere, actualizez informaţiile \n"
+"pieselor existente cu nume de fiÅŸier identice"
+
+#: ../data/gtkpod.glade.h:360
+msgid ""
+"When copying from iPod no check is performed on whether the destination file "
+"exists. Enabling this option will make gtkpod check whether the length of "
+"the destination file is the same as the file in the iPod. If so the file is "
+"skipped, allowing a quick sync of the iPod's contents."
+msgstr ""
+"Când copiez de pe iPod nu verific dacă fişierul destinaţie există. Activarea "
+"acestei opţiuni va face gtkpod să verifice dacă dimensiunea fişierului "
+"destinaţie este aceeaşi cu cea a fişierului de pe iPod. Dacă da, se sare "
+"peste fişier, permiţând sincronizarea rapidă a conţinutului iPod-ului."
+
+#: ../data/gtkpod.glade.h:361
+msgid "When syncing playlists"
+msgstr "Când se sincronizează liste de redare"
+
+#: ../data/gtkpod.glade.h:362
+msgid ""
+"Will show a list of tracks removed and a list of tracks newly added or "
+"updated."
+msgstr ""
+"Va afişa o listă a pieselor şterse şi o listă a pieselor adăugate recent sau "
+"actualizate."
+
+#: ../data/gtkpod.glade.h:363
+msgid "Write ID3 tags to disk when modified in gtkpod"
+msgstr "Scrie etichetele ID3 pe disc atunci când sunt modificate în gtkpod"
+
+#: ../data/gtkpod.glade.h:364
+msgid "Write all changes made to the disk and the iPod(s)."
+msgstr "Scrie toate modificările făcute pe disc şi pe iPod(uri)"
+
+#: ../data/gtkpod.glade.h:365
+msgid ""
+"Write extended information (PC filenames, SHA1 hashes,\n"
+"encoding...). Recommended."
+msgstr ""
+"Scrie informaţie extinsă (nume de fişier pe PC, hashes SHA1, \n"
+" codare....). Recomandat."
+
+#: ../data/gtkpod.glade.h:367
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr ""
+"Puteţi folosi de asemenea antetele tabelului, dar această opţiune vă permite "
+"să sortaţi conform unei coloane care nu este afişată."
+
+#: ../data/gtkpod.glade.h:368
+msgid "_About gtkpod"
+msgstr "_Despre gtkpod"
+
+#: ../data/gtkpod.glade.h:369
+msgid "_Add Album"
+msgstr "_Adaugă album"
+
+#: ../data/gtkpod.glade.h:370
+msgid "_Add Image"
+msgstr "_Adaugă imagine"
+
+#: ../data/gtkpod.glade.h:371
+msgid "_Album"
+msgstr "_Album"
+
+#: ../data/gtkpod.glade.h:372
+msgid "_All Tracks"
+msgstr "_Toate"
+
+#: ../data/gtkpod.glade.h:373
+msgid "_Arrange Sort Tabs"
+msgstr "_Aranjează categoriile"
+
+#: ../data/gtkpod.glade.h:374
+msgid "_Check iPod's Files"
+msgstr "_Verifică fişierele iPodului"
+
+#: ../data/gtkpod.glade.h:375
+msgid "_Conversion Log"
+msgstr "_Jurnal conversie"
+
+#: ../data/gtkpod.glade.h:376
+msgid "_Create Playlists"
+msgstr "_Creează listă de redare"
+
+#: ../data/gtkpod.glade.h:377
+msgid "_Create iPod's Directories"
+msgstr "_Creează dosarele iPodului"
+
+#: ../data/gtkpod.glade.h:378
+msgid "_Delete"
+msgstr "Åž_terge"
+
+#: ../data/gtkpod.glade.h:379
+msgid "_Display"
+msgstr "_AfiÅŸare"
+
+#: ../data/gtkpod.glade.h:380
+msgid "_Displayed Tracks"
+msgstr "_Piese afiÅŸate"
+
+#: ../data/gtkpod.glade.h:381
+msgid "_Edit"
+msgstr "_Editare"
+
+#: ../data/gtkpod.glade.h:382
+msgid "_Encoding (ID3, files):"
+msgstr "_Encodare (ID3, fiÅŸiere):"
+
+#: ../data/gtkpod.glade.h:383
+msgid "_Enqueue"
+msgstr "_Adaugă în coadă"
+
+#: ../data/gtkpod.glade.h:384
+msgid "_Export Tracks from Database"
+msgstr "_Exportă piesele din baza de date"
+
+#: ../data/gtkpod.glade.h:385
+msgid "_File"
+msgstr "_FiÅŸier"
+
+#: ../data/gtkpod.glade.h:386
+msgid "_General"
+msgstr "_General"
+
+#: ../data/gtkpod.glade.h:387
+msgid "_Help"
+msgstr "_Ajutor"
+
+#: ../data/gtkpod.glade.h:388
+msgid "_Ignore rules"
+msgstr "_Ignoră reguli"
+
+#: ../data/gtkpod.glade.h:389
+msgid "_Image"
+msgstr "_Imagine"
+
+#: ../data/gtkpod.glade.h:390
+msgid "_Info Window"
+msgstr "_Fereastră informaţii"
+
+#: ../data/gtkpod.glade.h:391
+msgid "_Last.FM"
+msgstr "_Last.FM"
+
+#: ../data/gtkpod.glade.h:392
+msgid "_Less Sort Tabs"
+msgstr "Mai _puţine categorii"
+
+#: ../data/gtkpod.glade.h:393
+msgid "_Limit to"
+msgstr "_Limitează la"
+
+#: ../data/gtkpod.glade.h:394
+msgid "_Load iPod(s)"
+msgstr "Încarcă i_Pod(urile)"
+
+#: ../data/gtkpod.glade.h:395
+msgid "_Local"
+msgstr "_Local"
+
+#: ../data/gtkpod.glade.h:396
+msgid "_M3U"
+msgstr "_M3U"
+
+#: ../data/gtkpod.glade.h:397
+msgid "_Misc."
+msgstr "_Misc."
+
+#: ../data/gtkpod.glade.h:398
+msgid "_More Sort Tabs"
+msgstr "Mai _multe categorii"
+
+#: ../data/gtkpod.glade.h:399
+msgid "_Newly Added Tracks"
+msgstr "Piese adăugate _recent"
+
+#: ../data/gtkpod.glade.h:400
+msgid "_Normalize Volume"
+msgstr "_Normalizare volum"
+
+#: ../data/gtkpod.glade.h:401
+msgid "_Number of sort tabs:"
+msgstr "_Număr categorii"
+
+#: ../data/gtkpod.glade.h:402
+msgid "_PLS"
+msgstr "_PLS"
+
+#: ../data/gtkpod.glade.h:403
+msgid "_Play Now"
+msgstr "_Redă acum"
+
+#: ../data/gtkpod.glade.h:404
+msgid "_Podcasts"
+msgstr "_Podcasturi"
+
+#: ../data/gtkpod.glade.h:405
+msgid "_Prefer Local"
+msgstr "_Preferă local"
+
+#: ../data/gtkpod.glade.h:406
+msgid "_Remove Album"
+msgstr "Ște_rge album"
+
+#: ../data/gtkpod.glade.h:407
+msgid "_Remove Cover Art"
+msgstr "_Åžterge coperta"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr "Ște_rge imagini"
+
+#: ../data/gtkpod.glade.h:409
+msgid "_Save Changes"
+msgstr "_Salvează modificările"
+
+#: ../data/gtkpod.glade.h:410
+msgid "_Save Displayed Track Order"
+msgstr "Sal_vează ordinea afişată a pieselor"
+
+#: ../data/gtkpod.glade.h:411
+msgid "_Sorting"
+msgstr "_Sortare"
+
+#: ../data/gtkpod.glade.h:412
+msgid "_Synchronize Playlist with Dir(s)"
+msgstr "Sincroni_zează lista de redare cu dosarul(ele)"
+
+#: ../data/gtkpod.glade.h:413
+msgid "_Toolbar"
+msgstr "Bară de unel_te"
+
+#: ../data/gtkpod.glade.h:414
+msgid "_Tools"
+msgstr "_Unelte"
+
+#: ../data/gtkpod.glade.h:415
+msgid "_Tooltips"
+msgstr "_Indicii"
+
+#: ../data/gtkpod.glade.h:416
+msgid "_Track Info"
+msgstr "Informaţii _piesă"
+
+#: ../data/gtkpod.glade.h:417
+msgid "_Undo All"
+msgstr "_Refacere toate"
+
+#: ../data/gtkpod.glade.h:418
+msgid "_Update Tracks from File"
+msgstr "Act_ualizează piesele din fişier"
+
+#: ../data/gtkpod.glade.h:419
+msgid "_Video"
+msgstr "_Video"
+
+#: ../data/gtkpod.glade.h:420
+msgid "_View"
+msgstr "_Vizualizare"
+
+#: ../data/gtkpod.glade.h:421
+msgid "_iPod"
+msgstr "_iPod"
+
+#: ../data/gtkpod.glade.h:423
+#, no-c-format
+msgid ""
+"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
+"nr: %C, year: %Y, skip data: %*, the character '%': %%. You can separate "
+"several templates by a ';'. The first one matching the filename will be "
+"used. Example: '%a - %A/%T %t.mp3;%t.wav'."
+msgstr ""
+"artist: %a, album: %A, compozitor: %c, titlu: %t, gen: %G, nr pistă: %T, nr "
+"CD: %C, an: %Y, data sărit: %*, caracterul '%': %%. Puteţi separa mai multe "
+"ÅŸabloane pritnr-un ';'. Primul ÅŸablon care se potriveÅŸte numelui de fiÅŸier "
+"va fi folosit. Exemplu: '%a - %A/%T %t.mp3;%t.wav'."
+
+#: ../data/gtkpod.glade.h:424
+msgid "folder"
+msgstr "dosar"
+
+#: ../data/gtkpod.glade.h:425
+msgid "folder.jpg"
+msgstr "dosar.jpg"
+
+#: ../data/gtkpod.glade.h:427
+#, no-c-format
+msgid "folder.jpg;%a.jpg"
+msgstr "dosar.jpg;%a.jpg"
+
+#: ../data/gtkpod.glade.h:428
+msgid "gtkpod"
+msgstr "gtkpod"
+
+#: ../data/gtkpod.glade.h:429
+msgid "gtkpod Info"
+msgstr "Informaţii gtkpod"
+
+#: ../data/gtkpod.glade.h:430
+msgid ""
+"gtkpod expects the ID3 tags and the filenames to be in the encoding "
+"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
+"operation. 'System Charset' is the charset used by your current locale."
+msgstr ""
+"gtkpod aşteaptă ca etichetele ID3 şi numele de fişiere să fie în codarea "
+"specificată aici. Puteţi schimba acest lucru pentru operaţii 'Adaugă "
+"fişiere' şi 'Adaugă dosare'. 'Setul de caractere implicit' este setul de "
+"caractere folosit de setările dvs locale."
+
+#: ../data/gtkpod.glade.h:431
+msgid "gtkpod options"
+msgstr "Opţiuni gtkpod"
+
+#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
+#: ../data/gtkpod.glade.h:433
+msgid ""
+"iPod\n"
+"Local Repository (Standard)\n"
+"Local Repository (Podcasts)\n"
+msgstr ""
+"iPod\n"
+"Depozit local (standard)\n"
+"Depozit local (podcasturi)\n"
+
+#: ../data/gtkpod.glade.h:437
+msgid "iPod mountpoint:"
+msgstr "Punct de montare:"
+
+#: ../data/gtkpod.glade.h:438
+msgid "iTunesDB backup:"
+msgstr "Copie iTunesDB"
+
+#: ../data/gtkpod.glade.h:439
+msgid "mserv Root:"
+msgstr "Rădăcină mserv:"
+
+#: ../data/gtkpod.glade.h:440
+msgid "mserv database lookup will be done for music in this directory."
+msgstr ""
+"căutarea prin baza de date mserv va fi realizată pentru muzica din acest "
+"dosar."
+
+#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
+msgid "n/a"
+msgstr "n/a"
+
+#: ../data/gtkpod.glade.h:442
+msgid "special_sorttab -- Don't translate!"
+msgstr "special_sorttab -- Don't translate!"
+
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr "Nu am putut iniţializa GnomeVFS\n"
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr ""
+"iPod-ul montat de curând la '%s' nu a putut fi încărcat în gtkpod\n"
+"\n"
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+"iPod-ul montat de curând la '%s' pare să fie deja încărcat!\n"
+"\n"
+
+#: ../src/autodetection.c:416
+msgid "New iPod"
+msgstr "iPod nou"
+
+#: ../src/charset.c:53
+msgid "Arabic (IBM-864)"
+msgstr "Arabic (IBM-864)"
+
+#: ../src/charset.c:54
+msgid "Arabic (ISO-8859-6)"
+msgstr "Arabic (ISO-8859-6)"
+
+#: ../src/charset.c:55
+msgid "Arabic (Windows-1256)"
+msgstr "Arabic (Windows-1256)"
+
+#: ../src/charset.c:56
+msgid "Baltic (ISO-8859-13)"
+msgstr "Baltic (ISO-8859-13)"
+
+#: ../src/charset.c:57
+msgid "Baltic (ISO-8859-4)"
+msgstr "Baltic (ISO-8859-4)"
+
+#: ../src/charset.c:58
+msgid "Baltic (Windows-1257)"
+msgstr "Baltic (Windows-1257)"
+
+#: ../src/charset.c:59
+msgid "Celtic (ISO-8859-14)"
+msgstr "Celtic (ISO-8859-14)"
+
+#: ../src/charset.c:60
+msgid "Central European (IBM-852)"
+msgstr "Central European (IBM-852)"
+
+#: ../src/charset.c:61
+msgid "Central European (ISO-8859-2)"
+msgstr "Central European (ISO-8859-2)"
+
+#: ../src/charset.c:62
+msgid "Central European (Windows-1250)"
+msgstr "Central European (Windows-1250)"
+
+#: ../src/charset.c:63
+msgid "Chinese Simplified (GB18030)"
+msgstr "Chinese Simplified (GB18030)"
+
+#: ../src/charset.c:64
+msgid "Chinese Simplified (GB2312)"
+msgstr "Chinese Simplified (GB2312)"
+
+#: ../src/charset.c:65
+msgid "Chinese Traditional (Big5)"
+msgstr "Chinese Traditional (Big5)"
+
+#: ../src/charset.c:66
+msgid "Chinese Traditional (Big5-HKSCS)"
+msgstr "Chinese Traditional (Big5-HKSCS)"
+
+#: ../src/charset.c:67
+msgid "Cyrillic (IBM-855)"
+msgstr "Cyrillic (IBM-855)"
+
+#: ../src/charset.c:68
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "Cyrillic (ISO-8859-5)"
+
+#: ../src/charset.c:69
+msgid "Cyrillic (ISO-IR-111)"
+msgstr "Cyrillic (ISO-IR-111)"
+
+#: ../src/charset.c:70
+msgid "Cyrillic (KOI8-R)"
+msgstr "Cyrillic (KOI8-R)"
+
+#: ../src/charset.c:71
+msgid "Cyrillic (Windows-1251)"
+msgstr "Cyrillic (Windows-1251)"
+
+#: ../src/charset.c:72
+msgid "Cyrillic/Russian (CP-866)"
+msgstr "Cyrillic/Russian (CP-866)"
+
+#: ../src/charset.c:73
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "Cyrillic/Ukrainian (KOI8-U)"
+
+#: ../src/charset.c:74
+msgid "English (US-ASCII)"
+msgstr "English (US-ASCII)"
+
+#: ../src/charset.c:75
+msgid "Greek (ISO-8859-7)"
+msgstr "Greek (ISO-8859-7)"
+
+#: ../src/charset.c:76
+msgid "Greek (Windows-1253)"
+msgstr "Greek (Windows-1253)"
+
+#: ../src/charset.c:77
+msgid "Hebrew (IBM-862)"
+msgstr "Hebrew (IBM-862)"
+
+#: ../src/charset.c:78
+msgid "Hebrew (Windows-1255)"
+msgstr "Hebrew (Windows-1255)"
+
+#: ../src/charset.c:79
+msgid "Japanese (automatic detection)"
+msgstr "Japanese (automatic detection)"
+
+#: ../src/charset.c:80
+msgid "Japanese (EUC-JP)"
+msgstr "Japanese (EUC-JP)"
+
+#: ../src/charset.c:81
+msgid "Japanese (ISO-2022-JP)"
+msgstr "Japanese (ISO-2022-JP)"
+
+#: ../src/charset.c:82
+msgid "Japanese (Shift_JIS)"
+msgstr "Japanese (Shift_JIS)"
+
+#: ../src/charset.c:83
+msgid "Korean (EUC-KR)"
+msgstr "Korean (EUC-KR)"
+
+#: ../src/charset.c:84
+msgid "Nordic (ISO-8859-10)"
+msgstr "Nordic (ISO-8859-10)"
+
+#: ../src/charset.c:85
+msgid "South European (ISO-8859-3)"
+msgstr "South European (ISO-8859-3)"
+
+#: ../src/charset.c:86
+msgid "Thai (TIS-620)"
+msgstr "Thai (TIS-620)"
+
+#: ../src/charset.c:87
+msgid "Turkish (IBM-857)"
+msgstr "Turkish (IBM-857)"
+
+#: ../src/charset.c:88
+msgid "Turkish (ISO-8859-9)"
+msgstr "Turkish (ISO-8859-9)"
+
+#: ../src/charset.c:89
+msgid "Turkish (Windows-1254)"
+msgstr "Turkish (Windows-1254)"
+
+#: ../src/charset.c:90
+msgid "Unicode (UTF-7)"
+msgstr "Unicode (UTF-7)"
+
+#: ../src/charset.c:91
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../src/charset.c:92
+msgid "Unicode (UTF-16BE)"
+msgstr "Unicode (UTF-16BE)"
+
+#: ../src/charset.c:93
+msgid "Unicode (UTF-16LE)"
+msgstr "Unicode (UTF-16LE)"
+
+#: ../src/charset.c:94
+msgid "Unicode (UTF-32BE)"
+msgstr "Unicode (UTF-32BE)"
+
+#: ../src/charset.c:95
+msgid "Unicode (UTF-32LE)"
+msgstr "Unicode (UTF-32LE)"
+
+#: ../src/charset.c:96
+msgid "Vietnamese (VISCII)"
+msgstr "Vietnamese (VISCII)"
+
+#: ../src/charset.c:97
+msgid "Vietnamese (Windows-1258)"
+msgstr "Vietnamese (Windows-1258)"
+
+#: ../src/charset.c:98
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr "Visual Hebrew (ISO-8859-8)"
+
+#: ../src/charset.c:99
+msgid "Western (IBM-850)"
+msgstr "Western (IBM-850)"
+
+#: ../src/charset.c:100
+msgid "Western (ISO-8859-1)"
+msgstr "Western (ISO-8859-1)"
+
+#: ../src/charset.c:101
+msgid "Western (ISO-8859-15)"
+msgstr "Western (ISO-8859-15)"
+
+#: ../src/charset.c:102
+msgid "Western (Windows-1252)"
+msgstr "Western (Windows-1252)"
+
+#. sanity!
+#. check for "System Charset" and return NULL
+#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+msgid "System Charset"
+msgstr "Setul de caractere implicit"
+
+#. we are not the first instance of gtkpod -- the socket is
+#. already being used, so we pass
+#: ../src/clientserver.c:214
+msgid ""
+"Another instance of gtkpod was detected. Playcount server not started.\n"
+msgstr ""
+"O altă instanţă a gtkpod a fost detectată. Serverul de numărare a redărilor "
+"nu este pornit.\n"
+
+#: ../src/confirmation.c:377
+msgid "Confirmation Dialogue"
+msgstr "Dialog confirmare"
+
+#: ../src/context_menus.c:362
+#, c-format
+msgid "Copied \"%s\" playlist to %s"
+msgstr "Am copiat lista de redare \"%s\" la %s"
+
+#: ../src/context_menus.c:401
+#, c-format
+msgid "Copied %d track to '%s'"
+msgid_plural "Copied %d tracks to '%s'"
+msgstr[0] "Am copiat %d piesă la '%s'"
+msgstr[1] "Am copiat %d piese la '%s'"
+
+#: ../src/context_menus.c:429
+#, c-format
+msgid "Copied '%s' playlist to '%s' in '%s'"
+msgstr "Am copiat lista de redare '%s' la '%s' în '%s'"
+
+#: ../src/context_menus.c:462
+#, c-format
+msgid "Copied %d track to '%s' in '%s'"
+msgid_plural "Copied %d tracks to %s in '%s'"
+msgstr[0] "Am copiat %d piesă la '%s' în '%s'"
+msgstr[1] "Am copiat %d piese la '%s' în '%s'"
+
+#: ../src/context_menus.c:622 ../src/tools.c:854
+msgid "Play Now"
+msgstr "Redă acum"
+
+#: ../src/context_menus.c:628 ../src/tools.c:867
+msgid "Enqueue"
+msgstr "Adaugă în coadă"
+
+#: ../src/context_menus.c:634
+msgid "Copy Tracks to Filesystem"
+msgstr "Copiază piesele către sistemul de fişiere"
+
+#: ../src/context_menus.c:641 ../src/file_export.c:1085
+msgid "Create Playlist File"
+msgstr "Creează fişier listă de redare"
+
+#: ../src/context_menus.c:648
+msgid "Create new Playlist"
+msgstr "Creează listă de redare nouă"
+
+#: ../src/context_menus.c:655
+msgid "Update Tracks from File"
+msgstr "Actualizeză piesele din fişier"
+
+#: ../src/context_menus.c:669
+msgid "Sync Playlist with Dir(s)"
+msgstr "Sincronizează lista de redare cu dosar(e)"
+
+#: ../src/context_menus.c:679
+msgid "Remove All Tracks from iPod"
+msgstr "Åžterge toate piesele de pe iPod"
+
+#: ../src/context_menus.c:697
+msgid "Remove All Podcasts from iPod"
+msgstr "Åžterge toate podcasturile de pe iPod"
+
+#: ../src/context_menus.c:712
+msgid "Delete Including Tracks"
+msgstr "Şterge incluzând piesele"
+
+#: ../src/context_menus.c:720
+msgid "Delete But Keep Tracks"
+msgstr "Şterge dar păstrează piesele"
+
+#: ../src/context_menus.c:728
+msgid "Edit iPod Properties"
+msgstr "Editează proprietăţile iPod-ului"
+
+#: ../src/context_menus.c:735
+msgid "Edit Repository Properties"
+msgstr "Editează proprietăţile depozitului"
+
+#: ../src/context_menus.c:742
+msgid "Edit Playlist Properties"
+msgstr "Editează proprietăţile listei de redare"
+
+#: ../src/context_menus.c:770
+msgid "View Full Size Artwork"
+msgstr "Vizualizeză coperta la dimensiunea reală"
+
+#: ../src/context_menus.c:777
+msgid "Select Cover From File"
+msgstr "Selectează coperta din fişier"
+
+#: ../src/context_menus.c:790
+msgid "Load iPod"
+msgstr "Încarcă iPod"
+
+#: ../src/context_menus.c:797
+msgid "Eject iPod"
+msgstr "Deconectează iPod"
+
+#: ../src/context_menus.c:814
+msgid "Remove All Tracks from Database"
+msgstr "Åžterge toate piesele din baza de date"
+
+#: ../src/context_menus.c:829
+msgid "Delete Including Tracks (Harddisk)"
+msgstr "Şterge incluzând piesele (disc dur)"
+
+#: ../src/context_menus.c:837
+msgid "Delete Including Tracks (Database)"
+msgstr "Şterge incluzând piesele (bază de date)"
+
+#: ../src/context_menus.c:845
+msgid "Delete From iPod"
+msgstr "Åžterge de pe iPod"
+
+#: ../src/context_menus.c:853
+msgid "Delete From Playlist"
+msgstr "Åžterge din lista de redare"
+
+#: ../src/context_menus.c:861
+msgid "Delete From Harddisk"
+msgstr "Åžterge de pe discul dur"
+
+#: ../src/context_menus.c:869
+msgid "Delete From Database"
+msgstr "Åžterge din baza de date"
+
+#: ../src/context_menus.c:877
+msgid "Alphabetize"
+msgstr "Sortează alfabetic"
+
+#: ../src/context_menus.c:895
+msgid "Remove Album"
+msgstr "Șterge album"
+
+#: ../src/context_menus.c:905
+msgid "Remove Photo"
+msgstr "_Åžterge imagine"
+
+#: ../src/context_menus.c:922
+msgid "Rename Album"
+msgstr "Redenumește album"
+
+#: ../src/context_menus.c:981 ../src/context_menus.c:1030
+msgid "Copy selected playlist to..."
+msgstr "Copiază lista de redare selectată către..."
+
+#: ../src/context_menus.c:1083
+msgid "Copy selected track(s) to..."
+msgstr "Copiază piesa(piesele) selectat(e) către..."
+
+#: ../src/date_parser.l:269
+#, c-format
+msgid "Date format error: unrecognized character: '%s'\n"
+msgstr "Eroare format dată: caracter nerecunoscut: '%s'\n"
+
+#: ../src/details.c:82
+msgid "Audio/Video"
+msgstr "Audio/Video"
+
+#: ../src/details.c:83
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/details.c:84
+msgid "Video"
+msgstr "Video"
+
+#: ../src/details.c:85
+msgid "Podcast"
+msgstr "Podcast"
+
+#: ../src/details.c:86
+msgid "Video Podcast"
+msgstr "Podcast video"
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr "Carte audio"
+
+#: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
+msgid "Music Video"
+msgstr "Videoclip"
+
+#: ../src/details.c:89 ../src/display_spl.c:107 ../src/display_spl.c:210
+#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
+msgid "TV Show"
+msgstr "Emisiune TV"
+
+#: ../src/details.c:90
+msgid "TV Show & Music Video"
+msgstr "Emisiune TV ÅŸi videoclip"
+
+#: ../src/details.c:836
+#, c-format
+msgid "%s (image data corrupted or unreadable)"
+msgstr "%s (date imagine corupte sau imposibil de citit)"
+
+#: ../src/details.c:973
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr "Vă rugăm raportaţi tip media necunoscut %x\n"
+
+#: ../src/details.c:1418
+msgid "<b>n/a</b>"
+msgstr "<b>n/a</b>"
+
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr "Eroare la tragerea unei imagini în fereastra de detalii: %s\n"
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr "Copertă nouă stabilită cu succes pentru piesele selectate"
+
+#: ../src/display.c:490
+#, c-format
+msgid "<b>Image Dimensions: %s</b>"
+msgstr "<b>Dimensiuni imagine: %s</b>"
+
+#: ../src/display.c:744
+msgid "Edit selected entry of which sort tab?"
+msgstr "Editează înregistrarea selectată a cărei categorii?"
+
+#. no entry selected
+#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
+msgid "No entry selected."
+msgstr "Nici o înregistrare selectată."
+
+#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
+#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
+#, c-format
+msgid "No entry selected in Sort Tab %d"
+msgstr "Nici o înregistrare selectată în categoria %d"
+
+#: ../src/display.c:949
+msgid "Remove entry of which sort tab from database?"
+msgstr "Şterge înregistrarea cărei categorii din baza de date?"
+
+#: ../src/display.c:957
+msgid "Remove tracks in selected entry of which filter tab from the iPod?"
+msgstr "Şterge piesele din înregistrarea cărei categorii de pe iPod?"
+
+#: ../src/display.c:979
+msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
+msgstr "Şterge de pe discul dur piesele din înregistrarea cărei categorii?"
+
+#: ../src/display.c:1009
+msgid "Remove tracks in selected entry of which filter tab from playlist?"
+msgstr "Şterge din lista de redare piesele din înregistrarea cărei categorii?"
+
+#: ../src/display.c:1036 ../src/display.c:1074
+#, c-format
+msgid ""
+"iPod at '%s' is not loaded.\n"
+"Please load it first."
+msgstr ""
+"iPod la '%s' nu este încărcat.\n"
+"Vă rugăm încărcaţi-l mai întâi."
+
+#: ../src/display.c:1111 ../src/display.c:1138
+msgid "Update selected entry of which sort tab?"
+msgstr "Actualizează înregistrarea selectată a cărei categorii?"
+
+#: ../src/display.c:1224
+msgid "Export selected entry of which sort tab?"
+msgstr "Exportă înregistrarea selectată a cărei categorii?"
+
+#: ../src/display.c:1280
+msgid "Create playlist file from selected entry of which sort tab?"
+msgstr ""
+"Creează fişierul listă de redare din înregistrarea selectată a cărei "
+"categorii?"
+
+#: ../src/display.c:1334
+msgid "Play tracks in selected entry of which sort tab?"
+msgstr "Redă piesele din înregistrarea selectată a cărei categorii?"
+
+#: ../src/display.c:1389
+msgid "Enqueue tracks in selected entry of which sort tab?"
+msgstr "Adaugă la coadă înregistrarea selectată a cărei categorii?"
+
+#: ../src/display.c:1646
+msgid "Normalize tracks in selected entry of which sort tab?"
+msgstr ""
+"Normalizează volumul pieselor din înregistrarea selectată a cărei categorii?"
+
+#: ../src/display_coverart.c:1713
+msgid "Failed to remove the album from the album hash store."
+msgstr "Ştergerea albumului din memoria hash a albumelor eşuată."
+
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr "Eroare la tragerea unei imagini în căsuța afișare copertă: %s\n"
+
+#: ../src/display_itdb.c:376
+#, c-format
+msgid "Failed to set cover art: '%s'\n"
+msgstr "Stabilirea coperţii: '%s' eşuată\n"
+
+#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
+msgid "Local"
+msgstr "Local"
+
+#. add podcast playlist
+#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
+#: ../src/display_itdb.c:1025
+msgid "Podcasts"
+msgstr "Podcasturi"
+
+#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
+#: ../src/repository.c:1186
+msgid "iPod"
+msgstr "iPod"
+
+#: ../src/display_itdb.c:1084
+#, c-format
+msgid "Increased playcount for '%s'"
+msgstr "Număr redări incrementat pentru '%s'"
+
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr "Eroare la citirea bazei de date foto a iPod-ului (%s).\n"
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr "Eroare la citirea bazei de date foto a iPod-ului.\n"
+
+#: ../src/display_photo.c:238
+msgid "Could not access the iPod's photo database."
+msgstr "Nu am putut accesa baza de date foto a iPod-ului"
+
+#: ../src/display_photo.c:441
+msgid "Photo Albums"
+msgstr "Albume foto"
+
+#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+msgid "<Unnamed>"
+msgstr "<Fără nume>"
+
+#: ../src/display_photo.c:939
+msgid "The Photo Library album cannot be removed"
+msgstr "Albumul Bibliotecă foto nu poate fi șters"
+
+#: ../src/display_photo.c:961
+msgid "Do you want to remove the album's photos too?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi de asemenea imaginile din album?"
+
+#: ../src/display_photo.c:967
+msgid "Yes. Do Not Display Again"
+msgstr "Da. Nu afișa mesajul din nou"
+
+#: ../src/display_photo.c:1038
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr ""
+"Veți șterge selecția de imagini din albumul curent.\n"
+" Doriți ștergerea selecției și din baza de date?"
+
+#: ../src/display_photo.c:1053
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr ""
+"Veți șterge selecția de imagini din Biblioteca foto și din toate albumele. "
+"Sigur doriți acest lucru?"
+
+#: ../src/display_photo.c:1128
+msgid "New Photo Album Name"
+msgstr "Nume album foto nou"
+
+#: ../src/display_photo.c:1129
+msgid "Please enter a new name for the photo album"
+msgstr "Vă rugăm să introduceţi un nume nou pentru albumul foto"
+
+#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+msgid "An album with that name already exists."
+msgstr "Un album cu același nume există deja."
+
+#: ../src/display_photo.c:1210
+msgid "New Photo Album"
+msgstr "Album foto nou"
+
+#: ../src/display_photo.c:1211
+msgid "Please enter a name for the new photo album"
+msgstr "Vă rugăm să introduceţi un nume pentru albumul foto"
+
+#: ../src/display_photo.c:1232
+msgid "The new album failed to be created."
+msgstr "Noul album nu a putut fi creat."
+
+#: ../src/display_photo.c:1256
+msgid "Add Image to iPod"
+msgstr "Adaugă imagine la iPod"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1311
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr "Adaugare dosar cu imagini la iPod. Selectați dosarul."
+
+#: ../src/display_photo.c:1699
+#, c-format
+msgid "<No members>\n"
+msgstr "<Lipsă membri>\n"
+
+#. give a notice on the statusbar -- otherwise the user
+#. * will never know why the drag is not possible
+#: ../src/display_playlists.c:516 ../src/display_playlists.c:558
+msgid "Error: drag from iPod not possible in offline mode."
+msgstr "Eroare: tragerea de pe iPod nu este posibilă în modul offline"
+
+#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
+#, c-format
+msgid "Copied one track"
+msgid_plural "Copied %d tracks"
+msgstr[0] "Am copiat o piesă"
+msgstr[1] "Am copiat %d piese"
+
+#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
+msgid "Can't reorder sorted treeview."
+msgstr "Nu pot reordona afişarea în arbore sortat"
+
+#: ../src/display_playlists.c:954
+#, c-format
+msgid ""
+"This DND type (%d) is not (yet) supported. If you feel implementing this "
+"would be useful, please contact the author.\n"
+"\n"
+msgstr ""
+"Acest tip DND (%d) nu este (încă) suportat. Dacă consideraţi implementarea "
+"acestuia utilă, vă rugam contactaţi autorul.\n"
+"\n"
+
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr "Fotografii"
+
+#: ../src/display_sorttabs.c:473
+msgid "'Played' condition ignored because of error."
+msgstr "Condiţia 'redat' a fost ignorată din cauza unei erori."
+
+#: ../src/display_sorttabs.c:476
+msgid "'Modified' condition ignored because of error."
+msgstr "Condiţia 'modificat' a fost ignorată din cauza unei erori."
+
+#: ../src/display_sorttabs.c:479
+msgid "'Added' condition ignored because of error."
+msgstr "Condiţia 'adăugat' a fost ignorată din cauza unei erori."
+
+#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+msgid "All"
+msgstr "Toate"
+
+#: ../src/display_sorttabs.c:1588
+msgid "Compilations"
+msgstr "Compilaţii"
+
+#: ../src/display_sorttabs.c:2988
+msgid "Comp."
+msgstr "Comp."
+
+#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+msgid "Year"
+msgstr "An"
+
+#: ../src/display_sorttabs.c:2997
+msgid "Special"
+msgstr "Special"
+
+#: ../src/display_sorttabs.c:3245
+msgid "Last Played"
+msgstr "Ultima redare"
+
+#: ../src/display_sorttabs.c:3246
+msgid "Last Modified"
+msgstr "Ultima modificare"
+
+#: ../src/display_spl.c:64
+msgid "days"
+msgstr "zile"
+
+#: ../src/display_spl.c:65
+msgid "weeks"
+msgstr "săptămâni"
+
+#: ../src/display_spl.c:66
+msgid "months"
+msgstr "luni"
+
+#: ../src/display_spl.c:73
+msgid "kbps"
+msgstr "kops"
+
+#: ../src/display_spl.c:74
+msgid "Hz"
+msgstr "Hz"
+
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+msgid "MB"
+msgstr "MO"
+
+#: ../src/display_spl.c:76
+msgid "secs"
+msgstr "secunde"
+
+#: ../src/display_spl.c:86 ../src/misc_conversion.c:74
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#. 15
+#: ../src/display_spl.c:87 ../src/misc_conversion.c:75
+msgid "Samplerate"
+msgstr "Samplerate"
+
+#: ../src/display_spl.c:90
+msgid "Kind"
+msgstr "Tip"
+
+#: ../src/display_spl.c:91 ../src/misc_conversion.c:81
+msgid "Date modified"
+msgstr "Data modificării"
+
+#: ../src/display_spl.c:92
+msgid "Track number"
+msgstr "Număr pistă"
+
+#: ../src/display_spl.c:93
+msgid "Size"
+msgstr "Dimensiune"
+
+#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
+msgid "Comment"
+msgstr "Comentariu"
+
+#: ../src/display_spl.c:96 ../src/misc_conversion.c:79
+msgid "Date added"
+msgstr "Data adăugării"
+
+#: ../src/display_spl.c:99
+msgid "Last played"
+msgstr "Ultima redare"
+
+#: ../src/display_spl.c:100
+msgid "Disc number"
+msgstr "Număr disc"
+
+#: ../src/display_spl.c:102 ../src/misc_conversion.c:87
+msgid "Compilation"
+msgstr "Compilaţie"
+
+#: ../src/display_spl.c:103 ../src/misc_conversion.c:76
+msgid "BPM"
+msgstr "BPM"
+
+#: ../src/display_spl.c:104 ../src/misc_conversion.c:86
+msgid "Grouping"
+msgstr "Grupare"
+
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "Listă de redare"
+
+#: ../src/display_spl.c:106
+msgid "Video Kind"
+msgstr "Tip video"
+
+#: ../src/display_spl.c:108
+msgid "Season number"
+msgstr "Număr sezon"
+
+#: ../src/display_spl.c:109
+msgid "Skip count"
+msgstr "Număr săriri peste"
+
+#: ../src/display_spl.c:110
+msgid "Last skipped"
+msgstr "Ultima sărire peste"
+
+#: ../src/display_spl.c:111
+msgid "Album artist"
+msgstr "Artist album"
+
+#: ../src/display_spl.c:117
+msgid "contains"
+msgstr "conţine"
+
+#: ../src/display_spl.c:118
+msgid "does not contain"
+msgstr "nu conţine"
+
+#: ../src/display_spl.c:119 ../src/display_spl.c:128 ../src/display_spl.c:138
+#: ../src/display_spl.c:157 ../src/display_spl.c:164
+msgid "is"
+msgstr "este"
+
+#: ../src/display_spl.c:120 ../src/display_spl.c:129 ../src/display_spl.c:139
+#: ../src/display_spl.c:158 ../src/display_spl.c:165
+msgid "is not"
+msgstr "nu este"
+
+#: ../src/display_spl.c:121
+msgid "starts with"
+msgstr "începe cu"
+
+#: ../src/display_spl.c:122
+msgid "ends with"
+msgstr "se termină cu"
+
+#: ../src/display_spl.c:130
+msgid "is greater than"
+msgstr "este mai mare decât"
+
+#: ../src/display_spl.c:131
+msgid "is less than"
+msgstr "este mai mic decât"
+
+#: ../src/display_spl.c:132 ../src/display_spl.c:144
+msgid "is in the range"
+msgstr "este în intervalul"
+
+#: ../src/display_spl.c:140
+msgid "is after"
+msgstr "este după"
+
+#: ../src/display_spl.c:141
+msgid "is before"
+msgstr "este înainte"
+
+#: ../src/display_spl.c:142
+msgid "in the last"
+msgstr "este între ultimele"
+
+#: ../src/display_spl.c:143
+msgid "not in the last"
+msgstr "nu este între ultimele"
+
+#: ../src/display_spl.c:150
+msgid "is set"
+msgstr "este stabilit"
+
+#: ../src/display_spl.c:151
+msgid "is not set"
+msgstr "nu este stabilit"
+
+#: ../src/display_spl.c:171
+msgid "Not supported"
+msgstr "Nu este suportat"
+
+#: ../src/display_spl.c:178
+msgid "minutes"
+msgstr "minute"
+
+#: ../src/display_spl.c:180
+msgid "tracks"
+msgstr "piese"
+
+#: ../src/display_spl.c:181
+msgid "hours"
+msgstr "ore"
+
+#: ../src/display_spl.c:182 ../src/info.c:780
+msgid "GB"
+msgstr "GO"
+
+#: ../src/display_spl.c:189
+msgid "random order"
+msgstr "ordine aleatoare"
+
+#: ../src/display_spl.c:190
+msgid "title"
+msgstr "titlu"
+
+#: ../src/display_spl.c:191
+msgid "album"
+msgstr "album"
+
+#: ../src/display_spl.c:192
+msgid "artist"
+msgstr "artist"
+
+#: ../src/display_spl.c:193
+msgid "genre"
+msgstr "gen"
+
+#: ../src/display_spl.c:194
+msgid "most recently added"
+msgstr "adăugate recent"
+
+#: ../src/display_spl.c:195
+msgid "least recently added"
+msgstr "adăugate mai demult"
+
+#: ../src/display_spl.c:196
+msgid "most often played"
+msgstr "cele mai des redate"
+
+#: ../src/display_spl.c:197
+msgid "least often played"
+msgstr "cele mai rar redate"
+
+#: ../src/display_spl.c:198
+msgid "most recently played"
+msgstr "redate recent"
+
+#: ../src/display_spl.c:199
+msgid "least recently played"
+msgstr "redate mai demult"
+
+#: ../src/display_spl.c:200
+msgid "highest rating"
+msgstr "aprecierea cea mai mare"
+
+#: ../src/display_spl.c:201
+msgid "lowest rating"
+msgstr "aprecierea cea mai mică"
+
+#: ../src/display_spl.c:208 ../src/display_spl.c:217
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+msgid "to"
+msgstr "până la"
+
+#: ../src/display_spl.c:1485
+msgid "-"
+msgstr "-"
+
+#: ../src/display_spl.c:1500
+msgid "+"
+msgstr "+"
+
+#: ../src/display_tracks.c:281
+#, c-format
+msgid "Moved one track"
+msgid_plural "Moved %d tracks"
+msgstr[0] "O piesă mutată."
+msgstr[1] "%d piese mutate."
+
+#: ../src/display_tracks.c:1810
+#, c-format
+msgid ""
+"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
+"d.%d < 2.5.4). Once you sort the track view, you cannot go back to the "
+"unsorted state.\n"
+"\n"
+msgstr ""
+"Nu pot reface acţiune de sortare din cauza unui bug în biblioteca GTK pe "
+"care o folosiţi (%d.%d.%d < 2.5.4). O dată ce aţi sortat piesele, nu vă "
+"puteţi întoarce în starea anterioară sortării.\n"
+"\n"
+
+#: ../src/display_tracks.c:2069
+msgid "Rtng"
+msgstr "Aprec."
+
+#: ../src/display_tracks.c:2072
+msgid "#"
+msgstr "#"
+
+#: ../src/display_tracks.c:2075
+msgid "CD"
+msgstr "CD"
+
+#: ../src/display_tracks.c:2078
+msgid "ID"
+msgstr "ID"
+
+#: ../src/display_tracks.c:2081
+msgid "Trnsfrd"
+msgstr "Trnsfrt"
+
+#: ../src/display_tracks.c:2085
+msgid "Cmpl"
+msgstr "Cmpl"
+
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "Timp"
+
+#: ../src/display_tracks.c:2094
+msgid "Plycnt"
+msgstr "Red"
+
+#: ../src/display_tracks.c:2106
+msgid "Released"
+msgstr "Lansat"
+
+#: ../src/display_tracks.c:2112
+msgid "Vol."
+msgstr "Vol."
+
+#: ../src/display_tracks.c:2115
+msgid "Sndchk."
+msgstr "Verif."
+
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr "Fișierul copertă există deja"
+
+#: ../src/fetchcover.c:371
+#, c-format
+msgid ""
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
+"\n"
+"- Clicking Yes will overwrite the existing file, possibly associating\n"
+" other music files in the same directory with this coverart file.\n"
+"- Clicking No will save the file with a unique file name.\n"
+"- Clicking Cancel will abort the fetchcover operation."
+msgstr ""
+"Fişierul imagine %s există deja. \n"
+"Acesta poate fi asociat cu alte fişiere muzicale în dosar.\n"
+"\n"
+"- Dând click pe Da se va suprascrie fişierul existent, fiind posibilă \n"
+" asocierea altor fiÅŸiere muzicale din acelaÅŸi dosar cu acesta. \n"
+"- Dând click pe Nu se va salva fişierul cu un nume unic.\n"
+"- Dând click pe Revocare se va abandona obţinerea coperţii."
+
+#: ../src/file.c:236
+#, c-format
+msgid ""
+"'%s' is a directory, not a playlist file.\n"
+"\n"
+msgstr ""
+"'%s' este un dosar, nu un fişier listă de redare.\n"
+"\n"
+
+#: ../src/file.c:266
+#, c-format
+msgid ""
+"'%s' is a not a known playlist file.\n"
+"\n"
+msgstr ""
+"'%s' nu este un fişier listă de redare cunoscut.\n"
+"\n"
+
+#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/wavfile.c:107
+#, c-format
+msgid "Could not open '%s' for reading.\n"
+msgstr "Nu am putut deschide '%s' pentru citire.\n"
+
+#: ../src/file.c:369
+#, c-format
+msgid "Skipping '%s' because it is a directory.\n"
+msgstr "Sar peste '%s' pentru că este un dosar.\n"
+
+#: ../src/file.c:374
+#, c-format
+msgid "Skipping '%s' to avoid adding playlist file recursively\n"
+msgstr ""
+"Sar peste '%s' pentru a evita adăugarea recursivă a fişierelor listă de "
+"redare\n"
+
+#: ../src/file.c:629
+#, c-format
+msgid "Unknown token '%s' in template '%s'\n"
+msgstr "Bucată '%s' necunoscută în şablonul '%s'\n"
+
+#: ../src/file.c:923
+#, c-format
+msgid "Local filename not valid (%s)"
+msgstr "Nume de fiÅŸier local nevalid (%s)"
+
+#: ../src/file.c:982
+#, c-format
+msgid "No information found for user '%s' in '%s'"
+msgstr "Informaţie negăsită pentru utilizatorul '%s' în '%s'"
+
+#: ../src/file.c:991
+#, c-format
+msgid "mserv data file (%s) not available for track (%s)"
+msgstr "FiÅŸierul date mserv (%s) nu este disponibil pentru piesa (%s)"
+
+#: ../src/file.c:999
+#, c-format
+msgid "Track (%s) not in mserv music root directory (%s)"
+msgstr "Piesa (%s) nu este în dosarul rădăcină de muzică a mserv (%s)"
+
+#: ../src/file.c:1123
+#, c-format
+msgid ""
+"The following track could not be processed (file does not exist): '%s'\n"
+msgstr "Următoarea piesă nu a putut fi procesată (fişierul nu există): '%s'\n"
+
+#: ../src/file.c:1209
+#, c-format
+msgid "The following track could not be processed (filetype unknown): '%s'\n"
+msgstr ""
+"Următoarea piesă nu a putut fi procesată (tip fişier necunoscut): '%s'\n"
+
+#: ../src/file.c:1307
+#, c-format
+msgid ""
+"The following track could not be processed (filetype is known but analysis "
+"failed): '%s'\n"
+msgstr ""
+"Următoarea piesă nu a putut fi procesată (tip fişier cunoscut, dar analiza "
+"eşuată): '%s'\n"
+
+#: ../src/file.c:1337 ../src/file.c:1391
+msgid "Nothing to update"
+msgstr "Nimic de actualizat"
+
+#: ../src/file.c:1358
+#, c-format
+msgid "Updating %s"
+msgstr "Actualizez %s"
+
+#: ../src/file.c:1372
+msgid "Updated selected tracks with info from file."
+msgstr "Am actualizat piesele selectate cu informaţii din fişier."
+
+#: ../src/file.c:1406
+#, c-format
+msgid "Retrieving mserv data %s"
+msgstr "Primind date de la mserv %s"
+
+#: ../src/file.c:1411
+msgid "no filename available"
+msgstr "nume de fiÅŸier indisponibil"
+
+#: ../src/file.c:1416
+msgid "Updated selected tracks with data from mserv."
+msgstr "Am actualizat piesele selectate cu date de la mserv."
+
+#: ../src/file.c:1437
+#, c-format
+msgid "The following track could not be updated"
+msgid_plural "The following %d tracks could not be updated"
+msgstr[0] "Următoarea piesă nu a putut fi actualizată"
+msgstr[1] "Următoarele %d piese nu au putut fi actualizate"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1443
+msgid "Failed Track Update"
+msgstr "Actualizare piesă eşuată"
+
+#: ../src/file.c:1501
+#, c-format
+msgid "The following track has been updated"
+msgid_plural "The following %d tracks have been updated"
+msgstr[0] "Următoarea piesă a fost actualizată"
+msgstr[1] "Următoarele %d piese au fost actualizate"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1507
+msgid "Successful Track Update"
+msgstr "Actualizare piesă reuşită"
+
+#: ../src/file.c:1566
+#, c-format
+msgid "No mserv information could be retrieved for the following track"
+msgid_plural ""
+"No mserv information could be retrieved for the following %d tracks"
+msgstr[0] "Nu am putut obţine informaţii de la mserv pentru următoarea piesă."
+msgstr[1] ""
+"Nu am putut obţine informaţii de la mserv pentru următoarele %d piese."
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1572
+msgid "mserv data retrieval problem"
+msgstr "Problemă primire date de la mserv"
+
+#: ../src/file.c:1661
+msgid "no local filename available, file on the iPod will be used instead"
+msgstr ""
+"nume de fişier local indisponibil, în schimb utilizez fişierul de pe iPod"
+
+#: ../src/file.c:1667
+msgid "no local filename available and copy on iPod cannot be found"
+msgstr ""
+"nume de fişier local indisponibil şi copia de pe iPod nu poate fi găsită"
+
+#: ../src/file.c:1671 ../src/file.c:1689
+msgid "no local filename available"
+msgstr "nume de fiÅŸier local indisponibil"
+
+#: ../src/file.c:1679
+msgid "local file could not be found, file on the iPod will be used instead"
+msgstr "fişierul local nu a fost găsit, utilizez în schimb fişierul de pe iPod"
+
+#: ../src/file.c:1685
+msgid "local file as well as copy on the iPod cannot be found"
+msgstr "nici fişierul local nici copia de pe iPod nu au putut fi găsite"
+
+#. update not successful -- log this track for later display
+#: ../src/file.c:1788
+msgid "update failed (format not supported?)"
+msgstr "actualizare eşuată (format nesuportat?)"
+
+#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#, c-format
+msgid "Processing '%s'..."
+msgstr "Procesare '%s'..."
+
+#: ../src/file.c:1879
+#, c-format
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "Sar peste '%s' pentru că se potriveşte cu măşti de excludere.\n"
+
+#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
+#, c-format
+msgid ""
+"Podcast already present: '%s'\n"
+"\n"
+msgstr ""
+"Podcast deja prezent: '%s'\n"
+"\n"
+
+#: ../src/file.c:2064
+#, c-format
+msgid ""
+"Writing to video files not yet supported (%s).\n"
+"\n"
+msgstr ""
+"Scrierea în fişiere video nu este încă suportată (%s).\n"
+"\n"
+
+#: ../src/file.c:2116 ../src/file.c:2130
+#, c-format
+msgid "Couldn't change tags of file: %s\n"
+msgstr "Nu am putut modifica etichetele fiÅŸierului: %s\n"
+
+#: ../src/file.c:2232
+#, c-format
+msgid "Could not open '%s' for reading and writing.\n"
+msgstr "Nu am putut deschide '%s' pentru citire ÅŸi scriere.\n"
+
+#: ../src/file.c:2239
+#, c-format
+msgid "Could not obtain lock on '%s'.\n"
+msgstr "Nu am putut obţine blocare pentru '%s'.\n"
+
+#. error!
+#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
+#, c-format
+msgid "Malformed line in '%s': %s\n"
+msgstr "Linie malformată în '%s': %s\n"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:2315
+msgid "Remove offline playcounts?"
+msgstr "Elimin contoarele de redare în mod deconectat?"
+
+#. title
+#: ../src/file.c:2316
+msgid ""
+"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
+"remove them from the offline playcount file, 'Cancel' to keep them."
+msgstr ""
+"Unele piese redate în mod deconectat nu au putut fi găsite în iTunesDB. "
+"Apăsaţi 'OK' penru a le şterge din fişierul contor redări în mod deconectat, "
+"'Revocare' pentru a le păstra."
+
+#: ../src/file.c:2333
+#, c-format
+msgid "Error writing to '%s'.\n"
+msgstr "Eroare la scrierea către '%s'.\n"
+
+#: ../src/file.c:2390 ../src/tools.c:270
+#, c-format
+msgid ""
+"Normalization failed: file type not supported (%s).\n"
+"\n"
+msgstr ""
+"Normalizare eşuată: tip fişier nesuportat (%s).\n"
+"\n"
+
+#: ../src/file.c:2406 ../src/tools.c:287
+#, c-format
+msgid ""
+"Normalization failed: file not available (%s).\n"
+"\n"
+msgstr ""
+"Normalizare eşuată: fişier indisponibil (%s).\n"
+"\n"
+
+#: ../src/file_convert.c:316
+msgid "Summary status of conversion processes"
+msgstr "Rezumat al stării procesului de conversie"
+
+#: ../src/file_convert.c:564
+msgid "active"
+msgstr "activ"
+
+#: ../src/file_convert.c:569
+msgid "inactive"
+msgstr "inactiv"
+
+#: ../src/file_convert.c:580
+#, c-format
+msgid "Active threads: %d. Scheduled tracks: %d."
+msgstr "Fire de execuţie active: %d. Piese programate: %d."
+
+#: ../src/file_convert.c:1071
+#, c-format
+msgid "Original filename not available for '%s.'\n"
+msgstr "Nume de fiÅŸier original indisponibil pentru '%s'.\n"
+
+#: ../src/file_convert.c:1086
+#, c-format
+msgid "Filename '%s' is no longer valid for '%s'.\n"
+msgstr "Numele de fiÅŸier '%s' nu mai este valid pentru '%s'.\n"
+
+#: ../src/file_convert.c:1137
+msgid "Ogg Vorbis"
+msgstr "Ogg Vorbis"
+
+#: ../src/file_convert.c:1143
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../src/file_convert.c:1198
+#, c-format
+msgid ""
+"Files of type '%s' are not supported by the iPod. Please go to the "
+"Preferences to set up and turn on a suitable conversion script for '%s'.\n"
+"\n"
+msgstr ""
+"Fişierele de tipul '%s' nu sunt suportate de către iPod. Vă rugăm mergeţi la "
+"Preferinţe şi stabiliţi şi activaţi un script potrivit de conversie pentru '%"
+"s'.\n"
+"\n"
+
+#: ../src/file_convert.c:1284
+msgid "No information available"
+msgstr "Nici o informaţie nu este disponibilă"
+
+#: ../src/file_convert.c:1323
+#, c-format
+msgid "Could not create '%s'. Filetype conversion will not work.\n"
+msgstr "Nu am putut crea '%s'. Conversia tipului de fişier nu va funcţiona.\n"
+
+#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#, c-format
+msgid ""
+"Transfer of '%s' failed. %s\n"
+"\n"
+msgstr ""
+"Transferul '%s' a eÅŸuat. %s\n"
+"\n"
+
+#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '%s'.\n"
+"\n"
+msgstr ""
+"Conversia '%s' a eÅŸuat: '%s'.\n"
+"\n"
+
+#: ../src/file_convert.c:2062
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
+"\n"
+msgstr ""
+"Conversia '%s' a eÅŸuat: '%s %s' e returnat statusul de ieÅŸire %d.\n"
+"\n"
+
+#: ../src/file_convert.c:2091
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
+"expected.\n"
+"\n"
+msgstr ""
+"Conversia '%s' eşuată: '\"%s\" %s' nu a returnat extensia de fişier "
+"aşteptată.\n"
+"\n"
+
+#: ../src/file_convert.c:2167
+#, c-format
+msgid ""
+"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
+"\n"
+msgstr ""
+"Conversia '%s' eşuată: nu am putut accesa fişierul original '%s' (%s).\n"
+"\n"
+
+#: ../src/file_convert.c:2222
+#, c-format
+msgid ""
+"Conversion of '%s' failed: Could not create directory '%s'.\n"
+"\n"
+msgstr ""
+"Conversia '%s' eşuată: nu am putut crea dosarul '%s'.\n"
+"\n"
+
+#: ../src/file_convert.c:2356
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '%s' returned exit status %d.\n"
+"\n"
+msgstr ""
+"Conversia '%s' eşuată: '%s' a returnat statusul de ieşire %d.\n"
+"\n"
+
+#: ../src/file_convert.c:2395
+#, c-format
+msgid ""
+"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
+"\n"
+msgstr ""
+"Conversia '%s' eşuată: nu am putut obţine informaţii (stat) despre fişierul "
+"convertit '%s'.\n"
+"\n"
+
+#: ../src/file_export.c:182
+#, c-format
+msgid "Skipping existing file with same length: '%s'\n"
+msgstr "Sar peste fiÅŸier deja existent cu aceeaÅŸi lungime: '%s'\n"
+
+#: ../src/file_export.c:190
+#, c-format
+msgid "Overwriting existing file: '%s'\n"
+msgstr "Suprascriu fiÅŸierul existent: '%s'\n"
+
+#: ../src/file_export.c:207
+#, c-format
+msgid "Error copying '%s' to '%s': Permission Error (%s)\n"
+msgstr "Eroare la copierea '%s' către '%s': eroare de permisiune (%s)\n"
+
+#: ../src/file_export.c:209
+#, c-format
+msgid "Error copying '%s' to '%s' (%s)\n"
+msgstr "Eroare la copierea '%s' către '%s' (%s)\n"
+
+#: ../src/file_export.c:327
+#, c-format
+msgid "Could find file for '%s' on the iPod\n"
+msgstr "Nu am putut găsi fişierul pentru '%s' pe iPod\n"
+
+#. create the dialog window
+#: ../src/file_export.c:395 ../src/tools.c:360
+msgid "Information"
+msgstr "Informaţie"
+
+#: ../src/file_export.c:406 ../src/tools.c:372
+msgid "Press button to abort."
+msgstr "Apăsaţi butonul pentru a abandona."
+
+#: ../src/file_export.c:419
+msgid "copying..."
+msgstr "copiez..."
+
+#: ../src/file_export.c:476
+#, c-format
+msgid "Failed to write '%s-%s'\n"
+msgstr "Scriere eşuată '%s-%s'\n"
+
+#: ../src/file_export.c:489
+#, c-format
+msgid "Copied %d of %d track."
+msgid_plural "Copied %d of %d tracks."
+msgstr[0] "Am copiat %d piesă din %d."
+msgstr[1] "Am copiat %d piese din %d."
+
+#: ../src/file_export.c:505 ../src/tools.c:518
+#, c-format
+msgid "%d%% (%d:%02d:%02d left)"
+msgstr "%d%% (%d:%02d:%02d rămas)"
+
+#: ../src/file_export.c:514
+msgid "Some tracks were not copied."
+msgstr "Unele piese nu au fost copiate."
+
+#: ../src/file_export.c:579
+msgid "Export from iPod database not possible in offline mode."
+msgstr "Exportarea din baza de date iPod nu este posibilă în mod deconectat."
+
+#: ../src/file_export.c:587
+msgid "Select Export Destination Directory"
+msgstr "Selectaţi dosarul destinaţie pentru exportare"
+
+#: ../src/file_export.c:736
+msgid "Drag from iPod database not possible in offline mode."
+msgstr "Tragerea din baza de date a iPod nu este posibilă în mod deconectat."
+
+#: ../src/file_export.c:770
+msgid "The following tracks have to be copied to your harddisk"
+msgstr "Următoarele piese trebuie copiate pe discul dvs dur."
+
+#: ../src/file_export.c:815
+msgid ""
+"Some tracks were not copied to your harddisk. Only the copied tracks will be "
+"included in the current drag and drop operation.\n"
+"\n"
+msgstr ""
+"Unele piese nu au fost copiate pe discul dvs dur. Numai piesel copiate vor "
+"fi incluse în operaţia curentă trage şi aruncă.\n"
+"\n"
+
+#: ../src/file_export.c:1010
+#, c-format
+msgid ""
+"No valid filename for: %s\n"
+"\n"
+msgstr ""
+"Nume de fiÅŸier invalid: %s\n"
+"\n"
+
+#: ../src/file_export.c:1026
+#, c-format
+msgid "Created playlist with one track."
+msgid_plural "Created playlist with %d tracks."
+msgstr[0] "Am creat o listă de redare cu o piesă."
+msgstr[1] "Am creat o listă de redare cu %d piese."
+
+#: ../src/file_export.c:1031
+#, c-format
+msgid ""
+"Could not open '%s' for writing (%s).\n"
+"\n"
+msgstr ""
+"Nu am putut deschide '%s' pentru scriere (%s).\n"
+"\n"
+
+#: ../src/file_itunesdb.c:129
+#, c-format
+msgid "Matching SHA1 checksum for file %d/%d"
+msgstr "Potrivesc suma de control SHA1 pentru fiÅŸierul %d/%d"
+
+#: ../src/file_itunesdb.c:236
+#, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "Nu am putut deschide \"%s\" pentru citirea informaţiilor extinse.\n"
+
+#: ../src/file_itunesdb.c:243
+msgid "Could not create hash value from itunesdb\n"
+msgstr "Nu am putut crea valori hash din itunesdb\n"
+
+#: ../src/file_itunesdb.c:259
+#, c-format
+msgid "Error while reading extended info: %s\n"
+msgstr "Eroare la citirea informaţiilor extinse: %s\n"
+
+#: ../src/file_itunesdb.c:276
+#, c-format
+msgid ""
+"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
+"gtkpod will try to match the information using SHA1 checksums. This may take "
+"a long time.\n"
+"\n"
+msgstr ""
+"iTunesDB '%s' nu se potriveşte cu suma de control din fişierul de informaţii "
+"extinse '%s'\n"
+"gtkpod va încerca să potrivească sumele de siguranţă SHA1. Acest lucru s-ar "
+"putea să dureze destul de mult.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:288
+#, c-format
+msgid ""
+"%s:\n"
+"Expected \"itunesdb_hash=\" but got:\"%s\"\n"
+msgstr ""
+"%s:\n"
+"Aşteptat \"itunesdb_hash=\" dar găsit:\"%s\"\n"
+
+#: ../src/file_itunesdb.c:348
+#, c-format
+msgid ""
+"%s:\n"
+"Format error: %s\n"
+msgstr ""
+"%s:\n"
+"Eroare format: %s\n"
+
+#: ../src/file_itunesdb.c:393
+msgid ""
+"No SHA1 checksums on individual tracks are available.\n"
+"\n"
+"To avoid this situation in the future either switch on duplicate detection "
+"(will provide SHA1 checksums) or avoid using the iPod with programs other "
+"than gtkpod.\n"
+"\n"
+msgstr ""
+"Suma de control SHA1 a unor piese nu este disponibilă.\n"
+"\n"
+"Pentru a evita această situaţie pe viitor fie activați detecţia dublurilor "
+"(va oferi sumele de siguranţă SHA1) sau evitaţi să folosiţi iPod-ul cu alte "
+"programe decât gtkpod.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:457
+msgid ""
+"Extended info will not be used. If you have non-transferred tracks,\n"
+"these will be lost.\n"
+msgstr ""
+"Informaţiile extinse nu vor fi utilizate. Dacă aveţi piese netransferate, \n"
+" acestea vor fi pierdute.\n"
+
+#: ../src/file_itunesdb.c:465
+msgid "Offline iPod database successfully imported"
+msgstr "Baza de date iPod deconectată a fost importată cu succes"
+
+#: ../src/file_itunesdb.c:468
+msgid "Local database successfully imported"
+msgstr "Baza de date locală a fost importată cu succes"
+
+#: ../src/file_itunesdb.c:476
+#, c-format
+msgid ""
+"Offline iPod database import failed: '%s'\n"
+"\n"
+msgstr ""
+"Importarea bazei de date iPod deconectată eşuată: '%s'\n"
+"\n"
+
+#: ../src/file_itunesdb.c:480
+#, c-format
+msgid ""
+"Local database import failed: '%s'\n"
+"\n"
+msgstr ""
+"Importarea bazei de date locală eşuată: '%s'\n"
+"\n"
+
+#: ../src/file_itunesdb.c:487
+msgid ""
+"Offline iPod database import failed: \n"
+"\n"
+msgstr ""
+"Importarea bazei de date iPod în mod deconectat eşuată: \n"
+"\n"
+
+#: ../src/file_itunesdb.c:490
+msgid ""
+"Local database import failed: \n"
+"\n"
+msgstr ""
+"Importarea bazei de date locală eşuată: \n"
+"\n"
+
+#: ../src/file_itunesdb.c:497
+#, c-format
+msgid ""
+"'%s' does not exist. Import aborted.\n"
+"\n"
+msgstr ""
+"'%s' nu există. Importare abandondată.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:520
+msgid "Extended info will not be used.\n"
+msgstr "Informaţiile extinse nu vor fi folosite.\n"
+
+#: ../src/file_itunesdb.c:527
+msgid "iPod Database Successfully Imported"
+msgstr "Baza de date iPod importată cu succes"
+
+#: ../src/file_itunesdb.c:534
+#, c-format
+msgid ""
+"iPod Database Import Failed: '%s'\n"
+"\n"
+msgstr ""
+"Importul bazei de date iPod eÅŸuat: '%s'\n"
+"\n"
+
+#: ../src/file_itunesdb.c:540
+msgid ""
+"iPod Database Import Failed.\n"
+"\n"
+msgstr ""
+"Importul bazei de date iPod eÅŸuat.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:549
+#, c-format
+msgid ""
+"'%s' (or similar) does not exist. Import aborted.\n"
+"\n"
+msgstr ""
+"'%s' (sau similar) nu există. Importare abandonată.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:865
+#, c-format
+msgid ""
+"Could not find iPod directory structure at '%s'.\n"
+"If you are sure that the iPod is properly mounted at '%s', gtkpod can create "
+"the directory structure for you.\n"
+"\n"
+"Do you want to create the directory structure now?\n"
+msgstr ""
+"Nu am putut găsi structura de directoare a iPod la '%s'.\n"
+"Dacă sunteţi sigur că iPod-ul este montat corect la '%s', gtkpod poate crea "
+"structura de directoare pentru dvs.\n"
+"\n"
+"Doriţi să creaţi structura de directoare acum?\n"
+
+#: ../src/file_itunesdb.c:1180
+#, c-format
+msgid "Could not open \"%s\" for writing extended info.\n"
+msgstr "Nu am putut deschide \"%s\" pentru scrierea informaţiilor extinse.\n"
+
+#: ../src/file_itunesdb.c:1195
+msgid "Aborted writing of extended info.\n"
+msgstr "Scrierea informaţiilor extinse abandonată.\n"
+
+#: ../src/file_itunesdb.c:1397
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../src/file_itunesdb.c:1411
+#, c-format
+msgid "%d%% (%d/%d %d:%02d:%02d left)"
+msgstr "%d%% (%d/%d %d:%02d:%02d rămas)"
+
+#: ../src/file_itunesdb.c:1463
+msgid "Status: Deleting File"
+msgstr "Status: ÅŸterg fiÅŸier"
+
+#: ../src/file_itunesdb.c:1524
+#, c-format
+msgid ""
+"Could not remove the following file: '%s'\n"
+"\n"
+msgstr ""
+"Nu am putut şterge următorul fişier: '%s'\n"
+"\n"
+
+#: ../src/file_itunesdb.c:1632
+msgid ""
+"The following track could not be converted successfully:\n"
+"\n"
+msgid_plural ""
+"The following tracks could not be converted successfully:\n"
+"\n"
+msgstr[0] ""
+"Următoarea piesă nu a putut fi convertită cu succes:\n"
+"\n"
+msgstr[1] ""
+"Următoarele piese nu au putut fi convertite cu succes:\n"
+"\n"
+
+#: ../src/file_itunesdb.c:1642
+msgid ""
+"The following track could not be transferred successfully:\n"
+"\n"
+msgid_plural ""
+"The following tracks could not be transferred successfully:\n"
+"\n"
+msgstr[0] ""
+"Următoarea piesă nu a putut fi transferată cu succes:\n"
+"\n"
+msgstr[1] ""
+"Următoarele piese nu au putut fi transferate cu succes:\n"
+"\n"
+
+#. ID
+#. modal,
+#. gint id,
+#. gboolean modal,
+#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+msgid "Warning"
+msgstr "Avertizare"
+
+#. title
+#: ../src/file_itunesdb.c:1652
+msgid ""
+"The iPod could not be ejected. Please fix the problems mentioned below and "
+"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
+"for conversion and transfer."
+msgstr ""
+"iPod-ul nu a putut fi deconectat. Vă rugăm reparaţi problemele menţionate "
+"mai jos şi apoi deconectaţi iPod din nou. Apăsând 'Ok' va re-programa "
+"piesele eÅŸuate pentru conversie ÅŸi transfer."
+
+#: ../src/file_itunesdb.c:1715
+#, c-format
+msgid "Status: Copying track"
+msgstr "Status: copiez piesă"
+
+#: ../src/file_itunesdb.c:1721
+#, c-format
+msgid "Status: Waiting for conversion to complete"
+msgstr "Status: aÅŸtept finalizarea conversiei"
+
+#: ../src/file_itunesdb.c:1725
+#, c-format
+msgid "Status: Finished transfer"
+msgstr "Status: transfer terminat"
+
+#: ../src/file_itunesdb.c:1770
+#, c-format
+msgid ""
+"One track could not be transferred because your iPod is full. Either delete "
+"some tracks or otherwise create space on the iPod before ejecting the iPod "
+"again."
+msgid_plural ""
+"%d tracks could not be transferred because your iPod is full. Either delete "
+"some tracks or otherwise create space on the iPod before ejecting the iPod "
+"again."
+msgstr[0] ""
+"O piesă nu a putut fi transferată deoarece iPod-ul este plin. Fie ştergeţi "
+"nişte piese sau creaţi spaţiu într-un alt mod pe iPod înainte de a deconecta "
+"iPod-ul din nou."
+msgstr[1] ""
+"%d piese nu au putut fi transferate deoarece iPod-ul este plin. Fie ştergeţi "
+"nişte piese sau creaţi spaţiu într-un alt mod pe iPod înainte de a deconecta "
+"iPod-ul din nou."
+
+#: ../src/file_itunesdb.c:1852
+#, c-format
+msgid ""
+"You did not import the existing iTunesDB ('%s'). This is most likely "
+"incorrect and will result in the loss of the existing database.\n"
+"\n"
+"Press 'OK' if you want to proceed anyhow or 'Cancel' to skip storing. If you "
+"cancel, you can import the existing database before calling this function "
+"again.\n"
+msgstr ""
+"Nu aţi importat iTunesDB existentă ('%s'). Acest lucru este cel mai probabil "
+"incorect, iar rezultatul va fi pierderea bazei de date existentă.\n"
+"\n"
+"Apăsaţi 'Ok' dacă doriţi să continuaţi oricum sau 'Revocare' ca să săriţi "
+"peste memorare. Dacă revocaţi, puteţi importa baza de date existentă înainte "
+"de a apela această funcţie din nou.\n"
+
+#: ../src/file_itunesdb.c:1887
+msgid ""
+"iPod directory structure must be present before synching to the iPod can be "
+"performed.\n"
+msgstr ""
+"Structura de dosare a iPod trebuie să fie prezentă înainte de a putea "
+"efectua sincronizarea iPod.\n"
+
+#: ../src/file_itunesdb.c:1896
+msgid "Some tracks could not be deleted from the iPod. Export aborted!"
+msgstr "Unele piese nu au putut fi şterse de pe iPod. Exportare abandonată!"
+
+#: ../src/file_itunesdb.c:1914
+#, c-format
+msgid "Now writing database '%s'. Please wait..."
+msgstr "Scriu în baza de date '%s'. Vă rugăm aşteptaţi..."
+
+#: ../src/file_itunesdb.c:1963
+#, c-format
+msgid "Extended information file not deleted: '%s'"
+msgstr "Fişierul de informaţii extinse nu a fost şters: '%s'"
+
+#: ../src/file_itunesdb.c:2070
+#, c-format
+msgid "%s: Database saved"
+msgstr "%s: bază de date salvată"
+
+#: ../src/file_itunesdb.c:2074
+#, c-format
+msgid "%s: Changes saved"
+msgstr "%s: schimbări salvate"
+
+#: ../src/fileselection.c:129
+msgid "Successfully added files"
+msgstr "Fişiere adăugate cu succes"
+
+#: ../src/fileselection.c:131
+msgid "Some files were not added successfully"
+msgstr "Unele fişiere nu au fost adăugate cu succes"
+
+#: ../src/fileselection.c:164 ../src/fileselection.c:305
+#: ../src/fileselection.c:792
+msgid "Please select a playlist or repository before adding tracks."
+msgstr ""
+"Vă rugăm selectaţi o listă de redare sau un depozit înainte de a adăuga "
+"piese."
+
+#: ../src/fileselection.c:175 ../src/fileselection.c:314
+#: ../src/fileselection.c:803
+msgid "Please load the iPod before adding tracks."
+msgstr "Vă rugăm încărcaţi iPod-ul înainte de a adăuga piese."
+
+#: ../src/fileselection.c:185
+#, c-format
+msgid "Add files to '%s'"
+msgstr "Adaugă fişiere la '%s'"
+
+#: ../src/fileselection.c:189
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr "Adaugă fişiere la '%s/%s'"
+
+#. Create window title
+#: ../src/fileselection.c:322
+#, c-format
+msgid "Add playlist files to '%s'"
+msgstr "Adaugă fişiere listă de redare la '%s'"
+
+#. Create the file chooser, and handle the response
+#: ../src/fileselection.c:378
+msgid "Set Cover"
+msgstr "StabileÅŸte coperta"
+
+#: ../src/fileselection.c:816
+#, c-format
+msgid "Add directories to '%s'"
+msgstr "Adaugă dosare la '%s'"
+
+#: ../src/fileselection.c:820
+#, c-format
+msgid "Add directories to '%s/%s'"
+msgstr "Adaugă dosare la '%s/%s'"
+
+#: ../src/fileselection.c:1097
+msgid "Ok"
+msgstr "Ok"
+
+#: ../src/fileselection.c:1106
+msgid "Cancel"
+msgstr "Revocare"
+
+#: ../src/flacfile.c:62
+#, c-format
+msgid "'%s' does not appear to be an FLAC audio file.\n"
+msgstr "'%s' nu pare să fie un fişier audio FLAC.\n"
+
+#: ../src/flacfile.c:78
+#, c-format
+msgid "Error retrieving tags for '%s'.\n"
+msgstr "Eroare la primirea etichetelor pentru '%s'.\n"
+
+#: ../src/flacfile.c:165
+#, c-format
+msgid ""
+"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
+"compile the gtkpod source together with the FLAC library.\n"
+msgstr ""
+"Importarea '%s' eşuată: FLAC nu este suportat fără biblioteca FLAC. Trebuie "
+"să compilaţi sursa gtkpod împreună cu biblioteca FLAC.\n"
+
+#: ../src/flacfile.c:171
+#, c-format
+msgid ""
+"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
+"library. You must compile the gtkpod source together with the FLAC library.\n"
+msgstr ""
+"Actualizarea metadata FLAC pentru '%s' eşuată: FLAC nu este suportat fără "
+"biblioteca FLAC. Trebuie să compilaţi sursa gtkpod împreună cu biblioteca "
+"FLAC.\n"
+
+#: ../src/getopt.c:681
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opţiunea `%s' este ambiguă\n"
+
+#: ../src/getopt.c:706
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opţiunea `--%s' nu permite niciun argument\n"
+
+#: ../src/getopt.c:711
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opţiunea `%c%s' nu permite niciun argument\n"
+
+#: ../src/getopt.c:729 ../src/getopt.c:902
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opţiunea `%s' necesită un argument\n"
+
+#. --option
+#: ../src/getopt.c:758
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opţiune nerecunoscută `--%s'\n"
+
+#. +option or -option
+#: ../src/getopt.c:762
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opţiune nerecunoscută `%c%s'\n"
+
+#. 1003.2 specifies the format of this message.
+#: ../src/getopt.c:788
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opţiune ilegală -- %c\n"
+
+#: ../src/getopt.c:791
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opţiune invalidă -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: ../src/getopt.c:821 ../src/getopt.c:951
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opţiunea necesită un argument --%c\n"
+
+#: ../src/getopt.c:868
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opţiunea `-W %s' este ambiguă\n"
+
+#: ../src/getopt.c:886
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opţiunea `-W %s' nu permite argumente\n"
+
+#: ../src/info.c:383
+msgid "n/c"
+msgstr "n/c"
+
+#: ../src/info.c:388 ../src/info.c:838
+msgid "offline"
+msgstr "deconectat"
+
+#: ../src/info.c:486
+#, c-format
+msgid " P:%d T:%d/%d"
+msgstr " L:%d P:%d/%d"
+
+#: ../src/info.c:780
+msgid "B"
+msgstr "O"
+
+#: ../src/info.c:780
+msgid "kB"
+msgstr "kO"
+
+#: ../src/info.c:780
+msgid "TB"
+msgstr "TB"
+
+#: ../src/info.c:823
+#, c-format
+msgid " %s Free"
+msgstr "%s liber"
+
+#: ../src/info.c:828
+#, c-format
+msgid " %s Pending"
+msgstr "%s în aşteptare"
+
+#: ../src/info.c:833
+msgid " disconnected"
+msgstr "deconectat"
+
+#: ../src/info.c:884
+msgid "No database or playlist selected"
+msgstr "Nici o bază de date sau listă de redare selectată"
+
+#: ../src/info.c:889
+msgid "No tracks selected"
+msgstr "Nici o piesă selectată"
+
+#: ../src/info.c:894
+msgid "No playlist selected"
+msgstr "Nici o listă de redare selectată"
+
+#: ../src/info.c:899
+msgid "No iPod or iPod playlist selected"
+msgstr "Nici un iPod sau listă de redare de pe iPod selectat(ă)"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "Selectaţi sau introduceţi modelul dvs"
+
+#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
+msgid "Select mountpoint"
+msgstr "Selectează punct de montare"
+
+#: ../src/ipod_init.c:359
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "Eroare la iniţializarea iPod: %s\n"
+
+#: ../src/ipod_init.c:366
+msgid "Error initialising iPod, unknown error\n"
+msgstr "Eroare la iniţializarea iPod, eroare necunoscută\n"
+
+#: ../src/ipod_init.c:422
+#, c-format
+msgid "<b>Please select your iPod model at </b><i>%s</i>"
+msgstr "<b>Vă rugăm selectaţi modelul dvs de iPod conectat la </b><i>%s</i>"
+
+#: ../src/ipod_init.c:463
+msgid ""
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
+msgstr ""
+"Nu am putut determina modelul pe care l-aţi selecta -- acest lucru poate fi "
+"un bug sau o incompatibilitate în bibliotecile GTK+ sau glade.\n"
+"\n"
+
+#: ../src/misc.c:70
+msgid ""
+"© 2002 - 2007\n"
+"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+"Corey Donohoe (atmos at atmos dot org)\n"
+msgstr ""
+"© 2002 - 2007\n"
+"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+"Corey Donohoe (atmos at atmos dot org)\n"
+
+#: ../src/misc.c:74
+msgid ""
+"Patches were supplied by the following people (list may be incomplete -- "
+"please contact me)\n"
+msgstr ""
+"Petice şi îmbunăţiri au fost oferite de către următoarele persoane (lista "
+"poate fi incompletă, vă rog contactaţi-mă)\n"
+
+#: ../src/misc.c:75
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
+msgstr "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
+
+#: ../src/misc.c:76
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
+msgstr "Hiroshi Kawashima: Japanese charset autodetecion feature"
+
+#: ../src/misc.c:77
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
+msgstr "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
+
+#: ../src/misc.c:78
+msgid ""
+"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
+"newlines at the end"
+msgstr ""
+"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
+"newlines at the end"
+
+#: ../src/misc.c:79
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
+msgstr "Sam Clegg: user defined filenames when exporting tracks from the iPod"
+
+#: ../src/misc.c:80
+msgid "Chris Cutler: automatic creation of various playlist types"
+msgstr "Chris Cutler: automatic creation of various playlist types"
+
+#: ../src/misc.c:81
+msgid ""
+"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
+"dialogue during sync"
+msgstr ""
+"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
+"dialogue during sync"
+
+#: ../src/misc.c:82
+msgid ""
+"Edward Matteucci: debugging, special playlist creation, most of the volume "
+"normalizing code"
+msgstr ""
+"Edward Matteucci: debugging, special playlist creation, most of the volume "
+"normalizing code"
+
+#: ../src/misc.c:83
+msgid "Jens Lautenbach: some optical improvements"
+msgstr "Jens Lautenbach: some optical improvements"
+
+#: ../src/misc.c:84
+msgid "Alex Tribble: iPod eject patch"
+msgstr "Alex Tribble: iPod eject patch"
+
+#: ../src/misc.c:85
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+msgstr "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+
+#: ../src/misc.c:86
+msgid ""
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
+msgstr ""
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
+
+#: ../src/misc.c:87
+msgid ""
+"Ero Carrera: Filename validation and quick sync when copying tracks from the "
+"iPod"
+msgstr ""
+"Ero Carrera: Filename validation and quick sync when copying tracks from the "
+"iPod"
+
+#: ../src/misc.c:88
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
+msgstr "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
+
+#: ../src/misc.c:89
+msgid "Armando Atienza: Support with external playcounts"
+msgstr "Armando Atienza: Support with external playcounts"
+
+#: ../src/misc.c:90
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+msgstr "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+
+#: ../src/misc.c:91
+msgid "Jim Hall: Decent INSTALL file"
+msgstr "Jim Hall: Decent INSTALL file"
+
+#: ../src/misc.c:92
+msgid ""
+"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
+"contacts to the iPod"
+msgstr ""
+"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
+"contacts to the iPod"
+
+#. J"urgen!
+#: ../src/misc.c:93
+msgid "Flavio Stanchina: bugfixes"
+msgstr "Flavio Stanchina: bugfixes"
+
+#: ../src/misc.c:94
+msgid ""
+"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
+"the title"
+msgstr ""
+"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
+"the title"
+
+#: ../src/misc.c:95
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
+msgstr "Steve Jay: use statvfs() instead of df (better portability, faster)"
+
+#: ../src/misc.c:97
+msgid ""
+"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
+"tags"
+msgstr ""
+"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
+"tags"
+
+#: ../src/misc.c:99
+msgid ""
+"James Liggett:\n"
+"replacement of old GTK file selection dialogs with new GTK filechooser "
+"dialogs\n"
+"refactored user preferences system."
+msgstr ""
+"James Liggett:\n"
+"replacement of old GTK file selection dialogs with new GTK filechooser "
+"dialogs\n"
+"refactored user preferences system."
+
+#: ../src/misc.c:103
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
+msgstr "Daniel Kercher: sync scripts for abook and webcalendar"
+
+#: ../src/misc.c:105
+msgid "Clinton Gormley: sync scripts for thunderbird"
+msgstr "Clinton Gormley: sync scripts for thunderbird"
+
+#: ../src/misc.c:107
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
+msgstr "Sebastien Beridot: sync script for ldif addressbook format"
+
+#: ../src/misc.c:109
+msgid "Sebastian Scherer: sync script for kNotes"
+msgstr "Sebastian Scherer: sync script for kNotes"
+
+#: ../src/misc.c:111
+msgid "Nick Piper: sync script for Palm, type-ahead search"
+msgstr "Nick Piper: sync script for Palm, type-ahead search"
+
+#: ../src/misc.c:113
+msgid "Uwe Hermann: help with support for iPod Video"
+msgstr "Uwe Hermann: help with support for iPod Video"
+
+#: ../src/misc.c:115
+msgid ""
+"Iain Benson: support for compilation tag in mp3 files and separate display "
+"of compilations in the sort tab."
+msgstr ""
+"Iain Benson: support for compilation tag in mp3 files and separate display "
+"of compilations in the sort tab."
+
+#: ../src/misc.c:116
+msgid ""
+"Nicolas Chariot: icons of buttons\n"
+"\n"
+msgstr ""
+"Nicolas Chariot: iconurile butoanelor\n"
+"\n"
+
+#: ../src/misc.c:118
+msgid "This program borrows code from the following projects:"
+msgstr "Programul împrumută cod de la următoarele proiecte:"
+
+#: ../src/misc.c:119
+msgid ""
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
+msgstr ""
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
+
+#: ../src/misc.c:120
+msgid ""
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
+msgstr ""
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
+
+#: ../src/misc.c:121
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
+msgstr "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
+
+#: ../src/misc.c:122
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
+msgstr "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
+
+#: ../src/misc.c:124
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
+msgstr ""
+"Interfaţa utilizator grafică (GUI) a fost creată cu ajutorul glade-2 (http://"
+"glade.gnome.org/)."
+
+#: ../src/misc.c:128
+msgid "French: David Le Brun (david at dyn-ns dot net)"
+msgstr "Franceză: David Le Brun (david at dyn-ns dot net)"
+
+#: ../src/misc.c:129
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr "Franceză: Éric Lassauge (rpmfarm at free dot fr)"
+
+#: ../src/misc.c:130
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+msgstr "Germană: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+
+#: ../src/misc.c:131
+msgid "German: Kai-Ove"
+msgstr "Germană: Kai-Ove"
+
+#: ../src/misc.c:132
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+msgstr "Ebraică: Assaf Gillat (gillata at gmail dot com)"
+
+#: ../src/misc.c:133
+msgid ""
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
+msgstr ""
+"Italiană: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
+"net)"
+
+#: ../src/misc.c:134
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr "Italiană: Daniele Forsi (dforsi at gmail dot com)"
+
+#: ../src/misc.c:135
+msgid "Japanese: Ayako Sano"
+msgstr "Japoneză: Ayako Sano"
+
+#: ../src/misc.c:136
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+msgstr "Japoneză: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+
+#: ../src/misc.c:137
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr "Română: Alex Eftimie (alexeftimie at gmail dot com)"
+
+#: ../src/misc.c:138
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr ""
+"Spaniolă: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+
+#: ../src/misc.c:139
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
+msgstr "Suedeză: Stefan Asserhall (stefan asserhall at comhem dot se)"
+
+#: ../src/misc.c:144
+msgid ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+msgstr ""
+"Acest program este liber; îl puteţi redistribui şi/sau modifica în "
+"conformitate cu termenii Licenţei Publice Generale GNU aşa cum este "
+"publicată de Free Software Foundation; fie versiunea 2 a Licenţei, fie (la "
+"latitudinea dumneavoastră) orice versiune ulterioară.\n"
+"\n"
+"Acest program este distribuit cu speranţa că va fi util, dar FĂRĂ NICI O "
+"GARANŢIE, fără garanţie implicită de vandabilitate şi conformitate unui "
+"anumit scop. Citiţi Licenţa Publică Generală GNU pentru detalii.\n"
+"\n"
+"Ar trebui să fi primit o copie a Licenței Publice Generale GNU\n"
+"alături de acest program; dacă nu, puteți scrie către Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+
+#: ../src/misc.c:159
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+msgstr ""
+"© 2002 - 2007\n"
+"Jorg Schuler <jcsjcs at users dot sourceforge dot net>\n"
+"Corey Donohoe <atmos at atmos dot org>"
+
+#: ../src/misc.c:167
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr "Interfaţă multiplatformă multilingvă pentru iPod-ul Apple™"
+
+#: ../src/misc.c:934
+#, c-format
+msgid "Could not process '%s' (no filename available)"
+msgstr "Nu am putut procesa '%s' (numele de fiÅŸier indisponibil)"
+
+#: ../src/misc.c:1088
+#, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "Bucată '%%%c' necunoscută în şablonul '%s'"
+
+#: ../src/misc.c:1171
+#, c-format
+msgid "Template ('%s') does not match file type '%s'\n"
+msgstr "Åžablonul ('%s') nu se potriveÅŸte cu tipul de fiÅŸier '%s'\n"
+
+#: ../src/misc.c:1257
+#, c-format
+msgid "Error creating %s: %s\n"
+msgstr "Eroare la crearea %s: %s\n"
+
+#: ../src/misc.c:1691
+#, c-format
+msgid ""
+"Writing preferences file '%s' failed (%s).\n"
+"\n"
+msgstr ""
+"Scrierea fişierului de preferinţe '%s' eşuată (%s).\n"
+"\n"
+
+#: ../src/misc.c:1693
+msgid "unspecified error"
+msgstr "eroare nespecificată"
+
+#: ../src/misc.c:1701
+#, c-format
+msgid ""
+"Writing preferences to the iPod (%s) failed: could not get path to Control "
+"Directory.\n"
+"\n"
+msgstr ""
+"Scrierea preferinţelor pe iPod (%s) eşuată: nu am putut obţine calea către "
+"Control Directory.\n"
+"\n"
+
+#. title
+#: ../src/misc_confirm.c:71
+msgid "The following has occurred:"
+msgstr "S-au petrecut următoarele:"
+
+#: ../src/misc_confirm.c:122
+msgid ""
+"Are you sure you want to delete the following track completely from your "
+"iPod? The number of playlists this track is a member of is indicated in "
+"parentheses."
+msgid_plural ""
+"Are you sure you want to delete the following tracks completely from your "
+"iPod? The number of playlists the tracks are member of is indicated in "
+"parentheses."
+msgstr[0] ""
+"Sunteţi sigur că doriţi să ştergeţi complet următoarea piesă de pe iPod? "
+"Numărul listelor de redare în care această piesă este prezentă, este indicat "
+"în paranteză."
+msgstr[1] ""
+"Sunteţi sigur că doriţi să ştergeţi complet următoarele piese de pe iPod? "
+"Numărul listelor de redare în care aceste piese sunt prezente, este indicat "
+"în paranteză."
+
+#: ../src/misc_confirm.c:126
+msgid "Delete Track Completely from iPod?"
+msgid_plural "Delete Tracks Completely from iPod?"
+msgstr[0] "Åžterg complet piesa de pe iPod?"
+msgstr[1] "Åžterg complet piesele de pe iPod?"
+
+#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#, c-format
+msgid ""
+"Are you sure you want to remove the following track from the playlist \"%s\"?"
+msgid_plural ""
+"Are you sure you want to remove the following tracks from the playlist \"%s"
+"\"?"
+msgstr[0] ""
+"Sunteţi sigur că doriţi să ştergeţi următoarea piesă din lista de redare \"%s"
+"\"?"
+msgstr[1] ""
+"Sunteţi sigur că doriţi să ştergeţi următoarele piese din lista de redare \"%"
+"s\"?"
+
+#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+msgid "Remove Track From Playlist?"
+msgid_plural "Remove Tracks From Playlist?"
+msgstr[0] "Åžterg piesa din lista de redare?"
+msgstr[1] "Åžterg piesele din lista de redare?"
+
+#: ../src/misc_confirm.c:163
+msgid ""
+"Are you sure you want to delete the following track completely from your "
+"harddisk? The number of playlists this track is a member of is indicated in "
+"parentheses."
+msgid_plural ""
+"Are you sure you want to delete the following tracks completely from your "
+"harddisk? The number of playlists the tracks are member of is indicated in "
+"parentheses."
+msgstr[0] ""
+"Sunteţi sigur că doriţi să ştergeţi complet următoarea piesă de pe discul "
+"dur? Numărul listelor de redare în care această piesă este prezentă, este "
+"indicat în paranteză."
+msgstr[1] ""
+"Sunteţi sigur că doriţi să ştergeţi complet următoarele piese de pe discul "
+"dur? Numărul listelor de redare în care aceste piese sunt prezente, este "
+"indicat în paranteză."
+
+#: ../src/misc_confirm.c:167
+msgid "Delete Track from Harddisk?"
+msgid_plural "Delete Tracks from Harddisk?"
+msgstr[0] "Åžterg complet piesa de pe discul dur?"
+msgstr[1] "Åžterg complet piesele de pe discul dur?"
+
+#: ../src/misc_confirm.c:192
+msgid ""
+"Are you sure you want to remove the following track completely from your "
+"local database? The number of playlists this track is a member of is "
+"indicated in parentheses."
+msgid_plural ""
+"Are you sure you want to remove the following tracks completely from your "
+"local database? The number of playlists the tracks are member of is "
+"indicated in parentheses."
+msgstr[0] ""
+"Sunteţi sigur că doriţi să ştergeţi complet următoarea piesă din baza de "
+"date locală? Numărul listelor de redare în care această piesă este prezentă, "
+"este indicat în paranteză."
+msgstr[1] ""
+"Sunteţi sigur că doriţi să ştergeţi complet următoarele piese din baza de "
+"date locală? Numărul listelor de redare în care aceste piese sunt prezente, "
+"este indicat în paranteză."
+
+#: ../src/misc_confirm.c:196
+msgid "Remove Track from Local Database?"
+msgid_plural "Remove Tracks from Local Database?"
+msgstr[0] "Şterg piesa din baza de date locală?"
+msgstr[1] "Şterg piesele din baza de date locală?"
+
+#: ../src/misc_confirm.c:261
+#, c-format
+msgid "Deleted one track completely from iPod"
+msgid_plural "Deleted %d tracks completely from iPod"
+msgstr[0] "\t\t\t\t"
+msgstr[1] "Am ÅŸters complet %d piese de pe iPod"
+
+#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#, c-format
+msgid "Deleted %d track from playlist '%s'"
+msgid_plural "Deleted %d tracks from playlist '%s'"
+msgstr[0] "Am şters complet %d piesă din lista de redare '%s'"
+msgstr[1] "Am ÅŸters complet %d piese din lista de redare '%s'"
+
+#: ../src/misc_confirm.c:285
+#, c-format
+msgid "Deleted one track from harddisk"
+msgid_plural "Deleted %d tracks from harddisk"
+msgstr[0] "Am şters o piesă de pe discul dur"
+msgstr[1] "Am ÅŸters %d piese de pe discul dur"
+
+#: ../src/misc_confirm.c:297
+#, c-format
+msgid "Deleted track from local database"
+msgid_plural "Deleted %d tracks from local database"
+msgstr[0] "Am şters o piesă din baza de date locală"
+msgstr[1] "Am şters %d piese din baza de date locală"
+
+#: ../src/misc_confirm.c:442
+msgid "Cannot remove entry 'All'"
+msgstr "Nu pot şterge înregistrarea 'Toate'"
+
+#: ../src/misc_confirm.c:536
+#, c-format
+msgid "Removed all %d tracks from the iPod"
+msgstr "Am eliminat toate %d piese de pe iPod"
+
+#: ../src/misc_confirm.c:541
+#, c-format
+msgid "Removed all podcasts from the iPod"
+msgstr "Am ÅŸters toate podcasturile de pe iPod"
+
+#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#, c-format
+msgid "Deleted playlist '%s' including %d member track"
+msgid_plural "Deleted playlist '%s' including %d member tracks"
+msgstr[0] "Am şters lista de redare '%s' incluzând %d piesă membru."
+msgstr[1] "Am şters lista de redare '%s' incluzând %d piese membre."
+
+#. first use playlist name
+#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#, c-format
+msgid "Deleted playlist '%s'"
+msgstr "Am ÅŸters lista de redare '%s'"
+
+#: ../src/misc_confirm.c:600
+#, c-format
+msgid "Deleted playlist '%s' including %d member track on harddisk"
+msgid_plural "Deleted playlist '%s' including %d member tracks on harddisk"
+msgstr[0] ""
+"Am şters lista de redare '%s' incluzând %d piesă membru pe discul dur."
+msgstr[1] ""
+"Am şters lista de redare '%s' incluzând %d piese membre pe discul dur."
+
+#: ../src/misc_confirm.c:617
+#, c-format
+msgid "Removed all %d tracks from the database"
+msgstr "Am ÅŸters toate %d piese din baza de date"
+
+#: ../src/misc_confirm.c:695
+#, c-format
+msgid "Are you sure you want to remove all tracks from your iPod?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi toate piesele de pe iPod-ul dvs?"
+
+#: ../src/misc_confirm.c:700
+#, c-format
+msgid "Are you sure you want to remove all podcasts from your iPod?"
+msgstr ""
+"Sunteţi sigur că doriţi să ştergeţi toate podcasturile de pe iPod-ul dvs?"
+
+#: ../src/misc_confirm.c:708
+#, c-format
+msgid ""
+"Are you sure you want to delete playlist '%s' and the following track "
+"completely from your iPod? The number of playlists this track is a member of "
+"is indicated in parentheses."
+msgid_plural ""
+"Are you sure you want to delete playlist '%s' and the following tracks "
+"completely from your iPod? The number of playlists the tracks are member of "
+"is indicated in parentheses."
+msgstr[0] ""
+"Sunteţi sigur că doriţi să ştergeţi lista de redare '%s' şi următoarea piesă "
+"de pe iPod? Numărul listelor de redare în care această piesă este membră "
+"este indicat între paranteze."
+msgstr[1] ""
+"Sunteţi sigur că doriţi să ştergeţi lista de redare '%s' şi următoarele "
+"piese de pe iPod? Numărul listelor de redare în care aceste piese sunt "
+"membre este indicat între paranteze."
+
+#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#, c-format
+msgid "Are you sure you want to delete the playlist '%s'?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi lista de redare '%s'?"
+
+#: ../src/misc_confirm.c:745
+#, c-format
+msgid ""
+"Are you sure you want to delete playlist '%s' and remove the following track "
+"from your harddisk? The number of playlists this track is a member of is "
+"indicated in parentheses."
+msgid_plural ""
+"Are you sure you want to delete playlist '%s' and remove the following "
+"tracks from your harddisk? The number of playlists the tracks are member of "
+"is indicated in parentheses."
+msgstr[0] ""
+"Sunteţi sigur că doriţi să ştergeţi lista de redare '%s' şi următoarea piesă "
+"de pe discul dur? Numărul listelor de redare în care această piesă este "
+"membră este indicat în paranteze."
+msgstr[1] ""
+"Sunteţi sigur că doriţi să ştergeţi lista de redare '%s' şi următoarele "
+"piese de pe discul dur? Numărul listelor de redare în care aceste piese sunt "
+"membre este indicat în paranteze."
+
+#: ../src/misc_confirm.c:753
+#, c-format
+msgid "Are you sure you want to remove all tracks from the database?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi toate piesele din baza de date?"
+
+#: ../src/misc_confirm.c:762
+#, c-format
+msgid ""
+"Are you sure you want to delete playlist '%s' and remove the following track "
+"from the database? The number of playlists this track is a member of is "
+"indicated in parentheses."
+msgid_plural ""
+"Are you sure you want to delete playlist '%s' and remove the following "
+"tracks from the database? The number of playlists the tracks are member of "
+"is indicated in parentheses."
+msgstr[0] ""
+"Sunteţi sigur că doriţi să ştergeţi lista de redare '%s' şi următoarea piesă "
+"din baza de date? Numărul listelor de redare în care această piesă este "
+"membră este indicat în paranteze."
+msgstr[1] ""
+"Sunteţi sigur că doriţi să ştergeţi lista de redare '%s' şi următoarele "
+"piese din baza de date? Numărul listelor de redare în care aceste piese sunt "
+"membre este indicat în paranteze."
+
+#: ../src/misc_confirm.c:841
+msgid ""
+"Data has been changed and not been saved.\n"
+"OK to exit gtkpod?"
+msgstr ""
+"Au fost modificate date, dar nu au fost ÅŸi salvate.\n"
+"Da pentru a părăsi gtkpod?"
+
+#: ../src/misc_conversion.c:66
+msgid "File type"
+msgstr "Tip fiÅŸier"
+
+#: ../src/misc_conversion.c:67
+msgid "PC File"
+msgstr "FiÅŸier PC"
+
+#: ../src/misc_conversion.c:68
+msgid "iPod File"
+msgstr "FiÅŸier iPod"
+
+#: ../src/misc_conversion.c:69
+msgid "iPod ID"
+msgstr "iPod ID"
+
+#. 10
+#: ../src/misc_conversion.c:70
+msgid "Track Nr (#)"
+msgstr "Nr pistă"
+
+#: ../src/misc_conversion.c:71
+msgid "Transferred"
+msgstr "Transferat"
+
+#: ../src/misc_conversion.c:72
+msgid "File Size"
+msgstr "Dimensiune"
+
+#: ../src/misc_conversion.c:73
+msgid "Play Time"
+msgstr "Durată"
+
+#. 20
+#: ../src/misc_conversion.c:80
+msgid "Date played"
+msgstr "Data redării"
+
+#: ../src/misc_conversion.c:82
+msgid "Volume"
+msgstr "Volum"
+
+#: ../src/misc_conversion.c:83
+msgid "Soundcheck"
+msgstr "Verificare sunet"
+
+#. 25
+#: ../src/misc_conversion.c:85
+msgid "CD Nr"
+msgstr "Nr CD"
+
+#: ../src/misc_conversion.c:88
+msgid "Category"
+msgstr "Categorie"
+
+#: ../src/misc_conversion.c:89
+msgid "Description"
+msgstr "Descriere"
+
+#. 30
+#: ../src/misc_conversion.c:90
+msgid "Podcast URL"
+msgstr "URL podcast"
+
+#: ../src/misc_conversion.c:91
+msgid "Podcast RSS"
+msgstr "RSS podcast"
+
+#: ../src/misc_conversion.c:92
+msgid "Subtitle"
+msgstr "Subtitrare"
+
+#: ../src/misc_conversion.c:93
+msgid "Date released"
+msgstr "Data lansării"
+
+#: ../src/misc_conversion.c:94
+msgid "Checked"
+msgstr "Bifat"
+
+#. 35
+#: ../src/misc_conversion.c:95
+msgid "Start time"
+msgstr "Timp pornire"
+
+#: ../src/misc_conversion.c:96
+msgid "Stop time"
+msgstr "Timp oprire"
+
+#: ../src/misc_conversion.c:97
+msgid "Remember Playback Position"
+msgstr "Reţine poziţia redării"
+
+#: ../src/misc_conversion.c:98
+msgid "Skip when Shuffling"
+msgstr "Sari peste în mod Shuffle"
+
+#: ../src/misc_conversion.c:99
+msgid "Artwork Path"
+msgstr "Cale copertă"
+
+#. 40
+#: ../src/misc_conversion.c:100
+msgid "Media Type"
+msgstr "Tip media"
+
+#: ../src/misc_conversion.c:102
+msgid "TV Episode"
+msgstr "Episod TV"
+
+#: ../src/misc_conversion.c:103
+msgid "TV Network"
+msgstr "Reţea TV"
+
+#: ../src/misc_conversion.c:104
+msgid "Season Nr"
+msgstr "Nr Sezon"
+
+#. 45
+#: ../src/misc_conversion.c:105
+msgid "Episode Nr"
+msgstr "Nr Episod"
+
+#: ../src/misc_conversion.c:106
+msgid "Album Artist"
+msgstr "Artist album"
+
+#: ../src/misc_conversion.c:107
+msgid "Sort Artist"
+msgstr "Artist sortare"
+
+#: ../src/misc_conversion.c:108
+msgid "Sort Title"
+msgstr "Titlu sortare"
+
+#: ../src/misc_conversion.c:109
+msgid "Sort Album"
+msgstr "Album sortare"
+
+#. 50
+#: ../src/misc_conversion.c:110
+msgid "Sort Album Artist"
+msgstr "Artist album sortare"
+
+#: ../src/misc_conversion.c:111
+msgid "Sort Composer"
+msgstr "Compozitor sortare"
+
+#: ../src/misc_conversion.c:112
+msgid "Sort TV Show"
+msgstr "Emisiune TV sortare"
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr "Indicator de piesă gapless"
+
+#: ../src/misc_conversion.c:126
+msgid "Name of file on PC, if available"
+msgstr "Numele fişierului pe PC, dacă este disponibil"
+
+#: ../src/misc_conversion.c:127
+msgid "Name of file on the iPod"
+msgstr "Numele fiÅŸierului pe iPod"
+
+#. 10
+#: ../src/misc_conversion.c:129
+msgid "Track Nr. and total number of tracks on CD"
+msgstr "Nr pistei şi numărul total de piese pe CD"
+
+#: ../src/misc_conversion.c:130
+msgid "Whether the file has already been transferred to the iPod or not"
+msgstr "Dacă fişierul a fost transferat deja pe iPod sau nu"
+
+#: ../src/misc_conversion.c:136
+msgid "Beats per minute"
+msgstr "Bătăi pe minut"
+
+#: ../src/misc_conversion.c:137
+msgid "Number of times the track has been played"
+msgstr "De câte ori a fost redată piesa"
+
+#: ../src/misc_conversion.c:138
+msgid "Star rating from 0 to 5"
+msgstr "Apreciere cu steluţe de la 0 la 5"
+
+#: ../src/misc_conversion.c:139
+msgid "Date and time track has been added"
+msgstr "Data şi ora la care a fost adăugat"
+
+#. 20
+#: ../src/misc_conversion.c:140
+msgid "Date and time track has last been played"
+msgstr "Data ÅŸi ora la care a fost redat"
+
+#: ../src/misc_conversion.c:141
+msgid "Date and time track has last been modified"
+msgstr "Data ÅŸi ora la care a fost modificat"
+
+#: ../src/misc_conversion.c:142
+msgid "Manual volume adjust"
+msgstr "Ajustare manuală a volumului"
+
+#: ../src/misc_conversion.c:143
+msgid ""
+"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
+"the iPod"
+msgstr "Ajustare volum în dB -- trebuie să activaţi 'soundcheck' pe iPod"
+
+#. 25
+#: ../src/misc_conversion.c:146
+msgid "CD Nr. and total number of CDS in set"
+msgstr "Nr CD şi numărul total de CD-uri în set"
+
+#: ../src/misc_conversion.c:149
+msgid ""
+"The category (e.g. 'Technology' or 'Music') where the podcast was located."
+msgstr ""
+"Categoria (e.g. 'Tehnologie' sau 'Muzică') în care a fost localizat "
+"podcastul."
+
+#: ../src/misc_conversion.c:150
+msgid "Accessible by selecting the center button on the iPod."
+msgstr "Accesibil prin selecatarea butonului central al iPod-ului."
+
+#: ../src/misc_conversion.c:154
+msgid "Release date (for podcasts displayed next to the title on the iPod)"
+msgstr "Data lansării (pentru podcasturi afişate imediat după titlu pe iPod)"
+
+#. 50
+#: ../src/misc_conversion.c:168 ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170 ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172 ../src/misc_conversion.c:173
+msgid "Used for sorting on the iPod"
+msgstr "Folosite pentru sortarea pe iPod"
+
+#: ../src/misc_conversion.c:735
+#, c-format
+msgid "The URI '%s' is not an absolute URI using the file scheme"
+msgstr "URI '%s' nu este un URI absolut folosind schema de fiÅŸiere"
+
+#: ../src/misc_conversion.c:745
+#, c-format
+msgid "The local file URI '%s' may not include a '#'"
+msgstr "URI-ul fiÅŸierului local '%s' nu poate include un '#'"
+
+#: ../src/misc_conversion.c:762
+#, c-format
+msgid "The URI '%s' is invalid"
+msgstr "URI '%s' este invalid"
+
+#: ../src/misc_conversion.c:774
+#, c-format
+msgid "The hostname of the URI '%s' is invalid"
+msgstr "Numele de host al URI '%s' este invalid"
+
+#: ../src/misc_conversion.c:790
+#, c-format
+msgid "The URI '%s' contains invalidly escaped characters"
+msgstr "URI '%s' conţine caractere întârziate invalid"
+
+#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
+#: ../src/misc_playlist.c:429
+msgid "Please enter a name for the new playlist"
+msgstr "Vă rugăm să introduceţi un nume pentru lista de redare nouă"
+
+#: ../src/misc_playlist.c:154
+msgid "AR:"
+msgstr "AR:"
+
+#: ../src/misc_playlist.c:157
+msgid "AL:"
+msgstr "AL:"
+
+#: ../src/misc_playlist.c:160
+msgid "GE:"
+msgstr "GE:"
+
+#: ../src/misc_playlist.c:163
+msgid "CO:"
+msgstr "CO:"
+
+#: ../src/misc_playlist.c:166
+msgid "YE:"
+msgstr "AN:"
+
+#: ../src/misc_playlist.c:194
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: ../src/misc_playlist.c:272
+#, c-format
+msgid "Random (%d)"
+msgstr "Aleator (%d)"
+
+#: ../src/misc_playlist.c:297
+msgid ""
+"Auto Store of track view disabled.\n"
+"\n"
+msgstr ""
+"Memorare automată a vizualizării pieselor dezactivată.\n"
+"\n"
+
+#: ../src/misc_playlist.c:356
+msgid "Not Listed"
+msgstr "Nelistat"
+
+#: ../src/misc_playlist.c:406
+#, c-format
+msgid "Created playlist '%s' with %d track."
+msgid_plural "Created playlist '%s' with %d tracks."
+msgstr[0] "Am creat lista de redare '%s' cu %d piesă."
+msgstr[1] "Am creat lista de redare '%s' cu %d piese."
+
+#. n==0
+#: ../src/misc_playlist.c:417
+msgid "No tracks available, playlist not created"
+msgstr "Nicio piesă disponibilă, lista de redare nu a fost creată"
+
+#: ../src/misc_playlist.c:543
+#, c-format
+msgid "Most Listened (%d)"
+msgstr "Cele mai ascultate (%d)"
+
+#: ../src/misc_playlist.c:584
+#, c-format
+msgid "Never Listened"
+msgstr "Niciodată ascultate"
+
+#: ../src/misc_playlist.c:624
+#, c-format
+msgid "Best Rated (%d)"
+msgstr "Cele mai apreciate (%d)"
+
+#: ../src/misc_playlist.c:666
+msgid "Unrated tracks"
+msgstr "Piese fără apreciere"
+
+#: ../src/misc_playlist.c:671
+#, c-format
+msgid "Rated %d"
+msgstr "Apreciat %d"
+
+#: ../src/misc_playlist.c:714
+#, c-format
+msgid "Recent (%d)"
+msgstr "Recent (%d)"
+
+#: ../src/misc_playlist.c:753
+msgid "Last Time"
+msgstr "Ultima dată"
+
+#: ../src/misc_playlist.c:844
+msgid "Removal of dangling tracks with no files on PC was canceled."
+msgstr "Ştergerea pieselor agăţate fără fişiere pe PC a fost revocată."
+
+#: ../src/misc_playlist.c:854
+msgid "Handling of dangling tracks with files on PC was canceled."
+msgstr "Manipularea pieselor agăţate fără fişiere pe PC a fost revocată."
+
+#: ../src/misc_playlist.c:882
+msgid "Dangling tracks with no files on PC were removed."
+msgstr "Piesele agăţate fără fişiere pe PC au fost şterse."
+
+#: ../src/misc_playlist.c:943
+msgid "Dangling tracks with files on PC were handled."
+msgstr "Piesele agăţate fără fişiere pe PC au fost manipulate."
+
+#: ../src/misc_playlist.c:976
+msgid "Track"
+msgstr "Piesă"
+
+#: ../src/misc_playlist.c:1019
+msgid ""
+"You did not import the existing iTunesDB. This is most likely incorrect and "
+"will result in the loss of the existing database.\n"
+"\n"
+"Press 'OK' if you want to proceed anyhow or 'Cancel' to abort. If you "
+"cancel, you can import the existing database before calling this function "
+"again.\n"
+msgstr ""
+"Nu aţi importat iTunesDB existentă ('%s'). Acest lucru este cel mai probabil "
+"incorect, iar rezultatul va fi pierderea bazei de date existentă.\n"
+"\n"
+"Apăsaţi 'Ok' dacă doriţi să continuaţi oricum sau 'Revocare' ca să săriţi "
+"peste memorare. Dacă revocaţi, puteţi importa baza de date existentă înainte "
+"de a apela această funcţie din nou.\n"
+
+#: ../src/misc_playlist.c:1033
+msgid "Creating a tree of known files"
+msgstr "Creez un arbore de fiÅŸiere cunoscute"
+
+#: ../src/misc_playlist.c:1077
+msgid "Checking iPOD files against known files in DB"
+msgstr "Verific fişierel iPod faţă de fişierele cunoscute în DB"
+
+#: ../src/misc_playlist.c:1120
+msgid "Orphaned"
+msgstr "Făcut orfan"
+
+#: ../src/misc_playlist.c:1147
+#, c-format
+msgid ""
+"The following orphaned file had already been added to the iPod again. It "
+"will be removed with the next sync:\n"
+"%s\n"
+"\n"
+msgstr ""
+"Următoarele fişiere orfane au fost deja adăugate pe iPod. Vor fi şterse la "
+"următoarea sincronizare:\n"
+"%s\n"
+"\n"
+
+#: ../src/misc_playlist.c:1175
+#, c-format
+msgid "Found %d orphaned and %d dangling files. Processing..."
+msgstr "Am găsit %d fişiere orfane şi %d fişiere agăţate. Procesez..."
+
+#: ../src/misc_playlist.c:1199
+#, c-format
+msgid ""
+"The following dangling track has a file on PC.\n"
+"Press OK to have them transfered from the file on next Sync, CANCEL to leave "
+"it as is."
+msgid_plural ""
+"The following %d dangling tracks have files on PC.\n"
+"Press OK to have them transfered from the files on next Sync, CANCEL to "
+"leave them as is."
+msgstr[0] ""
+"Următoarea piesă agăţata are fişier pe PC.\n"
+"Apăsaţi OK pentru a o transfera din fişier la următoarea sincronizare, sau "
+"Revocare pentru a o lăsa aşa cum este."
+msgstr[1] ""
+"Următoarele %d piese agăţate au fişiere pe PC.\n"
+"Apăsaţi OK pentru a le transfera din fişier la următoarea sincronizare, sau "
+"Revocare pentru a le lăsa aşa cum sunt."
+
+#: ../src/misc_playlist.c:1204
+#, c-format
+msgid ""
+"The following dangling track doesn't have file on PC. \n"
+"Press OK to remove it, CANCEL to leave it as is."
+msgid_plural ""
+"The following %d dangling tracks do not have files on PC. \n"
+"Press OK to remove them, CANCEL to leave them. as is"
+msgstr[0] ""
+"Următoarea %d piesă agăţată nu are fişier pe PC.\n"
+"Apăsaţi OK pentru a o şterge, sau Revocare pentru a o lăsa aşa cum este."
+msgstr[1] ""
+"Următoarele %d piese agăţate nu au fişiere pe PC.\n"
+"Apăsaţi OK pentru a le şterge, sau Revocare pentru a le lăsa aşa cum sunt."
+
+#. we want unique window for each
+#. gboolean modal,
+#: ../src/misc_playlist.c:1211
+msgid "Dangling Tracks"
+msgstr "Piese agăţate"
+
+#: ../src/misc_playlist.c:1234
+#, c-format
+msgid "Found %d orphaned and %d dangling files. Done."
+msgstr "Am găsit %d fişiere orfane şi %d fişiere agăţate. Terminat."
+
+#. update for count == 1, 21, 41 ... and for count == n
+#: ../src/misc_track.c:89
+#, c-format
+msgid "Hashed %d of %d track."
+msgid_plural "Hashed %d of %d tracks."
+msgstr[0] "Am făcut suma binară de căutare (hash) pentru %d piesă din %d."
+msgstr[1] "Am făcut sumă binară de căutare (hash) pentru %d piese din %d."
+
+#: ../src/misc_track.c:198
+#, c-format
+msgid "The following duplicate track has been removed."
+msgid_plural "The following %d duplicate tracks have been removed."
+msgstr[0] "Următoarea piesă cu dubluri a fost ştearsă"
+msgstr[1] "Următoarele %d piese cu dubluri au fost şterse"
+
+#: ../src/misc_track.c:205
+#, c-format
+msgid ""
+"The following duplicate track has not been added to the master play list."
+msgid_plural ""
+"The following %d duplicate tracks have not been added to the master play "
+"list."
+msgstr[0] ""
+"Următoarea piesă cu dubluri nu a fost adăugată la lista de redare principală."
+msgstr[1] ""
+"Următoarele %d piese cu dubluri nu au fost adăugate la lista de redare "
+"principală."
+
+#. gint id,
+#. gboolean modal,
+#: ../src/misc_track.c:212
+msgid "Duplicate detection"
+msgstr "Detecţie dubluri"
+
+#: ../src/misc_track.c:1339
+msgid "Local Database"
+msgstr "Bază de date locală"
+
+#. artwork is set
+#: ../src/misc_track.c:1350
+msgid "Embedded or filename was lost"
+msgstr "Înglobată sau numele de fişier s-a pierdut"
+
+#: ../src/misc_track.c:1354
+msgid "Artwork not set"
+msgstr "Coperta nu a fost stabilită"
+
+#: ../src/misc_track.c:1816
+#, c-format
+msgid "Could not find source file for '%s'. Track not copied."
+msgstr "Nu am putut găsi fişierul sursă pentru '%s'. Piesa nu a fost copiată."
+
+#: ../src/misc_track.c:2052
+#, c-format
+msgid "drag and drop: ignored '%s'\n"
+msgstr "trage şi aruncă: ignorat '%s'\n"
+
+#: ../src/mp3file.c:1336
+#, c-format
+msgid "Error setting ID3 field: %s\n"
+msgstr "Eroare la setarea câmpului ID3: %s\n"
+
+#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
+#, c-format
+msgid "ERROR while opening file: '%s' (%s).\n"
+msgstr "Eroare la deschiderea fiÅŸierului: '%s' (%s).\n"
+
+#: ../src/mp3file.c:1688
+#, c-format
+msgid "ERROR while writing tag to file: '%s' (%s).\n"
+msgstr "Eroare la scrierea etichetelor în fişier: '%s' (%s).\n"
+
+#. Tracks with zero play length are ignored by iPod...
+#: ../src/mp3file.c:2770
+#, c-format
+msgid "File \"%s\" has zero play length. Ignoring.\n"
+msgstr "FiÅŸierul \"%s\" are timp de redare null. ÃŽl ignor.\n"
+
+#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#, c-format
+msgid "'%s' does not appear to be a mp4 audio or video file.\n"
+msgstr "'%s' nu pare să fie un fişier mp4 audio sau video.\n"
+
+#: ../src/mp4file.c:253 ../src/mp4file.c:414
+#, c-format
+msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
+msgstr ""
+"Nu am putut deschide '%s' pentru citire, sau fiÅŸierul nu este de tipul mp4.\n"
+
+#: ../src/mp4file.c:529
+#, c-format
+msgid "'%s' does not appear to be a mp4 audio file.\n"
+msgstr "'%s' nu pare să fie un fişier mp4 audio.\n"
+
+#: ../src/mp4file.c:540
+#, c-format
+msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
+msgstr ""
+"Nu am putut deschide '%s' pentru scriere, sau fiÅŸierul nu este de tipul "
+"mp4.\n"
+
+#: ../src/mp4file.c:553
+#, c-format
+msgid ""
+"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
+"You must compile the gtkpod source together with the mp4v2 library.\n"
+msgstr ""
+"Importarea '%s' eşuată: fişierele m4a/m4p/m4b nu sunt suportate în lipsa "
+"bibliotecii mp4v2. Trebuie să compilezi sursa gtkpod împreună cu biblioteca "
+"mp4v2.\n"
+
+#: ../src/mp4file.c:559
+#, c-format
+msgid ""
+"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
+"without the mp4v2 library. You must compile the gtkpod source together with "
+"the mp4v2 library.\n"
+msgstr ""
+"Actualizare metadata m4a/m4p/m4b pentru '%s' eşuată: m4a/m4p/m4b nu sunt "
+"suportate fără biblioteca mp4v2. Trebuie să compilaţi sursa gtkpod împreună "
+"cu biblioteca mp4v2.\n"
+
+#: ../src/mp4file.c:565
+#, c-format
+msgid ""
+"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
+"without the mp4v2 library. You must compile the gtkpod source together with "
+"the mp4v2 library.\n"
+msgstr ""
+"Verificare de sunet m4a/m4p/m4b pentru '%s' eşuată: m4a/m4p/m4b nu sunt "
+"suportate fără biblioteca mp4v2. Trebuie să compilaţi sursa gtkpod împreună "
+"cu biblioteca mp4v2.\n"
+
+#: ../src/oggfile.c:73
+#, c-format
+msgid "'%s' does not appear to be an ogg audio file.\n"
+msgstr "'%s' nu pare să fie un fişier audio ogg.\n"
+
+#: ../src/oggfile.c:154
+#, c-format
+msgid ""
+"Import of '%s' failed: ogg not supported without the ogg library. You must "
+"compile the gtkpod source together with the ogg library.\n"
+msgstr ""
+"Importarea '%s' eşuată: fişierele ogg nu sunt suportate în lipsa bibliotecii "
+"ogg. Trebuie să compilezi sursa gtkpod împreună cu biblioteca ogg.\n"
+
+#: ../src/oggfile.c:160
+#, c-format
+msgid ""
+"ogg metadata update for '%s' failed: ogg not supported without the ogg "
+"library. You must compile the gtkpod source together with the ogg library.\n"
+msgstr ""
+"Actualizare metadata ogg pentru '%s' eşuată: fişierele ogg nu sunt suportate "
+"fără biblioteca ogg. Trebuie să compilaţi sursa gtkpod împreună cu "
+"biblioteca ogg.\n"
+
+#: ../src/prefs.c:357
+#, c-format
+msgid "gtkpod version %s usage:\n"
+msgstr "gtkpod versiunea %s utilizare:\n"
+
+#: ../src/prefs.c:358
+msgid " -h, --help: display this message\n"
+msgstr " -h, --help: afişează acest mesaj\n"
+
+#: ../src/prefs.c:359
+msgid " -p <file>: increment playcount for file by one\n"
+msgstr " -p <fişier>: incrementează contorul de redări pentru fişier\n"
+
+#: ../src/prefs.c:360
+msgid " --hash <file>:print gtkpod hash for file\n"
+msgstr " -- hash <fişier>: afişează hashul gtkpod pentru fişier\n"
+
+#: ../src/prefs.c:361
+msgid " -m path: define the mountpoint of your iPod\n"
+msgstr " -m cale: defineÅŸte punctul de montare al iPod-ului dvs\n"
+
+#: ../src/prefs.c:362
+msgid " --mountpoint: same as '-m'.\n"
+msgstr " --mountpoint: acelaÅŸi lucru ca '-m'.\n"
+
+#: ../src/prefs.c:363
+msgid " -a: import database automatically after start.\n"
+msgstr " -a: importă baza de date automat după pornire.\n"
+
+#: ../src/prefs.c:364
+msgid " --auto: same as '-a'.\n"
+msgstr " --auto: la fel ca '-a'.\n"
+
+#: ../src/prefs.c:561
+#, c-format
+msgid "Couldn't create ~/.gtkpod\n"
+msgstr "Nu am putut crea ~/.gtkpod\n"
+
+#: ../src/prefs_window.c:133
+msgid "Please select command for 'Play Now'"
+msgstr "Vă rugăm selectaţi o comandă pentru 'Redă acum'"
+
+#: ../src/prefs_window.c:134
+msgid "Please select command for 'Enqueue'"
+msgstr "Vă rugăm selectaţi o comandă pentru 'Adaugă în coadă'"
+
+#: ../src/prefs_window.c:135
+msgid "Please select the mp3gain executable"
+msgstr "Vă rugăm selectaţi executabilul mp3gain"
+
+#: ../src/prefs_window.c:136
+msgid "Please select the aacgain executable"
+msgstr "Vă rugăm selectaţi executabilul aacgain"
+
+#: ../src/prefs_window.c:137
+msgid "Select the mserv music root directory"
+msgstr "Vă rugăm selectaţi dosarul rădăcină de muzică al mserv"
+
+#: ../src/prefs_window.c:138
+msgid "Select the mserv trackinfo root directory"
+msgstr ""
+"Vă rugăm selectaţi dosarul rădăcină de informaţii despre piese al mserv"
+
+#: ../src/prefs_window.c:139
+msgid "Select the ogg/vorbis converter command"
+msgstr "Selectaţi comanda de conversie ogg/vorbis"
+
+#: ../src/prefs_window.c:140
+msgid "Select the flac converter command"
+msgstr "Selectaţi comanda de conversie flac"
+
+#: ../src/prefs_window.c:141
+msgid "Select the m4a converter command."
+msgstr "Selectaţi comanda de conversie m4a."
+
+#: ../src/prefs_window.c:142
+msgid "Select the mp3 converter command."
+msgstr "Selectaţi comanda de conversie mp3."
+
+#: ../src/prefs_window.c:143
+msgid "Select the wav converter command."
+msgstr "Selectaţi comanda de conversie wav."
+
+#: ../src/prefs_window.c:201 ../src/repository.c:662
+#, c-format
+msgid ""
+"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
+"improve an existing one, please send it to jcsjcs at users.sourceforge.net "
+"for inclusion into the next release.</i>"
+msgstr ""
+"<i>Aruncaţi o privire peste scripturile din '%s'. Dacă scrieţi un script "
+"nou, sau îmbunătăţiţi unul existent, vă rugăm trimiteţi-l la jcsjcs at users."
+"sourceforge.net pentru includerea lui în următoarea versiune.</i>"
+
+#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
+msgid "Preferences not updated"
+msgstr "Preferinţele nu au fost actualizate"
+
+#: ../src/prefs_window.c:1232
+msgid "Preferences applied"
+msgstr "Preferinţele au fost aplicate"
+
+#: ../src/repository.c:573 ../src/repository.c:2395
+msgid "Set backup file"
+msgstr "Stabiliţi fişierul copie de siguranţă"
+
+#: ../src/repository.c:612
+msgid "Select directory for synchronization"
+msgstr "Selectaţi dosarul pentru sincronizare"
+
+#: ../src/repository.c:638
+msgid "Please select command to sync contacts"
+msgstr "Vă rugăm selectaţi comanda pentru sincronizarea agendei"
+
+#: ../src/repository.c:644
+msgid "Please select command to sync calendar"
+msgstr "Vă rugăm selectaţi comanda pentru sincronizarea calendarului"
+
+#: ../src/repository.c:650
+msgid "Please select command to sync notes"
+msgstr "Vă rugăm selectaţi comanda pentru sincronizarea notiţelor"
+
+#: ../src/repository.c:729
+msgid "Smart playlist updated."
+msgstr "Listă de redare inteligentă actualizată."
+
+#: ../src/repository.c:1190
+msgid "Podcasts Repository"
+msgstr "Depozit podcasturi"
+
+#: ../src/repository.c:1194
+msgid "Local Repository"
+msgstr "Depozit local"
+
+#: ../src/repository.c:1348
+msgid "Master Playlist"
+msgstr "Listă de redare principală"
+
+#: ../src/repository.c:1352
+msgid "Podcasts Playlist"
+msgstr "Listă de redare podcasturi"
+
+#: ../src/repository.c:1360
+msgid "Regular Playlist"
+msgstr "Listă de redare oarecare"
+
+#: ../src/repository.c:2423
+msgid "Set local repository file"
+msgstr "Stabiliţi fişierul depozitului local"
+
+#: ../src/repository.c:2522
+msgid "New Repository"
+msgstr "Depozit nou"
+
+#: ../src/sha1.c:186
+msgid "Hashed file is 0 bytes long\n"
+msgstr "Fişierul hash are lungime 0 octeţi\n"
+
+#: ../src/sha1.c:239
+#, c-format
+msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
+msgstr "Nu am putut deschide '%s' pentru a calcula suma de control SHA1: %s\n"
+
+#: ../src/syncdir.c:237
+#, c-format
+msgid "Sync summary for %s/%s\n"
+msgstr "Rezumat sincronizare pentru %s/%s\n"
+
+#: ../src/syncdir.c:246
+msgid "The following track has been added or updated:\n"
+msgid_plural "The following tracks have been added or updated:\n"
+msgstr[0] "Următoarea piesă a fost adăugată sau actualizată:\n"
+msgstr[1] "Următoarele piese au fost adăugate sau actualizate:\n"
+
+#: ../src/syncdir.c:255
+msgid "The following track has been completely removed from the iPod:\n"
+msgid_plural ""
+"The following tracks have been completely removed from the iPod:\n"
+msgstr[0] "Următoarea piesă a fost ştersă complet de pe iPod:\n"
+msgstr[1] "Următoarele piese au fost şterse complet de pe iPod:\n"
+
+#: ../src/syncdir.c:264
+msgid "The following track has been removed from the repository:\n"
+msgid_plural "The following tracks have been removed from the repository:\n"
+msgstr[0] "Următoarea piesă a fost eliminată din depozit:\n"
+msgstr[1] "Următoarele piese au fost eliminate din depozit:\n"
+
+#: ../src/syncdir.c:271
+msgid "The following track has been removed from the playlist:\n"
+msgid_plural "The following tracks have been removed from the playlist:\n"
+msgstr[0] "Următoarea piesă a fost eliminată din lista de redare:\n"
+msgstr[1] "Următoarele piese au fost eliminate din lista de redare:\n"
+
+#: ../src/syncdir.c:277
+msgid "Nothing was changed.\n"
+msgstr "Nu am modificat nimic.\n"
+
+#: ../src/syncdir.c:282
+msgid "Sync summary"
+msgstr "Rezumat sincronizare"
+
+#: ../src/tools.c:118
+#, c-format
+msgid ""
+"Could not find '%s'.\n"
+"Please specifiy the exact path in the Tools section of the preference dialog "
+"or install the program if it is not installed on your system.\n"
+"\n"
+msgstr ""
+"Nu am putut găsi '%s'.\n"
+"Vă rugăm specificaţi calea exactă în secţiunea Unelte a dialogului de "
+"preferinţe sau instalaţi programul dacă nu este instalat pe sistem.\n"
+"\n"
+
+#: ../src/tools.c:203
+#, c-format
+msgid ""
+"Execution of '%s' failed.\n"
+"\n"
+msgstr ""
+"Execuţia '%s' eşuată.\n"
+"\n"
+
+#: ../src/tools.c:248
+#, c-format
+msgid ""
+"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
+"preferences.\n"
+msgstr ""
+"Nu am normalizat '%s'. Stabiliţi calea mp3gain în secţiunea Unelte a "
+"dialogului preferinţe.\n"
+
+#: ../src/tools.c:258
+#, c-format
+msgid ""
+"Did not normalize '%s'. Set aacgain path in the Tools section of the "
+"preferences.\n"
+msgstr ""
+"Nu am normalizat '%s'. Stabiliţi calea aacgain în secţiunea Unelte a "
+"dialogului preferinţe.\n"
+
+#: ../src/tools.c:385
+msgid "Normalizing..."
+msgstr "Normalizez..."
+
+#: ../src/tools.c:435
+#, c-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: ../src/tools.c:461
+msgid "Aborting..."
+msgstr "Renunţare..."
+
+#: ../src/tools.c:465
+msgid "Will abort after current mp3gain process ends."
+msgstr "Voi abandonda după ce procesul curent mp3gain se încheie."
+
+#: ../src/tools.c:491
+#, c-format
+msgid ""
+"'%s-%s' (%s) could not be normalized.\n"
+"\n"
+msgstr ""
+"'%s-%s' (%s) nu a putut fi normalizat.\n"
+"\n"
+
+#: ../src/tools.c:530
+#, c-format
+msgid "Normalized %d of %d tracks."
+msgid_plural "Normalized %d of %d tracks."
+msgstr[0] "Am normalizat %d din %d piese."
+msgstr[1] "Am normalizat %d din %d piese."
+
+#: ../src/tools.c:633
+msgid ""
+"Please specify the command to be called on the 'Tools' section of the "
+"preferences dialog.\n"
+msgstr ""
+"Vă rugăm specificaţi comanda de apelat în secţiunea 'Unelte' din dialogul "
+"preferinţe.\n"
+
+#: ../src/tools.c:645
+#, c-format
+msgid ""
+"Could not find the command '%s'.\n"
+"\n"
+"Please verify the setting in the 'Tools' section of the preferences dialog.\n"
+"\n"
+msgstr ""
+"Nu am găsit comanda '%s'.\n"
+"\n"
+"Vă rugăm verificaţi setările din secţiunea Unelte a dialogului preferinţe.\n"
+"\n"
+
+#: ../src/tools.c:687
+#, c-format
+msgid ""
+"'%s' returned the following output:\n"
+"%s\n"
+msgstr ""
+"'%s' a returnat următoarea ieşire:\n"
+"%s\n"
+
+#: ../src/tools.c:754
+#, c-format
+msgid "No command set for '%s'"
+msgstr "Nici o comandă stabilită pentru '%s'"
+
+#: ../src/tools.c:774
+#, c-format
+msgid "Could not find command '%s' specified for '%s'"
+msgstr "Nu am putut găsi comanda '%s' specificată pentru '%s'"
+
+#: ../src/wavfile.c:181
+#, c-format
+msgid "%s does not appear to be a supported wav file.\n"
+msgstr "%s nu pare să fie un fişier wav suportat.\n"
+
+#, fuzzy
+#~ msgid "<b>Resolution:</b>"
+#~ msgstr "<b>Indicii</b>"
+
+#~ msgid "label"
+#~ msgstr "etichetă"
+
+#~ msgid ""
+#~ "Cannot open '%s' for reading.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Nu am putut deschide '%s' pentru citire.\n"
+#~ "\n"
+
+#~ msgid "Unable to open '%s' for reading\n"
+#~ msgstr "Nu am putut deschide '%s' pentru citire\n"
+
+#~ msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
+#~ msgstr ""
+#~ "Nu am putut deschide \"iTunesDB.ext\" pentru citirea informaţiilor "
+#~ "extinse.\n"
+
+#~ msgid "Add _Directory"
+#~ msgstr "Adaugă _dosar"
+
+#~ msgid "Dirs"
+#~ msgstr "Dosare"
+
+#~ msgid "Files"
+#~ msgstr "FiÅŸiere"
+
+#~ msgid "New PL"
+#~ msgstr "LR nouă"
+
+#~ msgid "_About"
+#~ msgstr "_Despre"
+
+#~ msgid "Download Cover"
+#~ msgstr "Descarcă imaginea copertei"
+
+#~ msgid "Find _New"
+#~ msgstr "Găseşte _nou"
+
+#~ msgid "Set Cover Art from _Web"
+#~ msgstr "StabileÅŸte coperta de pe _web"
+
+#~ msgid "_Previous"
+#~ msgstr "_Precedent"
+
+#~ msgid "Find Cover on Web"
+#~ msgstr "Găseşte coperta pe web"
Copied: gtkpod/branches/etch-bpo/po/ru.po (from rev 305, gtkpod/tags/0.99.12-1/po/ru.po)
===================================================================
--- gtkpod/branches/etch-bpo/po/ru.po (rev 0)
+++ gtkpod/branches/etch-bpo/po/ru.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,5489 @@
+# translation of gtkpod
+# Copyright (C) 2007 gtkpod developers
+# This file is distributed under the same license as the gtkpod package.
+# Matvey Kozhev <sikon at lucidfox.org>, 2007.
+# , fuzzy
+# <>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gtkpod VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-13 00:57+0900\n"
+"PO-Revision-Date: 2007-12-15 21:53+0600\n"
+"Last-Translator: Matvey Kozhev <sikon at lucidfox.org>\n"
+"Language-Team: Russian <ru at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../data/gtkpod.desktop.in.h:1
+msgid "GtkPod"
+msgstr "GtkPod"
+
+#: ../data/gtkpod.desktop.in.h:2
+msgid "Manage music and video on an Apple iPod"
+msgstr "Менеджер музыки и видео Ð´Ð»Ñ Apple iPod"
+
+#: ../data/gtkpod.desktop.in.h:3
+msgid "iPod Manager"
+msgstr "Менеджер iPod"
+
+#: ../data/gtkpod.glade.h:1
+msgid " "
+msgstr " "
+
+#: ../data/gtkpod.glade.h:2
+msgid " "
+msgstr " "
+
+#: ../data/gtkpod.glade.h:3
+msgid " "
+msgstr " "
+
+#: ../data/gtkpod.glade.h:4
+msgid " "
+msgstr " "
+
+#: ../data/gtkpod.glade.h:5
+msgid " Sort by:"
+msgstr " Сортировать по:"
+
+#: ../data/gtkpod.glade.h:6
+msgid " <= cts <= "
+msgstr " <= cts <= "
+
+#: ../data/gtkpod.glade.h:7
+msgid " Logic: "
+msgstr " Логика: "
+
+#: ../data/gtkpod.glade.h:9
+#, no-c-format
+msgid "%A"
+msgstr "%A"
+
+#: ../data/gtkpod.glade.h:10
+msgid ""
+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
+"finished."
+msgstr "\"ДД/ММ/ГГГГ ЧЧ/ММ < d < ДД/ММ/ГГГГ ЧЧ/ММ' или похожий. Ðажмите Enter поÑле"
+"завершениÑ."
+
+#: ../data/gtkpod.glade.h:11
+msgid "'aacgain' executable:"
+msgstr "ИÑполнÑемый файл \"aacgain\":"
+
+#: ../data/gtkpod.glade.h:12
+msgid "'mp3gain' executable:"
+msgstr "ИÑполнÑемый файл \"mp3gain\":"
+
+#: ../data/gtkpod.glade.h:13
+msgid "(Checked)"
+msgstr "(Отмечено)"
+
+#: ../data/gtkpod.glade.h:14
+msgid "...as icons"
+msgstr "...как значки"
+
+#: ../data/gtkpod.glade.h:15
+msgid "...as text"
+msgstr "...как текÑÑ‚"
+
+#: ../data/gtkpod.glade.h:16
+msgid "...both as icons and text"
+msgstr "...как значки и текÑÑ‚"
+
+#: ../data/gtkpod.glade.h:17
+msgid "...entry 'All' in sort tab..."
+msgstr "...запиÑÑŒ \"Ð’Ñе\" на вкладке Ñортировки"
+
+#: ../data/gtkpod.glade.h:18
+msgid "...master playlist"
+msgstr "...главный ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:20
+#, no-c-format
+msgid "../%A.jpg"
+msgstr "../%A.jpg"
+
+#: ../data/gtkpod.glade.h:21
+msgid "0"
+msgstr "0"
+
+#: ../data/gtkpod.glade.h:22
+msgid "1"
+msgstr "1"
+
+#: ../data/gtkpod.glade.h:23
+msgid "2"
+msgstr "2"
+
+#: ../data/gtkpod.glade.h:24
+msgid "3"
+msgstr "3"
+
+#: ../data/gtkpod.glade.h:25
+msgid "4"
+msgstr "4"
+
+#: ../data/gtkpod.glade.h:26
+msgid "5"
+msgstr "5"
+
+#: ../data/gtkpod.glade.h:27
+msgid ":"
+msgstr ":"
+
+#: ../data/gtkpod.glade.h:28
+msgid "<"
+msgstr "<"
+
+#: ../data/gtkpod.glade.h:29
+msgid "<b>Account Information</b>"
+msgstr "<b>Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± учётной запиÑи</b>"
+
+#: ../data/gtkpod.glade.h:30
+msgid "<b>Adding/Updating/Syncing</b>"
+msgstr "<b>Добавление/обновление/ÑинхронизациÑ</b>"
+
+#: ../data/gtkpod.glade.h:31
+msgid "<b>Audioscrobbler</b>"
+msgstr "<b>Сборщик ÑтатиÑтики</b>"
+
+#: ../data/gtkpod.glade.h:32
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>ÐвтоматичеÑки Ñгенерированные ÑпиÑки воÑпроизведениÑ</b>"
+
+#: ../data/gtkpod.glade.h:33
+msgid "<b>Automatically select...</b>"
+msgstr "<b>ÐвтоматичеÑки выбирать...</b>"
+
+#: ../data/gtkpod.glade.h:34
+msgid "<b>Calendar/Contacts/Notes</b>"
+msgstr "<b>Календарь/контакты/заметки</b>"
+
+#: ../data/gtkpod.glade.h:35
+msgid "<b>Coverart</b>"
+msgstr "<b>Coverart</b>"
+
+#: ../data/gtkpod.glade.h:36
+msgid "<b>Delete Confirmation</b>"
+msgstr "<b>Подтверждение удалениÑ</b>"
+
+#: ../data/gtkpod.glade.h:37
+msgid "<b>Examples</b>"
+msgstr "<b>Примеры</b>"
+
+#: ../data/gtkpod.glade.h:38
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>Игнорировать чаÑто вÑтречающиеÑÑ Ñлова</b>"
+
+#: ../data/gtkpod.glade.h:39
+msgid "<b>Misc</b>"
+msgstr "<b>Разное</b>"
+
+#: ../data/gtkpod.glade.h:40
+msgid "<b>Mountpoint and individual repository/playlist options</b>"
+msgstr "<b>ÐаÑтройки точки Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ отдельных репозиториев/ÑпиÑков воÑпроизведениÑ</b>"
+
+#: ../data/gtkpod.glade.h:41
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Преобразование на лету</b>"
+
+#: ../data/gtkpod.glade.h:42
+msgid "<b>Play</b>"
+msgstr "<b>ВоÑпроизведение</b>"
+
+#: ../data/gtkpod.glade.h:43
+msgid "<b>Playlists</b>"
+msgstr "<b>СпиÑки воÑпроизведениÑ</b>"
+
+#: ../data/gtkpod.glade.h:44
+msgid "<b>Please select mountpoint and your iPod model</b>"
+msgstr "<b>ПожалуйÑта, выберите точку Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ модель iPod</b>"
+
+#: ../data/gtkpod.glade.h:45
+msgid "<b>Repositories</b>"
+msgstr "<b>Репозитории</b>"
+
+#: ../data/gtkpod.glade.h:46
+msgid "<b>Resolution:</b>"
+msgstr "<b>Разрешение:</b>"
+
+#: ../data/gtkpod.glade.h:47
+msgid "<b>Sort Order</b>"
+msgstr "<b>ПорÑдок Ñортировки</b>"
+
+#: ../data/gtkpod.glade.h:48
+msgid "<b>Sort Tabs</b>"
+msgstr "<b>Сортировочные вкладки</b>"
+
+#: ../data/gtkpod.glade.h:49
+msgid "<b>Sync</b>"
+msgstr "<b>СинхронизациÑ</b>"
+
+#: ../data/gtkpod.glade.h:50
+msgid "<b>Synchronization</b>"
+msgstr "<b>СинхронизациÑ</b>"
+
+#: ../data/gtkpod.glade.h:51
+msgid "<b>Tag Reading</b>"
+msgstr "<b>Чтение меток</b>"
+
+#: ../data/gtkpod.glade.h:52
+msgid "<b>Toolbar</b>"
+msgstr "<b>Панель инÑтрументов</b>"
+
+#: ../data/gtkpod.glade.h:53
+msgid "<b>Tooltips</b>"
+msgstr "<b>Ð’Ñплывающие подÑказки</b>"
+
+#: ../data/gtkpod.glade.h:54
+msgid "<b>Track Attributes</b>"
+msgstr "<b>Ðтрибуты дорожки</b>"
+
+#: ../data/gtkpod.glade.h:55
+msgid "<b>Track Editing</b>"
+msgstr "<b>Редактирование дорожек</b>"
+
+#: ../data/gtkpod.glade.h:56
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>ÐÐ¾Ñ€Ð¼Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð³Ñ€Ð¾Ð¼ÐºÐ¾Ñти</b>"
+
+#: ../data/gtkpod.glade.h:57
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
+
+#: ../data/gtkpod.glade.h:58
+msgid ">"
+msgstr ">"
+
+#: ../data/gtkpod.glade.h:59
+msgid "About gtkpod"
+msgstr "О программе gtkpod"
+
+#: ../data/gtkpod.glade.h:60
+msgid "Add Directories Recursively"
+msgstr "Добавить папки рекурÑивно"
+
+#: ../data/gtkpod.glade.h:61
+msgid "Add Files"
+msgstr "Добавить файлы"
+
+#: ../data/gtkpod.glade.h:62
+msgid "Add Files or Directories"
+msgstr "Добавить файлы или папки"
+
+#: ../data/gtkpod.glade.h:63
+msgid "Add Fol_der"
+msgstr "Добавить _папку"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Folder"
+msgstr "Добавить папку"
+
+#: ../data/gtkpod.glade.h:65
+msgid "Add Image_s"
+msgstr "Добавить _изображениÑ"
+
+#: ../data/gtkpod.glade.h:66
+msgid "Add Images from a Directory"
+msgstr "Добавить Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð· папки"
+
+#: ../data/gtkpod.glade.h:67
+msgid "Add Playlist"
+msgstr "Добавить ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:68
+msgid "Add _Files"
+msgstr "Добавить _файлы_"
+
+#: ../data/gtkpod.glade.h:69
+msgid "Add _Playlist"
+msgstr "Добавить _ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:70
+msgid "Add coverart from file using the following template"
+msgstr "Добавить изображение обложки из файла, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ Ñледующий шаблон"
+
+#: ../data/gtkpod.glade.h:71
+msgid "Add directories recursively"
+msgstr "Добавить папки рекурÑивно"
+
+#: ../data/gtkpod.glade.h:72
+msgid "Add new repository/iPod"
+msgstr "Добавить новый репозиторий/iPod"
+
+#: ../data/gtkpod.glade.h:73
+msgid "Add playlist from file"
+msgstr "Добавить ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¸Ð· файла"
+
+#: ../data/gtkpod.glade.h:74 ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
+msgid "Added"
+msgstr "Добавлено"
+
+#: ../data/gtkpod.glade.h:75
+msgid "Advanced Sorting Options"
+msgstr "Дополнительные параметры Ñортировки"
+
+#. 0
+#: ../data/gtkpod.glade.h:76 ../src/display_sorttabs.c:2982
+#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
+msgid "Album"
+msgstr "Ðльбом"
+
+#: ../data/gtkpod.glade.h:77
+msgid "Album Art"
+msgstr "Обложка"
+
+#: ../data/gtkpod.glade.h:78
+msgid "All (AND)"
+msgstr "Ð’Ñе (И)"
+
+#: ../data/gtkpod.glade.h:79
+msgid "All Tracks Never Listened To"
+msgstr "Ð’Ñе дорожки, не проÑлушанные ни разу"
+
+#: ../data/gtkpod.glade.h:80
+msgid "All Tracks Played Since Last Time"
+msgstr "Ð’Ñе дорожки, проÑлушанные Ñ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³Ð¾ раза"
+
+#: ../data/gtkpod.glade.h:81
+msgid "All Tracks not Listed in any Playlist"
+msgstr "Ð’Ñе дорожки, не включённые ни в один ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:82
+msgid "Also include tracks never played in \"Best Rated\" playlist"
+msgstr "Также включать никогда не воÑпроизведённые дорожки в ÑпиÑок \"Ðаибольший рейтинг\""
+
+#: ../data/gtkpod.glade.h:83
+msgid "Always write ID3v2.4 tags (only applies to MP3)"
+msgstr "Ð’Ñегда запиÑывать метки ID3v2.4 (только Ð´Ð»Ñ MP3)"
+
+#: ../data/gtkpod.glade.h:84
+msgid "Any (OR)"
+msgstr "Любые (ИЛИ)"
+
+#: ../data/gtkpod.glade.h:85 ../src/display_sorttabs.c:2979
+#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
+msgid "Artist"
+msgstr "ИÑполнитель"
+
+#: ../data/gtkpod.glade.h:86
+msgid "Artwork Preview"
+msgstr "ПредпроÑмотр изображениÑ"
+
+#: ../data/gtkpod.glade.h:87
+msgid ""
+"As a last resort set the following tags to the\n"
+"filename if they are (still) empty:"
+msgstr "Ð’ качеÑтве крайней меры, уÑтановить Ñледующие метки в\n"
+"Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°, еÑли они (вÑÑ‘ ещё) пуÑÑ‚Ñ‹"
+
+#: ../data/gtkpod.glade.h:89
+msgid "Ascending"
+msgstr "По возраÑтанию"
+
+#: ../data/gtkpod.glade.h:90
+msgid "Auto Store"
+msgstr "ÐвтоÑохранение"
+
+#: ../data/gtkpod.glade.h:91
+msgid ""
+"Automatically start displaying tracks that match the criteria entered above. "
+"If not selected, you must press 'Display' to start displaying."
+msgstr "ÐвтоматичеÑки начать отображение дорожек, отвечающих выбранным выше критериÑм."
+"ЕÑли не выбрано, вы должны нажать \"Отобразить\" Ð´Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° отображениÑ."
+
+#: ../data/gtkpod.glade.h:92
+msgid "Available:"
+msgstr "ДоÑтупно:"
+
+#: ../data/gtkpod.glade.h:93
+msgid "Before removing playlists or tracks from a playlist"
+msgstr "Перед удалением ÑпиÑков воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ дорожек из ÑпиÑка"
+
+#: ../data/gtkpod.glade.h:94
+msgid "Before removing tracks from the harddisk"
+msgstr "Перед удалением дорожек Ñ Ð¶Ñ‘Ñткого диÑка"
+
+#: ../data/gtkpod.glade.h:95
+msgid "Before removing tracks from the iPod"
+msgstr "Перед удалением дорожек Ñ iPod"
+
+#: ../data/gtkpod.glade.h:96
+msgid "Before removing tracks from the local database"
+msgstr "Перед удалением дорожек из локальной базы данных"
+
+#: ../data/gtkpod.glade.h:97
+msgid "Best Rated Tracks"
+msgstr "Дорожки Ñ Ð½Ð°Ð¸Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð¼ рейтингом"
+
+#: ../data/gtkpod.glade.h:98
+msgid "Browse"
+msgstr "Обзор"
+
+#: ../data/gtkpod.glade.h:99
+msgid "Cache directory:"
+msgstr "Папка Ñ ÐºÑшем:"
+
+#: ../data/gtkpod.glade.h:100
+msgid "Calendar"
+msgstr "Календарь"
+
+#: ../data/gtkpod.glade.h:101
+msgid "Calendar sync command:"
+msgstr "Команда Ñинхронизации календарÑ:"
+
+#: ../data/gtkpod.glade.h:102
+msgid "Call automatically when synchronizing iTunesDB"
+msgstr "Вызывать автоматичеÑки при Ñинхронизации iTunesDB"
+
+#: ../data/gtkpod.glade.h:103
+msgid "Category: "
+msgstr "КатегориÑ: "
+
+#: ../data/gtkpod.glade.h:104
+msgid ""
+"Change all tracks\n"
+"simultaneously"
+msgstr "Изменить вÑе дорожки\n"
+"одновременно"
+
+#: ../data/gtkpod.glade.h:106
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr "Перед удалением Ñнимков из фотоальбома, проверÑÑ‚ÑŒ,\n"
+"должны ли они быть удалены из базы данных Ñнимков."
+
+#: ../data/gtkpod.glade.h:108
+msgid "Check for existing files when copying from iPod."
+msgstr "ПроверÑÑ‚ÑŒ наличие ÑущеÑтвующих файлов при копировании Ñ iPod."
+
+#: ../data/gtkpod.glade.h:109
+msgid "Command for 'Enqueue':"
+msgstr "Команда \"ПоÑтавить в очередь\":"
+
+#: ../data/gtkpod.glade.h:110
+msgid "Command for 'Play now':"
+msgstr "Команда \"ВоÑпроизвеÑти ÑейчаÑ\":"
+
+#. 5
+#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97
+#: ../src/misc_conversion.c:65
+msgid "Composer"
+msgstr "Композитор"
+
+#: ../data/gtkpod.glade.h:112
+msgid "Confirm before removing tracks from the iPod or repository"
+msgstr "Выводить подтверждение перед удалением дорожек Ñ iPod или из репозиториÑ"
+
+#: ../data/gtkpod.glade.h:113
+msgid ""
+"Confirm before removing tracks from the iPod or repository\n"
+"when syncing playlists"
+msgstr "Выводить подтверждение перед удалением дорожек Ñ iPod или из репозиториÑ\n"
+"при Ñинхронизации ÑпиÑков воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:115
+msgid "Confirm lists of directories"
+msgstr "Подтверждать ÑпиÑки папок"
+
+#: ../data/gtkpod.glade.h:116
+msgid "Contacts sync command:"
+msgstr "Команда Ñинхронизации контактов:"
+
+#: ../data/gtkpod.glade.h:117
+msgid "Containing Displayed Tracks"
+msgstr "Содержащие отображаемые дорожки"
+
+#: ../data/gtkpod.glade.h:118
+msgid "Containing Selected Tracks"
+msgstr "Содержащие выбранные дорожки"
+
+#: ../data/gtkpod.glade.h:119
+msgid "Conversion Progress Display"
+msgstr "Отображение хода преобразованиÑ"
+
+#: ../data/gtkpod.glade.h:120
+msgid "Cover"
+msgstr "Обложка"
+
+#: ../data/gtkpod.glade.h:121
+msgid "Create New Playlist"
+msgstr "Создать новый ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:122
+msgid "Create Repository"
+msgstr "Создать репозиториÑ"
+
+#: ../data/gtkpod.glade.h:123
+msgid "Create _Playlist File"
+msgstr "Создать _файл ÑпиÑка воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:124
+msgid "Credits"
+msgstr "Ðвторы"
+
+#: ../data/gtkpod.glade.h:125
+msgid "Currently only rating is supported."
+msgstr "Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÑ‚ÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ рейтинг."
+
+#: ../data/gtkpod.glade.h:126
+msgid "Delete repository"
+msgstr "Удалить репозиторий"
+
+#: ../data/gtkpod.glade.h:127
+msgid ""
+"Delete tracks that are no longer present from the\n"
+"iPod or repository"
+msgstr "УдалÑÑ‚ÑŒ отÑутÑтвующие дорожки Ñ\n"
+"iPod или из репозиториÑ"
+
+#: ../data/gtkpod.glade.h:129
+msgid "Deleted tracks"
+msgstr "Удалённые дорожки"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Descending"
+msgstr "По убыванию"
+
+#: ../data/gtkpod.glade.h:131
+msgid "Details"
+msgstr "ПодробноÑти"
+
+#: ../data/gtkpod.glade.h:133
+#, no-c-format
+msgid ""
+"Determines how the string for the info field should be constructed, e.g '%a/%"
+"A/%T - %t.mp3' or '%o'. You can separate several templates by semicolons -- "
+"gtkpod will determine which one to use by the filename extension given. "
+"Artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
+"nr: %C, year: %Y, original filename (requires extended information file): %"
+"o, the character '%': %%."
+msgstr ""
+"ОпределÑет поÑтроение Ñтроки Ð´Ð»Ñ Ð¿Ð¾Ð»Ñ Ñведений, например, '%a/%"
+"A/%T - %t.mp3' или '%o'. Ð’Ñ‹ можете разделить неÑколько шаблонов точками Ñ Ð·Ð°Ð¿Ñтой -- "
+"gtkpod определит, какой из них иÑпользовать, по заданному раÑширению файла. "
+"ИÑполнитель: %a, альбом: %A, композитор: %c, название: %t, жанр: %G, номер дорожки: %T, номер CD: %C, год: %Y, оригинальное иÑÑ Ñ„Ð°Ð¹Ð»Ð° (требует раÑширенный файл Ñведений): %"
+"o, Ñимвол '%': %%."
+
+#: ../data/gtkpod.glade.h:135
+#, no-c-format
+msgid ""
+"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
+"mp3' or '%o'. You can separate several patterns by semicolons -- gtkpod "
+"will determine which one to use by the filename extension given. Artist: %a, "
+"album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, "
+"year: %Y, original filename (requires extended information file): %o, "
+"current playlist: %p, the character '%': %%."
+msgstr ""
+"ОпределÑет Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ð´Ð»Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐµÐº, копируемых Ñ iPod, например, '%a/%A/%T - %t."
+"mp3' or '%o'. Ð’Ñ‹ можете разделить неÑколько шаблонов точками Ñ Ð·Ð°Ð¿Ñтой -- "
+"gtkpod определит, какой из них иÑпользовать, по заданному раÑширению файла. "
+"ИÑполнитель: %a, альбом: %A, композитор: %c, название: %t, жанр: %G, номер дорожки: %T, номер CD: %C, год: %Y, оригинальное иÑÑ Ñ„Ð°Ð¹Ð»Ð° (требует раÑширенный файл Ñведений): %o, текущий ÑпиÑок воÑпроизведениÑ: %p, Ñимвол '%': %%."
+
+#: ../data/gtkpod.glade.h:137
+#, no-c-format
+msgid ""
+"Determines the name of the file with the cover art. You can separate several "
+"patterns by semicolons which will be tried in order. Artist: %a, album: %A, "
+"composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, year: %Y, "
+"original filename (requires extended information file): %o, original "
+"filename without file extension: %O, current playlist: %p, the character "
+"'%': %%."
+msgstr ""
+"ОпределÑет Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ñ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÐµÐ¼ обложки. Ð’Ñ‹ можете разделить неÑколько шаблонов точками Ñ Ð·Ð°Ð¿Ñтой -- "
+"gtkpod определит, какой из них иÑпользовать, по заданному раÑширению файла. "
+"ИÑполнитель: %a, альбом: %A, композитор: %c, название: %t, жанр: %G, номер дорожки: %T, номер CD: %C, год: %Y, оригинальное иÑÑ Ñ„Ð°Ð¹Ð»Ð° (требует раÑширенный файл Ñведений): %o, текущий ÑпиÑок воÑпроизведениÑ: %p, Ñимвол '%': %%."
+
+#: ../data/gtkpod.glade.h:138
+msgid ""
+"Directories to sync with are determined from the filenames of the tracks in "
+"the playlist."
+msgstr "Папки, подлежащие Ñинхронизации, определÑÑŽÑ‚ÑÑ Ð¿Ð¾ именам файлов дорожек в ÑпиÑке воÑпроизведениÑ."
+
+#: ../data/gtkpod.glade.h:139
+msgid "Display a list of tracks that could actually be updated."
+msgstr "Отобразить ÑпиÑок дорожек, которые могут быть обновлены."
+
+#: ../data/gtkpod.glade.h:140
+msgid "Display a list of tracks that could not be updated."
+msgstr "Отобразить ÑпиÑок дорожек, которые не могут быть обновлены."
+
+#: ../data/gtkpod.glade.h:141
+msgid "Display conversion log"
+msgstr "Отобразить журнал Ñообщений преобразованиÑ"
+
+#: ../data/gtkpod.glade.h:142
+msgid "Display info about detected duplicates"
+msgstr "Отобразить ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± обнаруженных дубликатах"
+
+#: ../data/gtkpod.glade.h:143
+msgid "Display info about non-updated tracks"
+msgstr "Отобразить ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ необновлённых дорожках"
+
+#: ../data/gtkpod.glade.h:144
+msgid "Display info about updated tracks"
+msgstr "Отобразить ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð± обновлённых дорожках"
+
+#: ../data/gtkpod.glade.h:145
+msgid "Display messages and warnings at startup"
+msgstr "Отображать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ запуÑке"
+
+#: ../data/gtkpod.glade.h:146
+msgid ""
+"Display the list of duplicates that have been detected after adding files."
+msgstr "Отобразить ÑпиÑок дубликатов, обнаруженных поÑле Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²."
+
+#: ../data/gtkpod.glade.h:147
+msgid "Display toolbar..."
+msgstr "Отобразить панель инÑтрументов..."
+
+#: ../data/gtkpod.glade.h:148
+msgid "Display tooltips in main window"
+msgstr "Отображать вÑплывающие подÑказки в главном окне"
+
+#: ../data/gtkpod.glade.h:149
+msgid "Display tooltips in prefs window"
+msgstr "Отображать вÑплывающие подÑказки в окне наÑтроек"
+
+#: ../data/gtkpod.glade.h:150
+msgid "Display tracks that match the criteria entered above."
+msgstr "Отобразить дорожки, удовлетворÑющие введённым выше критериÑм."
+
+#: ../data/gtkpod.glade.h:151
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr "Отображаемые\n"
+"дорожки"
+
+#: ../data/gtkpod.glade.h:153
+msgid "Displayed:"
+msgstr "Отображено:"
+
+#: ../data/gtkpod.glade.h:154
+msgid "Don't allow file duplication"
+msgstr "Запрещать поÑвление дубликатов файлов"
+
+#: ../data/gtkpod.glade.h:155
+msgid "Don't automatically sync on startup"
+msgstr "Ðе ÑинхронизироватьÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки при запуÑке"
+
+#: ../data/gtkpod.glade.h:156
+msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+msgstr "ПоиÑк дубликатов оÑнован на (модифицированном) Ñ…Ñше SHA1 в отношении файла."
+
+#: ../data/gtkpod.glade.h:157
+msgid "Edit Repository/iPod Options"
+msgstr "ÐаÑтройки репозиториев/iPod"
+
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:662
+msgid "Edit Smart Playlist"
+msgstr "Изменить умный ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:749
+msgid "Edit Track Details"
+msgstr "Изменить ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ дорожке"
+
+#: ../data/gtkpod.glade.h:160
+msgid "Edit _Preferences"
+msgstr "_Параметры"
+
+#: ../data/gtkpod.glade.h:161
+msgid "Effective free space"
+msgstr "Ðффективное Ñвободное проÑтранÑтво"
+
+#: ../data/gtkpod.glade.h:162
+msgid "Empty Playlist"
+msgstr "ПуÑтой ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:163
+msgid "Exclude file mask(s)"
+msgstr "ИÑключать маÑки файлов"
+
+#: ../data/gtkpod.glade.h:164
+msgid "Export can be continued at a later time if canceled."
+msgstr "ÐкÑпорт может быть возобновлён позднее в Ñлучае отмены."
+
+#: ../data/gtkpod.glade.h:165
+msgid "File size"
+msgstr "Размер файла"
+
+#: ../data/gtkpod.glade.h:166
+msgid "File size (deleted)"
+msgstr "Размер файла (удалённого)"
+
+#: ../data/gtkpod.glade.h:167
+msgid "File size (non-transferred)"
+msgstr "Размер файла (непереданного)"
+
+#: ../data/gtkpod.glade.h:168
+msgid "Filename Format: "
+msgstr "Формат имени файла: "
+
+#: ../data/gtkpod.glade.h:169
+msgid ""
+"Find orphan files (files with no track info in DB) and dangling tracks "
+"(tracks with no corresponding files on iPod)"
+msgstr "Ðайти оÑиротевшие файлы (файлы без Ñведений о дорожке в базе данных) и повиÑшие дорожки"
+"(дорожки без ÑоответÑтвующих файлов на iPod)"
+
+#: ../data/gtkpod.glade.h:170
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgstr "Сначала попробовать <i>folder.jpg</i>, затем <i><artist>/jpg</i>"
+
+#: ../data/gtkpod.glade.h:171
+msgid "Flac with :"
+msgstr "FLAC Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:"
+
+#: ../data/gtkpod.glade.h:173
+#, no-c-format
+msgid ""
+"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
+"tracks and start playing."
+msgstr "Ðапример, \"xmms %s\" очиÑтит текущий ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ XMMS, добавит выбранные "
+"дорожки и начнёт воÑпроизведение."
+
+#: ../data/gtkpod.glade.h:175
+#, no-c-format
+msgid ""
+"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
+"current playlist."
+msgstr "Ðапример, \"xmms -e %s\" добавит (поÑтавит в очередь) выбранные дорожки в "
+"текущий ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ XMMS."
+
+#: ../data/gtkpod.glade.h:176 ../src/display_sorttabs.c:2985
+#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
+msgid "Genre"
+msgstr "Жанр"
+
+#: ../data/gtkpod.glade.h:177
+msgid "Group artists on compilation CDs"
+msgstr "Группировать по иÑполнителÑм на CD Ñборников"
+
+#: ../data/gtkpod.glade.h:178
+msgid ""
+"Highly recommended for faster import when taking advantage of the "
+"duplication recognition. Also, having the PC filenames allows writing "
+"changed ID3 tags to disk, and even to reconstruct your iPod's contents in "
+"case of file system corruption (change the \"transferred=\" entries in your "
+"backuped database)."
+msgstr "ÐаÑтоÑтельно рекомендуетÑÑ Ð´Ð»Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð¸Ñ ÑкороÑти импорта при иÑпользовании "
+"раÑÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°Ð½Ð¸Ñ Ð´ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ‚Ð¾Ð². Кроме того, иÑпользование имён файлов ПК позволÑет запиÑывать "
+"изменённые метки ID3 на диÑк и даже воÑÑтановить Ñодержимое iPod в Ñлучае "
+"Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¹ ÑиÑтемы (измените запиÑи \"transferred=\" в Ñвоей "
+"резервной копии базы данных)."
+
+#: ../data/gtkpod.glade.h:179 ../src/context_menus.c:685
+#: ../src/context_menus.c:703 ../src/context_menus.c:820
+msgid "I'm sure"
+msgstr "Я уверен"
+
+#: ../data/gtkpod.glade.h:180
+msgid ""
+"If available, the local copy of the track is referenced in the playlist. "
+"Otherwise the file on the iPod is used."
+msgstr "ЕÑли доÑтупна Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸, на неё ÑоздаётÑÑ ÑÑылка в ÑпиÑке воÑпроизведениÑ. "
+"Ð’ противном Ñлучае иÑпользуетÑÑ Ñ„Ð°Ð¹Ð» на iPod."
+
+#: ../data/gtkpod.glade.h:181
+msgid "If both options are selected, embedded APIC data takes precedence."
+msgstr "ЕÑли выбраны обе опции, внедрённые данные APIC имеют приоритет."
+
+#: ../data/gtkpod.glade.h:182
+msgid ""
+"If checked, sorting will be case sensitive. Please note that case sensitive "
+"sorting will not work well with most charsets."
+msgstr "ЕÑли Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°, Ñортировка будет учитывать региÑÑ‚Ñ€. Имейте в виду, что Ñортировка "
+"Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¼ региÑтра не работает корректно Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ð½Ñтвом кодировок."
+
+#: ../data/gtkpod.glade.h:183
+msgid ""
+"If the filename (full path) of an existing track matches that of a track to "
+"be added, this option allows you to update the information about the "
+"existing track rather than just skipping the track altogether. No update "
+"will take place if the file hasn't changed and you have selected the 'Don't "
+"allow file duplication' option above."
+msgstr "ЕÑли Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° (полный путь) ÑущеÑтвующей дорожки Ñовпадает Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ файла"
+"добавлÑемой дорожки, Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð¿Ð¾Ð·Ð²Ð¾Ð»Ñет вам обновить ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ÑущеÑтвующей"
+"дорожке вмеÑто её пропуÑка. Обновление не будет произведено, еÑли файл не"
+"был изменён и вы выбрали опцию \"Запрещать поÑвление дубликатов файлов\" выше."
+
+#: ../data/gtkpod.glade.h:184
+msgid "If you check this, gtkpod will descend into subdirectories recursively."
+msgstr "При выборе Ñтой опции gtkpod будет проÑматривать папки рекурÑивно."
+
+#: ../data/gtkpod.glade.h:185
+msgid ""
+"If you check this, information (cover art and meta information) changed for "
+"this track will be copied to all other selected tracks as well. Use with "
+"care."
+msgstr "При выборе Ñтой опции ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ (обложка и метаданные), изменившиеÑÑ"
+"у данной дорожки, будут также Ñкопированы во вÑе оÑтальные дорожки."
+"ИÑпользуйте Ñ Ð¾ÑторожноÑтью."
+
+#: ../data/gtkpod.glade.h:186
+msgid ""
+"If you don't select the master playlist automatically, the initial database "
+"import is much faster because the display dosn't have to be updated."
+msgstr "ЕÑли вы не выбираете главный ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑки,"
+"первый импорт базы данных проиÑходит значительно быÑтрее, поÑкольку"
+"отображаемые ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð½Ðµ нуждаютÑÑ Ð² обновлении."
+
+#: ../data/gtkpod.glade.h:187
+msgid ""
+"If you select several tracks in the track list and edit a tag of the first "
+"track, the tags in the other tracks are updated as well."
+msgstr "ЕÑли вы выберете неÑколько дорожек в ÑпиÑке дорожек и измените"
+"метку первой дорожки, метки вÑех оÑтальных дорожек также обновÑÑ‚ÑÑ."
+
+#: ../data/gtkpod.glade.h:188
+msgid "Ignore these words when at the beginning of the following fields:"
+msgstr "Игнорировать Ñти Ñлова в начале Ñледующих полей:"
+
+#: ../data/gtkpod.glade.h:189
+msgid ""
+"In order to save the displayed track order to the iPod choose 'Save "
+"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
+msgstr "Чтобы Ñохранить отображаемый порÑдок дорожек на iPod, выберите пункт"
+"\"Сохранить отображаемый порÑдок дорожек\" в меню \"Правка\" или опцию"
+"\"ÐвтоÑохранение\" ниже."
+
+#: ../data/gtkpod.glade.h:190
+msgid "Initialize iPod"
+msgstr "Инициализировать iPod"
+
+#: ../data/gtkpod.glade.h:191
+msgid ""
+"Insert before\n"
+"Insert after"
+msgstr "Ð’Ñтавить перед\n"
+"Ð’Ñтавить поÑле"
+
+#: ../data/gtkpod.glade.h:193
+msgid "Keeps all compilation CDs grouped together in the artists sort tab."
+msgstr "Группирует вмеÑте вÑе CD Ñборников на вкладке Ñортировки по иÑполнителÑм."
+
+#: ../data/gtkpod.glade.h:194
+msgid "Live _updating"
+msgstr "&Обновление в реальном времени"
+
+#: ../data/gtkpod.glade.h:195
+msgid "Load iPod(s)"
+msgstr "Загрузить iPod"
+
+#: ../data/gtkpod.glade.h:196
+msgid "Lower Margin"
+msgstr "ÐижнÑÑ Ð³Ñ€Ð°Ð½Ð¸Ñ†Ð°"
+
+#: ../data/gtkpod.glade.h:197
+msgid "M4A with :"
+msgstr "M4A Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:"
+
+#: ../data/gtkpod.glade.h:198
+msgid "MP3 with :"
+msgstr "MP3 Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:"
+
+#: ../data/gtkpod.glade.h:199
+msgid "Match al_l of the following"
+msgstr "Совпадение Ñо вÑеми указанными"
+
+#: ../data/gtkpod.glade.h:200
+msgid "Match an_y of the following"
+msgstr "Совпадение Ñ Ð»ÑŽÐ±Ñ‹Ð¼ из указанных"
+
+#: ../data/gtkpod.glade.h:201
+msgid "Match only _checked tracks"
+msgstr "Совпадение только Ñ &отмеченными дорожками"
+
+#: ../data/gtkpod.glade.h:202
+msgid "Maximum number of background threads:"
+msgstr "МакÑимальное чиÑло фоновых потоков:"
+
+#: ../data/gtkpod.glade.h:203
+msgid "Maximum size of cache directory (in GB):"
+msgstr "МакÑимальный размер папки кÑша (в ГБ):"
+
+#: ../data/gtkpod.glade.h:204
+msgid "Model:"
+msgstr "Модель:"
+
+#: ../data/gtkpod.glade.h:205 ../src/display_tracks.c:2100
+msgid "Modified"
+msgstr "Изменено"
+
+#: ../data/gtkpod.glade.h:206
+msgid "Most Recently Played Tracks"
+msgstr "Ðедавно воÑпроизведённые дорожки"
+
+#: ../data/gtkpod.glade.h:207
+msgid "Move selected attributes to the displayed list"
+msgstr "ПеремеÑтить выбранные атрибуты в отображаемый ÑпиÑок"
+
+#: ../data/gtkpod.glade.h:208
+msgid "Music Root:"
+msgstr "ÐšÐ¾Ñ€Ð½ÐµÐ²Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° музыки:"
+
+#: ../data/gtkpod.glade.h:209
+msgid ""
+"Music files can have images embedded in the APIC tag. Currently this is only "
+"supported for MP3 files."
+msgstr "Музыкальные файлы могут иметь изображениÑ, внедрённые в метку APIC."
+"Ð’ наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ñто поддерживаетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² MP3."
+
+#: ../data/gtkpod.glade.h:210
+msgid "Never show this dialogue again"
+msgstr "Ðе показывать Ñтот диалог Ñнова"
+
+#: ../data/gtkpod.glade.h:211 ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66 ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93 ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428 ../src/misc_playlist.c:430
+msgid "New Playlist"
+msgstr "Создать ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:212
+msgid "No lower margin"
+msgstr "Без нижней границы"
+
+#: ../data/gtkpod.glade.h:213
+msgid "No upper margin"
+msgstr "Без верхней границы"
+
+#: ../data/gtkpod.glade.h:214
+msgid "Non-transferred tracks"
+msgstr "Ðепереданные дорожки"
+
+#: ../data/gtkpod.glade.h:215
+msgid "None"
+msgstr "Ðет"
+
+#: ../data/gtkpod.glade.h:216
+msgid ""
+"Normally the charset specified when first importing the track will be used "
+"for the filename. If you set this option you can set a different charset "
+"with the charset selector (Preferences/'Adding/Updating/Syncing'). Note: the "
+"charset info is stored in the extended information file (see "
+"Preferences/'Writing of the iTunesDB'). Tracks imported before V0.51 will "
+"have no charset stored. Instead the charset specified will be used."
+msgstr "Как правило, Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¸ файла будет иÑпользована кодировка, выбраннаÑ"
+"при первом импорте дорожки. ЕÑли вы включите Ñту опцию, вы можете"
+"задать другую кодировку Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ функции выбора кодировки"
+"(Параметры - Добавление/удаление/ÑинхронизациÑ). Замечание: выбор"
+"кодировки ÑохранÑетÑÑ Ð² файле раÑширенных Ñведений (Ñм."
+"Параметры - ЗапиÑÑŒ в iTunesDB). Ð”Ð»Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐµÐº, импортированных до верÑии"
+"0.51, кодировка Ñохранена не будет. ВмеÑто Ñтого будет иÑпользоватьÑÑ"
+"Ð·Ð°Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°."
+
+#: ../data/gtkpod.glade.h:217
+msgid ""
+"Normally the charset specified when first importing the track will be used "
+"to update the track information. If you have chosen a wrong charset when "
+"first importing a track and want to correct it using the 'Update Track' "
+"function, you must check this option. Note: the charset info is stored in "
+"the extended information file (see 'Writing of iTunesDB' below) and tracks "
+"imported before V0.51 will have no charset stored. Instead the charset "
+"specified above will be used then."
+msgstr "Как правило, Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ñведений о дорожке будет иÑпользована кодировка,"
+"Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð¿Ñ€Ð¸ первом импорте дорожки. ЕÑли вы выбрали неверную кодировку"
+"при первом импорте и хотите иÑправить ошибку Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ функции"
+"\"Обновить дорожку\", вы должны включить Ñту опцию. Замечание: выбор"
+"кодировки ÑохранÑетÑÑ Ð² файле раÑширенных Ñведений (Ñм."
+"Параметры - ЗапиÑÑŒ в iTunesDB). Ð”Ð»Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐµÐº, импортированных до верÑии"
+"0.51, кодировка Ñохранена не будет. ВмеÑто Ñтого будет иÑпользоватьÑÑ"
+"Ð·Ð°Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°."
+
+#: ../data/gtkpod.glade.h:218
+msgid ""
+"Normally the charset specified when first importing the track will be used "
+"to write the tags. If you have chosen a wrong charset when first importing a "
+"track, you should select this option along with the correct charset. Note: "
+"uses the extended information file to store the charset information (see "
+"'Writing of the iTunesDB' on the 'Input/Output' page) and tracks imported "
+"before V0.51 will have no charset stored -- the charset specified on the "
+"'Input/Output' page will be used."
+msgstr "Как правило, Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи меток будет иÑпользована кодировка, выбраннаÑ"
+"при первом импорте дорожки. ЕÑли вы выбрали неверную кодировку"
+"при первом импорте, вы должны включить Ñту опцию и выбрать верную"
+"дорожку. Замечание: выбор кодировки ÑохранÑетÑÑ Ð² файле раÑширенных"
+"Ñведений (Ñм. Параметры - ЗапиÑÑŒ в iTunesDB). Ð”Ð»Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐµÐº,"
+"импортированных до верÑии 0.51, кодировка Ñохранена не будет. ВмеÑто"
+"Ñтого будет иÑпользоватьÑÑ Ð·Ð°Ð´Ð°Ð½Ð½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°."
+
+#: ../data/gtkpod.glade.h:219
+msgid ""
+"Normally, if a track is no longer present in the sync directory, it will be "
+"removed from the playlist, but not from the iPod or local repository.\n"
+"If this option is checked, tracks will be completely removed from the iPod "
+"or local repository, unless the track is a member of other playlists as "
+"well.\n"
+"NOTE: if you sync with the master playlist, you must check this option if "
+"you want tracks to be removed, because removing from the master playlist "
+"means removing from the iPod."
+msgstr "Как правило, еÑли дорожка больше не ÑущеÑтвует в папке Ð´Ð»Ñ Ñинхронизации,"
+"она будет удалена из ÑпиÑка воÑпроизведениÑ, но не Ñ iPod (из репозиториÑ).\n"
+"ЕÑли Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°, дорожки будут полноÑтью удалены Ñ iPod или из"
+"локального репозиториÑ, кроме Ñлучаев, когда дорожка также ÑодержитÑÑ"
+"в других ÑпиÑках воÑпроизведениÑ.\n"
+"ЗÐМЕЧÐÐИЕ: еÑли вы ÑинхронизируетеÑÑŒ Ñ Ð³Ð»Ð°Ð²Ð½Ñ‹Ð¼ ÑпиÑком воÑпроизведениÑ,"
+"вы должны включить Ñту опцию, еÑли вы хотите удалÑÑ‚ÑŒ дорожки, поÑкольку"
+"удаление из главного ÑпиÑка означает удаление Ñ iPod."
+
+#: ../data/gtkpod.glade.h:222
+msgid "Notes sync command:"
+msgstr "Команда Ñинхронизации заметок:"
+
+#: ../data/gtkpod.glade.h:223
+msgid "Number of playlists"
+msgstr "ЧиÑло ÑпиÑков воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:224
+msgid "Number of tracks"
+msgstr "ЧиÑло дорожек"
+
+#: ../data/gtkpod.glade.h:225
+msgid "Number of tracks in generated playlists:"
+msgstr "ЧиÑло дорожек в Ñгенерированных ÑпиÑках воÑпроизведениÑ:"
+
+#: ../data/gtkpod.glade.h:226
+msgid ""
+"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
+"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
+msgstr "ЧиÑло дорожек в Ñгенерированных ÑпиÑках воÑпроизведениÑ"
+"\"Ðаиболее чаÑто проÑлушиваемые\", \"Ðаибольший рейтинг\" и"
+"\"ПоÑледние воÑпроизведённые\". Выберите 0, чтобы убрать лимит."
+
+#: ../data/gtkpod.glade.h:227
+msgid "Ogg with :"
+msgstr "Ogg Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:"
+
+#: ../data/gtkpod.glade.h:228
+msgid "On startup automatically sync with playlist directories"
+msgstr "ÐвтоматичеÑки ÑинхронизироватьÑÑ Ñ Ð¿Ð°Ð¿ÐºÐ°Ð¼Ð¸ ÑпиÑков воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ запуÑке"
+
+#: ../data/gtkpod.glade.h:229
+msgid "On startup automatically sync with the following directory"
+msgstr "ÐвтоматичеÑки ÑинхронизироватьÑÑ Ñо Ñледующей директорией при запуÑке"
+
+#: ../data/gtkpod.glade.h:230
+msgid "On startup automatically update (Live Playlist)"
+msgstr "ÐвтоматичеÑки обновлÑÑ‚ÑŒ при запуÑке (ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ñ€ÐµÐ°Ð»ÑŒÐ½Ð¾Ð³Ð¾ времени)"
+
+#: ../data/gtkpod.glade.h:231
+msgid "One for each Album"
+msgstr "По одному Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ альбома"
+
+#: ../data/gtkpod.glade.h:232
+msgid "One for each Artist"
+msgstr "По одному Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ иÑполнителÑ"
+
+#: ../data/gtkpod.glade.h:233
+msgid "One for each Composer"
+msgstr "По одному Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ композитора"
+
+#: ../data/gtkpod.glade.h:234
+msgid "One for each Genre"
+msgstr "По одному Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ жанра"
+
+#: ../data/gtkpod.glade.h:235
+msgid "One for each Rating"
+msgstr "По одному Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ рейтинга"
+
+#: ../data/gtkpod.glade.h:236
+msgid "One for each Year"
+msgstr "По одному Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ года"
+
+#: ../data/gtkpod.glade.h:237
+msgid "Overwrite tags that are already set"
+msgstr "ПерезапиÑывать уже заданные метки"
+
+#: ../data/gtkpod.glade.h:238
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../data/gtkpod.glade.h:239
+msgid "Path:"
+msgstr "Путь:"
+
+#: ../data/gtkpod.glade.h:240
+msgid "Photo Window"
+msgstr "Окно Ñнимков"
+
+#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:94
+msgid "Play time"
+msgstr "ДлительноÑÑ‚ÑŒ"
+
+#: ../data/gtkpod.glade.h:242 ../src/display_spl.c:98
+#: ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "ЧиÑло воÑпроизведений"
+
+#: ../data/gtkpod.glade.h:243 ../src/display_tracks.c:2097
+msgid "Played"
+msgstr "ВоÑпроизведено"
+
+#: ../data/gtkpod.glade.h:244
+msgid "Playlist name:"
+msgstr "Ð˜Ð¼Ñ ÑпиÑка воÑпроизведениÑ:"
+
+#: ../data/gtkpod.glade.h:245
+msgid "Playlist type:"
+msgstr "Тип ÑпиÑка воÑпроизведениÑ:"
+
+#: ../data/gtkpod.glade.h:246 ../src/display_playlists.c:2258
+msgid "Playlists"
+msgstr "СпиÑки воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:247
+msgid "Please refer to the notice below."
+msgstr "ПожалуйÑта, обратитеÑÑŒ к замечанию ниже."
+
+#: ../data/gtkpod.glade.h:248
+msgid "Please specify a time interval"
+msgstr "ПожалуйÑта, задайте временной интервал"
+
+#: ../data/gtkpod.glade.h:249
+msgid "Preferences"
+msgstr "Параметры"
+
+#: ../data/gtkpod.glade.h:250
+msgid "Progress Information"
+msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ходе операции"
+
+#: ../data/gtkpod.glade.h:251
+msgid "R_ename Album"
+msgstr "Пере&именовать альбом"
+
+#: ../data/gtkpod.glade.h:252
+msgid "Random Playlist from Displayed Tracks"
+msgstr "Случайный ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¸Ð· отображаемых дорожек"
+
+#: ../data/gtkpod.glade.h:253
+msgid "Randomize Current Playlist"
+msgstr "ПереÑтроить текущий ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ñлучайным образом"
+
+#: ../data/gtkpod.glade.h:254 ../src/display_spl.c:101
+#: ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "Рейтинг"
+
+#: ../data/gtkpod.glade.h:255
+msgid "Read coverart from embedded APIC data"
+msgstr "Читать Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¾Ð±Ð»Ð¾Ð¶ÐµÐº из внедрённых данных APIC"
+
+#: ../data/gtkpod.glade.h:256
+msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
+msgstr "Читать метки из Ñодержимого файлов (например, меток ID3 Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² MP3)"
+
+#: ../data/gtkpod.glade.h:257
+msgid "Remove selected attributes from the displayed list"
+msgstr "Удалить выбранные атрибуты из отображаемого ÑпиÑка"
+
+#: ../data/gtkpod.glade.h:258
+msgid "Repository Options"
+msgstr "ÐаÑтройки репозиториÑ"
+
+#: ../data/gtkpod.glade.h:259
+msgid "Repository name:"
+msgstr "Ðазвание репозиториÑ:"
+
+#: ../data/gtkpod.glade.h:260
+msgid "Repository type:"
+msgstr "Тип репозиториÑ:"
+
+#: ../data/gtkpod.glade.h:261
+msgid "Root directory of mserv database (trackinfo root)."
+msgstr "ÐšÐ¾Ñ€Ð½ÐµÐ²Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° базы данных mserv (trackinfo)."
+
+#: ../data/gtkpod.glade.h:262
+msgid "Rules"
+msgstr "Правила"
+
+#: ../data/gtkpod.glade.h:263 ../src/context_menus.c:804
+msgid "Save Changes"
+msgstr "Сохранить изменениÑ"
+
+#: ../data/gtkpod.glade.h:264
+msgid "Scrobble Tracks?"
+msgstr "Собирать ÑтатиÑтику о дорожках?"
+
+#: ../data/gtkpod.glade.h:265
+msgid "Select '-1' for no upper limit."
+msgstr "Выберите \"-1\" Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð²ÐµÑ€Ñ…Ð½ÐµÐ¹ границы."
+
+#: ../data/gtkpod.glade.h:266
+msgid "Select '0' for no lower limit."
+msgstr "Выберите \"0\" Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ð½ÐµÐ¹ границы."
+
+#: ../data/gtkpod.glade.h:267
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr "Выбранный\n"
+"ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:269
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr "Выбранные\n"
+"дорожки"
+
+#: ../data/gtkpod.glade.h:271
+msgid "Selected Filter Tab Entry from Database"
+msgstr "Выбранную запиÑÑŒ вкладки фильтрации из базы данных"
+
+#: ../data/gtkpod.glade.h:272
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "Выбранную запиÑÑŒ вкладки фильтрации Ñ Ð¶Ñ‘Ñткого диÑка"
+
+#: ../data/gtkpod.glade.h:273
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "Выбранную запиÑÑŒ вкладки фильтрации из ÑпиÑка воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:274
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "Выбранную запиÑÑŒ вкладки фильтрации Ñ iPod"
+
+#: ../data/gtkpod.glade.h:275
+msgid "Selected Playlist Including Tracks from Database"
+msgstr "Выбранный ÑпиÑок воÑпроизведениÑ, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸, из базы данных"
+
+#: ../data/gtkpod.glade.h:276
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "Выбранный ÑпиÑок воÑпроизведениÑ, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸, Ñ Ð¶Ñ‘Ñткого диÑка"
+
+#: ../data/gtkpod.glade.h:277
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "Выбранный ÑпиÑок воÑпроизведениÑ, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸, Ñ iPod"
+
+#: ../data/gtkpod.glade.h:278
+msgid "Selected Tab _Entry"
+msgstr "Выбранную _запиÑÑŒ вкладки"
+
+#: ../data/gtkpod.glade.h:279
+msgid "Selected Tracks from Database"
+msgstr "Выбранные дорожки из базы данных"
+
+#: ../data/gtkpod.glade.h:280
+msgid "Selected Tracks from Hard Disk"
+msgstr "Выбранные дорожки Ñ Ð¶Ñ‘Ñткого диÑка"
+
+#: ../data/gtkpod.glade.h:281
+msgid "Selected Tracks from Playlist"
+msgstr "Выбранные дорожки из ÑпиÑка воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:282
+msgid "Selected Tracks from iPod"
+msgstr "Выбранные дорожки Ñ iPod"
+
+#: ../data/gtkpod.glade.h:283
+msgid "Selected _Playlist"
+msgstr "Выбранный _ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:284
+msgid "Selected _Tracks"
+msgstr "Выбранные _дорожки"
+
+#: ../data/gtkpod.glade.h:285
+msgid "Selected playlist"
+msgstr "Выбранный ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:286
+msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
+msgstr "СпиÑок файловых маÑок Ð´Ð»Ñ Ð¸ÑключениÑ, разделённых точками Ñ Ð·Ð°Ð¿Ñтой, например, \"*.mp3\""
+
+#: ../data/gtkpod.glade.h:287
+msgid "Set Cover Art from _File"
+msgstr "Выбрать обложку из _файла"
+
+#: ../data/gtkpod.glade.h:288
+msgid "Set mountpoint or edit repository options"
+msgstr "Задать точку Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð»Ð¸ изменить параметры репозиториÑ"
+
+#: ../data/gtkpod.glade.h:289
+msgid "Set options for Calendar/Contacts/Notes"
+msgstr "Задать наÑтройки календарÑ/контактов/заметок"
+
+#: ../data/gtkpod.glade.h:290
+msgid ""
+"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
+"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
+"files will be calculated and written to your music file using this command."
+msgstr "УÑтановите Ñто в \"aacgain -q -k, чтобы иÑпользовать функцию \"Ðормализовать"
+"громкоÑÑ‚ÑŒ\" в меню \"СервиÑ\". ЕÑли Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð°Ð´Ð°Ð½Ð°, отÑутÑтвующие данные"
+"о нормализации Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² M4A и M4B будут вычиÑлены и запиÑаны в"
+"музыкальный файл Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтой команды."
+
+#: ../data/gtkpod.glade.h:291
+msgid ""
+"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
+"the Tools Menu. If this is set, missing normalization data for mp3 files "
+"will be calculated and written to your mp3 file using this command."
+msgstr "УÑтановите Ñто в \"aacgain -q -k, чтобы иÑпользовать функцию \"Ðормализовать"
+"громкоÑÑ‚ÑŒ\" в меню \"СервиÑ\". ЕÑли Ñта Ð¾Ð¿Ñ†Ð¸Ñ Ð·Ð°Ð´Ð°Ð½Ð°, отÑутÑтвующие данные"
+"о нормализации Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² MP3 будут вычиÑлены и запиÑаны в файл MP3"
+"Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñтой команды."
+
+#: ../data/gtkpod.glade.h:292
+msgid "Set this to your last.fm password"
+msgstr "Введите здеÑÑŒ ваш пароль last.fm"
+
+#: ../data/gtkpod.glade.h:293
+msgid "Set this to your last.fm username"
+msgstr "Введите здеÑÑŒ ваше Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ last.fm"
+
+#: ../data/gtkpod.glade.h:294
+msgid ""
+"Set to 0 to effectively disable caching (a maximum of one track will be "
+"cached at a time)."
+msgstr "УÑтановите в 0, чтобы де-факто отключить кÑширование (будет"
+"кÑшировано не более одной дорожки)."
+
+#: ../data/gtkpod.glade.h:295
+msgid ""
+"Set to 0 to use as many background threads as CPUs are available on your "
+"system."
+msgstr "УÑтановите в 0, чтобы иÑпользовать макÑимально доÑтупное на вашей"
+"ÑиÑтеме чиÑло фоновых потоков."
+
+#: ../data/gtkpod.glade.h:296
+msgid "Show information about problems when accessing mserv"
+msgstr "Показывать ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ проблемах при доÑтупе к mserv"
+
+#: ../data/gtkpod.glade.h:297
+msgid "Show summary of sync result"
+msgstr "Показать Ñводную информацию о результате Ñинхронизации"
+
+#: ../data/gtkpod.glade.h:298 ../src/misc_playlist.c:96
+#: ../src/repository.c:1356
+msgid "Smart Playlist"
+msgstr "Умный ÑпиÑок воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:299
+msgid "Sort tracks according to: "
+msgstr "Сортировать дорожки по:"
+
+#: ../data/gtkpod.glade.h:300
+msgid "Sorting Options"
+msgstr "Параметры Ñортировки"
+
+#: ../data/gtkpod.glade.h:301
+msgid "Sorting case sensitive"
+msgstr "Сортировка Ñ ÑƒÑ‡Ñ‘Ñ‚Ð¾Ð¼ региÑтра"
+
+#: ../data/gtkpod.glade.h:302
+msgid "Sorttab: "
+msgstr "Вкладка Ñортировки: "
+
+#: ../data/gtkpod.glade.h:303
+msgid "Sorttabs"
+msgstr "Вкладки Ñортировки"
+
+#: ../data/gtkpod.glade.h:304
+msgid "Source:"
+msgstr "ИÑточник:"
+
+#: ../data/gtkpod.glade.h:306
+#, no-c-format
+msgid ""
+"Specify exact path including command line options. '%i' will be replaced "
+"with the mount point of the iPod."
+msgstr "Задайте точный путь, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ‹ командной Ñтроки. \"%i\" будет"
+"заменено на точку Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ iPod."
+
+#: ../data/gtkpod.glade.h:307
+msgid "Specify interval"
+msgstr "Задайте интервал"
+
+#: ../data/gtkpod.glade.h:308
+msgid "Start display automatically"
+msgstr "Ðачать отображение автоматичеÑки"
+
+#: ../data/gtkpod.glade.h:309
+msgid "Synchronise Contacts, Calendar and Notes"
+msgstr "Синхронизировать контакты, календарь и заметки"
+
+#: ../data/gtkpod.glade.h:310
+msgid "Synchronize All"
+msgstr "Синхронизировать вÑÑ‘"
+
+#: ../data/gtkpod.glade.h:311
+msgid "Synchronize Calendar"
+msgstr "Синхронизировать календарь"
+
+#: ../data/gtkpod.glade.h:312
+msgid "Synchronize Contacts"
+msgstr "Синхронизировать контакты"
+
+#: ../data/gtkpod.glade.h:313
+msgid "Synchronize Notes"
+msgstr "Синхронизировать заметки"
+
+#: ../data/gtkpod.glade.h:314
+msgid "Template for info field: "
+msgstr "Шаблон Ð´Ð»Ñ Ð¿Ð¾Ð»Ñ Ñведений:"
+
+#: ../data/gtkpod.glade.h:315
+msgid ""
+"The local copy of the track is referenced in the playlist. If the track is "
+"not available locally, an error message is displayed."
+msgstr "СпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ ÑÑылаетÑÑ Ð½Ð° локальную копию дорожки ЕÑли"
+"дорожка недоÑтупна локально, будет показано Ñообщение об ошибке."
+
+#: ../data/gtkpod.glade.h:316
+msgid ""
+"The output of the background conversion scripts is copied below. Each page "
+"of the notebook corresponds to one background thread."
+msgstr "Вывод фоновых Ñценариев Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¿Ð¸Ñ€ÑƒÐµÑ‚ÑÑ Ð½Ð¸Ð¶Ðµ. ÐšÐ°Ð¶Ð´Ð°Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ°"
+"ÑоответÑтвует одному фоновому потоку."
+
+#: ../data/gtkpod.glade.h:317
+msgid ""
+"The tags are written to the files on your harddrive and on the iPod (if "
+"available)."
+msgstr "Метки запиÑываютÑÑ Ð² файлы на вашем жёÑтком диÑке и на iPod"
+"(еÑли доÑтупно)."
+
+#: ../data/gtkpod.glade.h:318
+msgid "The track on the iPod is referenced in the playlist file."
+msgstr "Файл ÑпиÑка воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ ÑÑылаетÑÑ Ð½Ð° дорожку на iPod."
+
+#: ../data/gtkpod.glade.h:319
+msgid "This is the same option as in 'Edit/Delete Confirmation'"
+msgstr "Ðто та же опциÑ, что и в группе \"Подтверждение изменениÑ/удалениÑ\"."
+
+#: ../data/gtkpod.glade.h:320
+msgid ""
+"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
+"uses unicode to store the tags, so you won't have to worry about charsets "
+"any more. gtkpod will use UTF8 encoding as this will not increase the size "
+"of pure ASCII tags. ID3v2.2/4 tags will also be written if they are already "
+"present in the file to write to."
+msgstr "Ðто предпочтительный путь, но возможно, не вÑе программы Ñто поддерживают"
+"на данный момент. ID3v2.4 иÑпользует Unicode Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð¼ÐµÑ‚Ð¾Ðº, так что"
+"вам больше не надо будет беÑпокоитьÑÑ Ð¾ кодировках. gtkpod будет иÑпользовать"
+"кодирование в UTF-8, поÑкольку Ñто не увеличит размер меток в чиÑтом ASCII."
+"Метки ID3v2.2/4 также будут запиÑаны, еÑли они уже приÑутÑтвуют в файле, в"
+"который производитÑÑ Ð·Ð°Ð¿Ð¸ÑÑŒ."
+
+#: ../data/gtkpod.glade.h:321
+msgid "This option will be re-activated when you upgrade gtkpod."
+msgstr "Ðта Ð¾Ð¿Ñ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ включена вновь поÑле Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ gtkpod."
+
+#: ../data/gtkpod.glade.h:322
+msgid "Time:"
+msgstr "ВремÑ:"
+
+#: ../data/gtkpod.glade.h:323 ../src/display_sorttabs.c:2991
+#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
+msgid "Title"
+msgstr "Ðазвание"
+
+#: ../data/gtkpod.glade.h:324
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr "Ð’Ñего\n"
+"(iPod)"
+
+#: ../data/gtkpod.glade.h:326
+msgid ""
+"Total\n"
+"(local)"
+msgstr "Ð’Ñего\n"
+"(локально)"
+
+#: ../data/gtkpod.glade.h:328
+msgid "Tracks"
+msgstr "Дорожки"
+
+#: ../data/gtkpod.glade.h:329
+msgid "Tracks Most Often Listened To"
+msgstr "Ðаиболее чаÑто проÑлушиваемые дорожки"
+
+#: ../data/gtkpod.glade.h:330
+msgid ""
+"Tracks can be transferred in the background as soon as they are added to an "
+"iPod repository. Otherwise they will be transferred when ejecting the "
+"contents of the iPod completely unchanged until then."
+msgstr "Дорожки могут быть переданы в фоновом режиме неÑпоÑредÑтвенно поÑле"
+"Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² репозиторий iPod. Ð’ противном Ñлучае они будут переданы при"
+"извлечении iPod, а до Ñтого его Ñодержимое не изменитÑÑ."
+
+#: ../data/gtkpod.glade.h:331
+msgid "Tracks in Selected Tab _Entry"
+msgstr "Дорожки в выбранной _запиÑи вкладки"
+
+#: ../data/gtkpod.glade.h:332
+msgid "Tracks in Selected _Playlist"
+msgstr "Дорожки в выбранном _ÑпиÑке воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:333
+msgid "Transfer tracks to the iPod in the background"
+msgstr "Передавать дорожки на iPod в фоновом режиме"
+
+#: ../data/gtkpod.glade.h:334
+msgid "Translators"
+msgstr "Переводчики"
+
+#: ../data/gtkpod.glade.h:335
+msgid ""
+"Try to load contents of all connected iPods. For each iPod a separate "
+"repository must be set up."
+msgstr "ПопытатьÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñодержимое вÑех подключённых iPod. Ð”Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾"
+"iPod должен быть Ñоздан отдельный репозиторий."
+
+#: ../data/gtkpod.glade.h:336
+msgid "Undo _Track"
+msgstr "Отменить _дорожку"
+
+#: ../data/gtkpod.glade.h:337
+msgid "Update _mserv Data from File"
+msgstr "Обновить данные _mserv из файла"
+
+#: ../data/gtkpod.glade.h:338
+msgid "Update/Sync all playlists now"
+msgstr "Обновить/Ñинхронизировать вÑе ÑпиÑки воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ ÑейчаÑ"
+
+#: ../data/gtkpod.glade.h:339
+msgid "Update/Sync playlist now"
+msgstr "Обновить/Ñинхронизировать ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ ÑейчаÑ"
+
+#: ../data/gtkpod.glade.h:340
+msgid "Upper margin"
+msgstr "ВерхнÑÑ Ð³Ñ€Ð°Ð½Ð¸Ñ†Ð°"
+
+#: ../data/gtkpod.glade.h:341
+msgid "Use 'Multi-Edit' also for title field"
+msgstr "ИÑпользовать многоÑтрочный редактор также Ð´Ð»Ñ Ð¿Ð¾Ð»Ñ \"Ðазвание\""
+
+#: ../data/gtkpod.glade.h:342
+msgid "Use 'Multi-Edit' for tracks selections"
+msgstr "ИÑпользовать многоÑтрочный редактор Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° дорожек"
+
+#: ../data/gtkpod.glade.h:343
+msgid "Use <i><Album>.jpg</i> in the parent directory"
+msgstr "ИÑпользовать <i><Album>.jpg</i> в родительÑкой папке"
+
+#: ../data/gtkpod.glade.h:344
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+msgstr "ИÑпользовать <i><Album>.jpg</i>, <i><Album>.png</i>..."
+
+#: ../data/gtkpod.glade.h:345
+msgid "Use <i>folder.jpg</i> as cover art."
+msgstr "ИÑпользовать <i>folder.jpg</i> как обложку."
+
+#: ../data/gtkpod.glade.h:346
+msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
+msgstr "ИÑпользовать <i>folder.jpg</i>, <i>folder.png</i>..."
+
+#: ../data/gtkpod.glade.h:347
+msgid "Use mserv database to fill additional information"
+msgstr "ИÑпользовать базу данных mserv Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… Ñведений"
+
+#: ../data/gtkpod.glade.h:348
+msgid ""
+"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
+"for this filename."
+msgstr "ИÑпользовать выбранныю кодировку (Параметры - Добавление/обновление/ÑинхронизациÑ)\n"
+"Ð´Ð»Ñ Ñтого имени файла."
+
+#: ../data/gtkpod.glade.h:350
+msgid ""
+"Use selected encoding (on the 'General' page)\n"
+"when writing tags"
+msgstr "ИÑпользовать выбранную кодировку (на вкладке \"Общие\")\n"
+"при запиÑи меток"
+
+#: ../data/gtkpod.glade.h:352
+msgid "Use selected encoding also when updating or syncing tracks"
+msgstr "ИÑпользовать выбранную кодировку также при обновлении или Ñинхронизации дорожек"
+
+#: ../data/gtkpod.glade.h:353
+msgid "Use this template to parse filename for tag information:"
+msgstr "ИÑпользовать Ñтот шаблон Ð´Ð»Ñ Ñ€Ð°Ð·Ð±Ð¾Ñ€Ð° имени файла при заполнении меток:"
+
+#: ../data/gtkpod.glade.h:354
+msgid "Username to be used for mserv database lookup."
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, иÑпользуемое Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка в базе данных mserv."
+
+#: ../data/gtkpod.glade.h:355
+msgid "Username:"
+msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ:"
+
+#: ../data/gtkpod.glade.h:356
+msgid ""
+"Usually you don't want to set the title of several tracks to the same text. "
+"This option might avoid unwanted results (especially since there is no "
+"'undo' yet)."
+msgstr "ПриÑвоение неÑкольким дорожкам одного и того же Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾ не приветÑтвуетÑÑ."
+"Ðта Ð¾Ð¿Ñ†Ð¸Ñ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ‚ избежать нежелательных результатов (оÑобенно учитываÑ, что функции"
+"\"Отмена\" пока не ÑущеÑтвует)."
+
+#: ../data/gtkpod.glade.h:357
+msgid "View Full Size"
+msgstr "ПроÑмотреть в полном размере"
+
+#: ../data/gtkpod.glade.h:358
+msgid "WAV with :"
+msgstr "WAV Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ:"
+
+#: ../data/gtkpod.glade.h:359
+msgid ""
+"When adding dirs/files, update information of\n"
+"existing tracks with identical filenames"
+msgstr "ОбновлÑÑ‚ÑŒ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ÑущеÑтвующих дорожках\n"
+"Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ð¼Ð¸ именами файлов при добавлении папок/файлов"
+
+#: ../data/gtkpod.glade.h:361
+msgid ""
+"When copying from iPod no check is performed on whether the destination file "
+"exists. Enabling this option will make gtkpod check whether the length of "
+"the destination file is the same as the file in the iPod. If so the file is "
+"skipped, allowing a quick sync of the iPod's contents."
+msgstr "При копировании Ñ iPod не производитÑÑ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° ÑущеÑÑ‚Ð²Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð½ÐµÑ‡Ð½Ð¾Ð³Ð¾ файла."
+"При включении Ñтой опции gtkpod будет проверÑÑ‚ÑŒ, ÑоответÑтвует ли длина конечного"
+"файла длине файла на iPod. ЕÑли Ñто так, файл пропуÑкаетÑÑ, позволÑÑ Ð±Ñ‹Ñтро"
+"Ñинхронизировать вÑÑ‘ Ñодержимое iPod."
+
+#: ../data/gtkpod.glade.h:362
+msgid "When syncing playlists"
+msgstr "При Ñинхронизации ÑпиÑков воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:363
+msgid ""
+"Will show a list of tracks removed and a list of tracks newly added or "
+"updated."
+msgstr "Показывает ÑпиÑок удалённых дорожек, а также ÑпиÑок новых и"
+"обновлённых дорожек."
+
+#: ../data/gtkpod.glade.h:364
+msgid "Write ID3 tags to disk when modified in gtkpod"
+msgstr "ЗапиÑывать метки ID3 на диÑк при их изменении в gtkpod"
+
+#: ../data/gtkpod.glade.h:365
+msgid "Write all changes made to the disk and the iPod(s)."
+msgstr "ЗапиÑать вÑе Ñделанные Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° диÑк и на iPod"
+
+#: ../data/gtkpod.glade.h:366
+msgid ""
+"Write extended information (PC filenames, SHA1 hashes,\n"
+"encoding...). Recommended."
+msgstr "ЗапиÑывать раÑширенную информацию (имена файлов на ПК,"
+"Ñ…Ñши SHA1, кодировку...). РекомендуетÑÑ."
+
+#: ../data/gtkpod.glade.h:368
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr "Ð’Ñ‹ также можете иÑпользовать Ñтолбцы таблицы, но Ñто позволÑет вам"
+"Ñортировать дорожки по полÑм, отÑутÑтвующим в таблице."
+
+#: ../data/gtkpod.glade.h:369
+msgid "_About gtkpod"
+msgstr "_О программе gtkpod"
+
+#: ../data/gtkpod.glade.h:370
+msgid "_Add Album"
+msgstr "_Добавить альбом"
+
+#: ../data/gtkpod.glade.h:371
+msgid "_Add Image"
+msgstr "_Добавить изображение"
+
+#: ../data/gtkpod.glade.h:372
+msgid "_Album"
+msgstr "_Ðльбом"
+
+#: ../data/gtkpod.glade.h:373
+msgid "_All Tracks"
+msgstr "_Ð’Ñе дорожки"
+
+#: ../data/gtkpod.glade.h:374
+msgid "_Arrange Sort Tabs"
+msgstr "_УпорÑдочить вкладки Ñортировки"
+
+#: ../data/gtkpod.glade.h:375
+msgid "_Check iPod's Files"
+msgstr "_Проверить файлы на iPod"
+
+#: ../data/gtkpod.glade.h:376
+msgid "_Conversion Log"
+msgstr "_Журнал Ñообщений преобразованиÑ"
+
+#: ../data/gtkpod.glade.h:377
+msgid "_Create Playlists"
+msgstr "_Создать ÑпиÑки воÑпроизведениÑ"
+
+#: ../data/gtkpod.glade.h:378
+msgid "_Create iPod's Directories"
+msgstr "_Создать папки на iPod"
+
+#: ../data/gtkpod.glade.h:379
+msgid "_Delete"
+msgstr "_Удалить"
+
+#: ../data/gtkpod.glade.h:380
+msgid "_Display"
+msgstr "_Отображение"
+
+#: ../data/gtkpod.glade.h:381
+msgid "_Displayed Tracks"
+msgstr "_Отображаемые дорожки"
+
+#: ../data/gtkpod.glade.h:382
+msgid "_Edit"
+msgstr "_Правка"
+
+#: ../data/gtkpod.glade.h:383
+msgid "_Encoding (ID3, files):"
+msgstr "_Кодировка (ID3, файлы):"
+
+#: ../data/gtkpod.glade.h:384
+msgid "_Enqueue"
+msgstr "_ПоÑтавить в очередь"
+
+#: ../data/gtkpod.glade.h:385
+msgid "_Export Tracks from Database"
+msgstr "_ÐкÑпортировать дорожки из базы данных"
+
+#: ../data/gtkpod.glade.h:386
+msgid "_File"
+msgstr "_Файл"
+
+#: ../data/gtkpod.glade.h:387
+msgid "_General"
+msgstr "_Общие"
+
+#: ../data/gtkpod.glade.h:388
+msgid "_Help"
+msgstr "_Справка"
+
+#: ../data/gtkpod.glade.h:389
+msgid "_Ignore rules"
+msgstr "_Игнорировать правила"
+
+#: ../data/gtkpod.glade.h:390
+msgid "_Image"
+msgstr "_Изображение"
+
+#: ../data/gtkpod.glade.h:391
+msgid "_Info Window"
+msgstr "Окно _Ñведений"
+
+#: ../data/gtkpod.glade.h:392
+msgid "_Last.FM"
+msgstr "_Last.FM"
+
+#: ../data/gtkpod.glade.h:393
+msgid "_Less Sort Tabs"
+msgstr "_Меньше вкладок Ñортировки"
+
+#: ../data/gtkpod.glade.h:394
+msgid "_Limit to"
+msgstr "_Ограничить"
+
+#: ../data/gtkpod.glade.h:395
+msgid "_Load iPod(s)"
+msgstr "_Загрузить iPod"
+
+#: ../data/gtkpod.glade.h:396
+msgid "_Local"
+msgstr "_Локальный"
+
+#: ../data/gtkpod.glade.h:397
+msgid "_M3U"
+msgstr "_M3U"
+
+#: ../data/gtkpod.glade.h:398
+msgid "_Misc."
+msgstr "_Разное"
+
+#: ../data/gtkpod.glade.h:399
+msgid "_More Sort Tabs"
+msgstr "_Больше вкладок Ñортировки"
+
+#: ../data/gtkpod.glade.h:400
+msgid "_Newly Added Tracks"
+msgstr "_Вновь добавленные дорожки"
+
+#: ../data/gtkpod.glade.h:401
+msgid "_Normalize Volume"
+msgstr "_Ðормализовать громкоÑÑ‚ÑŒ"
+
+#: ../data/gtkpod.glade.h:402
+msgid "_Number of sort tabs:"
+msgstr "_ЧиÑло вкладок Ñортировки:"
+
+#: ../data/gtkpod.glade.h:403
+msgid "_PLS"
+msgstr "_PLS"
+
+#: ../data/gtkpod.glade.h:404
+msgid "_Play Now"
+msgstr "_ВоÑпроизвеÑти ÑейчаÑ"
+
+#: ../data/gtkpod.glade.h:405
+msgid "_Podcasts"
+msgstr "_ПодкаÑÑ‚Ñ‹"
+
+#: ../data/gtkpod.glade.h:406
+msgid "_Prefer Local"
+msgstr "_Предпочитать локальные"
+
+#: ../data/gtkpod.glade.h:407
+msgid "_Remove Cover Art"
+msgstr "_Удалить обложку"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr "_Удалить изображениÑ"
+
+#: ../data/gtkpod.glade.h:409
+msgid "_Remove _Album"
+msgstr "_Удалить альбом"
+
+#: ../data/gtkpod.glade.h:410
+msgid "_Save Changes"
+msgstr "_Сохранить изменениÑ"
+
+#: ../data/gtkpod.glade.h:411
+msgid "_Save Displayed Track Order"
+msgstr "_Сохранить отображаемый порÑдок дорожек"
+
+#: ../data/gtkpod.glade.h:412
+msgid "_Sorting"
+msgstr "_Сортировка"
+
+#: ../data/gtkpod.glade.h:413
+msgid "_Synchronize Playlist with Dir(s)"
+msgstr "_Синхронизировать ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ñ Ð¿Ð°Ð¿ÐºÐ°Ð¼Ð¸"
+
+#: ../data/gtkpod.glade.h:414
+msgid "_Toolbar"
+msgstr "_Панель инÑтрументов"
+
+#: ../data/gtkpod.glade.h:415
+msgid "_Tools"
+msgstr "_ИнÑтрументы"
+
+#: ../data/gtkpod.glade.h:416
+msgid "_Tooltips"
+msgstr "_Ð’Ñплывающие подÑказки"
+
+#: ../data/gtkpod.glade.h:417
+msgid "_Track Info"
+msgstr "_Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ дорожке"
+
+#: ../data/gtkpod.glade.h:418
+msgid "_Undo All"
+msgstr "_Отменить вÑе"
+
+#: ../data/gtkpod.glade.h:419
+msgid "_Update Tracks from File"
+msgstr "_Обновить дорожки из файла"
+
+#: ../data/gtkpod.glade.h:420
+msgid "_Video"
+msgstr "_Видео"
+
+#: ../data/gtkpod.glade.h:421
+msgid "_View"
+msgstr "_Вид"
+
+#: ../data/gtkpod.glade.h:422
+msgid "_iPod"
+msgstr "_iPod"
+
+#: ../data/gtkpod.glade.h:424
+#, no-c-format
+msgid ""
+"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
+"nr: %C, year: %Y, skip data: %*, the character '%': %%. You can separate "
+"several templates by a ';'. The first one matching the filename will be "
+"used. Example: '%a - %A/%T %t.mp3;%t.wav'."
+msgstr "иÑполнитель: %a, альбом: %A, композитор: %c, название: %t, жанр: %G, номер дорожки: %T,"
+"номер CD: %C, год: %Y, пропуÑкать данные: %*, Ñимвол '%': %%. Ð’Ñ‹ можете разделить "
+"неÑколько шаблонов точками Ñ Ð·Ð°Ð¿Ñтой. Будет иÑпользован первый, отвечающий имени"
+"файла. Пример: '%a - %A/%T %t.mp3;%t.wav'."
+
+#: ../data/gtkpod.glade.h:425
+msgid "folder"
+msgstr "folder"
+
+#: ../data/gtkpod.glade.h:426
+msgid "folder.jpg"
+msgstr "folder.jpg"
+
+#: ../data/gtkpod.glade.h:428
+#, no-c-format
+msgid "folder.jpg;%a.jpg"
+msgstr "folder.jpg;%a.jpg"
+
+#: ../data/gtkpod.glade.h:429
+msgid "gtkpod"
+msgstr "gtkpod"
+
+#: ../data/gtkpod.glade.h:430
+msgid "gtkpod Info"
+msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ gtkpod"
+
+#: ../data/gtkpod.glade.h:431
+msgid ""
+"gtkpod expects the ID3 tags and the filenames to be in the encoding "
+"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
+"operation. 'System Charset' is the charset used by your current locale."
+msgstr "gtkpod ожидает, что метки ID3 и имена файлов будут в указанной здеÑÑŒ"
+"кодировке. Ð’Ñ‹ можете изменить её Ð´Ð»Ñ Ð¿Ð¾Ñледовательных операций"
+"\"Добавить файлы\" и \"Добавить папку\". \"СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°\" - Ñто"
+"кодировка, Ð·Ð°Ð´Ð°Ð½Ð½Ð°Ñ Ð²Ð°ÑˆÐµÐ¹ текущей локалью."
+
+#: ../data/gtkpod.glade.h:432
+msgid "gtkpod options"
+msgstr "параметры gtkpod"
+
+#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
+#: ../data/gtkpod.glade.h:434
+msgid ""
+"iPod\n"
+"Local Repository (Standard)\n"
+"Local Repository (Podcasts)\n"
+msgstr "iPod\n"
+"Локальный репозиторий (Ñтандартный)\n"
+"Локальный Ñ€ÐµÐ¿Ð¾Ð·Ð¸Ñ‚Ð¾Ñ€Ð¸Ñ (подкаÑÑ‚Ñ‹)\n"
+
+#: ../data/gtkpod.glade.h:438
+msgid "iPod mountpoint:"
+msgstr "Точка Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ iPod:"
+
+#: ../data/gtkpod.glade.h:439
+msgid "iTunesDB backup:"
+msgstr "Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ iTunesDB:"
+
+#: ../data/gtkpod.glade.h:440
+msgid "label"
+msgstr "label"
+
+#: ../data/gtkpod.glade.h:441
+msgid "mserv Root:"
+msgstr "Корень mserv:"
+
+#: ../data/gtkpod.glade.h:442
+msgid "mserv database lookup will be done for music in this directory."
+msgstr "ПоиÑк по базе данных mserv будет производитьÑÑ Ð´Ð»Ñ Ð¼ÑƒÐ·Ñ‹ÐºÐ¸ в Ñтой папке."
+
+#: ../data/gtkpod.glade.h:443 ../src/details.c:1347
+msgid "n/a"
+msgstr "н/д"
+
+#: ../data/gtkpod.glade.h:444
+msgid "special_sorttab -- Don't translate!"
+msgstr "special_sorryab -- Ðе переводить!"
+
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr "Ðе удалоÑÑŒ инициализировать GnomeVFS\n"
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr "Вновь примонтированный iPod \"%s\" не мог быть загружен в gtkpod.\n"
+"\n"
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr "Вновь примонтированный iPod \"%s\" выглÑдит уже загруженным!\n"
+"\n"
+
+#: ../src/autodetection.c:416
+msgid "New iPod"
+msgstr "Ðовый iPod"
+
+#: ../src/charset.c:53
+msgid "Arabic (IBM-864)"
+msgstr "ÐрабÑÐºÐ°Ñ (IBM-864)"
+
+#: ../src/charset.c:54
+msgid "Arabic (ISO-8859-6)"
+msgstr "ÐрабÑÐºÐ°Ñ (ISO-8859-6)"
+
+#: ../src/charset.c:55
+msgid "Arabic (Windows-1256)"
+msgstr "ÐрабÑÐºÐ°Ñ (Windows-1256)"
+
+#: ../src/charset.c:56
+msgid "Baltic (ISO-8859-13)"
+msgstr "БалтийÑÐºÐ°Ñ (ISO-8859-13)"
+
+#: ../src/charset.c:57
+msgid "Baltic (ISO-8859-4)"
+msgstr "БалтийÑÐºÐ°Ñ (ISO-8859-4)"
+
+#: ../src/charset.c:58
+msgid "Baltic (Windows-1257)"
+msgstr "БалтийÑÐºÐ°Ñ (Windows-1257)"
+
+#: ../src/charset.c:59
+msgid "Celtic (ISO-8859-14)"
+msgstr "КельтÑÐºÐ°Ñ (ISO-8859-14)"
+
+#: ../src/charset.c:60
+msgid "Central European (IBM-852)"
+msgstr "ЦентральноевропейÑÐºÐ°Ñ (IBM-852)"
+
+#: ../src/charset.c:61
+msgid "Central European (ISO-8859-2)"
+msgstr "ЦентральноевропейÑÐºÐ°Ñ (ISO-8859-2)"
+
+#: ../src/charset.c:62
+msgid "Central European (Windows-1250)"
+msgstr "ЦентральноевропейÑÐºÐ°Ñ (Windows-1250)"
+
+#: ../src/charset.c:63
+msgid "Chinese Simplified (GB18030)"
+msgstr "КитайÑÐºÐ°Ñ ÑƒÐ¿Ñ€Ð¾Ñ‰Ñ‘Ð½Ð½Ð°Ñ (GB18030)"
+
+#: ../src/charset.c:64
+msgid "Chinese Simplified (GB2312)"
+msgstr "КитайÑÐºÐ°Ñ Ñ‚Ñ€Ð°Ð´Ð¸Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ (GB2312)"
+
+#: ../src/charset.c:65
+msgid "Chinese Traditional (Big5)"
+msgstr "КитайÑÐºÐ°Ñ Ñ‚Ñ€Ð°Ð´Ð¸Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ (Big5)"
+
+#: ../src/charset.c:66
+msgid "Chinese Traditional (Big5-HKSCS)"
+msgstr "КитайÑÐºÐ°Ñ Ñ‚Ñ€Ð°Ð´Ð¸Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ (Big5-HKSCS)"
+
+#: ../src/charset.c:67
+msgid "Cyrillic (IBM-855)"
+msgstr "КирилличеÑÐºÐ°Ñ (IBM-855)"
+
+#: ../src/charset.c:68
+msgid "Cyrillic (ISO-8859-5)"
+msgstr "КирилличеÑÐºÐ°Ñ (ISO-8859-5)"
+
+#: ../src/charset.c:69
+msgid "Cyrillic (ISO-IR-111)"
+msgstr "КирилличеÑÐºÐ°Ñ (ISO-IR-111)"
+
+#: ../src/charset.c:70
+msgid "Cyrillic (KOI8-R)"
+msgstr "КирилличеÑÐºÐ°Ñ (KOI8-R)"
+
+#: ../src/charset.c:71
+msgid "Cyrillic (Windows-1251)"
+msgstr "КирилличеÑÐºÐ°Ñ (Windows-1251)"
+
+#: ../src/charset.c:72
+msgid "Cyrillic/Russian (CP-866)"
+msgstr "КирилличеÑкаÑ/руÑÑÐºÐ°Ñ (CP-866)"
+
+#: ../src/charset.c:73
+msgid "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "КирилличеÑкаÑ/украинÑÐºÐ°Ñ (KOI8-U)"
+
+#: ../src/charset.c:74
+msgid "English (US-ASCII)"
+msgstr "ÐнглийÑÐºÐ°Ñ (US-ASCII)"
+
+#: ../src/charset.c:75
+msgid "Greek (ISO-8859-7)"
+msgstr "ГречеÑÐºÐ°Ñ (ISO-8859-7)"
+
+#: ../src/charset.c:76
+msgid "Greek (Windows-1253)"
+msgstr "ГречеÑÐºÐ°Ñ (Windows-1253)"
+
+#: ../src/charset.c:77
+msgid "Hebrew (IBM-862)"
+msgstr "Иврит (IBM-862)"
+
+#: ../src/charset.c:78
+msgid "Hebrew (Windows-1255)"
+msgstr "Иврит (Windows-1255)"
+
+#: ../src/charset.c:79
+msgid "Japanese (automatic detection)"
+msgstr "ЯпонÑÐºÐ°Ñ (автоопределение)"
+
+#: ../src/charset.c:80
+msgid "Japanese (EUC-JP)"
+msgstr "ЯпонÑÐºÐ°Ñ (EUC-JP)"
+
+#: ../src/charset.c:81
+msgid "Japanese (ISO-2022-JP)"
+msgstr "ЯпонÑÐºÐ°Ñ (ISO-2022-JP)"
+
+#: ../src/charset.c:82
+msgid "Japanese (Shift_JIS)"
+msgstr "ЯпонÑÐºÐ°Ñ (Shift_JIS)"
+
+#: ../src/charset.c:83
+msgid "Korean (EUC-KR)"
+msgstr "КорейÑÐºÐ°Ñ (EUC-KR)"
+
+#: ../src/charset.c:84
+msgid "Nordic (ISO-8859-10)"
+msgstr "ÐордичеÑÐºÐ°Ñ (ISO-8859-10)"
+
+#: ../src/charset.c:85
+msgid "South European (ISO-8859-3)"
+msgstr "ЮжноевропейÑÐºÐ°Ñ (ISO-8859-3)"
+
+#: ../src/charset.c:86
+msgid "Thai (TIS-620)"
+msgstr "ТайÑÐºÐ°Ñ (TIS-620)"
+
+#: ../src/charset.c:87
+msgid "Turkish (IBM-857)"
+msgstr "Ð¢ÑƒÑ€ÐµÑ†ÐºÐ°Ñ (IBM-857)"
+
+#: ../src/charset.c:88
+msgid "Turkish (ISO-8859-9)"
+msgstr "Ð¢ÑƒÑ€ÐµÑ†ÐºÐ°Ñ (ISO-8859-9)"
+
+#: ../src/charset.c:89
+msgid "Turkish (Windows-1254)"
+msgstr "Ð¢ÑƒÑ€ÐµÑ†ÐºÐ°Ñ (Windows-1254)"
+
+#: ../src/charset.c:90
+msgid "Unicode (UTF-7)"
+msgstr "Unicode (UTF-7)"
+
+#: ../src/charset.c:91
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../src/charset.c:92
+msgid "Unicode (UTF-16BE)"
+msgstr "Unicode (UTF-16BE)"
+
+#: ../src/charset.c:93
+msgid "Unicode (UTF-16LE)"
+msgstr "Unicode (UTF-16LE)"
+
+#: ../src/charset.c:94
+msgid "Unicode (UTF-32BE)"
+msgstr "Unicode (UTF-32BE)"
+
+#: ../src/charset.c:95
+msgid "Unicode (UTF-32LE)"
+msgstr "Unicode (UTF-32LE)"
+
+#: ../src/charset.c:96
+msgid "Vietnamese (VISCII)"
+msgstr "ВьетнамÑÐºÐ°Ñ (VISCII)"
+
+#: ../src/charset.c:97
+msgid "Vietnamese (Windows-1258)"
+msgstr "ВьетнамÑÐºÐ°Ñ (Windows-1258)"
+
+#: ../src/charset.c:98
+msgid "Visual Hebrew (ISO-8859-8)"
+msgstr "Визуальный иврит (ISO-8859-8)"
+
+#: ../src/charset.c:99
+msgid "Western (IBM-850)"
+msgstr "Ð—Ð°Ð¿Ð°Ð´Ð½Ð°Ñ (IBM-850)"
+
+#: ../src/charset.c:100
+msgid "Western (ISO-8859-1)"
+msgstr "Ð—Ð°Ð¿Ð°Ð´Ð½Ð°Ñ (ISO-8859-1)"
+
+#: ../src/charset.c:101
+msgid "Western (ISO-8859-15)"
+msgstr "Ð—Ð°Ð¿Ð°Ð´Ð½Ð°Ñ (ISO-8859-15)"
+
+#: ../src/charset.c:102
+msgid "Western (Windows-1252)"
+msgstr "Ð—Ð°Ð¿Ð°Ð´Ð½Ð°Ñ (Windows-1252)"
+
+#. sanity!
+#. check for "System Charset" and return NULL
+#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+msgid "System Charset"
+msgstr "СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ°"
+
+#. we are not the first instance of gtkpod -- the socket is
+#. already being used, so we pass
+#: ../src/clientserver.c:214
+msgid ""
+"Another instance of gtkpod was detected. Playcount server not started.\n"
+msgstr "Была обнаружена Ð´Ñ€ÑƒÐ³Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ gtkpod. Сервер чиÑла воÑпроизведений не был запущен.\n"
+
+#: ../src/confirmation.c:377
+msgid "Confirmation Dialogue"
+msgstr "Диалог подтверждениÑ"
+
+#: ../src/context_menus.c:362
+#, c-format
+msgid "Copied \"%s\" playlist to %s"
+msgstr "СпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" Ñкопирован в %s"
+
+#: ../src/context_menus.c:401
+#, c-format
+msgid "Copied %d track to '%s'"
+msgstr "Дорожка %d Ñкопирована в \"%s\""
+
+#: ../src/context_menus.c:429
+#, c-format
+msgid "Copied '%s' playlist to '%s' in '%s'"
+msgstr "СпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" Ñкопирован в \"%s\" в \"%s\""
+
+#: ../src/context_menus.c:462
+#, c-format
+msgid "Copied %d track to '%s' in '%s'"
+msgstr "Дорожка %d Ñкопирована в \"%s\" в \"%s\""
+
+#: ../src/context_menus.c:622 ../src/tools.c:854
+msgid "Play Now"
+msgstr "ВоÑпроизвеÑти ÑейчаÑ"
+
+#: ../src/context_menus.c:628 ../src/tools.c:867
+msgid "Enqueue"
+msgstr "ПоÑтавить в очередь"
+
+#: ../src/context_menus.c:634
+msgid "Copy Tracks to Filesystem"
+msgstr "Скопировать дорожки в файловую ÑиÑтему"
+
+#: ../src/context_menus.c:641 ../src/file_export.c:1085
+msgid "Create Playlist File"
+msgstr "Создать файл ÑпиÑка воÑпроизведениÑ"
+
+#: ../src/context_menus.c:648
+msgid "Create new Playlist"
+msgstr "Создать новый ÑпиÑок воÑпроизведениÑ"
+
+#: ../src/context_menus.c:655
+msgid "Update Tracks from File"
+msgstr "Обновить дорожки из файла"
+
+#: ../src/context_menus.c:669
+msgid "Sync Playlist with Dir(s)"
+msgstr "Синхронизировать ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ñ Ð¿Ð°Ð¿ÐºÐ°Ð¼Ð¸"
+
+#: ../src/context_menus.c:679
+msgid "Remove All Tracks from iPod"
+msgstr "Удалить вÑе дорожки Ñ iPod"
+
+#: ../src/context_menus.c:697
+msgid "Remove All Podcasts from iPod"
+msgstr "Удалить вÑе подкаÑÑ‚Ñ‹ Ñ iPod"
+
+#: ../src/context_menus.c:712
+msgid "Delete Including Tracks"
+msgstr "Удалить, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸"
+
+#: ../src/context_menus.c:720
+msgid "Delete But Keep Tracks"
+msgstr "Удалить, но Ñохранить дорожки"
+
+#: ../src/context_menus.c:728
+msgid "Edit iPod Properties"
+msgstr "СвойÑтва iPod"
+
+#: ../src/context_menus.c:735
+msgid "Edit Repository Properties"
+msgstr "СвойÑтва репозиториÑ"
+
+#: ../src/context_menus.c:742
+msgid "Edit Playlist Properties"
+msgstr "СвойÑтва ÑпиÑка воÑпроизведениÑ"
+
+#: ../src/context_menus.c:770
+msgid "View Full Size Artwork"
+msgstr "ПроÑмотреть изображение в полном размере"
+
+#: ../src/context_menus.c:777
+msgid "Select Cover From File"
+msgstr "Выбрать обложку из файла"
+
+#: ../src/context_menus.c:790
+msgid "Load iPod"
+msgstr "Загрузить iPod"
+
+#: ../src/context_menus.c:797
+msgid "Eject iPod"
+msgstr "Извлечь iPod"
+
+#: ../src/context_menus.c:814
+msgid "Remove All Tracks from Database"
+msgstr "Удалить вÑе дорожки из базы данных"
+
+#: ../src/context_menus.c:829
+msgid "Delete Including Tracks (Harddisk)"
+msgstr "Удалить, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸ (жёÑткий диÑк)"
+
+#: ../src/context_menus.c:837
+msgid "Delete Including Tracks (Database)"
+msgstr "Удалить, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸ (база данных)"
+
+#: ../src/context_menus.c:845
+msgid "Delete From iPod"
+msgstr "Удалить Ñ iPod"
+
+#: ../src/context_menus.c:853
+msgid "Delete From Playlist"
+msgstr "Удалить из ÑпиÑка воÑпроизведениÑ"
+
+#: ../src/context_menus.c:861
+msgid "Delete From Harddisk"
+msgstr "Удалить Ñ Ð¶Ñ‘Ñткого диÑка"
+
+#: ../src/context_menus.c:869
+msgid "Delete From Database"
+msgstr "Удалить из базы данных"
+
+#: ../src/context_menus.c:877
+msgid "Alphabetize"
+msgstr "УпорÑдочить по алфавиту"
+
+#: ../src/context_menus.c:895
+msgid "Remove Album"
+msgstr "Удалить альбом"
+
+#: ../src/context_menus.c:905
+msgid "Remove Photo"
+msgstr "Удалить Ñнимок"
+
+#: ../src/context_menus.c:915
+msgid "Rename Album"
+msgstr "Переименовать альбом"
+
+#: ../src/context_menus.c:974 ../src/context_menus.c:1023
+msgid "Copy selected playlist to..."
+msgstr "Копировать выбранный ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð²..."
+
+#: ../src/context_menus.c:1076
+msgid "Copy selected track(s) to..."
+msgstr "Копировать выбранные дорожки в..."
+
+#: ../src/date_parser.l:269
+#, c-format
+msgid "Date format error: unrecognized character: '%s'\n"
+msgstr "Ошибка формата даты: неопознанный Ñимвол: \"%s\"\n"
+
+#: ../src/details.c:82
+msgid "Audio/Video"
+msgstr "Ðудио/Видео"
+
+#: ../src/details.c:83
+msgid "Audio"
+msgstr "Ðудио"
+
+#: ../src/details.c:84
+msgid "Video"
+msgstr "Видео"
+
+#: ../src/details.c:85
+msgid "Podcast"
+msgstr "ПодкаÑÑ‚"
+
+#: ../src/details.c:86
+msgid "Video Podcast"
+msgstr "ВидеоподкаÑÑ‚"
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr "Ðудиокнига"
+
+#: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
+msgid "Music Video"
+msgstr "Музыкальный видеоклип"
+
+#: ../src/details.c:89 ../src/display_spl.c:107 ../src/display_spl.c:210
+#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
+msgid "TV Show"
+msgstr "Телепередача"
+
+#: ../src/details.c:90
+msgid "TV Show & Music Video"
+msgstr "Телепередача и музыкальный видеоклип"
+
+#: ../src/details.c:836
+#, c-format
+msgid "%s (image data corrupted or unreadable)"
+msgstr "%s (данные Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ñ‹ или не читаютÑÑ)"
+
+#: ../src/details.c:973
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr "ПожалуйÑта, Ñообщите о неизвеÑтном типе данных %x\n"
+
+#: ../src/details.c:1418
+msgid "<b>n/a</b>"
+msgstr "<b>н/д</b>"
+
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr "Произошла ошибка при перетаÑкивании Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð½Ð° окно Ñведений: %s\n"
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr "ÐÐ¾Ð²Ð°Ñ Ð¾Ð±Ð»Ð¾Ð¶ÐºÐ° уÑпешно уÑтановлена Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… дорожек"
+
+#: ../src/display.c:743
+msgid "Edit selected entry of which sort tab?"
+msgstr "Ðа какой вкладке Ñортировки редактировать выбранную запиÑÑŒ?"
+
+#. no entry selected
+#: ../src/display.c:750 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
+msgid "No entry selected."
+msgstr "ЗапиÑÑŒ не выбрана."
+
+#: ../src/display.c:909 ../src/display.c:1229 ../src/display.c:1285
+#: ../src/display.c:1339 ../src/display.c:1394 ../src/display.c:1655
+#, c-format
+msgid "No entry selected in Sort Tab %d"
+msgstr "Ðе выбрана запиÑÑŒ на вкладке Ñортировки %d"
+
+#: ../src/display.c:948
+msgid "Remove entry of which sort tab from database?"
+msgstr "Ðа какой вкладке Ñортировки удалить запиÑÑŒ из базы данных?"
+
+#: ../src/display.c:956
+msgid "Remove tracks in selected entry of which filter tab from the iPod?"
+msgstr "Ðа какой вкладке фильтрации удалить дорожки из выбранной запиÑи Ñ iPod?"
+
+#: ../src/display.c:978
+msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
+msgstr "Ðа какой вкладке фильтрации удалить дорожки из выбранной запиÑи Ñ Ð¶Ñ‘Ñткого диÑка?"
+
+#: ../src/display.c:1008
+msgid "Remove tracks in selected entry of which filter tab from playlist?"
+msgstr "Ðа какой вкладке фильтрации удалить дорожки из выбранной запиÑи из ÑпиÑка воÑпроизведениÑ?"
+
+#: ../src/display.c:1035 ../src/display.c:1073
+#, c-format
+msgid ""
+"iPod at '%s' is not loaded.\n"
+"Please load it first."
+msgstr "iPod на \"%s\" не загружен.\n"
+"ПожалуйÑта, Ñначала загрузите его."
+
+#: ../src/display.c:1110 ../src/display.c:1137
+msgid "Update selected entry of which sort tab?"
+msgstr "Ðа какой вкладке Ñортировки обновить выбранную запиÑÑŒ?"
+
+#: ../src/display.c:1223
+msgid "Export selected entry of which sort tab?"
+msgstr "Ðа какой вкладке Ñортировки ÑкÑпортировать выбранную запиÑÑŒ?"
+
+#: ../src/display.c:1279
+msgid "Create playlist file from selected entry of which sort tab?"
+msgstr "Из запиÑи какой вкладки Ñортировки Ñоздать файл ÑпиÑка воÑпроизведениÑ?"
+
+#: ../src/display.c:1333
+msgid "Play tracks in selected entry of which sort tab?"
+msgstr "Ðа какой вкладке Ñортировки воÑпроизвеÑти дорожки из выбранной запиÑи?"
+
+#: ../src/display.c:1388
+msgid "Enqueue tracks in selected entry of which sort tab?"
+msgstr "Ðа какой вкладке Ñортировки поÑтавить в очередь дорожки из выбранной запиÑи?"
+
+#: ../src/display.c:1645
+msgid "Normalize tracks in selected entry of which sort tab?"
+msgstr "Ðа какой вкладке Ñортировки нормализовать дорожки из выбранной запиÑи?"
+
+#: ../src/display_coverart.c:1713
+msgid "Failed to remove the album from the album hash store."
+msgstr "Ðе удалоÑÑŒ удалить альбом из хранилища Ñ…Ñшей альбомов."
+
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr "Произошла ошибка при попытке перетащить изображение на окно обложки: %s\n"
+
+#: ../src/display_itdb.c:376
+#, c-format
+msgid "Failed to set cover art: '%s'\n"
+msgstr "Ðе удалоÑÑŒ задать обложку: \"%s\"\n"
+
+#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
+msgid "Local"
+msgstr "Локальный"
+
+#. add podcast playlist
+#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
+#: ../src/display_itdb.c:1025
+msgid "Podcasts"
+msgstr "ПодкаÑÑ‚Ñ‹"
+
+#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
+#: ../src/repository.c:1186
+msgid "iPod"
+msgstr "iPod"
+
+#: ../src/display_itdb.c:1084
+#, c-format
+msgid "Increased playcount for '%s'"
+msgstr "Увеличено чиÑло воÑпроизведений Ð´Ð»Ñ \"%s\""
+
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr "Ошибка при чтении базы данных Ñнимков iPod (%s).\n"
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr "Ошибка при чтении базы данных Ñнимков iPod.\n"
+
+#: ../src/display_photo.c:238
+msgid "Could not access the ipod's photo database."
+msgstr "Ðе удалоÑÑŒ обратитьÑÑ Ðº базе данных Ñнимков iPod."
+
+#: ../src/display_photo.c:441
+msgid "Photo Albums"
+msgstr "Фотоальбомы"
+
+#: ../src/display_photo.c:451 ../src/display_photo.c:1666
+msgid "<Unnamed>"
+msgstr "<БезымÑнный>"
+
+#: ../src/display_photo.c:920
+msgid "The Photo Library album cannot be removed"
+msgstr "Ðльбом фотогалереи не может быть удалён"
+
+#: ../src/display_photo.c:942
+msgid "Do you want to remove the album's photos too?"
+msgstr "Желаете ли вы также удалить Ñнимки альбома?"
+
+#: ../src/display_photo.c:948
+msgid "Yes. Do Not Display Again"
+msgstr "Да. Ðе показывать Ñнова"
+
+#: ../src/display_photo.c:1019
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr "Ðто удалит выбранные Ñнимки из выбранного альбома.\n"
+" Желаете ли вы также удалить их из базы данных?"
+
+#: ../src/display_photo.c:1034
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr "Ðто удалит выбранные Ñнимки из фотогалереи и вÑех альбомов."
+"Вы уверены?"
+
+#: ../src/display_photo.c:1109
+msgid "New Photo Album Name"
+msgstr "Ðовое название фотоальбома"
+
+#: ../src/display_photo.c:1110
+msgid "Please enter a new name for the photo album"
+msgstr "ПожалуйÑта, введите новое название Ð´Ð»Ñ Ñ„Ð¾Ñ‚Ð¾Ð°Ð»ÑŒÐ±Ð¾Ð¼Ð°"
+
+#: ../src/display_photo.c:1122 ../src/display_photo.c:1204
+msgid "An album with that name already exists."
+msgstr "Ðльбом Ñ Ñ‚Ð°ÐºÐ¸Ð¼ названием уже ÑущеÑтвует."
+
+#: ../src/display_photo.c:1191
+msgid "New Photo Album"
+msgstr "Ðовый фотоальбом"
+
+#: ../src/display_photo.c:1192
+msgid "Please enter a name for the new photo album"
+msgstr "ПожалуйÑта, введите название Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ фотоальбома"
+
+#: ../src/display_photo.c:1213
+msgid "The new album failed to be created."
+msgstr "Ðе удалоÑÑŒ Ñоздать новый альбом."
+
+#: ../src/display_photo.c:1237
+msgid "Add Image to iPod"
+msgstr "Добавить изображение на iPod"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1292
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr "Добавить папку Ñ Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñми на iPod. Выбрать папку."
+
+#: ../src/display_photo.c:1680
+#, c-format
+msgid "<No members>\n"
+msgstr "<Ðет членов>\n"
+
+#. give a notice on the statusbar -- otherwise the user
+#. * will never know why the drag is not possible
+#: ../src/display_playlists.c:516 ../src/display_playlists.c:558
+msgid "Error: drag from iPod not possible in offline mode."
+msgstr "Ошибка: перетаÑкивание Ñ iPod невозможно в автономном режиме."
+
+#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
+#, c-format
+msgid "Copied one track"
+msgstr "Одна дорожка Ñкопирована"
+
+#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
+msgid "Can't reorder sorted treeview."
+msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÑƒÐ¿Ð¾Ñ€Ñдочить отÑортированное дерево."
+
+#: ../src/display_playlists.c:954
+#, c-format
+msgid ""
+"This DND type (%d) is not (yet) supported. If you feel implementing this "
+"would be useful, please contact the author.\n"
+"\n"
+msgstr "Ðтот тип DND (%d) ещё не поддерживаетÑÑ. ЕÑли вы Ñчитаете, что"
+"его Ñ€ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ‚ оказатьÑÑ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð¾Ð¹, ÑвÑжитеÑÑŒ Ñ Ñ€Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ñ‡Ð¸ÐºÐ¾Ð¼.\n"
+"\n"
+
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr "Снимки"
+
+#: ../src/display_sorttabs.c:473
+msgid "'Played' condition ignored because of error."
+msgstr "УÑловие \"воÑпроизведено\" проигнорировано из-за ошибки."
+
+#: ../src/display_sorttabs.c:476
+msgid "'Modified' condition ignored because of error."
+msgstr "УÑловие \"изменено\" проигнорировано из-за ошибки."
+
+#: ../src/display_sorttabs.c:479
+msgid "'Added' condition ignored because of error."
+msgstr "УÑловие \"Добавлено\" проигнорировано из-за ошибки."
+
+#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+msgid "All"
+msgstr "Ð’Ñе"
+
+#: ../src/display_sorttabs.c:1588
+msgid "Compilations"
+msgstr "Сборники"
+
+#: ../src/display_sorttabs.c:2988
+msgid "Comp."
+msgstr "Сбор."
+
+#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+msgid "Year"
+msgstr "Год"
+
+#: ../src/display_sorttabs.c:2997
+msgid "Special"
+msgstr "ОÑобый"
+
+#: ../src/display_sorttabs.c:3245
+msgid "Last Played"
+msgstr "ПоÑледние воÑпроизведённые"
+
+#: ../src/display_sorttabs.c:3246
+msgid "Last Modified"
+msgstr "ПоÑледние изменённые"
+
+#: ../src/display_spl.c:64
+msgid "days"
+msgstr "дней"
+
+#: ../src/display_spl.c:65
+msgid "weeks"
+msgstr "недель"
+
+#: ../src/display_spl.c:66
+msgid "months"
+msgstr "меÑÑцев"
+
+#: ../src/display_spl.c:73
+msgid "kbps"
+msgstr "кб/Ñ"
+
+#: ../src/display_spl.c:74
+msgid "Hz"
+msgstr "Гц"
+
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+msgid "MB"
+msgstr "МБ"
+
+#: ../src/display_spl.c:76
+msgid "secs"
+msgstr "Ñек"
+
+#: ../src/display_spl.c:86 ../src/misc_conversion.c:74
+msgid "Bitrate"
+msgstr "Битрейт"
+
+#. 15
+#: ../src/display_spl.c:87 ../src/misc_conversion.c:75
+msgid "Samplerate"
+msgstr "ДиÑкретизациÑ"
+
+#: ../src/display_spl.c:90
+msgid "Kind"
+msgstr "Вид"
+
+#: ../src/display_spl.c:91 ../src/misc_conversion.c:81
+msgid "Date modified"
+msgstr "Дата изменениÑ"
+
+#: ../src/display_spl.c:92
+msgid "Track number"
+msgstr "Ðомер дорожки"
+
+#: ../src/display_spl.c:93
+msgid "Size"
+msgstr "Размер"
+
+#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
+msgid "Comment"
+msgstr "Примечание"
+
+#: ../src/display_spl.c:96 ../src/misc_conversion.c:79
+msgid "Date added"
+msgstr "Дата добавлениÑ"
+
+#: ../src/display_spl.c:99
+msgid "Last played"
+msgstr "ПоÑледние воÑпроизведённые"
+
+#: ../src/display_spl.c:100
+msgid "Disc number"
+msgstr "Ðомер диÑка"
+
+#: ../src/display_spl.c:102 ../src/misc_conversion.c:87
+msgid "Compilation"
+msgstr "Сборник"
+
+#: ../src/display_spl.c:103 ../src/misc_conversion.c:76
+msgid "BPM"
+msgstr "BPM"
+
+#: ../src/display_spl.c:104 ../src/misc_conversion.c:86
+msgid "Grouping"
+msgstr "Группировка"
+
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "СпиÑок воÑпроизведениÑ"
+
+#: ../src/display_spl.c:106
+msgid "Video Kind"
+msgstr "Тип видео"
+
+#: ../src/display_spl.c:108
+msgid "Season number"
+msgstr "Ðомер Ñезона"
+
+#: ../src/display_spl.c:109
+msgid "Skip count"
+msgstr "ЧиÑло пропуÑков"
+
+#: ../src/display_spl.c:110
+msgid "Last skipped"
+msgstr "ПоÑледние пропущенные"
+
+#: ../src/display_spl.c:111
+msgid "Album artist"
+msgstr "Художник обложки"
+
+#: ../src/display_spl.c:117
+msgid "contains"
+msgstr "Ñодержит"
+
+#: ../src/display_spl.c:118
+msgid "does not contain"
+msgstr "не Ñодержит"
+
+#: ../src/display_spl.c:119 ../src/display_spl.c:128 ../src/display_spl.c:138
+#: ../src/display_spl.c:157 ../src/display_spl.c:164
+msgid "is"
+msgstr "ÑвлÑетÑÑ"
+
+#: ../src/display_spl.c:120 ../src/display_spl.c:129 ../src/display_spl.c:139
+#: ../src/display_spl.c:158 ../src/display_spl.c:165
+msgid "is not"
+msgstr "не ÑвлÑетÑÑ"
+
+#: ../src/display_spl.c:121
+msgid "starts with"
+msgstr "начинаетÑÑ Ñ"
+
+#: ../src/display_spl.c:122
+msgid "ends with"
+msgstr "заканчиваетÑÑ Ð½Ð°"
+
+#: ../src/display_spl.c:130
+msgid "is greater than"
+msgstr "больше, чем"
+
+#: ../src/display_spl.c:131
+msgid "is less than"
+msgstr "меньше, чем"
+
+#: ../src/display_spl.c:132 ../src/display_spl.c:144
+msgid "is in the range"
+msgstr "в диапазоне"
+
+#: ../src/display_spl.c:140
+msgid "is after"
+msgstr "поÑле"
+
+#: ../src/display_spl.c:141
+msgid "is before"
+msgstr "перед"
+
+#: ../src/display_spl.c:142
+msgid "in the last"
+msgstr "в поÑледних"
+
+#: ../src/display_spl.c:143
+msgid "not in the last"
+msgstr "не в поÑледних"
+
+#: ../src/display_spl.c:150
+msgid "is set"
+msgstr "задан"
+
+#: ../src/display_spl.c:151
+msgid "is not set"
+msgstr "не задан"
+
+#: ../src/display_spl.c:171
+msgid "Not supported"
+msgstr "Ðе поддерживаетÑÑ"
+
+#: ../src/display_spl.c:178
+msgid "minutes"
+msgstr "минут"
+
+#: ../src/display_spl.c:180
+msgid "tracks"
+msgstr "дорожке"
+
+#: ../src/display_spl.c:181
+msgid "hours"
+msgstr "чаÑов"
+
+#: ../src/display_spl.c:182 ../src/info.c:780
+msgid "GB"
+msgstr "ГБ"
+
+#: ../src/display_spl.c:189
+msgid "random order"
+msgstr "Ñлучайный порÑдок"
+
+#: ../src/display_spl.c:190
+msgid "title"
+msgstr "название"
+
+#: ../src/display_spl.c:191
+msgid "album"
+msgstr "альбом"
+
+#: ../src/display_spl.c:192
+msgid "artist"
+msgstr "иÑполнитель"
+
+#: ../src/display_spl.c:193
+msgid "genre"
+msgstr "жанр"
+
+#: ../src/display_spl.c:194
+msgid "most recently added"
+msgstr "поÑледние добавленные"
+
+#: ../src/display_spl.c:195
+msgid "least recently added"
+msgstr "первые добавленные"
+
+#: ../src/display_spl.c:196
+msgid "most often played"
+msgstr "наиболее чаÑто воÑпроизводимык"
+
+#: ../src/display_spl.c:197
+msgid "least often played"
+msgstr "наименее чаÑто воÑпроизводимык"
+
+#: ../src/display_spl.c:198
+msgid "most recently played"
+msgstr "поÑледние воÑпроизведённые"
+
+#: ../src/display_spl.c:199
+msgid "least recently played"
+msgstr "наиболее давно воÑпроизведённые"
+
+#: ../src/display_spl.c:200
+msgid "highest rating"
+msgstr "наибольший рейтинг"
+
+#: ../src/display_spl.c:201
+msgid "lowest rating"
+msgstr "наименьший рейтинг"
+
+#: ../src/display_spl.c:208 ../src/display_spl.c:217
+msgid "Movie"
+msgstr "Фильм"
+
+#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+msgid "to"
+msgstr "до"
+
+#: ../src/display_spl.c:1485
+msgid "-"
+msgstr "-"
+
+#: ../src/display_spl.c:1500
+msgid "+"
+msgstr "+"
+
+#: ../src/display_tracks.c:281
+#, c-format
+msgid "Moved one track"
+msgstr "Одна дорожка перемещена"
+
+#: ../src/display_tracks.c:1810
+#, c-format
+msgid ""
+"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
+"d.%d < 2.5.4). Once you sort the track view, you cannot go back to the "
+"unsorted state.\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ отменить Ñортировку дорожек из-за ошибки в иÑпользуемой"
+"библиотеке GTK (%d.%d.%d < 2.5.4). ПоÑле Ñортировки окна дорожен невозможно"
+"вернутьÑÑ Ð² неотÑортированное ÑоÑтоÑние.\n"
+"\n"
+
+#: ../src/display_tracks.c:2069
+msgid "Rtng"
+msgstr "Рейтинг"
+
+#: ../src/display_tracks.c:2072
+msgid "#"
+msgstr "No"
+
+#: ../src/display_tracks.c:2075
+msgid "CD"
+msgstr "CD"
+
+#: ../src/display_tracks.c:2078
+msgid "ID"
+msgstr "ID"
+
+#: ../src/display_tracks.c:2081
+msgid "Trnsfrd"
+msgstr "Передано"
+
+#: ../src/display_tracks.c:2085
+msgid "Cmpl"
+msgstr "Сборник"
+
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "ВремÑ"
+
+#: ../src/display_tracks.c:2094
+msgid "Plycnt"
+msgstr "ВоÑпроизв."
+
+#: ../src/display_tracks.c:2106
+msgid "Released"
+msgstr "Выпущено"
+
+#: ../src/display_tracks.c:2112
+msgid "Vol."
+msgstr "Том"
+
+#: ../src/display_tracks.c:2115
+msgid "Sndchk."
+msgstr "Sndchk."
+
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr "Файл обложки уже ÑущеÑтвует"
+
+#: ../src/fetchcover.c:371
+#, c-format
+msgid ""
+"The picture file %s already exists. \t\t\t\t\n"
+"This may be associated with other music files in the directory. \t\t\t\t\n"
+"\n"
+"- Clicking Yes will overwrite the existing file, possibly associating \t\t\t"
+"\t\n"
+" other music files in the same directory with this coverart file. \t\t\t"
+"\t\n"
+"- Clicking No will save the file with a unique file name. \t\t\t\t\n"
+"- Clicking Cancel will abort the fetchcover operation."
+msgstr "Файл Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ %s уже ÑущеÑтвует.. \t\t\t\t\n"
+"Ðто может быть ÑвÑзано Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ музыкальными файлами в папке. \t\t\t\t\n"
+"\n"
+"- Ðажмите \"Да\", чтобы заменить ÑущеÑтвующий файл, возможно, ÑвÑзав\t\t\t"
+"\t\n"
+"другие музыкальные файлы в той же папке Ñ Ñтим файлом обложки.\t\t\t"
+"\t\n"
+"- Ðажмите \"Ðет\", чтобы Ñохранить файл под уникальным именем.\t\t\t\t\n"
+"- Ðажмите \"Отмена\", чтобы отменить операцию Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ð»Ð¾Ð¶ÐºÐ¸."
+
+#: ../src/file.c:236
+#, c-format
+msgid ""
+"'%s' is a directory, not a playlist file.\n"
+"\n"
+msgstr "\"%s\" - папка, а не файл ÑпиÑка воÑпроизведениÑ.\n"
+"\n"
+
+#: ../src/file.c:266
+#, c-format
+msgid ""
+"'%s' is a not a known playlist file.\n"
+"\n"
+msgstr "\"%s\" не ÑвлÑетÑÑ Ð¸Ð·Ð²ÐµÑтным файлом ÑпиÑка воÑпроизведениÑ.\n"
+"\n"
+
+#: ../src/file.c:283
+#, c-format
+msgid ""
+"Cannot open '%s' for reading.\n"
+"\n"
+msgstr "Ðе ужалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ.\n"
+"\n"
+
+#: ../src/file.c:369
+#, c-format
+msgid "Skipping '%s' because it is a directory.\n"
+msgstr "Пропущено \"%s\", поÑкольку Ñто папка.\n"
+
+#: ../src/file.c:374
+#, c-format
+msgid "Skipping '%s' to avoid adding playlist file recursively\n"
+msgstr "Пропущено \"%s\", чтобы предотвратить рекурÑивное добавление файла ÑпиÑка воÑпроизведениÑ.\n"
+
+#: ../src/file.c:629
+#, c-format
+msgid "Unknown token '%s' in template '%s'\n"
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð»ÐµÐºÑема \"%s\" в шаблоне \"%s\"\n"
+
+#: ../src/file.c:923
+#, c-format
+msgid "Local filename not valid (%s)"
+msgstr "Локальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° недопуÑтимо (%s)"
+
+#: ../src/file.c:982
+#, c-format
+msgid "No information found for user '%s' in '%s'"
+msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ пользователе \"%s\" в \"%s\" не найдены."
+
+#: ../src/file.c:991
+#, c-format
+msgid "mserv data file (%s) not available for track (%s)"
+msgstr "Файл данных mserv (%s) не доÑтупен Ð´Ð»Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸ (%s)"
+
+#: ../src/file.c:999
+#, c-format
+msgid "Track (%s) not in mserv music root directory (%s)"
+msgstr "Дорожка (%s) отÑутÑтвует в корневой папке музыки mserv (%s)"
+
+#: ../src/file.c:1123
+#, c-format
+msgid ""
+"The following track could not be processed (file does not exist): '%s'\n"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° не могла быть обработана (файл не ÑущеÑтвует): \"%s\"\n"
+
+#: ../src/file.c:1209
+#, c-format
+msgid "The following track could not be processed (filetype unknown): '%s'\n"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° не могла быть обработана (неизвеÑтный тип файла): \"%s\"\n"
+
+#: ../src/file.c:1307
+#, c-format
+msgid ""
+"The following track could not be processed (filetype is known but analysis "
+"failed): '%s'\n"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° не могла быть обработана (тип файла извеÑтен, но его не удалоÑÑŒ проанализировать): \"%s\"\n"
+
+#: ../src/file.c:1337 ../src/file.c:1391
+msgid "Nothing to update"
+msgstr "Ðечего обновлÑÑ‚ÑŒ"
+
+#: ../src/file.c:1358
+#, c-format
+msgid "Updating %s"
+msgstr "ОбновлÑетÑÑ %s"
+
+#: ../src/file.c:1372
+msgid "Updated selected tracks with info from file."
+msgstr "Выбранные дорожки обновлены Ñ Ð¸Ñпользованием Ñведений из файла."
+
+#: ../src/file.c:1406
+#, c-format
+msgid "Retrieving mserv data %s"
+msgstr "ЗагружаютÑÑ Ð´Ð°Ð½Ð½Ñ‹Ðµ mserv %s"
+
+#: ../src/file.c:1411
+msgid "no filename available"
+msgstr "Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° недоÑтупно"
+
+#: ../src/file.c:1416
+msgid "Updated selected tracks with data from mserv."
+msgstr "Выбранные дорожки обновлены Ñ Ð¸Ñпользованием Ñведений из mserv."
+
+#: ../src/file.c:1437
+#, c-format
+msgid "The following track could not be updated"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° не может быть обновлена"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1443
+msgid "Failed Track Update"
+msgstr "Ошибка при обновлении дорожки"
+
+#: ../src/file.c:1501
+#, c-format
+msgid "The following track has been updated"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° была обновлена"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1507
+msgid "Successful Track Update"
+msgstr "УÑпешное обновление дорожки"
+
+#: ../src/file.c:1566
+#, c-format
+msgid "No mserv information could be retrieved for the following track"
+"No mserv information could be retrieved for the following %d tracks"
+msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ mserv не могли быть получены Ð´Ð»Ñ Ñледующей дорожки"
+"Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ mserv не могли быть получены Ð´Ð»Ñ Ñледующих %d дорожек"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1572
+msgid "mserv data retrieval problem"
+msgstr "Ошибка загрузки данных mserv"
+
+#: ../src/file.c:1661
+msgid "no local filename available, file on the iPod will be used instead"
+msgstr "локальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° недоÑтупно, будет иÑпользовано Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на iPod"
+
+#: ../src/file.c:1667
+msgid "no local filename available and copy on iPod cannot be found"
+msgstr "локальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° недоÑтупно, и не найдена ÐºÐ¾Ð¿Ð¸Ñ Ð½Ð° iPod"
+
+#: ../src/file.c:1671 ../src/file.c:1689
+msgid "no local filename available"
+msgstr "локальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° недоÑтупно"
+
+#: ../src/file.c:1679
+msgid "local file could not be found, file on the iPod will be used instead"
+msgstr "локальный файл не найден, будет иÑпользован файл на iPod"
+
+#: ../src/file.c:1685
+msgid "local file as well as copy on the iPod cannot be found"
+msgstr "локальный файл и ÐºÐ¾Ð¿Ð¸Ñ Ð½Ð° iPod не найдены"
+
+#. update not successful -- log this track for later display
+#: ../src/file.c:1788
+msgid "update failed (format not supported?)"
+msgstr "ошибка при обновлении (формат не поддерживаетÑÑ?)"
+
+#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#, c-format
+msgid "Processing '%s'..."
+msgstr "Идёт обработка \"%s\"..."
+
+#: ../src/file.c:1879
+#, c-format
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "Пропущено \"%s\", поÑкольку оно ÑоответÑтвует маÑкам иÑключениÑ.\n"
+
+#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
+#, c-format
+msgid ""
+"Podcast already present: '%s'\n"
+"\n"
+msgstr "ПодкаÑÑ‚ уже приÑутÑтвует: \"%s\"\n"
+"\n"
+
+#: ../src/file.c:2064
+#, c-format
+msgid ""
+"Writing to video files not yet supported (%s).\n"
+"\n"
+msgstr "ЗапиÑÑŒ в видеофайлы ещё не поддерживаетÑÑ (%s).\n"
+"\n"
+
+#: ../src/file.c:2116 ../src/file.c:2130
+#, c-format
+msgid "Couldn't change tags of file: %s\n"
+msgstr "Ðе удалоÑÑŒ изменить метки файла: %s\n"
+
+#: ../src/file.c:2232
+#, c-format
+msgid "Could not open '%s' for reading and writing.\n"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸ запиÑи.\n"
+
+#: ../src/file.c:2239
+#, c-format
+msgid "Could not obtain lock on '%s'.\n"
+msgstr "Ðе удалоÑÑŒ получить блокировку Ð´Ð»Ñ \"%s\".\n"
+
+#. error!
+#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
+#, c-format
+msgid "Malformed line in '%s': %s\n"
+msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ñтрока в \"%s\": %s\n"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:2315
+msgid "Remove offline playcounts?"
+msgstr "Удалить Ñчётчики воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð² автономном режиме?"
+
+#. title
+#: ../src/file.c:2316
+msgid ""
+"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
+"remove them from the offline playcount file, 'Cancel' to keep them."
+msgstr "Ðекоторые дорожки, воÑпроизведённые в автономном режиме, не были найдены в iTunesDB."
+"Ðажмите \"OK\", чтобы удалить их из файла Ñчётчика воÑпроизведений в автономном режиме."
+"Ðажмите \"Cancel\", чтобы Ñохранить их."
+
+#: ../src/file.c:2333
+#, c-format
+msgid "Error writing to '%s'.\n"
+msgstr "Ошибка запиÑи в \"%s\".\n"
+
+#: ../src/file.c:2390 ../src/tools.c:270
+#, c-format
+msgid ""
+"Normalization failed: file type not supported (%s).\n"
+"\n"
+msgstr "ÐÐ¾Ñ€Ð¼Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð° неуÑпешно: тип файла не поддерживаетÑÑ (%s).\n"
+"\n"
+
+#: ../src/file.c:2406 ../src/tools.c:287
+#, c-format
+msgid ""
+"Normalization failed: file not available (%s).\n"
+"\n"
+msgstr "ÐÐ¾Ñ€Ð¼Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð° неуÑпешно: файл недоÑтупен (%s).\n"
+"\n"
+
+#: ../src/file_convert.c:316
+msgid "Summary status of conversion processes"
+msgstr "Сводное ÑоÑтоÑние процеÑÑов преобразованиÑ"
+
+#: ../src/file_convert.c:564
+msgid "active"
+msgstr "активно"
+
+#: ../src/file_convert.c:569
+msgid "inactive"
+msgstr "неактивно"
+
+#: ../src/file_convert.c:580
+#, c-format
+msgid "Active threads: %d. Scheduled tracks: %d."
+msgstr "Ðктивных потоков: %d. Спланированных дорожек: %d."
+
+#: ../src/file_convert.c:1071
+#, c-format
+msgid "Original filename not available for '%s.'\n"
+msgstr "Оригинальное Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° недоÑтупно Ð´Ð»Ñ \"%s\".\n"
+
+#: ../src/file_convert.c:1086
+#, c-format
+msgid "Filename '%s' is no longer valid for '%s'.\n"
+msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° \"%s\" больше не допуÑтимо Ð´Ð»Ñ \"%s\".\n"
+
+#: ../src/file_convert.c:1137
+msgid "Ogg Vorbis"
+msgstr "Ogg Vorbis"
+
+#: ../src/file_convert.c:1143
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../src/file_convert.c:1198
+#, c-format
+msgid ""
+"Files of type '%s' are not supported by the iPod. Please go to the "
+"Preferences to set up and turn on a suitable conversion script for '%s'.\n"
+"\n"
+msgstr "Файлы типа \"%s\" не поддерживаютÑÑ iPod. ПожалуйÑта, откройте диалог"
+"\"Параметры\", чтобы уÑтановить и включить подходÑщий Ñценарий"
+"Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ \"%s\".\n"
+"\n"
+
+#: ../src/file_convert.c:1284
+msgid "No information available"
+msgstr "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупны"
+
+#: ../src/file_convert.c:1323
+#, c-format
+msgid "Could not create '%s'. Filetype conversion will not work.\n"
+msgstr "Ðе удалоÑÑŒ Ñоздать \"%s\". Преобразование типа файлов не будет работать.\n"
+
+#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#, c-format
+msgid ""
+"Transfer of '%s' failed. %s\n"
+"\n"
+msgstr "Передача \"%s\" завершена неуÑпешно. %s\n"
+"\n"
+
+#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '%s'.\n"
+"\n"
+msgstr "Преобразование \"%s\" завершено неуÑпешно. %s\n"
+"\n"
+
+#: ../src/file_convert.c:2062
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
+"\n"
+msgstr "Преобразование \"%s\" завершено неуÑпешно: \"%s %s\" вернул ÑÑ‚Ð°Ñ‚ÑƒÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ %d.\n"
+"\n"
+
+#: ../src/file_convert.c:2091
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
+"expected.\n"
+"\n"
+msgstr "Преобразование \"%s\" завершено неуÑпешно: \"%s %s\" не вернул раÑширение"
+"файла, как ожидалоÑÑŒ.\n"
+"\n"
+
+#: ../src/file_convert.c:2167
+#, c-format
+msgid ""
+"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
+"\n"
+msgstr "Преобразование \"%s\" завершено неуÑпешно: Ðет доÑтупа к оригинальному файлу \"%s\" (%s).\n"
+"\n"
+
+#: ../src/file_convert.c:2222
+#, c-format
+msgid ""
+"Conversion of '%s' failed: Could not create directory '%s'.\n"
+"\n"
+msgstr "Преобразование \"%s\" завершено неуÑпешно: Ðе удалоÑÑŒ Ñоздать папку \"%s\".\n"
+"\n"
+
+#: ../src/file_convert.c:2356
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '%s' returned exit status %d.\n"
+"\n"
+msgstr "Преобразование \"%s\" завершено неуÑпешно: \"%s\" вернул ÑÑ‚Ð°Ñ‚ÑƒÑ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ %d.\n"
+"\n"
+
+#: ../src/file_convert.c:2395
+#, c-format
+msgid ""
+"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
+"\n"
+msgstr "Преобразование \"%s\" завершено неуÑпешно: не удалоÑÑŒ получить информацию о преобразованном файле \"%s\".\n"
+"\n"
+
+#: ../src/file_export.c:182
+#, c-format
+msgid "Skipping existing file with same length: '%s'\n"
+msgstr "Пропущен ÑущеÑтвующий файл Ñ Ñ‚Ð¾Ð¹ же длиной: \"%s\"\n"
+
+#: ../src/file_export.c:190
+#, c-format
+msgid "Overwriting existing file: '%s'\n"
+msgstr "ПерезапиÑан ÑущеÑтвующий файл: \"%s\"\n"
+
+#: ../src/file_export.c:207
+#, c-format
+msgid "Error copying '%s' to '%s': Permission Error (%s)\n"
+msgstr "Ошибка при копировании \"%s\" в \"%s\": Ошибка прав доÑтупа (%s)\n"
+
+#: ../src/file_export.c:209
+#, c-format
+msgid "Error copying '%s' to '%s' (%s)\n"
+msgstr "Ошибка при копировании \"%s\" в \"%s\" (%s)\n"
+
+#: ../src/file_export.c:217
+#, c-format
+msgid "Unable to open '%s' for reading\n"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ\n"
+
+#: ../src/file_export.c:327
+#, c-format
+msgid "Could find file for '%s' on the iPod\n"
+msgstr "Ðайден файл Ð´Ð»Ñ \"%s\" на iPod\n"
+
+#. create the dialog window
+#: ../src/file_export.c:395 ../src/tools.c:360
+msgid "Information"
+msgstr "СведениÑ"
+
+#: ../src/file_export.c:406 ../src/tools.c:372
+msgid "Press button to abort."
+msgstr "Ðажмите кнопку Ð´Ð»Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ñ‹."
+
+#: ../src/file_export.c:419
+msgid "copying..."
+msgstr "копирование..."
+
+#: ../src/file_export.c:476
+#, c-format
+msgid "Failed to write '%s-%s'\n"
+msgstr "Ðе удалоÑÑŒ запиÑать \"%s-%s\"\n"
+
+#: ../src/file_export.c:489
+#, c-format
+msgid "Copied %d of %d track."
+msgstr "Скопировано %d из дорожки %d."
+
+#: ../src/file_export.c:505 ../src/tools.c:518
+#, c-format
+msgid "%d%% (%d:%02d:%02d left)"
+msgstr "%d%% (%d:%02d:%02d оÑталоÑÑŒ)"
+
+#: ../src/file_export.c:514
+msgid "Some tracks were not copied."
+msgstr "Ðекоторые дорожки не были Ñкопированы."
+
+#: ../src/file_export.c:579
+msgid "Export from iPod database not possible in offline mode."
+msgstr "ÐкÑпорт из базы данных iPod невозможен в автономном режиме."
+
+#: ../src/file_export.c:587
+msgid "Select Export Destination Directory"
+msgstr "Выберите целевую директорию Ð´Ð»Ñ ÑкÑпорта"
+
+#: ../src/file_export.c:736
+msgid "Drag from iPod database not possible in offline mode."
+msgstr "ПеретаÑкивание из базы данных iPod невозможно в автономном режиме."
+
+#: ../src/file_export.c:770
+msgid "The following tracks have to be copied to your harddisk"
+msgstr "Следующие дорожки должны быть Ñкопированы на ваш жёÑткий диÑк"
+
+#: ../src/file_export.c:815
+msgid ""
+"Some tracks were not copied to your harddisk. Only the copied tracks will be "
+"included in the current drag and drop operation.\n"
+"\n"
+msgstr "Ðекоторые дорожки не были Ñкопированы на ваш жёÑткий диÑк. Только Ñкопированные"
+"дорожки могут быть включены в текущую операцию перетаÑкиваниÑ.\n"
+"\n"
+
+#: ../src/file_export.c:1010
+#, c-format
+msgid ""
+"No valid filename for: %s\n"
+"\n"
+msgstr "Ðет допуÑтимого имени файла длÑ: %s\n"
+"\n"
+
+#: ../src/file_export.c:1026
+#, c-format
+msgid "Created playlist with one track."
+msgstr "Создан ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ñ Ð¾Ð´Ð½Ð¾Ð¹ дорожкой."
+
+#: ../src/file_export.c:1031
+#, c-format
+msgid ""
+"Could not open '%s' for writing (%s).\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи (%s).\n"
+"\n"
+
+#: ../src/file_itunesdb.c:129
+#, c-format
+msgid "Matching SHA1 checksum for file %d/%d"
+msgstr "ПроверÑетÑÑ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñумма SHA1 Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %d/%d"
+
+#: ../src/file_itunesdb.c:236
+msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
+msgstr "Ðе удалоÑÑŒ открыть \"iTunesDB.ext\" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ€Ð°Ñширенных Ñведений.\n"
+
+#: ../src/file_itunesdb.c:243
+msgid "Could not create hash value from itunesdb\n"
+msgstr "Ðе удалоÑÑŒ Ñоздать значение Ñ…Ñша из iTunesDB\n"
+
+#: ../src/file_itunesdb.c:259
+#, c-format
+msgid "Error while reading extended info: %s\n"
+msgstr "Ошибка при чтении раÑширенных Ñведений: %s\n"
+
+#: ../src/file_itunesdb.c:276
+#, c-format
+msgid ""
+"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
+"gtkpod will try to match the information using SHA1 checksums. This may take "
+"a long time.\n"
+"\n"
+msgstr "iTunesDB \"%s\" не ÑоответÑтвует контрольной Ñумме в файле раÑширенных Ñведений \"%s\"\n"
+"gtkpod попытаетÑÑ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ ÑведениÑ, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ñ‹Ðµ Ñуммы SHA1. Ðто может"
+"занÑÑ‚ÑŒ длительное времÑ.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:288
+#, c-format
+msgid ""
+"%s:\n"
+"Expected \"itunesdb_hash=\" but got:\"%s\"\n"
+msgstr "%s:\n"
+"ОжидалоÑÑŒ \"itunesdb_hash=\", но получено: \"%s\"\n"
+
+#: ../src/file_itunesdb.c:348
+#, c-format
+msgid ""
+"%s:\n"
+"Format error: %s\n"
+msgstr "%s:\n"
+"Ошибка форматированиÑ: %s\n"
+
+#: ../src/file_itunesdb.c:393
+msgid ""
+"No SHA1 checksums on individual tracks are available.\n"
+"\n"
+"To avoid this situation in the future either switch on duplicate detection "
+"(will provide SHA1 checksums) or avoid using the iPod with programs other "
+"than gtkpod.\n"
+"\n"
+msgstr "Контрольные Ñуммы SHA1 Ð´Ð»Ñ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… дорожек недоÑтупны.\n"
+"\n"
+"Чтобы избежать Ñтой Ñитуации в будущем, либо включите обнаружение дубликатов"
+"(которое Ñделает доÑтупными контрольные Ñуммы SHA1), либо избегайте иÑпользованиÑ"
+"iPod Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ программами, кроме gtkpod.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:457
+msgid ""
+"Extended info will not be used. If you have non-transferred tracks,\n"
+"these will be lost.\n"
+msgstr "РаÑширенные ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð½Ðµ будут иÑпользованы. ЕÑли у Ð²Ð°Ñ Ð¸Ð¼ÐµÑŽÑ‚ÑÑ\n"
+"непереданные дорожки, они будут потерÑны.\n"
+
+#: ../src/file_itunesdb.c:465
+msgid "Offline iPod database successfully imported"
+msgstr "База данных iPod автономного режима импортирована уÑпешно"
+
+#: ../src/file_itunesdb.c:468
+msgid "Local database successfully imported"
+msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð±Ð°Ð·Ð° данных импортирована уÑпешно"
+
+#: ../src/file_itunesdb.c:476
+#, c-format
+msgid ""
+"Offline iPod database import failed: '%s'\n"
+"\n"
+msgstr "Ошибка при импорте базы данных iPod автономного режима: \"%s\"\n"
+"\n"
+
+#: ../src/file_itunesdb.c:480
+#, c-format
+msgid ""
+"Local database import failed: '%s'\n"
+"\n"
+msgstr "Ошибка при импорте локальной базы данных iPod: \"%s\"\n"
+"\n"
+
+#: ../src/file_itunesdb.c:487
+msgid ""
+"Offline iPod database import failed: \n"
+"\n"
+msgstr "Ошибка при импорте базы данных iPod автономного режима: \n"
+"\n"
+
+#: ../src/file_itunesdb.c:490
+msgid ""
+"Local database import failed: \n"
+"\n"
+msgstr "Ошибка при импорте локальной базы данных iPod: \n"
+"\n"
+
+#: ../src/file_itunesdb.c:497
+#, c-format
+msgid ""
+"'%s' does not exist. Import aborted.\n"
+"\n"
+msgstr "\"%s\" не ÑущеÑтвует. Импорт прерван.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:520
+msgid "Extended info will not be used.\n"
+msgstr "РаÑширенные ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð½Ðµ будут иÑпользованы.\n"
+
+#: ../src/file_itunesdb.c:527
+msgid "iPod Database Successfully Imported"
+msgstr "База данных iPod уÑпешно импортирована"
+
+#: ../src/file_itunesdb.c:534
+#, c-format
+msgid ""
+"iPod Database Import Failed: '%s'\n"
+"\n"
+msgstr "Ошибка импорта базы данных iPod: \"%s\"\n"
+"\n"
+
+#: ../src/file_itunesdb.c:540
+msgid ""
+"iPod Database Import Failed.\n"
+"\n"
+msgstr "Ошибка импорта базы данных iPod.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:549
+#, c-format
+msgid ""
+"'%s' (or similar) does not exist. Import aborted.\n"
+"\n"
+msgstr "\"%s\" (или похожий) не ÑущеÑтвует. Импорт прерван.\n"
+"\n"
+
+#: ../src/file_itunesdb.c:865
+#, c-format
+msgid ""
+"Could not find iPod directory structure at '%s'.\n"
+"If you are sure that the iPod is properly mounted at '%s', gtkpod can create "
+"the directory structure for you.\n"
+"\n"
+"Do you want to create the directory structure now?\n"
+msgstr "Ðе удалоÑÑŒ найти Ñтруктуру папок iPod в \"%s\".\n"
+"ЕÑли вы уверены, что iPod правильно примонтирован в \"%s\", gtkpod может Ñоздать"
+"Ñтруктуру папок Ð´Ð»Ñ Ð²Ð°Ñ."
+"\n"
+"Желаете ли вы Ñоздать Ñтруктуру папок ÑейчаÑ?\n"
+
+#: ../src/file_itunesdb.c:1180
+#, c-format
+msgid "Could not open \"%s\" for writing extended info.\n"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи раÑширенных Ñведений.\n"
+
+#: ../src/file_itunesdb.c:1195
+msgid "Aborted writing of extended info.\n"
+msgstr "ЗапиÑÑŒ раÑширенных Ñведений прервана.\n"
+
+#: ../src/file_itunesdb.c:1397
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../src/file_itunesdb.c:1411
+#, c-format
+msgid "%d%% (%d/%d %d:%02d:%02d left)"
+msgstr "%d%% (%d/%d %d:%02d:%02d оÑталоÑÑŒ)"
+
+#: ../src/file_itunesdb.c:1463
+msgid "Status: Deleting File"
+msgstr "СоÑтоÑние: Удаление файла"
+
+#: ../src/file_itunesdb.c:1524
+#, c-format
+msgid ""
+"Could not remove the following file: '%s'\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ удалить Ñледующий файл: \"%s\"\n"
+"\n"
+
+#: ../src/file_itunesdb.c:1632
+msgid ""
+"The following track could not be converted successfully:\n"
+"\n"
+"The following tracks could not be converted successfully:\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ преобразовать Ñледующую дорожку:\n"
+"\n"
+"Ðе удалоÑÑŒ преобразовать Ñледующие дорожки:\n"
+"\n"
+
+#: ../src/file_itunesdb.c:1642
+msgid ""
+"The following track could not be transferred successfully:\n"
+"\n"
+"The following tracks could not be transferred successfully:\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ передать Ñледующую дорожку:\n"
+"\n"
+"Ðе удалоÑÑŒ передать Ñледующие дорожки:\n"
+"\n"
+
+#. ID
+#. modal,
+#. gint id,
+#. gboolean modal,
+#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+msgid "Warning"
+msgstr "Внимание"
+
+#. title
+#: ../src/file_itunesdb.c:1652
+msgid ""
+"The iPod could not be ejected. Please fix the problems mentioned below and "
+"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
+"for conversion and transfer."
+msgstr "iPod не может быть извлечён. ПожалуйÑта, иÑправьте ошибки, упомÑнутые"
+"ниже, и извлеките iPod Ñнова. При нажатии \"OK\" gtkpod вновь попытаетÑÑ"
+"преобразовать и передать дорожки, Ð´Ð»Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ неудачей."
+
+#: ../src/file_itunesdb.c:1715
+#, c-format
+msgid "Status: Copying track"
+msgstr "СоÑтоÑние: Копирование дорожки"
+
+#: ../src/file_itunesdb.c:1721
+#, c-format
+msgid "Status: Waiting for conversion to complete"
+msgstr "СоÑтоÑние: Ожидание Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ"
+
+#: ../src/file_itunesdb.c:1725
+#, c-format
+msgid "Status: Finished transfer"
+msgstr "СоÑтоÑние: Передача завершена"
+
+#: ../src/file_itunesdb.c:1770
+#, c-format
+msgid ""
+"One track could not be transferred because your iPod is full. Either delete "
+"some tracks or otherwise create space on the iPod before ejecting the iPod "
+"again."
+"%d tracks could not be transferred because your iPod is full. Either delete "
+"some tracks or otherwise create space on the iPod before ejecting the iPod "
+"again."
+msgstr "Одна дорожка не могла быть передана, поÑкольку iPod заполнен. Либо удалите"
+"некоторые дорожки, либо оÑвободите меÑто на iPod иным образом перед"
+"повторным извлечением."
+"%d дорожек не могли быть переданы, поÑкольку iPod заполнен. Либо удалите"
+"некоторые дорожки, либо оÑвободите меÑто на iPod иным образом перед"
+"повторным извлечением."
+
+#: ../src/file_itunesdb.c:1852
+#, c-format
+msgid ""
+"You did not import the existing iTunesDB ('%s'). This is most likely "
+"incorrect and will result in the loss of the existing database.\n"
+"\n"
+"Press 'OK' if you want to proceed anyhow or 'Cancel' to skip storing. If you "
+"cancel, you can import the existing database before calling this function "
+"again.\n"
+msgstr "Ð’Ñ‹ не импортировали ÑущеÑтвующую iTunesDB (\"%s\"). Как правило, Ñто"
+"ÑвлÑетÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹ и приведёт к потере ÑущеÑтвующей базы данных.\n"
+"\n"
+"Ðажмите \"OK\", чтобы продолжить, неÑÐ¼Ð¾Ñ‚Ñ€Ñ Ð½Ð° Ñто, или \"Отмена\", чтобы"
+"пропуÑтить Ñохранение. ЕÑли вы нажмёте \"Отмена\", вы Ñможете"
+"импортировать ÑущеÑтвующую базу данных перед повторным вызовом"
+"Ñтой функции.\n"
+
+#: ../src/file_itunesdb.c:1887
+msgid ""
+"iPod directory structure must be present before synching to the iPod can be "
+"performed.\n"
+msgstr "Структура папок iPod должна приÑутÑтвовать, прежде чем может быть"
+"оÑущеÑтвлена ÑÐ¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ iPod.\n"
+
+#: ../src/file_itunesdb.c:1896
+msgid "Some tracks could not be deleted from the iPod. Export aborted!"
+msgstr "Ðекоторые дорожки не могут быть удалены Ñ iPod. ÐкÑпорт прерван."
+
+#: ../src/file_itunesdb.c:1914
+#, c-format
+msgid "Now writing database '%s'. Please wait..."
+msgstr "ЗапиÑываетÑÑ Ð±Ð°Ð·Ð° данных \"%s\". ПожалуйÑта, подождите..."
+
+#: ../src/file_itunesdb.c:1963
+#, c-format
+msgid "Extended information file not deleted: '%s'"
+msgstr "Файл раÑширенных Ñведений не удалён: \"%s\""
+
+#: ../src/file_itunesdb.c:2070
+#, c-format
+msgid "%s: Database saved"
+msgstr "%s: База данных Ñохранена"
+
+#: ../src/file_itunesdb.c:2074
+#, c-format
+msgid "%s: Changes saved"
+msgstr "%s: Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñохранены"
+
+#: ../src/fileselection.c:129
+msgid "Successfully added files"
+msgstr "Файлы уÑпешно добавлены"
+
+#: ../src/fileselection.c:131
+msgid "Some files were not added successfully"
+msgstr "Произошла ошибка при добавлении некоторых файлов"
+
+#: ../src/fileselection.c:164 ../src/fileselection.c:305
+#: ../src/fileselection.c:792
+msgid "Please select a playlist or repository before adding tracks."
+msgstr "ПожалуйÑта, выберите ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ репозиторий перед добавлением дорожек."
+
+#: ../src/fileselection.c:175 ../src/fileselection.c:314
+#: ../src/fileselection.c:803
+msgid "Please load the iPod before adding tracks."
+msgstr "ПожалуйÑта, загрузите iPod перед добавлением дорожек."
+
+#: ../src/fileselection.c:185
+#, c-format
+msgid "Add files to '%s'"
+msgstr "Добавить файлы к \"%s\""
+
+#: ../src/fileselection.c:189
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr "Добавить файлы к \"%s/%s\""
+
+#. Create window title
+#: ../src/fileselection.c:322
+#, c-format
+msgid "Add playlist files to '%s'"
+msgstr "Добавить файлы ÑпиÑка воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ðº \"%s\""
+
+#. Create the file chooser, and handle the response
+#: ../src/fileselection.c:378
+msgid "Set Cover"
+msgstr "Задать обложку"
+
+#: ../src/fileselection.c:816
+#, c-format
+msgid "Add directories to '%s'"
+msgstr "Добавить папки к \"%s\""
+
+#: ../src/fileselection.c:820
+#, c-format
+msgid "Add directories to '%s/%s'"
+msgstr "Добавить файлы к \"%s/%s\""
+
+#: ../src/fileselection.c:1097
+msgid "Ok"
+msgstr "OK"
+
+#: ../src/fileselection.c:1106
+msgid "Cancel"
+msgstr "Отмена"
+
+#: ../src/flacfile.c:62
+#, c-format
+msgid "'%s' does not appear to be an FLAC audio file.\n"
+msgstr "\"%s\" не поход на аудиофайл FLAC.\n"
+
+#: ../src/flacfile.c:78
+#, c-format
+msgid "Error retrieving tags for '%s'.\n"
+msgstr "Ошибка при получении меток Ð´Ð»Ñ \"%s\".\n"
+
+#: ../src/flacfile.c:165
+#, c-format
+msgid ""
+"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
+"compile the gtkpod source together with the FLAC library.\n"
+msgstr "Ошибка при импорте \"%s\": FLAC не поддерживаетÑÑ Ð±ÐµÐ· библиотеки FLAC. Ð’Ñ‹ должны"
+"Ñкомпилировать иÑходный код gtkpod Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ библиотеки FLAC.\n"
+
+#: ../src/flacfile.c:171
+#, c-format
+msgid ""
+"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
+"library. You must compile the gtkpod source together with the FLAC library.\n"
+msgstr "Ошибка при обновлении метаданных FLAC Ð´Ð»Ñ \"%s\": FLAC не поддерживаетÑÑ Ð±ÐµÐ· библиотеки FLAC. Ð’Ñ‹ должны"
+"Ñкомпилировать иÑходный код gtkpod Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ библиотеки FLAC.\n"
+
+#: ../src/getopt.c:681
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: Ð¾Ð¿Ñ†Ð¸Ñ \"%s\" имеет неÑколько значений\n"
+
+#: ../src/getopt.c:706
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: Ð¾Ð¿Ñ†Ð¸Ñ \"--%s\" не допуÑкает аргумент\n"
+
+#: ../src/getopt.c:711
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: Ð¾Ð¿Ñ†Ð¸Ñ \"%c%s\" не допуÑкает аргумент\n"
+
+#: ../src/getopt.c:729 ../src/getopt.c:902
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Ð¾Ð¿Ñ†Ð¸Ñ \"--%s\" требует аргумент\n"
+
+#. --option
+#: ../src/getopt.c:758
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ \"--%s\"\n"
+
+#. +option or -option
+#: ../src/getopt.c:762
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ \"%c%s\"\n"
+
+#. 1003.2 specifies the format of this message.
+#: ../src/getopt.c:788
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ -- %c\n"
+
+#: ../src/getopt.c:791
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: недопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ -- %c\n"
+
+#. 1003.2 specifies the format of this message.
+#: ../src/getopt.c:821 ../src/getopt.c:951
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Ð¾Ð¿Ñ†Ð¸Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ аргумент -- %c\n"
+
+#: ../src/getopt.c:868
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Ð¾Ð¿Ñ†Ð¸Ñ \"-W %s\" имеет неÑколько значений\n"
+
+#: ../src/getopt.c:886
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: Ð¾Ð¿Ñ†Ð¸Ñ \"-W %s\" не допуÑкает аргумент\n"
+
+#: ../src/info.c:383
+msgid "n/c"
+msgstr "n/c"
+
+#: ../src/info.c:388 ../src/info.c:838
+msgid "offline"
+msgstr "автономный"
+
+#: ../src/info.c:486
+#, c-format
+msgid " P:%d T:%d/%d"
+msgstr " P:%d T:%d/%d"
+
+#: ../src/info.c:780
+msgid "B"
+msgstr "Б"
+
+#: ../src/info.c:780
+msgid "kB"
+msgstr "КБ"
+
+#: ../src/info.c:780
+msgid "TB"
+msgstr "ТБ"
+
+#: ../src/info.c:823
+#, c-format
+msgid " %s Free"
+msgstr "%s Ñвободно"
+
+#: ../src/info.c:828
+#, c-format
+msgid " %s Pending"
+msgstr "%s выполнÑетÑÑ"
+
+#: ../src/info.c:833
+msgid " disconnected"
+msgstr " отключено"
+
+#: ../src/info.c:884
+msgid "No database or playlist selected"
+msgstr "Ðе выбрана база данных или ÑпиÑок воÑпроизведениÑ"
+
+#: ../src/info.c:889
+msgid "No tracks selected"
+msgstr "Дорожки не выбраны"
+
+#: ../src/info.c:894
+msgid "No playlist selected"
+msgstr "СпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð½Ðµ выбран"
+
+#: ../src/info.c:899
+msgid "No iPod or iPod playlist selected"
+msgstr "Ðе выбран iPod или ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ iPod"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "Выберите или введите Ñвою модель"
+
+#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
+msgid "Select mountpoint"
+msgstr "Выберите точку монтированиÑ"
+
+#: ../src/ipod_init.c:359
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "Ошибка при инициализации iPod: %s\n"
+
+#: ../src/ipod_init.c:366
+msgid "Error initialising iPod, unknown error\n"
+msgstr "Ошибка при инициализации iPod, неизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°\n"
+
+#: ../src/ipod_init.c:422
+#, c-format
+msgid "<b>Please select your iPod model at </b><i>%s</i>"
+msgstr "<b>ПожалуйÑта, выберите модель iPod в </b><i>%s</i>"
+
+#: ../src/ipod_init.c:463
+msgid ""
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ определить выбранную вами модель iPod -- возможно,"
+"Ñто ошибка в библиотеке GTK+ или glade.\n"
+"\n"
+
+#: ../src/misc.c:70
+msgid ""
+"© 2002 - 2007\n"
+"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+"Corey Donohoe (atmos at atmos dot org)\n"
+msgstr ""
+"© 2002 - 2007\n"
+"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+"Corey Donohoe (atmos at atmos dot org)\n"
+
+#: ../src/misc.c:74
+msgid ""
+"Patches were supplied by the following people (list may be incomplete -- "
+"please contact me)\n"
+msgstr ""
+"Patches were supplied by the following people (list may be incomplete -- "
+"please contact me)\n"
+
+#: ../src/misc.c:75
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
+msgstr "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
+
+#: ../src/misc.c:76
+msgid "Hiroshi Kawashima: Japanese charset autodetecion feature"
+msgstr "Hiroshi Kawashima: Japanese charset autodetecion feature"
+
+#: ../src/misc.c:77
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
+msgstr "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
+
+#: ../src/misc.c:78
+msgid ""
+"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
+"newlines at the end"
+msgstr ""
+"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
+"newlines at the end"
+
+#: ../src/misc.c:79
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
+msgstr "Sam Clegg: user defined filenames when exporting tracks from the iPod"
+
+#: ../src/misc.c:80
+msgid "Chris Cutler: automatic creation of various playlist types"
+msgstr "Chris Cutler: automatic creation of various playlist types"
+
+#: ../src/misc.c:81
+msgid ""
+"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
+"dialogue during sync"
+msgstr ""
+"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
+"dialogue during sync"
+
+#: ../src/misc.c:82
+msgid ""
+"Edward Matteucci: debugging, special playlist creation, most of the volume "
+"normalizing code"
+msgstr ""
+"Edward Matteucci: debugging, special playlist creation, most of the volume "
+"normalizing code"
+
+#: ../src/misc.c:83
+msgid "Jens Lautenbach: some optical improvements"
+msgstr "Jens Lautenbach: some optical improvements"
+
+#: ../src/misc.c:84
+msgid "Alex Tribble: iPod eject patch"
+msgstr "Alex Tribble: iPod eject patch"
+
+#: ../src/misc.c:85
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+msgstr "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+
+#: ../src/misc.c:86
+msgid ""
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
+msgstr ""
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
+
+#: ../src/misc.c:87
+msgid ""
+"Ero Carrera: Filename validation and quick sync when copying tracks from the "
+"iPod"
+msgstr ""
+"Ero Carrera: Filename validation and quick sync when copying tracks from the "
+"iPod"
+
+#: ../src/misc.c:88
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
+msgstr "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
+
+#: ../src/misc.c:89
+msgid "Armando Atienza: Support with external playcounts"
+msgstr "Armando Atienza: Support with external playcounts"
+
+#: ../src/misc.c:90
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+msgstr "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+
+#: ../src/misc.c:91
+msgid "Jim Hall: Decent INSTALL file"
+msgstr "Jim Hall: Decent INSTALL file"
+
+#: ../src/misc.c:92
+msgid ""
+"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
+"contacts to the iPod"
+msgstr ""
+"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
+"contacts to the iPod"
+
+#. J"urgen!
+#: ../src/misc.c:93
+msgid "Flavio Stanchina: bugfixes"
+msgstr "Flavio Stanchina: bugfixes"
+
+#: ../src/misc.c:94
+msgid ""
+"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
+"the title"
+msgstr ""
+"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
+"the title"
+
+#: ../src/misc.c:95
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
+msgstr "Steve Jay: use statvfs() instead of df (better portability, faster)"
+
+#: ../src/misc.c:97
+msgid ""
+"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
+"tags"
+msgstr ""
+"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
+"tags"
+
+#: ../src/misc.c:99
+msgid ""
+"James Liggett:\n"
+"replacement of old GTK file selection dialogs with new GTK filechooser "
+"dialogs\n"
+"refactored user preferences system."
+msgstr ""
+"James Liggett:\n"
+"replacement of old GTK file selection dialogs with new GTK filechooser "
+"dialogs\n"
+"refactored user preferences system."
+
+#: ../src/misc.c:103
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
+msgstr "Daniel Kercher: sync scripts for abook and webcalendar"
+
+#: ../src/misc.c:105
+msgid "Clinton Gormley: sync scripts for thunderbird"
+msgstr "Clinton Gormley: sync scripts for thunderbird"
+
+#: ../src/misc.c:107
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
+msgstr "Sebastien Beridot: sync script for ldif addressbook format"
+
+#: ../src/misc.c:109
+msgid "Sebastian Scherer: sync script for kNotes"
+msgstr "Sebastian Scherer: sync script for kNotes"
+
+#: ../src/misc.c:111
+msgid "Nick Piper: sync script for Palm, type-ahead search"
+msgstr "Nick Piper: sync script for Palm, type-ahead search"
+
+#: ../src/misc.c:113
+msgid "Uwe Hermann: help with support for iPod Video"
+msgstr "Uwe Hermann: help with support for iPod Video"
+
+#: ../src/misc.c:115
+msgid ""
+"Iain Benson: support for compilation tag in mp3 files and separate display "
+"of compilations in the sort tab."
+msgstr ""
+"Iain Benson: support for compilation tag in mp3 files and separate display "
+"of compilations in the sort tab."
+
+#: ../src/misc.c:116
+msgid ""
+"Nicolas Chariot: icons of buttons\n"
+"\n"
+msgstr ""
+"Nicolas Chariot: icons of buttons\n"
+"\n"
+
+#: ../src/misc.c:118
+msgid "This program borrows code from the following projects:"
+msgstr "This program borrows code from the following projects:"
+
+#: ../src/misc.c:119
+msgid ""
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
+msgstr ""
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
+
+#: ../src/misc.c:120
+msgid ""
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
+msgstr ""
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
+
+#: ../src/misc.c:121
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
+msgstr "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
+
+#: ../src/misc.c:122
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
+msgstr "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
+
+#: ../src/misc.c:124
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
+msgstr "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
+
+#: ../src/misc.c:128
+msgid "French: David Le Brun (david at dyn-ns dot net)"
+msgstr "French: David Le Brun (david at dyn-ns dot net)"
+
+#: ../src/misc.c:129
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+msgstr "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+
+#: ../src/misc.c:130
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+msgstr "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+
+#: ../src/misc.c:131
+msgid ""
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
+msgstr ""
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
+
+#: ../src/misc.c:132
+msgid "Japanese: Ayako Sano"
+msgstr "Japanese: Ayako Sano"
+
+#: ../src/misc.c:133
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+msgstr "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+
+#: ../src/misc.c:134
+msgid "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)"
+msgstr "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)"
+
+#: ../src/misc.c:139
+msgid ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
+
+#: ../src/misc.c:154
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+msgstr ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
+
+#: ../src/misc.c:162
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr "КроÑÑплатформенный многоÑзыковой Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð´Ð»Ñ Apple iPodâ„¢"
+
+#: ../src/misc.c:929
+#, c-format
+msgid "Could not process '%s' (no filename available)"
+msgstr "Ðе удалоÑÑŒ обработать \"%s\" (Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° недоÑтупно)"
+
+#: ../src/misc.c:1083
+#, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð»ÐµÐºÑема '%%%c' в шаблоне '%s'"
+
+#: ../src/misc.c:1166
+#, c-format
+msgid "Template ('%s') does not match file type '%s'\n"
+msgstr "Шаблон (\"%s\") не ÑоответÑтвует типу файла \"%s\"\n"
+
+#: ../src/misc.c:1252
+#, c-format
+msgid "Error creating %s: %s\n"
+msgstr "Ошибка при Ñоздании %s: %s\n"
+
+#: ../src/misc.c:1686
+#, c-format
+msgid ""
+"Writing preferences file '%s' failed (%s).\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ запиÑать файл наÑтроек \"%s\" (%s).\n"
+"\n"
+
+#: ../src/misc.c:1688
+msgid "unspecified error"
+msgstr "неÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
+
+#: ../src/misc.c:1696
+#, c-format
+msgid ""
+"Writing preferences to the iPod (%s) failed: could not get path to Control "
+"Directory.\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ запиÑать наÑтройки на iPod (%s): невозможно получить путь к папке Control.\n"
+"\n"
+
+#. title
+#: ../src/misc_confirm.c:71
+msgid "The following has occurred:"
+msgstr "Произошло Ñледующее:"
+
+#: ../src/misc_confirm.c:122
+msgid ""
+"Are you sure you want to delete the following track completely from your "
+"iPod? The number of playlists this track is a member of is indicated in "
+"parentheses."
+"Are you sure you want to delete the following tracks completely from your "
+"iPod? The number of playlists the tracks are member of is indicated in "
+"parentheses."
+msgstr "Ð’Ñ‹ уверены, что хотите полноÑтью удалить Ñледующую дорожку Ñ iPod?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входит Ñта дорожка, указано"
+"в Ñкобках."
+"Ð’Ñ‹ уверены, что хотите полноÑтью удалить Ñледующие дорожки Ñ iPod?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входÑÑ‚ Ñти дорожки, указано"
+"в Ñкобках."
+
+#: ../src/misc_confirm.c:126
+msgid "Delete Track Completely from iPod?"
+msgstr "Удалить дорожку Ñ iPod полноÑтью?"
+
+#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#, c-format
+msgid ""
+"Are you sure you want to remove the following track from the playlist \"%s\"?"
+"Are you sure you want to remove the following tracks from the playlist \"%s"
+"\"?"
+msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñледующую дорожку из ÑпиÑка воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\"?"
+"Ð’Ñ‹ уверены, что хотите удалить Ñледующие дорожки из ÑпиÑка воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\"?"
+
+#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+msgid "Remove Track From Playlist?"
+msgstr "Удалить дорожку из ÑпиÑка воÑпроизведениÑ?"
+
+#: ../src/misc_confirm.c:163
+msgid ""
+"Are you sure you want to delete the following track completely from your "
+"harddisk? The number of playlists this track is a member of is indicated in "
+"parentheses."
+"Are you sure you want to delete the following tracks completely from your "
+"harddisk? The number of playlists the tracks are member of is indicated in "
+"parentheses."
+msgstr "Ð’Ñ‹ уверены, что хотите полноÑтью удалить Ñледующую дорожку Ñ Ð¶Ñ‘Ñткого диÑка?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входит Ñта дорожка, указано"
+"в Ñкобках."
+"Ð’Ñ‹ уверены, что хотите полноÑтью удалить Ñледующие дорожки Ñ Ð¶Ñ‘Ñткого диÑка?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входÑÑ‚ Ñти дорожки, указано"
+"в Ñкобках."
+
+#: ../src/misc_confirm.c:167
+msgid "Delete Track from Harddisk?"
+msgstr "Удалить дорожку Ñ Ð¶Ñ‘Ñткого диÑка?"
+
+#: ../src/misc_confirm.c:192
+msgid ""
+"Are you sure you want to remove the following track completely from your "
+"local database? The number of playlists this track is a member of is "
+"indicated in parentheses."
+"Are you sure you want to remove the following tracks completely from your "
+"local database? The number of playlists the tracks are member of is "
+"indicated in parentheses."
+msgstr "Ð’Ñ‹ уверены, что хотите удалить Ñледующую дорожку из локальной базы данных?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входит Ñта дорожка, указано"
+"в Ñкобках."
+"Ð’Ñ‹ уверены, что хотите удалить Ñледующие дорожки из локальной базы данных?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входÑÑ‚ Ñти дорожки, указано"
+"в Ñкобках."
+
+#: ../src/misc_confirm.c:196
+msgid "Remove Track from Local Database?"
+msgstr "Удалить дорожку из локальной базы данных?"
+
+#: ../src/misc_confirm.c:261
+#, c-format
+msgid "Deleted one track completely from iPod"
+msgstr "Одна дорожка полноÑтью удалена Ñ iPod"
+
+#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#, c-format
+msgid "Deleted %d track from playlist '%s'"
+msgstr "Дорожка %d удалена из ÑпиÑка воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\""
+
+#: ../src/misc_confirm.c:285
+#, c-format
+msgid "Deleted one track from harddisk"
+msgstr "Одна дорожка удалена Ñ Ð¶Ñ‘Ñткого диÑка"
+
+#: ../src/misc_confirm.c:297
+#, c-format
+msgid "Deleted track from local database"
+msgstr "Дорожка удалена из локальной базы данных"
+
+#: ../src/misc_confirm.c:442
+msgid "Cannot remove entry 'All'"
+msgstr "Ðевозможно удалить запиÑÑŒ \"Ð’Ñе\""
+
+#: ../src/misc_confirm.c:536
+#, c-format
+msgid "Removed all %d tracks from the iPod"
+msgstr "Удалено %d дорожек Ñ iPod"
+
+#: ../src/misc_confirm.c:541
+#, c-format
+msgid "Removed all podcasts from the iPod"
+msgstr "Ð’Ñе подкаÑÑ‚Ñ‹ удалены Ñ iPod"
+
+#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#, c-format
+msgid "Deleted playlist '%s' including %d member track"
+msgstr "Удалён ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\", Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ %d дорожек"
+
+#. first use playlist name
+#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#, c-format
+msgid "Deleted playlist '%s'"
+msgstr "Удалён ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\""
+
+#: ../src/misc_confirm.c:600
+#, c-format
+msgid "Deleted playlist '%s' including %d member track on harddisk"
+msgstr "Удалён ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\", Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ %d дорожек на жёÑтком диÑке"
+
+#: ../src/misc_confirm.c:617
+#, c-format
+msgid "Removed all %d tracks from the database"
+msgstr "Удалено %d дорожек из базы данных"
+
+#: ../src/misc_confirm.c:695
+#, c-format
+msgid "Are you sure you want to remove all tracks from your iPod?"
+msgstr "Ð’Ñ‹ уверены, что хотите удалить вÑе дорожки Ñ iPod?"
+
+#: ../src/misc_confirm.c:700
+#, c-format
+msgid "Are you sure you want to remove all podcasts from your iPod?"
+msgstr "Ð’Ñ‹ уверены, что хотите удалить вÑе подкаÑÑ‚Ñ‹ Ñ iPod?"
+
+#: ../src/misc_confirm.c:708
+#, c-format
+msgid ""
+"Are you sure you want to delete playlist '%s' and the following track "
+"completely from your ipod? The number of playlists this track is a member of "
+"is indicated in parentheses."
+"Are you sure you want to delete playlist '%s' and the following tracks "
+"completely from your ipod? The number of playlists the tracks are member of "
+"is indicated in parentheses."
+msgstr "Ð’Ñ‹ уверены, что хотите удалить ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" и Ñледующую дорожку Ñ iPod?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входит Ñта дорожка, указано"
+"в Ñкобках."
+"Ð’Ñ‹ уверены, что хотите удалить ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" и Ñледующие дорожки Ñ iPod?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входÑÑ‚ Ñти дорожки, указано"
+"в Ñкобках."
+
+#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#, c-format
+msgid "Are you sure you want to delete the playlist '%s'?"
+msgstr "Ð’Ñ‹ уверены, что хотите удалить ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\"?"
+
+#: ../src/misc_confirm.c:745
+#, c-format
+msgid ""
+"Are you sure you want to delete playlist '%s' and remove the following track "
+"from your harddisk? The number of playlists this track is a member of is "
+"indicated in parentheses."
+"Are you sure you want to delete playlist '%s' and remove the following "
+"tracks from your harddisk? The number of playlists the tracks are member of "
+"is indicated in parentheses."
+msgstr "Ð’Ñ‹ уверены, что хотите удалить ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" и Ñледующую дорожку Ñ Ð¶Ñ‘Ñткого диÑка?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входит Ñта дорожка, указано"
+"в Ñкобках."
+"Ð’Ñ‹ уверены, что хотите удалить ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" и Ñледующие дорожки Ñ Ð¶Ñ‘Ñткого диÑка?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входÑÑ‚ Ñти дорожки, указано"
+"в Ñкобках."
+
+#: ../src/misc_confirm.c:753
+#, c-format
+msgid "Are you sure you want to remove all tracks from the database?"
+msgstr "Ð’Ñ‹ уверены, что хотите удалить вÑе дорожки из базы данных?"
+
+#: ../src/misc_confirm.c:762
+#, c-format
+msgid ""
+"Are you sure you want to delete playlist '%s' and remove the following track "
+"from the database? The number of playlists this track is a member of is "
+"indicated in parentheses."
+"Are you sure you want to delete playlist '%s' and remove the following "
+"tracks from the database? The number of playlists the tracks are member of "
+"is indicated in parentheses."
+msgstr "Ð’Ñ‹ уверены, что хотите удалить ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" и Ñледующую дорожку из базы данных?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входит Ñта дорожка, указано"
+"в Ñкобках."
+"Ð’Ñ‹ уверены, что хотите удалить ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" и Ñледующие дорожки из базы данных?"
+"ЧиÑло ÑпиÑков воÑпроизведениÑ, в которые входÑÑ‚ Ñти дорожки, указано"
+"в Ñкобках."
+
+#: ../src/misc_confirm.c:841
+msgid ""
+"Data has been changed and not been saved.\n"
+"OK to exit gtkpod?"
+msgstr "Данные изменены и не были Ñохранены.\n"
+"Вы уверены, что хотите выйти из gtkpod?"
+
+#: ../src/misc_conversion.c:66
+msgid "File type"
+msgstr "Тип файла"
+
+#: ../src/misc_conversion.c:67
+msgid "PC File"
+msgstr "Файл на ПК"
+
+#: ../src/misc_conversion.c:68
+msgid "iPod File"
+msgstr "Файл на iPod"
+
+#: ../src/misc_conversion.c:69
+msgid "iPod ID"
+msgstr "iPod ID"
+
+#. 10
+#: ../src/misc_conversion.c:70
+msgid "Track Nr (#)"
+msgstr "Ðомер дорожки"
+
+#: ../src/misc_conversion.c:71
+msgid "Transferred"
+msgstr "Передано"
+
+#: ../src/misc_conversion.c:72
+msgid "File Size"
+msgstr "Размер файла"
+
+#: ../src/misc_conversion.c:73
+msgid "Play Time"
+msgstr "ДлительноÑÑ‚ÑŒ"
+
+#. 20
+#: ../src/misc_conversion.c:80
+msgid "Date played"
+msgstr "Дата воÑпроизведениÑ"
+
+#: ../src/misc_conversion.c:82
+msgid "Volume"
+msgstr "Том"
+
+#: ../src/misc_conversion.c:83
+msgid "Soundcheck"
+msgstr "Soundcheck"
+
+#. 25
+#: ../src/misc_conversion.c:85
+msgid "CD Nr"
+msgstr "Ðомер CD"
+
+#: ../src/misc_conversion.c:88
+msgid "Category"
+msgstr "КатегориÑ"
+
+#: ../src/misc_conversion.c:89
+msgid "Description"
+msgstr "ОпиÑание"
+
+#. 30
+#: ../src/misc_conversion.c:90
+msgid "Podcast URL"
+msgstr "URL подкаÑта"
+
+#: ../src/misc_conversion.c:91
+msgid "Podcast RSS"
+msgstr "RSS подкаÑта"
+
+#: ../src/misc_conversion.c:92
+msgid "Subtitle"
+msgstr "Субтитры"
+
+#: ../src/misc_conversion.c:93
+msgid "Date released"
+msgstr "Дата выпуÑка"
+
+#: ../src/misc_conversion.c:94
+msgid "Checked"
+msgstr "Отмечено"
+
+#. 35
+#: ../src/misc_conversion.c:95
+msgid "Start time"
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð½Ð°Ñ‡Ð°Ð»Ð°"
+
+#: ../src/misc_conversion.c:96
+msgid "Stop time"
+msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ"
+
+#: ../src/misc_conversion.c:97
+msgid "Remember Playback Position"
+msgstr "Запомнить позицию воÑпроизведениÑ"
+
+#: ../src/misc_conversion.c:98
+msgid "Skip when Shuffling"
+msgstr "ПропуÑкать при перемешивании"
+
+#: ../src/misc_conversion.c:99
+msgid "Artwork Path"
+msgstr "Путь к изображению"
+
+#. 40
+#: ../src/misc_conversion.c:100
+msgid "Media Type"
+msgstr "Тип Ñодержимого"
+
+#: ../src/misc_conversion.c:102
+msgid "TV Episode"
+msgstr "Ð¡ÐµÑ€Ð¸Ñ Ñ‚ÐµÐ»ÐµÑериала"
+
+#: ../src/misc_conversion.c:103
+msgid "TV Network"
+msgstr "Телеканал"
+
+#: ../src/misc_conversion.c:104
+msgid "Season Nr"
+msgstr "Ðомер Ñезона"
+
+#. 45
+#: ../src/misc_conversion.c:105
+msgid "Episode Nr"
+msgstr "Ðомер Ñерии"
+
+#: ../src/misc_conversion.c:106
+msgid "Album Artist"
+msgstr "Художник обложки"
+
+#: ../src/misc_conversion.c:107
+msgid "Sort Artist"
+msgstr "Сортировка по иÑполнителÑм"
+
+#: ../src/misc_conversion.c:108
+msgid "Sort Title"
+msgstr "Сортировка по названиÑм"
+
+#: ../src/misc_conversion.c:109
+msgid "Sort Album"
+msgstr "Сортировка по альбомам"
+
+#. 50
+#: ../src/misc_conversion.c:110
+msgid "Sort Album Artist"
+msgstr "Сортировка по альбомам и иÑполнителÑм"
+
+#: ../src/misc_conversion.c:111
+msgid "Sort Composer"
+msgstr "Сортировка по композиторам"
+
+#: ../src/misc_conversion.c:112
+msgid "Sort TV Show"
+msgstr "Сортировка по телеÑериалам"
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr "Флаг безразрывной дорожки"
+
+#: ../src/misc_conversion.c:126
+msgid "Name of file on PC, if available"
+msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на ПК, еÑли доÑтупно"
+
+#: ../src/misc_conversion.c:127
+msgid "Name of file on the iPod"
+msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° на iPod"
+
+#. 10
+#: ../src/misc_conversion.c:129
+msgid "Track Nr. and total number of tracks on CD"
+msgstr "Ðомер дорожки и общее чиÑло дорожек на CD"
+
+#: ../src/misc_conversion.c:130
+msgid "Whether the file has already been transferred to the iPod or not"
+msgstr "Был ли файл уже передан на iPod или нет"
+
+#: ../src/misc_conversion.c:136
+msgid "Beats per minute"
+msgstr "Ударов в минуту"
+
+#: ../src/misc_conversion.c:137
+msgid "Number of times the track has been played"
+msgstr "Сколько раз дорожка была воÑпроизведена"
+
+#: ../src/misc_conversion.c:138
+msgid "Star rating from 0 to 5"
+msgstr "Оценка в звёздах, от 0 до 5"
+
+#: ../src/misc_conversion.c:139
+msgid "Date and time track has been added"
+msgstr "Дата и Ð²Ñ€ÐµÐ¼Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸"
+
+#. 20
+#: ../src/misc_conversion.c:140
+msgid "Date and time track has last been played"
+msgstr "Дата и Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ñледнего воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸"
+
+#: ../src/misc_conversion.c:141
+msgid "Date and time track has last been modified"
+msgstr "Дата и Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ñледнего Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸"
+
+#: ../src/misc_conversion.c:142
+msgid "Manual volume adjust"
+msgstr "Ð ÑƒÑ‡Ð½Ð°Ñ Ð¿Ð¾Ð´Ñтройка громкоÑти"
+
+#: ../src/misc_conversion.c:143
+msgid ""
+"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
+"the iPod"
+msgstr "ПодÑтройка громкоÑти в dB (\"replay gain\"): вы должны включить опцию"
+"\"soundcheck\" на iPod"
+
+#. 25
+#: ../src/misc_conversion.c:146
+msgid "CD Nr. and total number of CDS in set"
+msgstr "Ðомер CD и общее чиÑло CD в наборе"
+
+#: ../src/misc_conversion.c:149
+msgid ""
+"The category (e.g. 'Technology' or 'Music') where the podcast was located."
+msgstr "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ (например, \"ТехнологиÑ\" или \"Музыка\", где находилÑÑ Ð¿Ð¾Ð´ÐºÐ°ÑÑ‚."
+
+#: ../src/misc_conversion.c:150
+msgid "Accessible by selecting the center button on the iPod."
+msgstr "ДоÑтупно нажатием Ñредней кнопки на iPod."
+
+#: ../src/misc_conversion.c:154
+msgid "Release date (for podcasts displayed next to the title on the iPod)"
+msgstr "Дата выпуÑка (Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ°Ñтов раÑполагаетÑÑ Ñ€Ñдом Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼ на iPod)"
+
+#. 50
+#: ../src/misc_conversion.c:168 ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170 ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172 ../src/misc_conversion.c:173
+msgid "Used for sorting on the iPod"
+msgstr "ИÑпользуетÑÑ Ð´Ð»Ñ Ñортировки на iPod"
+
+#: ../src/misc_conversion.c:735
+#, c-format
+msgid "The URI '%s' is not an absolute URI using the file scheme"
+msgstr "URI \"%s\" не ÑвлÑетÑÑ Ð°Ð±Ñолютным URI Ñхемы file"
+
+#: ../src/misc_conversion.c:745
+#, c-format
+msgid "The local file URI '%s' may not include a '#'"
+msgstr "Локальный URL типа file \"%s\" не может включать \"#\""
+
+#: ../src/misc_conversion.c:762
+#, c-format
+msgid "The URI '%s' is invalid"
+msgstr "URI \"%s\" некорректен"
+
+#: ../src/misc_conversion.c:774
+#, c-format
+msgid "The hostname of the URI '%s' is invalid"
+msgstr "Ð˜Ð¼Ñ Ñ…Ð¾Ñта в URI \"%s\" некорректно"
+
+#: ../src/misc_conversion.c:790
+#, c-format
+msgid "The URI '%s' contains invalidly escaped characters"
+msgstr "URI %s Ñодержит неверные escape-поÑледовательноÑти"
+
+#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
+#: ../src/misc_playlist.c:429
+msgid "Please enter a name for the new playlist"
+msgstr "ПожалуйÑта, введите Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑпиÑка воÑпроизведениÑ"
+
+#: ../src/misc_playlist.c:154
+msgid "AR:"
+msgstr "ИС:"
+
+#: ../src/misc_playlist.c:157
+msgid "AL:"
+msgstr "ÐЛ:"
+
+#: ../src/misc_playlist.c:160
+msgid "GE:"
+msgstr "ЖÐ:"
+
+#: ../src/misc_playlist.c:163
+msgid "CO:"
+msgstr "ОБ:"
+
+#: ../src/misc_playlist.c:166
+msgid "YE:"
+msgstr "ГО:"
+
+#: ../src/misc_playlist.c:194
+msgid "Unknown"
+msgstr "ÐеизвеÑтно"
+
+#: ../src/misc_playlist.c:272
+#, c-format
+msgid "Random (%d)"
+msgstr "Случайное (%d)"
+
+#: ../src/misc_playlist.c:297
+msgid ""
+"Auto Store of track view disabled.\n"
+"\n"
+msgstr "ÐвтоÑохранение предÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¸ отключено.\n"
+"\n"
+
+#: ../src/misc_playlist.c:356
+msgid "Not Listed"
+msgstr "Ðе в ÑпиÑке"
+
+#: ../src/misc_playlist.c:406
+#, c-format
+msgid "Created playlist '%s' with %d track."
+msgstr "Создан ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ \"%s\" Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ¾Ð¹ %d."
+
+#. n==0
+#: ../src/misc_playlist.c:417
+msgid "No tracks available, playlist not created"
+msgstr "Ðет доÑтупных дорожек, ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð½Ðµ Ñоздан"
+
+#: ../src/misc_playlist.c:543
+#, c-format
+msgid "Most Listened (%d)"
+msgstr "Ðаиболее чаÑто проÑлушиваемые (%d)"
+
+#: ../src/misc_playlist.c:584
+#, c-format
+msgid "Never Listened"
+msgstr "Ðикогда не проÑлушанные"
+
+#: ../src/misc_playlist.c:624
+#, c-format
+msgid "Best Rated (%d)"
+msgstr "Ðаибольший рейтинг (%d)"
+
+#: ../src/misc_playlist.c:666
+msgid "Unrated tracks"
+msgstr "Дорожки без рейтинга"
+
+#: ../src/misc_playlist.c:671
+#, c-format
+msgid "Rated %d"
+msgstr "Рейтинг %d"
+
+#: ../src/misc_playlist.c:714
+#, c-format
+msgid "Recent (%d)"
+msgstr "Ðедавние (%d)"
+
+#: ../src/misc_playlist.c:753
+msgid "Last Time"
+msgstr "ПоÑледнее времÑ"
+
+#: ../src/misc_playlist.c:844
+msgid "Removal of dangling tracks with no files on PC was canceled."
+msgstr "Удаление повиÑших дорожек без файлов на ПК отменено."
+
+#: ../src/misc_playlist.c:854
+msgid "Handling of dangling tracks with files on PC was canceled."
+msgstr "Обработка повиÑших дорожек без файлов на ПК отменена."
+
+#: ../src/misc_playlist.c:882
+msgid "Dangling tracks with no files on PC were removed."
+msgstr "ПовиÑшие дорожки без файлов на ПК были удалены."
+
+#: ../src/misc_playlist.c:943
+msgid "Dangling tracks with files on PC were handled."
+msgstr "ПовиÑшие дорожки без файлов на ПК были обработаны."
+
+#: ../src/misc_playlist.c:976
+msgid "Track"
+msgstr "Дорожка"
+
+#: ../src/misc_playlist.c:1019
+msgid ""
+"You did not import the existing iTunesDB. This is most likely incorrect and "
+"will result in the loss of the existing database.\n"
+"\n"
+"Press 'OK' if you want to proceed anyhow or 'Cancel' to abort. If you "
+"cancel, you can import the existing database before calling this function "
+"again.\n"
+msgstr "Ð’Ñ‹ не импортировали ÑущеÑтвующую iTunesDB (\"%s\"). Как правило, Ñто"
+"ÑвлÑетÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ¾Ð¹ и приведёт к потере ÑущеÑтвующей базы данных.\n"
+"\n"
+"Ðажмите \"OK\", чтобы продолжить, неÑÐ¼Ð¾Ñ‚Ñ€Ñ Ð½Ð° Ñто, или \"Отмена\", чтобы"
+"пропуÑтить Ñохранение. ЕÑли вы нажмёте \"Отмена\", вы Ñможете"
+"импортировать ÑущеÑтвующую базу данных перед повторным вызовом"
+"Ñтой функции.\n"
+
+#: ../src/misc_playlist.c:1033
+msgid "Creating a tree of known files"
+msgstr "Создание дерева извеÑтных файлов"
+
+#: ../src/misc_playlist.c:1077
+msgid "Checking iPOD files against known files in DB"
+msgstr "СопоÑтавление файлов на iPod Ñ Ð¸Ð·Ð²ÐµÑтными файлами в БД"
+
+#: ../src/misc_playlist.c:1120
+msgid "Orphaned"
+msgstr "Сирота"
+
+#: ../src/misc_playlist.c:1147
+#, c-format
+msgid ""
+"The following orphaned file had already been added to the iPod again. It "
+"will be removed with the next sync:\n"
+"%s\n"
+"\n"
+msgstr "Следующий оÑиротевший файл уже был добавлен на iPod вновь. Он"
+"будет удалён при Ñледующей Ñинхронизации:\n"
+"%s\n"
+"\n"
+
+#: ../src/misc_playlist.c:1175
+#, c-format
+msgid "Found %d orphaned and %d dangling files. Processing..."
+msgstr "Ðайдено %d оÑиротевших и %d повиÑших файлов. Идёт обработка..."
+
+#: ../src/misc_playlist.c:1199
+#, c-format
+msgid ""
+"The following dangling track has a file on PC.\n"
+"Press OK to have them transfered from the file on next Sync, CANCEL to leave "
+"it as is."
+"The following %d dangling tracks have files on PC.\n"
+"Press OK to have them transfered from the files on next Sync, CANCEL to "
+"leave them as is."
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¿Ð¾Ð²Ð¸ÑÑˆÐ°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° имеет файл на ПК.\n"
+"Ðажмите \"OK\", чтобы передать её из файла при Ñледующей Ñинхронизации,"
+"или \"Отмена\", чтобы оÑтавить её как еÑÑ‚ÑŒ."
+"Следующие %d повиÑших дорожек имеют файлы на ПК.\n"
+"Ðажмите \"OK\", чтобы передать их из файлов при Ñледующей Ñинхронизации,"
+"или \"Отмена\", чтобы оÑтавить их как еÑÑ‚ÑŒ."
+
+#: ../src/misc_playlist.c:1204
+#, c-format
+msgid ""
+"The following dangling track doesn't have file on PC. \n"
+"Press OK to remove it, CANCEL to leave it as is."
+"The following %d dangling tracks do not have files on PC. \n"
+"Press OK to remove them, CANCEL to leave them. as is"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð¿Ð¾Ð²Ð¸ÑÑˆÐ°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° не имеет файла на ПК.\n"
+"Ðажмите \"OK\", чтобы удалить её, или \"Отмена\", чтобы оÑтавить её без изменений."
+"Следующие %d повиÑших дорожек не имеют файла на ПК.\n"
+"Ðажмите \"OK\", чтобы удалитьихё, или \"Отмена\", чтобы оÑтавить их без изменений."
+
+#. we want unique window for each
+#. gboolean modal,
+#: ../src/misc_playlist.c:1211
+msgid "Dangling Tracks"
+msgstr "ПовиÑшие дорожки"
+
+#: ../src/misc_playlist.c:1234
+#, c-format
+msgid "Found %d orphaned and %d dangling files. Done."
+msgstr "Ðайдено %d оÑиротевших и %d повиÑших файлов. Завершено."
+
+#. update for count == 1, 21, 41 ... and for count == n
+#: ../src/misc_track.c:89
+#, c-format
+msgid "Hashed %d of %d track."
+msgstr "Ð¥Ñшировано %d из %d дорожек."
+
+#: ../src/misc_track.c:198
+#, c-format
+msgid "The following duplicate track has been removed."
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ°-дубликат была удалена."
+
+#: ../src/misc_track.c:205
+#, c-format
+msgid ""
+"The following duplicate track has not been added to the master play list."
+"The following %d duplicate tracks have not been added to the master play "
+"list."
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ°-дубликат не была добавлена в главный ÑпиÑок воÑпроизведениÑ."
+"Следующие %d дорожек-дубликатов не были добавлены в главный ÑпиÑок воÑпроизведениÑ."
+
+#. gint id,
+#. gboolean modal,
+#: ../src/misc_track.c:212
+msgid "Duplicate detection"
+msgstr "Обнаружение дубликатов"
+
+#: ../src/misc_track.c:1339
+msgid "Local Database"
+msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ð±Ð°Ð·Ð° данных"
+
+#. artwork is set
+#: ../src/misc_track.c:1350
+msgid "Embedded or filename was lost"
+msgstr "Внедрено или Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° было потерÑно"
+
+#: ../src/misc_track.c:1354
+msgid "Artwork not set"
+msgstr "Изображение не задано"
+
+#: ../src/misc_track.c:1816
+#, c-format
+msgid "Could not find source file for '%s'. Track not copied."
+msgstr "Ðе удалоÑÑŒ найти иÑходный файл Ð´Ð»Ñ \"%s\". Дорожка не Ñкопирована."
+
+#: ../src/misc_track.c:2052
+#, c-format
+msgid "drag and drop: ignored '%s'\n"
+msgstr "перетаÑкивание: проигнорировано \"%s\"\n"
+
+#: ../src/mp3file.c:1336
+#, c-format
+msgid "Error setting ID3 field: %s\n"
+msgstr "Ошибка при уÑтановке Ð¿Ð¾Ð»Ñ ID3: %s\n"
+
+#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
+#, c-format
+msgid "ERROR while opening file: '%s' (%s).\n"
+msgstr "ОШИБКРпри открытии файла: \"%s\" (%s).\n"
+
+#: ../src/mp3file.c:1688
+#, c-format
+msgid "ERROR while writing tag to file: '%s' (%s).\n"
+msgstr "ОШИБКРпри запиÑи метки в файл: \"%s\" (%s).\n"
+
+#. Tracks with zero play length are ignored by iPod...
+#: ../src/mp3file.c:2770
+#, c-format
+msgid "File \"%s\" has zero play length. Ignoring.\n"
+msgstr "Файл \"%s\" имеет нулевую длительноÑÑ‚ÑŒ. Проигнорировано.\n"
+
+#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#, c-format
+msgid "'%s' does not appear to be a mp4 audio or video file.\n"
+msgstr "\"%s\" не похож на видео- или аудиофайл MP4.\n"
+
+#: ../src/mp4file.c:253 ../src/mp4file.c:414
+#, c-format
+msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ файл не ÑвлÑетÑÑ MP4-файлом.\n"
+
+#: ../src/mp4file.c:529
+#, c-format
+msgid "'%s' does not appear to be a mp4 audio file.\n"
+msgstr "\"%s\" не похож на аудиофайл MP4.\n"
+
+#: ../src/mp4file.c:540
+#, c-format
+msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи или файл не ÑвлÑетÑÑ MP4-файлом.\n"
+
+#: ../src/mp4file.c:553
+#, c-format
+msgid ""
+"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
+"You must compile the gtkpod source together with the mp4v2 library.\n"
+msgstr "Импорт \"%s\" завершилÑÑ Ð½ÐµÑƒÑпешно: M4A/M4P/M4B не поддерживаетÑÑ Ð±ÐµÐ· библиотеки mp4v2."
+"Ð’Ñ‹ должны откомпилировать иÑходный код gtkpod Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ библиотеки mp4v2.\n"
+
+#: ../src/mp4file.c:559
+#, c-format
+msgid ""
+"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
+"without the mp4v2 library. You must compile the gtkpod source together with "
+"the mp4v2 library.\n"
+msgstr "Обновление метаданных M4A/M4P/M4B Ð´Ð»Ñ \"%s\" завершилоÑÑŒ неуÑпешно: M4A/M4P/M4B"
+"не поддерживаетÑÑ Ð±ÐµÐ· библиотеки mp4v2. Ð’Ñ‹ должны откомпилировать иÑходный код"
+"gtkpod Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ библиотеки mp4v2.\n"
+
+#: ../src/mp4file.c:565
+#, c-format
+msgid ""
+"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
+"without the mp4v2 library. You must compile the gtkpod source together with "
+"the mp4v2 library.\n"
+msgstr "Обновление soundcheck M4A/M4P/M4B Ð´Ð»Ñ \"%s\" завершилоÑÑŒ неуÑпешно: M4A/M4P/M4B"
+"не поддерживаетÑÑ Ð±ÐµÐ· библиотеки mp4v2. Ð’Ñ‹ должны откомпилировать иÑходный код"
+"gtkpod Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ библиотеки mp4v2.\n"
+
+#: ../src/oggfile.c:62 ../src/wavfile.c:107
+#, c-format
+msgid "Could not open '%s' for reading.\n"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ.\n"
+
+#: ../src/oggfile.c:73
+#, c-format
+msgid "'%s' does not appear to be an ogg audio file.\n"
+msgstr "\"%s\" не похож на аудиофайл Ogg.\n"
+
+#: ../src/oggfile.c:154
+#, c-format
+msgid ""
+"Import of '%s' failed: ogg not supported without the ogg library. You must "
+"compile the gtkpod source together with the ogg library.\n"
+msgstr "Импорт \"%s\" завершилÑÑ Ð½ÐµÑƒÑпешно: Ogg не поддерживаетÑÑ Ð±ÐµÐ· библиотеки Ogg."
+"Ð’Ñ‹ должны откомпилировать иÑходный код gtkpod Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ библиотеки Ogg.\n"
+
+#: ../src/oggfile.c:160
+#, c-format
+msgid ""
+"ogg metadata update for '%s' failed: ogg not supported without the ogg "
+"library. You must compile the gtkpod source together with the ogg library.\n"
+msgstr "Обновление метаданных Ð´Ð»Ñ \"%s\" завершилоÑÑŒ неуÑпешно: Ogg не поддерживаетÑÑ Ð±ÐµÐ· библиотеки Ogg."
+"Ð’Ñ‹ должны откомпилировать иÑходный код gtkpod Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ¾Ð¹ библиотеки Ogg.\n"
+
+#: ../src/prefs.c:357
+#, c-format
+msgid "gtkpod version %s usage:\n"
+msgstr "иÑпользование верÑии gtkpod %s:\n"
+
+#: ../src/prefs.c:358
+msgid " -h, --help: display this message\n"
+msgstr " -h, --help: отобразить Ñто Ñообщение\n"
+
+#: ../src/prefs.c:359
+msgid " -p <file>: increment playcount for file by one\n"
+msgstr " -p <file>: увеличить чиÑло воÑпроизведений файла на 1\n"
+
+#: ../src/prefs.c:360
+msgid " --hash <file>:print gtkpod hash for file\n"
+msgstr " --hash <file>:вывеÑти Ñ…Ñш gtkpod Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð°\n"
+
+#: ../src/prefs.c:361
+msgid " -m path: define the mountpoint of your iPod\n"
+msgstr " -m path: задать точку Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ iPod\n"
+
+#: ../src/prefs.c:362
+msgid " --mountpoint: same as '-m'.\n"
+msgstr " --mountpoint: то же, что '-m'.\n"
+
+#: ../src/prefs.c:363
+msgid " -a: import database automatically after start.\n"
+msgstr " -a: импортировать базу данных автоматичеÑки при запуÑке.\n"
+
+#: ../src/prefs.c:364
+msgid " --auto: same as '-a'.\n"
+msgstr " --auto: то же, что '-a'.\n"
+
+#: ../src/prefs.c:561
+#, c-format
+msgid "Couldn't create ~/.gtkpod\n"
+msgstr "Ðе удалоÑÑŒ Ñоздать ~/.gtkpod\n"
+
+#: ../src/prefs_window.c:133
+msgid "Please select command for 'Play Now'"
+msgstr "ПожалуйÑта, выберите команду Ð´Ð»Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ \"ВоÑпроизвеÑти ÑейчаÑ\""
+
+#: ../src/prefs_window.c:134
+msgid "Please select command for 'Enqueue'"
+msgstr "ПожалуйÑта, выберите команду Ð´Ð»Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¸ \"ПоÑтавить в очередь\""
+
+#: ../src/prefs_window.c:135
+msgid "Please select the mp3gain executable"
+msgstr "ПожалуйÑта, выберите иÑполнÑемый файл mp3gain"
+
+#: ../src/prefs_window.c:136
+msgid "Please select the aacgain executable"
+msgstr "ПожалуйÑта, выберите иÑполнÑемый файл aacgain"
+
+#: ../src/prefs_window.c:137
+msgid "Select the mserv music root directory"
+msgstr "Выберите корневую папку музыки mserv"
+
+#: ../src/prefs_window.c:138
+msgid "Select the mserv trackinfo root directory"
+msgstr "Выберите корневую папку mserv trackinfo"
+
+#: ../src/prefs_window.c:139
+msgid "Select the ogg/vorbis converter command"
+msgstr "Выберите команду Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ogg/Vorbis"
+
+#: ../src/prefs_window.c:140
+msgid "Select the flac converter command"
+msgstr "Выберите команду Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ FLAC"
+
+#: ../src/prefs_window.c:141
+msgid "Select the m4a converter command."
+msgstr "Выберите команду Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ M4A"
+
+#: ../src/prefs_window.c:142
+msgid "Select the mp3 converter command."
+msgstr "Выберите команду Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ MP3"
+
+#: ../src/prefs_window.c:143
+msgid "Select the wav converter command."
+msgstr "Выберите команду Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ WAV"
+
+#: ../src/prefs_window.c:201 ../src/repository.c:662
+#, c-format
+msgid ""
+"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
+"improve an existing one, please send it to jcsjcs at users.sourceforge.net "
+"for inclusion into the next release.</i>"
+msgstr "<i>ПоÑмотрите на Ñценарии, поÑтавлÑемые в \"%s\". ЕÑли вы напиÑали новый"
+"Ñценарий или улучшили ÑущеÑтвующий, пожалуйÑта, отправьте его на jcsjcs at users.sourceforge.net "
+"Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð² Ñледующую верÑию.</i>"
+
+#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
+msgid "Preferences not updated"
+msgstr "ÐаÑтройки не обновлены"
+
+#: ../src/prefs_window.c:1232
+msgid "Preferences applied"
+msgstr "ÐаÑтройки применены"
+
+#: ../src/repository.c:573 ../src/repository.c:2395
+msgid "Set backup file"
+msgstr "Задайте файл резервной копии"
+
+#: ../src/repository.c:612
+msgid "Select directory for synchronization"
+msgstr "Выберите папку Ð´Ð»Ñ Ñинхронизации"
+
+#: ../src/repository.c:638
+msgid "Please select command to sync contacts"
+msgstr "ПожалуйÑта, выберите команду Ð´Ð»Ñ Ñинхронизации контактов"
+
+#: ../src/repository.c:644
+msgid "Please select command to sync calendar"
+msgstr "ПожалуйÑта, выберите команду Ð´Ð»Ñ Ñинхронизации календарÑ"
+
+#: ../src/repository.c:650
+msgid "Please select command to sync notes"
+msgstr "ПожалуйÑта, выберите команду Ð´Ð»Ñ Ñинхронизации заметок"
+
+#: ../src/repository.c:729
+msgid "Smart playlist updated."
+msgstr "Умный ÑпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»Ñ‘Ð½."
+
+#: ../src/repository.c:1190
+msgid "Podcasts Repository"
+msgstr "Репозиторий подкаÑтов"
+
+#: ../src/repository.c:1194
+msgid "Local Repository"
+msgstr "Локальный репозиторий"
+
+#: ../src/repository.c:1348
+msgid "Master Playlist"
+msgstr "Главный ÑпиÑок воÑпроизведениÑ"
+
+#: ../src/repository.c:1352
+msgid "Podcasts Playlist"
+msgstr "СпиÑок воÑÐ¿Ñ€Ð¾Ð¸Ð·Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÐºÐ°Ñтов"
+
+#: ../src/repository.c:1360
+msgid "Regular Playlist"
+msgstr "Обычный ÑпиÑок воÑпроизведениÑ"
+
+#: ../src/repository.c:2423
+msgid "Set local repository file"
+msgstr "Задайте файл локального репозиториÑ"
+
+#: ../src/repository.c:2522
+msgid "New Repository"
+msgstr "Ðовый репозиторий"
+
+#: ../src/sha1.c:186
+msgid "Hashed file is 0 bytes long\n"
+msgstr "Ð¥Ñшированный файл имеет длину 0 байт\n"
+
+#: ../src/sha1.c:239
+#, c-format
+msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
+msgstr "Ðе удалоÑÑŒ открыть \"%s\" Ð´Ð»Ñ Ð²Ñ‹Ñ‡Ð¸ÑÐ»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð¾Ð¹ Ñуммы SHA1: %s\n"
+
+#: ../src/syncdir.c:237
+#, c-format
+msgid "Sync summary for %s/%s\n"
+msgstr "Ð¡Ð²Ð¾Ð´Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ñинхронизации Ð´Ð»Ñ %s/%s\n"
+
+#: ../src/syncdir.c:246
+msgid "The following track has been added or updated:\n"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° была добавлена или обновлена:\n"
+
+#: ../src/syncdir.c:255
+msgid "The following track has been completely removed from the iPod:\n"
+"The following tracks have been completely removed from the iPod:\n"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° была полноÑтью удалена Ñ iPod:\n"
+"Следующие дорожки была полноÑтью удалены Ñ iPod:\n"
+
+#: ../src/syncdir.c:264
+msgid "The following track has been removed from the repository:\n"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° была удалена из репозиториÑ:\n"
+
+#: ../src/syncdir.c:271
+msgid "The following track has been removed from the playlist:\n"
+msgstr "Ð¡Ð»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð¶ÐºÐ° была удалена из ÑпиÑка воÑпроизведениÑ:\n"
+
+#: ../src/syncdir.c:277
+msgid "Nothing was changed.\n"
+msgstr "Ðикаких изменений не произошло.\n"
+
+#: ../src/syncdir.c:282
+msgid "Sync summary"
+msgstr "Ð¡Ð²Ð¾Ð´Ð½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ñинхронизации"
+
+#: ../src/tools.c:118
+#, c-format
+msgid ""
+"Could not find '%s'.\n"
+"Please specifiy the exact path in the Tools section of the preference dialog "
+"or install the program if it is not installed on your system.\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ найти \"%s\".\n"
+"ПожалуйÑта, задайте полный путь в разделе \"ИнÑтрументы\" диалога наÑтроек"
+"или уÑтановите программу, еÑли она не уÑтановлена на вашей ÑиÑтеме.\n"
+"\n"
+
+#: ../src/tools.c:203
+#, c-format
+msgid ""
+"Execution of '%s' failed.\n"
+"\n"
+msgstr "Ошибка при иÑполнении \"%s\".\n"
+"\n"
+
+#: ../src/tools.c:248
+#, c-format
+msgid ""
+"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
+"preferences.\n"
+msgstr "\"%s\" не был нормализован. Задайте путь к mp3gain в разделе \"ИнÑтрументы\""
+"диалога наÑтроек.\n"
+
+#: ../src/tools.c:258
+#, c-format
+msgid ""
+"Did not normalize '%s'. Set aacgain path in the Tools section of the "
+"preferences.\n"
+msgstr "\"%s\" не был нормализован. Задайте путь к aacgain в разделе \"ИнÑтрументы\""
+"диалога наÑтроек.\n"
+
+#: ../src/tools.c:385
+msgid "Normalizing..."
+msgstr "ÐормализациÑ..."
+
+#: ../src/tools.c:435
+#, c-format
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: ../src/tools.c:461
+msgid "Aborting..."
+msgstr "Прерывание..."
+
+#: ../src/tools.c:465
+msgid "Will abort after current mp3gain process ends."
+msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ прервана, когда завершитÑÑ Ñ‚ÐµÐºÑƒÑ‰Ð¸Ð¹ процеÑÑ mp3gain."
+
+#: ../src/tools.c:491
+#, c-format
+msgid ""
+"'%s-%s' (%s) could not be normalized.\n"
+"\n"
+msgstr ""
+"'%s-%s' (%s) не может быть нормализован.\n"
+"\n"
+
+#: ../src/tools.c:530
+#, c-format
+msgid "Normalized %d of %d tracks."
+msgstr "Ðормализовано %d из %d дорожек."
+
+#: ../src/tools.c:633
+msgid ""
+"Please specify the command to be called on the 'Tools' section of the "
+"preferences dialog.\n"
+msgstr "ПожалуйÑта, задайте команду Ð´Ð»Ñ Ð²Ñ‹Ð·Ð¾Ð²Ð° в разделе \"ИнÑтрументы\""
+"диалога наÑтроек.\n"
+
+#: ../src/tools.c:645
+#, c-format
+msgid ""
+"Could not find the command '%s'.\n"
+"\n"
+"Please verify the setting in the 'Tools' section of the preferences dialog.\n"
+"\n"
+msgstr "Ðе удалоÑÑŒ найти команду \"%s\".\n"
+"ПожалуйÑта, проверьте наÑтройку в разделе \"ИнÑтрументы\""
+"диалога наÑтроек.\n"
+
+#: ../src/tools.c:687
+#, c-format
+msgid ""
+"'%s' returned the following output:\n"
+"%s\n"
+msgstr "\"%s\" вернул Ñледующий вывод:\n"
+"%s\n"
+
+#: ../src/tools.c:754
+#, c-format
+msgid "No command set for '%s'"
+msgstr "Команда Ð´Ð»Ñ \"%s\" не задана"
+
+#: ../src/tools.c:774
+#, c-format
+msgid "Could not find command '%s' specified for '%s'"
+msgstr "Ðе удалоÑÑŒ найти команду \"%s\", заданную Ð´Ð»Ñ \"%s\""
+
+#: ../src/wavfile.c:181
+#, c-format
+msgid "%s does not appear to be a supported wav file.\n"
+msgstr "%s не похож на поддерживаемый wav-файл.\n"
+
Modified: gtkpod/branches/etch-bpo/po/sv.po
===================================================================
--- gtkpod/branches/etch-bpo/po/sv.po 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/po/sv.po 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,13 +1,13 @@
# Translation of gtkpod to Swedish.
# This file is distributed under the same license as gtkpod.
-# Copyright (C) Stefan Asserhäll <stefan.asserhall at comhem.se>, 2004, 2005.
+# Copyright (C) Stefan Asserhäll <stefan.asserhall at comhem.se>, 2004, 2005, 2007.
#
msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-14 22:57+0900\n"
-"PO-Revision-Date: 2006-09-25 21:47+0200\n"
+"POT-Creation-Date: 2007-12-13 18:36-0500\n"
+"PO-Revision-Date: 2007-12-14 21:11+0100\n"
"Last-Translator: Stefan Asserhäll <stefan.asserhall at comhem.se>\n"
"Language-Team: Svenska <sv at li.org>\n"
"MIME-Version: 1.0\n"
@@ -17,17 +17,16 @@
"X-Generator: KBabel 1.11.4\n"
#: ../data/gtkpod.desktop.in.h:1
-#, fuzzy
msgid "GtkPod"
-msgstr "gtkpod"
+msgstr "Gtkpod"
#: ../data/gtkpod.desktop.in.h:2
msgid "Manage music and video on an Apple iPod"
-msgstr ""
+msgstr "Hantera musik och video på en Apple iPod"
#: ../data/gtkpod.desktop.in.h:3
msgid "iPod Manager"
-msgstr ""
+msgstr "Hantering av iPod"
#: ../data/gtkpod.glade.h:1
msgid " "
@@ -137,21 +136,19 @@
#: ../data/gtkpod.glade.h:28
msgid "<"
-msgstr ""
+msgstr "<"
#: ../data/gtkpod.glade.h:29
-#, fuzzy
msgid "<b>Account Information</b>"
-msgstr "<b>Bekräfta borttagning</b>"
+msgstr "<b>Kontoinformation</b>"
#: ../data/gtkpod.glade.h:30
msgid "<b>Adding/Updating/Syncing</b>"
msgstr "<b>Tillägg, uppdatering, synkronisering</b>"
#: ../data/gtkpod.glade.h:31
-#, fuzzy
msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Verktygsrad</b>"
+msgstr "<b>Audioscrobbler</b>"
#: ../data/gtkpod.glade.h:32
msgid "<b>Auto-Generated Playlists</b>"
@@ -174,74 +171,73 @@
msgstr "<b>Bekräfta borttagning</b>"
#: ../data/gtkpod.glade.h:37
-msgid "<b>Displayed Track Attributes</b>"
-msgstr "<b>Visade spåregenskaper</b>"
-
-#: ../data/gtkpod.glade.h:38
msgid "<b>Examples</b>"
msgstr "<b>Exempel</b>"
-#: ../data/gtkpod.glade.h:39
+#: ../data/gtkpod.glade.h:38
msgid "<b>Ignore Frequent Words</b>"
msgstr "<b>Ignorera vanliga ord</b>"
-#: ../data/gtkpod.glade.h:40
+#: ../data/gtkpod.glade.h:39
msgid "<b>Misc</b>"
msgstr "<b>Diverse</b>"
-#: ../data/gtkpod.glade.h:41
+#: ../data/gtkpod.glade.h:40
msgid "<b>Mountpoint and individual repository/playlist options</b>"
msgstr "<b>Alternativ för monteringspunkt, enskilda arkiv och spellistor</b>"
-#: ../data/gtkpod.glade.h:42
-#, fuzzy
+#: ../data/gtkpod.glade.h:41
msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Bekräfta borttagning</b>"
+msgstr "<b>Konvertering i farten</b>"
-#: ../data/gtkpod.glade.h:43
+#: ../data/gtkpod.glade.h:42
msgid "<b>Play</b>"
msgstr "<b>Spela</b>"
-#: ../data/gtkpod.glade.h:44
+#: ../data/gtkpod.glade.h:43
msgid "<b>Playlists</b>"
msgstr "<b>Spellistor</b>"
-#: ../data/gtkpod.glade.h:45
+#: ../data/gtkpod.glade.h:44
msgid "<b>Please select mountpoint and your iPod model</b>"
msgstr "<b>Välj monteringsplats och iPod-modell</b>"
-#: ../data/gtkpod.glade.h:46
+#: ../data/gtkpod.glade.h:45
msgid "<b>Repositories</b>"
msgstr "<b>Arkiv</b>"
-#: ../data/gtkpod.glade.h:47
+#: ../data/gtkpod.glade.h:46
msgid "<b>Sort Order</b>"
msgstr "<b>Sorteringsordning</b>"
-#: ../data/gtkpod.glade.h:48
+#: ../data/gtkpod.glade.h:47
msgid "<b>Sort Tabs</b>"
msgstr "<b>Sorteringsflikar</b>"
-#: ../data/gtkpod.glade.h:49
+#: ../data/gtkpod.glade.h:48
msgid "<b>Sync</b>"
msgstr "<b>Synkronisera</b>"
-#: ../data/gtkpod.glade.h:50
+#: ../data/gtkpod.glade.h:49
msgid "<b>Synchronization</b>"
msgstr "<b>Synkronisering</b>"
-#: ../data/gtkpod.glade.h:51
+#: ../data/gtkpod.glade.h:50
msgid "<b>Tag Reading</b>"
msgstr "<b>Taggläsning</b>"
-#: ../data/gtkpod.glade.h:52
+#: ../data/gtkpod.glade.h:51
msgid "<b>Toolbar</b>"
msgstr "<b>Verktygsrad</b>"
-#: ../data/gtkpod.glade.h:53
+#: ../data/gtkpod.glade.h:52
msgid "<b>Tooltips</b>"
msgstr "<b>Verktygstips</b>"
+#: ../data/gtkpod.glade.h:53
+msgid "<b>Track Attributes</b>"
+msgstr "<b>Spåregenskaper</b>"
+
#: ../data/gtkpod.glade.h:54
msgid "<b>Track Editing</b>"
msgstr "<b>Spårredigering</b>"
@@ -256,7 +252,7 @@
#: ../data/gtkpod.glade.h:57
msgid ">"
-msgstr ""
+msgstr ">"
#: ../data/gtkpod.glade.h:58
msgid "About gtkpod"
@@ -267,92 +263,114 @@
msgstr "Lägg till kataloger rekursivt"
#: ../data/gtkpod.glade.h:60
+msgid "Add Files"
+msgstr "Lägg till filer"
+
+#: ../data/gtkpod.glade.h:61
msgid "Add Files or Directories"
msgstr "Lägg till filer eller kataloger"
-#: ../data/gtkpod.glade.h:61
-msgid "Add _Directory"
+#: ../data/gtkpod.glade.h:62
+msgid "Add Fol_der"
msgstr "Lägg till _katalog"
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:63
+msgid "Add Folder"
+msgstr "Lägg till katalog"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Image_s"
+msgstr "Lägg till _bilder"
+
+#: ../data/gtkpod.glade.h:65
+msgid "Add Images from a Directory"
+msgstr "Lägg till bilder från en katalog"
+
+#: ../data/gtkpod.glade.h:66
+msgid "Add Playlist"
+msgstr "Lägg till spellista"
+
+#: ../data/gtkpod.glade.h:67
msgid "Add _Files"
msgstr "Lägg till _filer"
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:68
msgid "Add _Playlist"
-msgstr "Lägg till _spellista"
+msgstr "Lägg till s_pellista"
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:69
msgid "Add coverart from file using the following template"
msgstr "Lägg till omslag från fil med följande mall"
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:70
msgid "Add directories recursively"
msgstr "Lägg till kataloger rekursivt"
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:71
msgid "Add new repository/iPod"
msgstr "Lägg till nytt arkiv eller iPod"
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:72
msgid "Add playlist from file"
msgstr "Lägg till spellista från fil"
-#: ../data/gtkpod.glade.h:68 ../src/display_sorttabs.c:3232
-#: ../src/display_tracks.c:1996
+#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
+#: ../src/display_tracks.c:2103
msgid "Added"
msgstr "Tillagd"
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:74
msgid "Advanced Sorting Options"
msgstr "Avancerade sorteringsalternativ"
#. 0
-#: ../data/gtkpod.glade.h:70 ../src/display_sorttabs.c:2954
+#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
msgid "Album"
msgstr "Album"
-#: ../data/gtkpod.glade.h:71
-#, fuzzy
+#: ../data/gtkpod.glade.h:76
msgid "Album Art"
-msgstr "Album"
+msgstr "Albumomslag"
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:77
msgid "All (AND)"
msgstr "Alla (och)"
-#: ../data/gtkpod.glade.h:73
+#: ../data/gtkpod.glade.h:78
msgid "All Tracks Never Listened To"
msgstr "Alla spår som aldrig lyssnats på"
-#: ../data/gtkpod.glade.h:74
+#: ../data/gtkpod.glade.h:79
msgid "All Tracks Played Since Last Time"
msgstr "Alla spår som spelats sedan sist"
-#: ../data/gtkpod.glade.h:75
+#: ../data/gtkpod.glade.h:80
msgid "All Tracks not Listed in any Playlist"
msgstr "Alla spår som inte finns i någon spellista"
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:81
msgid "Also include tracks never played in \"Best Rated\" playlist"
-msgstr ""
-"Inkludera också spår som aldrig spelats i spellistan \"med bäst betyg\""
+msgstr "Inkludera också spår som aldrig spelats i spellistan \"med bäst betyg\""
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:82
msgid "Always write ID3v2.4 tags (only applies to MP3)"
msgstr "Skriv alltid ID3v2.4-taggar (gäller bara MP3)"
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:83
msgid "Any (OR)"
msgstr "NÃ¥gon (eller)"
-#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2951
+#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
msgid "Artist"
msgstr "Artist"
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:85
+msgid "Artwork Preview"
+msgstr "Förhandsgranskning av omslagsbilder"
+
+#: ../data/gtkpod.glade.h:86
msgid ""
"As a last resort set the following tags to the\n"
"filename if they are (still) empty:"
@@ -360,28 +378,15 @@
"Om följande taggar (fortfarande) är tomma,\n"
"lagra filnamnet i dem som en sista utväg:"
-#: ../data/gtkpod.glade.h:82
+#: ../data/gtkpod.glade.h:88
msgid "Ascending"
msgstr "Stigande"
-#: ../data/gtkpod.glade.h:83
-msgid ""
-"Audio/Video\n"
-"Audio\n"
-"Video\n"
-"Podcast\n"
-"Video Podcast\n"
-"Audiobook\n"
-"Music Video\n"
-"TV Show\n"
-"TV Show & Music Video\n"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:93
+#: ../data/gtkpod.glade.h:89
msgid "Auto Store"
msgstr "Lagra automatiskt"
-#: ../data/gtkpod.glade.h:94
+#: ../data/gtkpod.glade.h:90
msgid ""
"Automatically start displaying tracks that match the criteria entered above. "
"If not selected, you must press 'Display' to start displaying."
@@ -389,52 +394,55 @@
"Börja automatiskt visa spår som motsvarar villkoren som skrivs in ovan. Om "
"inte markerad, måste du klicka på 'Visa' för att börja visningen."
-#: ../data/gtkpod.glade.h:95
+#: ../data/gtkpod.glade.h:91
+msgid "Available:"
+msgstr "Tillgängliga:"
+
+#: ../data/gtkpod.glade.h:92
msgid "Before removing playlists or tracks from a playlist"
msgstr "Innan spellistor eller spår tas bort från en spellista"
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:93
msgid "Before removing tracks from the harddisk"
msgstr "Innan spår tas bort från hårddisken"
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:94
msgid "Before removing tracks from the iPod"
msgstr "Innan spår tas bort från iPod"
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:95
msgid "Before removing tracks from the local database"
msgstr "Innan spår tas bort från den lokala databasen"
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:96
msgid "Best Rated Tracks"
msgstr "Spår med bäst betyg"
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:97
msgid "Browse"
msgstr "Bläddra"
-#: ../data/gtkpod.glade.h:101
-#, fuzzy
+#: ../data/gtkpod.glade.h:98
msgid "Cache directory:"
-msgstr "Lägg till _katalog"
+msgstr "Cachekatalog:"
-#: ../data/gtkpod.glade.h:102
+#: ../data/gtkpod.glade.h:99
msgid "Calendar"
msgstr "Kalender"
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:100
msgid "Calendar sync command:"
msgstr "Synkroniseringskommando för kalender:"
-#: ../data/gtkpod.glade.h:104
+#: ../data/gtkpod.glade.h:101
msgid "Call automatically when synchronizing iTunesDB"
msgstr "Anropa automatiskt vid synkronisering av iTunes databas"
-#: ../data/gtkpod.glade.h:105
+#: ../data/gtkpod.glade.h:102
msgid "Category: "
msgstr "Kategori: "
-#: ../data/gtkpod.glade.h:106
+#: ../data/gtkpod.glade.h:103
msgid ""
"Change all tracks\n"
"simultaneously"
@@ -442,29 +450,37 @@
"Ändra alla spår\n"
"samtidigt"
-#: ../data/gtkpod.glade.h:108
+#: ../data/gtkpod.glade.h:105
+msgid ""
+"Check before removing photos from a photo album whether\n"
+"they should be deleted from the Photo Database."
+msgstr ""
+"Kontrollera om foton ska tas bort från fotodatabasen\n"
+"innan de tas bort från ett fotoalbum"
+
+#: ../data/gtkpod.glade.h:107
msgid "Check for existing files when copying from iPod."
msgstr "Titta efter befintliga filer vid kopiering från iPod."
-#: ../data/gtkpod.glade.h:109
+#: ../data/gtkpod.glade.h:108
msgid "Command for 'Enqueue':"
msgstr "Kommando för 'Köa':"
-#: ../data/gtkpod.glade.h:110
+#: ../data/gtkpod.glade.h:109
msgid "Command for 'Play now':"
msgstr "Kommando för 'Spela nu':"
#. 5
-#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
#: ../src/misc_conversion.c:65
msgid "Composer"
msgstr "Kompositör"
-#: ../data/gtkpod.glade.h:112
+#: ../data/gtkpod.glade.h:111
msgid "Confirm before removing tracks from the iPod or repository"
msgstr "Bekräfta innan spår tas bort från iPod eller arkiv"
-#: ../data/gtkpod.glade.h:113
+#: ../data/gtkpod.glade.h:112
msgid ""
"Confirm before removing tracks from the iPod or repository\n"
"when syncing playlists"
@@ -472,56 +488,55 @@
"Bekräfta innan spår tas bort från iPod eller arkiv\n"
"vid synkronisering av spellistor"
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:114
msgid "Confirm lists of directories"
msgstr "Bekräfta lista med kataloger"
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:115
msgid "Contacts sync command:"
msgstr "Synkroniseringskommando för kontakter:"
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:116
msgid "Containing Displayed Tracks"
msgstr "Som innehåller visade spår"
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:117
msgid "Containing Selected Tracks"
msgstr "Som innehåller markerade spår"
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:118
msgid "Conversion Progress Display"
-msgstr ""
+msgstr "Visning av konverteringsförlopp"
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:119
msgid "Cover"
msgstr "Omslag"
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:120
msgid "Create New Playlist"
msgstr "Skapa ny spellista"
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:121
msgid "Create Repository"
msgstr "Skapa arkiv"
-#: ../data/gtkpod.glade.h:123
+#: ../data/gtkpod.glade.h:122
msgid "Create _Playlist File"
msgstr "Skapa sp_ellistefil"
-#: ../data/gtkpod.glade.h:124
+#: ../data/gtkpod.glade.h:123
msgid "Credits"
msgstr "Tack till"
-#: ../data/gtkpod.glade.h:125
+#: ../data/gtkpod.glade.h:124
msgid "Currently only rating is supported."
msgstr "För närvarande stöds bara ett betyg"
-#: ../data/gtkpod.glade.h:126
+#: ../data/gtkpod.glade.h:125
msgid "Delete repository"
msgstr "Ta bort arkiv"
-#: ../data/gtkpod.glade.h:127
-#, fuzzy
+#: ../data/gtkpod.glade.h:126
msgid ""
"Delete tracks that are no longer present from the\n"
"iPod or repository"
@@ -529,19 +544,19 @@
"Ta bort spår som inte längre finns\n"
"från iPod eller arkiv"
-#: ../data/gtkpod.glade.h:129
+#: ../data/gtkpod.glade.h:128
msgid "Deleted tracks"
msgstr "Borttagna spår"
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:129
msgid "Descending"
msgstr "Fallande"
-#: ../data/gtkpod.glade.h:131
+#: ../data/gtkpod.glade.h:130
msgid "Details"
msgstr "Detaljinformation"
-#: ../data/gtkpod.glade.h:133
+#: ../data/gtkpod.glade.h:132
#, no-c-format
msgid ""
"Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -558,7 +573,7 @@
"C, år: %Y, ursprungligt filnamn (kräver fil med utökad information): %o, "
"tecknet '%': %%."
-#: ../data/gtkpod.glade.h:135
+#: ../data/gtkpod.glade.h:134
#, no-c-format
msgid ""
"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -575,7 +590,7 @@
"ursprungligt filnamn (kräver fil med utökad information): %o, nuvarande "
"spellista: %p, tecknet '%': %%."
-#: ../data/gtkpod.glade.h:137
+#: ../data/gtkpod.glade.h:136
#, no-c-format
msgid ""
"Determines the name of the file with the cover art. You can separate several "
@@ -591,67 +606,61 @@
"ursprungligt filnamn (kräver fil med utökad information): %o, ursprungligt "
"filnamn utan filändelse: %O, nuvarande spellista: %p, tecknet '%': %%."
-#: ../data/gtkpod.glade.h:138
+#: ../data/gtkpod.glade.h:137
msgid ""
"Directories to sync with are determined from the filenames of the tracks in "
"the playlist."
-msgstr ""
-"Kataloger att synkronisera avgörs från filnamnen hos spåren i spellistan."
+msgstr "Kataloger att synkronisera avgörs från filnamnen hos spåren i spellistan."
-#: ../data/gtkpod.glade.h:139
-msgid "Dirs"
-msgstr "Kataloger"
-
-#: ../data/gtkpod.glade.h:140
+#: ../data/gtkpod.glade.h:138
msgid "Display a list of tracks that could actually be updated."
msgstr "Visa en lista med spår som skulle kunna uppdateras."
-#: ../data/gtkpod.glade.h:141
+#: ../data/gtkpod.glade.h:139
msgid "Display a list of tracks that could not be updated."
msgstr "Visa en lista med spår som inte kunde uppdateras."
-#: ../data/gtkpod.glade.h:142
+#: ../data/gtkpod.glade.h:140
msgid "Display conversion log"
-msgstr ""
+msgstr "Visa konverteringslogg"
-#: ../data/gtkpod.glade.h:143
+#: ../data/gtkpod.glade.h:141
msgid "Display info about detected duplicates"
msgstr "Visa information om detekterade duplikat"
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:142
msgid "Display info about non-updated tracks"
msgstr "Visa information om spår som inte uppdaterats"
-#: ../data/gtkpod.glade.h:145
+#: ../data/gtkpod.glade.h:143
msgid "Display info about updated tracks"
msgstr "Visa information om uppdaterade spår"
-#: ../data/gtkpod.glade.h:146
+#: ../data/gtkpod.glade.h:144
msgid "Display messages and warnings at startup"
msgstr "Visa meddelanden och varningar vid start"
-#: ../data/gtkpod.glade.h:147
-msgid ""
-"Display the list of duplicates that have been detected after adding files."
+#: ../data/gtkpod.glade.h:145
+msgid "Display the list of duplicates that have been detected after adding files."
msgstr "Visa listan med upptäckta duplikat efter filer har lagts till."
-#: ../data/gtkpod.glade.h:148
+#: ../data/gtkpod.glade.h:146
msgid "Display toolbar..."
msgstr "Visa verktygsrad..."
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:147
msgid "Display tooltips in main window"
msgstr "Visa verktygstips i huvudfönstret"
-#: ../data/gtkpod.glade.h:150
+#: ../data/gtkpod.glade.h:148
msgid "Display tooltips in prefs window"
msgstr "Visa verktygstips i inställningsfönstret"
-#: ../data/gtkpod.glade.h:151
+#: ../data/gtkpod.glade.h:149
msgid "Display tracks that match the criteria entered above."
msgstr "Visa spår som uppfyller ovan inskrivna villkor."
-#: ../data/gtkpod.glade.h:152
+#: ../data/gtkpod.glade.h:150
msgid ""
"Displayed\n"
"Tracks"
@@ -659,74 +668,71 @@
"Visade\n"
"spår"
-#: ../data/gtkpod.glade.h:154
+#: ../data/gtkpod.glade.h:152
+msgid "Displayed:"
+msgstr "Visade:"
+
+#: ../data/gtkpod.glade.h:153
msgid "Don't allow file duplication"
msgstr "Tillåt inte duplicerade filer"
-#: ../data/gtkpod.glade.h:155
+#: ../data/gtkpod.glade.h:154
msgid "Don't automatically sync on startup"
msgstr "Synkronisera inte automatiskt vid start"
-#: ../data/gtkpod.glade.h:156
-msgid "Download Cover"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:157
-#, fuzzy
+#: ../data/gtkpod.glade.h:155
msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
-msgstr ""
-"Igenkänning av duplikat är baserat på filens (modifierade) MD5-checksumma."
+msgstr "Igenkänning av duplikat är baserat på filens (modifierade) SHA1-checksumma."
-#: ../data/gtkpod.glade.h:158
+#: ../data/gtkpod.glade.h:156
msgid "Edit Repository/iPod Options"
msgstr "Redigera arkiv- och iPodalternativ"
-#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:659
+#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
msgid "Edit Smart Playlist"
msgstr "Redigera smart spellista"
-#: ../data/gtkpod.glade.h:160 ../src/context_menus.c:746
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
msgid "Edit Track Details"
msgstr "Redigera detaljinformation om spår"
-#: ../data/gtkpod.glade.h:161
+#: ../data/gtkpod.glade.h:159
msgid "Edit _Preferences"
msgstr "Redigera in_ställningar"
-#: ../data/gtkpod.glade.h:162
+#: ../data/gtkpod.glade.h:160
msgid "Effective free space"
msgstr "Verkligt ledigt utrymme"
-#: ../data/gtkpod.glade.h:163
+#: ../data/gtkpod.glade.h:161
msgid "Empty Playlist"
msgstr "Tom spellista"
-#: ../data/gtkpod.glade.h:164
+#: ../data/gtkpod.glade.h:162
msgid "Exclude file mask(s)"
msgstr "Filmask(er) att utesluta"
-#: ../data/gtkpod.glade.h:165
+#: ../data/gtkpod.glade.h:163
+msgid "Export can be continued at a later time if canceled."
+msgstr "Exporten kan fortsättas vid ett senare tillfälle om den avbryts."
+
+#: ../data/gtkpod.glade.h:164
msgid "File size"
msgstr "Filstorlek"
-#: ../data/gtkpod.glade.h:166
+#: ../data/gtkpod.glade.h:165
msgid "File size (deleted)"
msgstr "Filstorlek (borttagna)"
-#: ../data/gtkpod.glade.h:167
+#: ../data/gtkpod.glade.h:166
msgid "File size (non-transferred)"
msgstr "Filstorlek (inte överförda)"
-#: ../data/gtkpod.glade.h:168
+#: ../data/gtkpod.glade.h:167
msgid "Filename Format: "
msgstr "Filnamnsformat: "
-#: ../data/gtkpod.glade.h:169
-msgid "Files"
-msgstr "Filer"
-
-#: ../data/gtkpod.glade.h:170
-#, fuzzy
+#: ../data/gtkpod.glade.h:168
msgid ""
"Find orphan files (files with no track info in DB) and dangling tracks "
"(tracks with no corresponding files on iPod)"
@@ -734,17 +740,15 @@
"Hitta övergivna filer (filer utan någon spårinformation i databasen) och "
"saknade spår (spår utan motsvarande filer på iPod)"
-#: ../data/gtkpod.glade.h:171
-#, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
-msgstr ""
-"Försök först med <i>katalog.jpg</i>, därefter med <i><artist>.jpg</i>"
+#: ../data/gtkpod.glade.h:169
+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"
+msgstr "Försök först med <i>katalog.jpg</i>, därefter med <i><artist>.jpg</i>"
-#: ../data/gtkpod.glade.h:172
+#: ../data/gtkpod.glade.h:170
msgid "Flac with :"
-msgstr ""
+msgstr "FLAC med: "
-#: ../data/gtkpod.glade.h:174
+#: ../data/gtkpod.glade.h:172
#, no-c-format
msgid ""
"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
@@ -753,7 +757,7 @@
"Till exempel rensas XMM:s nuvarande spellista, de markerade spåren läggs "
"till och uppspelning startar med 'xmms %s'."
-#: ../data/gtkpod.glade.h:176
+#: ../data/gtkpod.glade.h:174
#, no-c-format
msgid ""
"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
@@ -762,17 +766,16 @@
"Till exempel läggs de markerade spåren till sist i XMM:s nuvarande spellista "
"(köas) med 'xmms -e %s'."
-#: ../data/gtkpod.glade.h:177 ../src/display_sorttabs.c:2957
+#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
msgid "Genre"
msgstr "Genre"
-#: ../data/gtkpod.glade.h:178
+#: ../data/gtkpod.glade.h:176
msgid "Group artists on compilation CDs"
msgstr "Gruppera artister på samlingsskivor"
-#: ../data/gtkpod.glade.h:179
-#, fuzzy
+#: ../data/gtkpod.glade.h:177
msgid ""
"Highly recommended for faster import when taking advantage of the "
"duplication recognition. Also, having the PC filenames allows writing "
@@ -786,12 +789,12 @@
"innehållet i iPod om filsystemet blir skadat (ändra raderna \"transferred=\" "
"i den säkerhetskopierade databasen)."
-#: ../data/gtkpod.glade.h:180 ../src/context_menus.c:682
-#: ../src/context_menus.c:700 ../src/context_menus.c:824
+#: ../data/gtkpod.glade.h:178 ../src/context_menus.c:685
+#: ../src/context_menus.c:703 ../src/context_menus.c:820
msgid "I'm sure"
msgstr "Jag är säker"
-#: ../data/gtkpod.glade.h:181
+#: ../data/gtkpod.glade.h:179
msgid ""
"If available, the local copy of the track is referenced in the playlist. "
"Otherwise the file on the iPod is used."
@@ -799,11 +802,11 @@
"Om tillgänglig, hänvisar spellistan till den lokala kopian av spåret. Annars "
"används filen på iPod."
-#: ../data/gtkpod.glade.h:182
+#: ../data/gtkpod.glade.h:180
msgid "If both options are selected, embedded APIC data takes precedence."
msgstr "Om båda alternativ är markerade, ges förtur åt inbäddad APIC-data."
-#: ../data/gtkpod.glade.h:183
+#: ../data/gtkpod.glade.h:181
msgid ""
"If checked, sorting will be case sensitive. Please note that case sensitive "
"sorting will not work well with most charsets."
@@ -811,7 +814,7 @@
"Om markerat är sorteringen skiftlägeskänslig. Observera att "
"skiftlägeskänslig sortering inte fungerar bra med de flesta teckenkodningar."
-#: ../data/gtkpod.glade.h:184
+#: ../data/gtkpod.glade.h:182
msgid ""
"If the filename (full path) of an existing track matches that of a track to "
"be added, this option allows you to update the information about the "
@@ -825,11 +828,11 @@
"spåret helt. Ingen uppdatering sker om filen inte har ändrats och du har "
"valt alternativet 'Tillåt inte duplicerade filer' ovan."
-#: ../data/gtkpod.glade.h:185
+#: ../data/gtkpod.glade.h:183
msgid "If you check this, gtkpod will descend into subdirectories recursively."
msgstr "Om du markerar det här, går gtkpod ner i underkataloger rekursivt."
-#: ../data/gtkpod.glade.h:186
+#: ../data/gtkpod.glade.h:184
msgid ""
"If you check this, information (cover art and meta information) changed for "
"this track will be copied to all other selected tracks as well. Use with "
@@ -839,7 +842,7 @@
"som ändrats för spåret också till alla andra markerade spår. Använd med "
"försiktighet."
-#: ../data/gtkpod.glade.h:187
+#: ../data/gtkpod.glade.h:185
msgid ""
"If you don't select the master playlist automatically, the initial database "
"import is much faster because the display dosn't have to be updated."
@@ -847,7 +850,7 @@
"Om du inte väljer huvudspellistan automatiskt, går den ursprungliga importen "
"av databasen mycket snabbare eftersom skärmen inte behöver uppdateras."
-#: ../data/gtkpod.glade.h:188
+#: ../data/gtkpod.glade.h:186
msgid ""
"If you select several tracks in the track list and edit a tag of the first "
"track, the tags in the other tracks are updated as well."
@@ -855,11 +858,11 @@
"Om du markerar flera spår i spårlistan och redigerar taggen för det första "
"spåret, uppdateras också taggarna för övriga spår."
-#: ../data/gtkpod.glade.h:189
+#: ../data/gtkpod.glade.h:187
msgid "Ignore these words when at the beginning of the following fields:"
msgstr "Ignorera dessa ord i början av följande fält:"
-#: ../data/gtkpod.glade.h:190
+#: ../data/gtkpod.glade.h:188
msgid ""
"In order to save the displayed track order to the iPod choose 'Save "
"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."
@@ -867,11 +870,11 @@
"För att lagra visad spårordning i iPod måste du välja 'Spara visad "
"spårordning' i menyn 'Redigera' eller välja 'Lagra automatiskt' nedan."
-#: ../data/gtkpod.glade.h:191
+#: ../data/gtkpod.glade.h:189
msgid "Initialize iPod"
msgstr "Initiera iPod"
-#: ../data/gtkpod.glade.h:192
+#: ../data/gtkpod.glade.h:190
msgid ""
"Insert before\n"
"Insert after"
@@ -879,69 +882,73 @@
"Infoga innan\n"
"Infoga efter"
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:192
msgid "Keeps all compilation CDs grouped together in the artists sort tab."
msgstr ""
"Behåller alla samlingsskivor grupperade tillsammans i sorteringsfliken för "
"artister"
-#: ../data/gtkpod.glade.h:195
+#: ../data/gtkpod.glade.h:193
msgid "Live _updating"
msgstr "_Uppdatering under tiden"
-#: ../data/gtkpod.glade.h:196
+#: ../data/gtkpod.glade.h:194
msgid "Load iPod(s)"
msgstr "Ladda iPod"
-#: ../data/gtkpod.glade.h:197
+#: ../data/gtkpod.glade.h:195
msgid "Lower Margin"
msgstr "Under gräns"
-#: ../data/gtkpod.glade.h:198
+#: ../data/gtkpod.glade.h:196
msgid "M4A with :"
-msgstr ""
+msgstr "M4A med: "
-#: ../data/gtkpod.glade.h:199
+#: ../data/gtkpod.glade.h:197
msgid "MP3 with :"
-msgstr ""
+msgstr "MP3 med: "
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:198
msgid "Match al_l of the following"
msgstr "Matcha a_lla följande"
-#: ../data/gtkpod.glade.h:201
+#: ../data/gtkpod.glade.h:199
msgid "Match an_y of the following"
msgstr "Matcha _någon av följande"
-#: ../data/gtkpod.glade.h:202
+#: ../data/gtkpod.glade.h:200
msgid "Match only _checked tracks"
msgstr "Matcha bara _kryssmarkerade spår"
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:201
msgid "Maximum number of background threads:"
-msgstr ""
+msgstr "Maximalt antal bakgrundstrådar:"
-#: ../data/gtkpod.glade.h:204
+#: ../data/gtkpod.glade.h:202
msgid "Maximum size of cache directory (in GB):"
-msgstr ""
+msgstr "Maximal storlek för cachekatalogen (i Gibyte):"
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:203
msgid "Model:"
msgstr "Modell:"
-#: ../data/gtkpod.glade.h:206 ../src/display_tracks.c:1993
+#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
msgid "Modified"
msgstr "Ändrad"
-#: ../data/gtkpod.glade.h:207
+#: ../data/gtkpod.glade.h:205
msgid "Most Recently Played Tracks"
msgstr "Spår som nyligen spelats"
-#: ../data/gtkpod.glade.h:208
+#: ../data/gtkpod.glade.h:206
+msgid "Move selected attributes to the displayed list"
+msgstr "Flytta markerade egenskaper till den visade listan"
+
+#: ../data/gtkpod.glade.h:207
msgid "Music Root:"
msgstr "Musikrot:"
-#: ../data/gtkpod.glade.h:209
+#: ../data/gtkpod.glade.h:208
msgid ""
"Music files can have images embedded in the APIC tag. Currently this is only "
"supported for MP3 files."
@@ -949,31 +956,34 @@
"Musikfiler kan ha inbäddade bilder i APIC-taggen. För närvarande stöds det "
"bara för MP3-filer."
-#: ../data/gtkpod.glade.h:210
+#: ../data/gtkpod.glade.h:209
msgid "Never show this dialogue again"
msgstr "Visa aldrig den här dialogrutan igen"
-#: ../data/gtkpod.glade.h:211
-msgid "New PL"
+#: ../data/gtkpod.glade.h:210 ../src/display_spl.c:1719
+#: ../src/misc_playlist.c:66 ../src/misc_playlist.c:68
+#: ../src/misc_playlist.c:93 ../src/misc_playlist.c:95
+#: ../src/misc_playlist.c:428 ../src/misc_playlist.c:430
+msgid "New Playlist"
msgstr "Ny spellista"
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:211
msgid "No lower margin"
msgstr "Ingen undre gräns"
-#: ../data/gtkpod.glade.h:213
+#: ../data/gtkpod.glade.h:212
msgid "No upper margin"
msgstr "Ingen övre gräns"
-#: ../data/gtkpod.glade.h:214
+#: ../data/gtkpod.glade.h:213
msgid "Non-transferred tracks"
msgstr "Spår som inte överförts"
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:214
msgid "None"
msgstr "Ingen"
-#: ../data/gtkpod.glade.h:216
+#: ../data/gtkpod.glade.h:215
msgid ""
"Normally the charset specified when first importing the track will be used "
"for the filename. If you set this option you can set a different charset "
@@ -990,7 +1000,7 @@
"importerats innan version 0.51 har ingen teckenkodning lagrad. Istället "
"används då teckensnittet som anges."
-#: ../data/gtkpod.glade.h:217
+#: ../data/gtkpod.glade.h:216
msgid ""
"Normally the charset specified when first importing the track will be used "
"to update the track information. If you have chosen a wrong charset when "
@@ -1008,7 +1018,7 @@
"importerats innan version 0.51 har ingen teckenkodning lagrad. Istället "
"används då teckensnittet som anges ovan."
-#: ../data/gtkpod.glade.h:218
+#: ../data/gtkpod.glade.h:217
msgid ""
"Normally the charset specified when first importing the track will be used "
"to write the tags. If you have chosen a wrong charset when first importing a "
@@ -1027,7 +1037,7 @@
"teckenkodning lagrad. Istället används då teckensnittet som anges på sidan "
"'In- och utmatning'."
-#: ../data/gtkpod.glade.h:219
+#: ../data/gtkpod.glade.h:218
msgid ""
"Normally, if a track is no longer present in the sync directory, it will be "
"removed from the playlist, but not from the iPod or local repository.\n"
@@ -1046,23 +1056,23 @@
"alternativet om du vill att spår ska tas bort, eftersom att ta bort från "
"huvudspellistan innebär att ta bort från iPod."
-#: ../data/gtkpod.glade.h:222
+#: ../data/gtkpod.glade.h:221
msgid "Notes sync command:"
msgstr "Synkroniseringskommando för anteckningar:"
-#: ../data/gtkpod.glade.h:223
+#: ../data/gtkpod.glade.h:222
msgid "Number of playlists"
msgstr "Antal spellistor"
-#: ../data/gtkpod.glade.h:224
+#: ../data/gtkpod.glade.h:223
msgid "Number of tracks"
msgstr "Antal spår"
-#: ../data/gtkpod.glade.h:225
+#: ../data/gtkpod.glade.h:224
msgid "Number of tracks in generated playlists:"
msgstr "Antal spår i skapade spellistor:"
-#: ../data/gtkpod.glade.h:226
+#: ../data/gtkpod.glade.h:225
msgid ""
"Number of tracks in the generated playlists 'Most Often Listened', 'Best "
"Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
@@ -1070,59 +1080,63 @@
"Antal spår i de skapade spellistorna 'oftast lyssnats på', 'med bäst betyg' "
"och 'nyligen spelats'. Ange '0' för 'ingen begränsning'."
-#: ../data/gtkpod.glade.h:227
+#: ../data/gtkpod.glade.h:226
msgid "Ogg with :"
-msgstr ""
+msgstr "Ogg med: "
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:227
msgid "On startup automatically sync with playlist directories"
msgstr "Synkronisera automatiskt med spellistekataloger vid start"
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:228
msgid "On startup automatically sync with the following directory"
msgstr "Synkronisera automatiskt med följande katalog vid start"
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:229
msgid "On startup automatically update (Live Playlist)"
msgstr "Uppdatera automatiskt vid start (levande spellista)"
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:230
msgid "One for each Album"
msgstr "En för varje album"
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:231
msgid "One for each Artist"
msgstr "En för varje artist"
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:232
msgid "One for each Composer"
msgstr "En för varje kompositör"
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:233
msgid "One for each Genre"
msgstr "En för varje genre"
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:234
msgid "One for each Rating"
msgstr "En för varje betyg"
-#: ../data/gtkpod.glade.h:236
+#: ../data/gtkpod.glade.h:235
msgid "One for each Year"
msgstr "En för varje år"
-#: ../data/gtkpod.glade.h:237
+#: ../data/gtkpod.glade.h:236
msgid "Overwrite tags that are already set"
msgstr "Skriv över taggar som redan är angivna"
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:237
msgid "Password:"
-msgstr ""
+msgstr "Lösenord:"
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:238
msgid "Path:"
msgstr "Sökväg:"
-#: ../data/gtkpod.glade.h:240
+#: ../data/gtkpod.glade.h:239
+msgid "Photo Window"
+msgstr "Fotofönster"
+
+#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
msgid "Play time"
msgstr "Speltid"
@@ -1131,118 +1145,104 @@
msgid "Playcount"
msgstr "Spelningsantal"
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:1990
+#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
msgid "Played"
msgstr "Spelad"
-#: ../data/gtkpod.glade.h:243 ../src/display_spl.c:105
-msgid "Playlist"
-msgstr "Spellista"
-
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:243
msgid "Playlist name:"
msgstr "Spellistans namn:"
-#: ../data/gtkpod.glade.h:245
+#: ../data/gtkpod.glade.h:244
msgid "Playlist type:"
msgstr "Typ av spellista:"
-#: ../data/gtkpod.glade.h:246 ../src/display_playlists.c:2176
+#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
msgid "Playlists"
msgstr "Spellistor"
-#: ../data/gtkpod.glade.h:247
+#: ../data/gtkpod.glade.h:246
msgid "Please refer to the notice below."
msgstr "Se anmärkningen nedan."
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:247
msgid "Please specify a time interval"
msgstr "Ange ett tidsintervall"
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:248
msgid "Preferences"
msgstr "Inställningar"
+#: ../data/gtkpod.glade.h:249
+msgid "Progress Information"
+msgstr "Förloppsinformation"
+
#: ../data/gtkpod.glade.h:250
-msgid ""
-"Press button to abort.\n"
-"Export can be continued at a later time."
-msgstr ""
-"Tryck på knappen för att avbryta.\n"
-"Exporten kan fortsättas vid ett senare tillfälle."
+msgid "R_ename Album"
+msgstr "B_yt namn på album"
-#: ../data/gtkpod.glade.h:252
-msgid "Previous"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:253
-#, fuzzy
-msgid "Progress Information"
-msgstr "Information"
-
-#: ../data/gtkpod.glade.h:254
+#: ../data/gtkpod.glade.h:251
msgid "Random Playlist from Displayed Tracks"
msgstr "Slumpmässig spellista från visade spår"
-#: ../data/gtkpod.glade.h:255
+#: ../data/gtkpod.glade.h:252
msgid "Randomize Current Playlist"
msgstr "Gör nuvarande spellista slumpmässig"
-#: ../data/gtkpod.glade.h:256 ../src/display_spl.c:101
+#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
#: ../src/misc_conversion.c:78
msgid "Rating"
msgstr "Betyg"
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:254
msgid "Read coverart from embedded APIC data"
msgstr "Läs omslagsbild från inbäddad APIC-data"
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:255
msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
msgstr "Läs spår från filinnehåll (t.ex. ID3-taggar i MP3-filer)"
-#: ../data/gtkpod.glade.h:259
-msgid "Remove Cover Art"
-msgstr "Ta bort omslagsbild"
+#: ../data/gtkpod.glade.h:256
+msgid "Remove selected attributes from the displayed list"
+msgstr "Ta bort markerade egenskaper från den visade listan"
-#: ../data/gtkpod.glade.h:260
+#: ../data/gtkpod.glade.h:257
msgid "Repository Options"
msgstr "Arkivalternativ"
-#: ../data/gtkpod.glade.h:261
+#: ../data/gtkpod.glade.h:258
msgid "Repository name:"
msgstr "Arkivnamn:"
-#: ../data/gtkpod.glade.h:262
+#: ../data/gtkpod.glade.h:259
msgid "Repository type:"
msgstr "Arkivtyp:"
-#: ../data/gtkpod.glade.h:263
+#: ../data/gtkpod.glade.h:260
msgid "Root directory of mserv database (trackinfo root)."
msgstr "Rotkatalog för mserv databasen (rot för spårinformation)."
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:261
msgid "Rules"
msgstr "Regler"
-#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:808
+#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
msgid "Save Changes"
msgstr "Spara ändringar"
-#: ../data/gtkpod.glade.h:266
-#, fuzzy
+#: ../data/gtkpod.glade.h:263
msgid "Scrobble Tracks?"
-msgstr "Markerade s_pår"
+msgstr "Skicka spår till Audioscrobble?"
-#: ../data/gtkpod.glade.h:267
+#: ../data/gtkpod.glade.h:264
msgid "Select '-1' for no upper limit."
msgstr "Välj '-1' för ingen övre gräns."
-#: ../data/gtkpod.glade.h:268
+#: ../data/gtkpod.glade.h:265
msgid "Select '0' for no lower limit."
msgstr "Välj '0' för ingen undre gräns."
-#: ../data/gtkpod.glade.h:269
+#: ../data/gtkpod.glade.h:266
msgid ""
"Selected\n"
"Playlist"
@@ -1250,7 +1250,7 @@
"Markerad\n"
"spellista"
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:268
msgid ""
"Selected\n"
"Tracks"
@@ -1258,90 +1258,83 @@
"Markerade\n"
"spår"
+#: ../data/gtkpod.glade.h:270
+msgid "Selected Filter Tab Entry from Database"
+msgstr "Markerade filterflikar från databas"
+
+#: ../data/gtkpod.glade.h:271
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "Markerade filterflikar från hårddisk"
+
+#: ../data/gtkpod.glade.h:272
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "Markerade filterflikar från spellista"
+
#: ../data/gtkpod.glade.h:273
-msgid "Selected Tab _Entry"
-msgstr "Markerad _flikrad"
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "Markerade filterflikar från iPod"
#: ../data/gtkpod.glade.h:274
-msgid "Selected _Playlist"
-msgstr "Markerad _spellista"
+msgid "Selected Playlist Including Tracks from Database"
+msgstr "Markerade spellista inklusive spår från databas"
#: ../data/gtkpod.glade.h:275
-msgid "Selected _Tracks"
-msgstr "Markerade s_pår"
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "Markerade spellista inklusive spår från hårddisk"
#: ../data/gtkpod.glade.h:276
-msgid "Selected filter tab entry from database"
-msgstr "Markerade filterflikrad från databasen"
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "Markerade spellista inklusive spår från iPod"
#: ../data/gtkpod.glade.h:277
-msgid "Selected filter tab entry from harddisk"
-msgstr "Markerade filterflikrad från hårddisken"
+msgid "Selected Tab _Entry"
+msgstr "Markerad _flikrad"
#: ../data/gtkpod.glade.h:278
-msgid "Selected filter tab entry from iPod"
-msgstr "Markerade filterflikrad från iPod"
+msgid "Selected Tracks from Database"
+msgstr "Markerade spår från databas"
#: ../data/gtkpod.glade.h:279
-msgid "Selected filter tab entry from playlist"
-msgstr "Markerade filterflikrad från spellistan"
+msgid "Selected Tracks from Hard Disk"
+msgstr "Markerade spår från hårddisk"
#: ../data/gtkpod.glade.h:280
-msgid "Selected playlist"
-msgstr "Markerade spellista"
+msgid "Selected Tracks from Playlist"
+msgstr "Markerade spår från spellista"
#: ../data/gtkpod.glade.h:281
-msgid "Selected playlist including tracks from database"
-msgstr "Markerade spellistan som innehåller spår från databasen"
+msgid "Selected Tracks from iPod"
+msgstr "Markerade spår från iPod"
#: ../data/gtkpod.glade.h:282
-msgid "Selected playlist including tracks from harddisk"
-msgstr "Markerade spellistan som innehåller spår från hårddisken"
+msgid "Selected _Playlist"
+msgstr "Markerad _spellista"
#: ../data/gtkpod.glade.h:283
-msgid "Selected playlist including tracks from iPod"
-msgstr "Markerade spellistan som innehåller spår från iPod"
+msgid "Selected _Tracks"
+msgstr "Markerade s_pår"
#: ../data/gtkpod.glade.h:284
-msgid "Selected tracks from database"
-msgstr "Markerade spår från databasen"
+msgid "Selected playlist"
+msgstr "Markerade spellista"
#: ../data/gtkpod.glade.h:285
-msgid "Selected tracks from harddisk"
-msgstr "Markerade spår från hårddisken"
+msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
+msgstr "Lista med filmasker att utesluta åtskilda med semikolon, t.ex. '*.mp3'"
#: ../data/gtkpod.glade.h:286
-msgid "Selected tracks from iPod"
-msgstr "Markerade spår från iPod"
+msgid "Set Cover Art from _File"
+msgstr "Ange omslagsbild från _fil"
#: ../data/gtkpod.glade.h:287
-msgid "Selected tracks from playlist"
-msgstr "Markerade spår från spellistan"
-
-#: ../data/gtkpod.glade.h:288
-#, fuzzy
-msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
-msgstr "Lista med filmasker att utesluta åtskilda med semikolon, t.ex. '*.mp3'"
-
-#: ../data/gtkpod.glade.h:289
-#, fuzzy
-msgid "Set Cover Art from File"
-msgstr "Ange omslagsbild"
-
-#: ../data/gtkpod.glade.h:290
-#, fuzzy
-msgid "Set Cover Art from Web"
-msgstr "Ange omslagsbild"
-
-#: ../data/gtkpod.glade.h:291
msgid "Set mountpoint or edit repository options"
msgstr "Ange monteringspunkt eller redigera arkivalternativ"
-#: ../data/gtkpod.glade.h:292
+#: ../data/gtkpod.glade.h:288
msgid "Set options for Calendar/Contacts/Notes"
msgstr "Ange alternativ för kalender, kontakter och anteckningar"
-#: ../data/gtkpod.glade.h:293
+#: ../data/gtkpod.glade.h:289
msgid ""
"Set this to 'aacgain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for .m4a and .m4b "
@@ -1352,7 +1345,7 @@
"normaliseringsdata för .m4a- och .m4b-filer och skrivs i musikfilerna med "
"detta kommando."
-#: ../data/gtkpod.glade.h:294
+#: ../data/gtkpod.glade.h:290
msgid ""
"Set this to 'mp3gain -q -k' to use the 'Normalize volume' functionality in "
"the Tools Menu. If this is set, missing normalization data for mp3 files "
@@ -1363,64 +1356,68 @@
"normaliseringsdata för mp3-filer och skrivs i musikfilerna med detta "
"kommando."
-#: ../data/gtkpod.glade.h:295
+#: ../data/gtkpod.glade.h:291
msgid "Set this to your last.fm password"
-msgstr ""
+msgstr "Ställ in detta till ditt lösenord på last.fm"
-#: ../data/gtkpod.glade.h:296
+#: ../data/gtkpod.glade.h:292
msgid "Set this to your last.fm username"
-msgstr ""
+msgstr "Ställ in detta till ditt användarnamn på last.fm"
-#: ../data/gtkpod.glade.h:297
+#: ../data/gtkpod.glade.h:293
msgid ""
"Set to 0 to effectively disable caching (a maximum of one track will be "
"cached at a time)."
msgstr ""
+"Ställ in till 0 för att inaktivera lagring i cache helt och hållet (maximalt "
+"ett spår lagras i cachen åt gången)."
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:294
msgid ""
"Set to 0 to use as many background threads as CPUs are available on your "
"system."
msgstr ""
+"Ställ in till 0 för att använda lika många bakgrundstrådar som det finns "
+"tillgängiga processorer på systemet."
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:295
msgid "Show information about problems when accessing mserv"
msgstr "Visa information om problem vid användning av mserv"
-#: ../data/gtkpod.glade.h:300
+#: ../data/gtkpod.glade.h:296
msgid "Show summary of sync result"
msgstr "Visa sammanfattning av synkroniseringsresultat"
-#: ../data/gtkpod.glade.h:301 ../src/misc_playlist.c:96
+#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
#: ../src/repository.c:1356
msgid "Smart Playlist"
msgstr "Smart spellista"
-#: ../data/gtkpod.glade.h:302
+#: ../data/gtkpod.glade.h:298
msgid "Sort tracks according to: "
msgstr "Sortera spår enligt: "
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:299
msgid "Sorting Options"
msgstr "Sorteringsalternativ"
-#: ../data/gtkpod.glade.h:304
+#: ../data/gtkpod.glade.h:300
msgid "Sorting case sensitive"
msgstr "Skiftlägeskänslig sortering"
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:301
msgid "Sorttab: "
msgstr "Sorteringsflik: "
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:302
msgid "Sorttabs"
msgstr "Sorteringsflikar"
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:303
msgid "Source:"
msgstr "Källa:"
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:305
#, no-c-format
msgid ""
"Specify exact path including command line options. '%i' will be replaced "
@@ -1429,39 +1426,39 @@
"Ange fullständig sökväg inklusive kommandoradsväljare. '%i' ersätts med "
"monteringspunkten för iPod."
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:306
msgid "Specify interval"
msgstr "Ange intervall"
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:307
msgid "Start display automatically"
msgstr "Börja visa automatiskt"
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:308
msgid "Synchronise Contacts, Calendar and Notes"
msgstr "Synkronisera kontakter, kalender och anteckningar"
-#: ../data/gtkpod.glade.h:313
+#: ../data/gtkpod.glade.h:309
msgid "Synchronize All"
msgstr "Synkronisera allt"
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:310
msgid "Synchronize Calendar"
msgstr "Synkronisera kalender"
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:311
msgid "Synchronize Contacts"
msgstr "Synkronisera kontakter"
-#: ../data/gtkpod.glade.h:316
+#: ../data/gtkpod.glade.h:312
msgid "Synchronize Notes"
msgstr "Synkronisera anteckningar"
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:313
msgid "Template for info field: "
msgstr "Mall för informationsfält:"
-#: ../data/gtkpod.glade.h:318
+#: ../data/gtkpod.glade.h:314
msgid ""
"The local copy of the track is referenced in the playlist. If the track is "
"not available locally, an error message is displayed."
@@ -1469,29 +1466,29 @@
"Spellistan hänvisar till den lokala kopian av spåret. Om spåret inte är "
"tillgängligt lokalt, visas ett felmeddelande."
-#: ../data/gtkpod.glade.h:319
+#: ../data/gtkpod.glade.h:315
msgid ""
"The output of the background conversion scripts is copied below. Each page "
"of the notebook corresponds to one background thread."
msgstr ""
+"Utmatningen från konverteringsskripten som kört i bakgrunden har kopierats "
+"nedan. Varje sida i anteckningsboken motsvarar en bakgrundstråd."
-#: ../data/gtkpod.glade.h:320
-#, fuzzy
+#: ../data/gtkpod.glade.h:316
msgid ""
"The tags are written to the files on your harddrive and on the iPod (if "
"available)."
-msgstr ""
-"Taggarna skrivs till filer på din hårddisk och på iPod (om tillgänglig)."
+msgstr "Taggarna skrivs till filer på din hårddisk och på iPod (om tillgänglig)."
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:317
msgid "The track on the iPod is referenced in the playlist file."
msgstr "Spellistan hänvisar till spåret på iPod."
-#: ../data/gtkpod.glade.h:322
+#: ../data/gtkpod.glade.h:318
msgid "This is the same option as in 'Edit/Delete Confirmation'"
msgstr "Det här är samma alternativ som i 'Redigera/Bekräfta "
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:319
msgid ""
"This is the way to go, but maybe not all programs support it yet. ID3v2.4 "
"uses unicode to store the tags, so you won't have to worry about charsets "
@@ -1505,20 +1502,20 @@
"storleken av rena ASCII-taggar. ID3v2.2/4-taggar skrivs också om de redan "
"finns i filen som skrivs."
-#: ../data/gtkpod.glade.h:324
+#: ../data/gtkpod.glade.h:320
msgid "This option will be re-activated when you upgrade gtkpod."
msgstr "Det här alternativet aktiveras igen när du uppdaterar gtkpod."
-#: ../data/gtkpod.glade.h:325
+#: ../data/gtkpod.glade.h:321
msgid "Time:"
msgstr "Tid:"
-#: ../data/gtkpod.glade.h:326 ../src/display_sorttabs.c:2963
+#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
msgid "Title"
msgstr "Titel"
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:323
msgid ""
"Total\n"
"(iPod)"
@@ -1526,7 +1523,7 @@
"Totalt\n"
"(iPod)"
-#: ../data/gtkpod.glade.h:329
+#: ../data/gtkpod.glade.h:325
msgid ""
"Total\n"
"(local)"
@@ -1534,38 +1531,41 @@
"Totalt\n"
"(lokalt)"
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:327
msgid "Tracks"
msgstr "Spår"
-#: ../data/gtkpod.glade.h:332
+#: ../data/gtkpod.glade.h:328
msgid "Tracks Most Often Listened To"
msgstr "Spår som oftast lyssnats på"
-#: ../data/gtkpod.glade.h:333
+#: ../data/gtkpod.glade.h:329
msgid ""
"Tracks can be transferred in the background as soon as they are added to an "
"iPod repository. Otherwise they will be transferred when ejecting the "
"contents of the iPod completely unchanged until then."
msgstr ""
+"Spår kan överföras i bakgrunden så fort de har lagts till i ett iPod-arkiv. "
+"Annars överförs de vid utmatning, och innehållet på iPod är fullständigt "
+"oförändrat innnan dess."
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:330
msgid "Tracks in Selected Tab _Entry"
msgstr "Spår i markerad _flikrad"
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:331
msgid "Tracks in Selected _Playlist"
msgstr "Spår i markerad _spellista"
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:332
msgid "Transfer tracks to the iPod in the background"
-msgstr ""
+msgstr "Överför spår till iPod i bakgrunden"
-#: ../data/gtkpod.glade.h:337
+#: ../data/gtkpod.glade.h:333
msgid "Translators"
msgstr "Översättare"
-#: ../data/gtkpod.glade.h:338
+#: ../data/gtkpod.glade.h:334
msgid ""
"Try to load contents of all connected iPods. For each iPod a separate "
"repository must be set up."
@@ -1573,53 +1573,55 @@
"Försök ladda innehållet från alla anslutna iPod-enheter. Ett separat arkiv "
"måste ställas in för varje iPod."
-#: ../data/gtkpod.glade.h:339
+#: ../data/gtkpod.glade.h:335
+msgid "Undo _Track"
+msgstr "Å_ngra spår"
+
+#: ../data/gtkpod.glade.h:336
msgid "Update _mserv Data from File"
msgstr "Uppdatera _mserv data från fil"
-#: ../data/gtkpod.glade.h:340
+#: ../data/gtkpod.glade.h:337
msgid "Update/Sync all playlists now"
msgstr "Uppdatera och synkronisera alla spellistor nu"
-#: ../data/gtkpod.glade.h:341
+#: ../data/gtkpod.glade.h:338
msgid "Update/Sync playlist now"
msgstr "Uppdatera och synkronisera spellista nu"
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:339
msgid "Upper margin"
msgstr "Övre gräns"
-#: ../data/gtkpod.glade.h:343
+#: ../data/gtkpod.glade.h:340
msgid "Use 'Multi-Edit' also for title field"
msgstr "Använd också 'Redigera flera' för titelfältet"
-#: ../data/gtkpod.glade.h:344
+#: ../data/gtkpod.glade.h:341
msgid "Use 'Multi-Edit' for tracks selections"
msgstr "Använd 'Redigera flera' för markerade spår"
-#: ../data/gtkpod.glade.h:345
-#, fuzzy
-msgid "Use <i><Album>.jpg</i> in the parent directory"
+#: ../data/gtkpod.glade.h:342
+msgid "Use <i><Album>.jpg</i> in the parent directory"
msgstr "Använd <i><Album>.jpg</i> i överliggande katalog"
-#: ../data/gtkpod.glade.h:346
-#, fuzzy
-msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
+#: ../data/gtkpod.glade.h:343
+msgid "Use <i><Album>.jpg</i>, <i><Album>.png</i>..."
msgstr "Använd <i><Album>.jpg</i>, <i><Album>.png</i>..."
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:344
msgid "Use <i>folder.jpg</i> as cover art."
msgstr "Använd <i>katalog.jpg</i> som omslagsbild."
-#: ../data/gtkpod.glade.h:348
+#: ../data/gtkpod.glade.h:345
msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
msgstr "Använd <i>katalog.jpg</i>, <i>katalog.png</i>..."
-#: ../data/gtkpod.glade.h:349
+#: ../data/gtkpod.glade.h:346
msgid "Use mserv database to fill additional information"
msgstr "Använd mserv databas för att fylla i ytterligare information"
-#: ../data/gtkpod.glade.h:350
+#: ../data/gtkpod.glade.h:347
msgid ""
"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
"for this filename."
@@ -1627,7 +1629,7 @@
"Använd vald teckenkodning för detta filnamn\n"
"(Inställningar/'Tillägg, uppdatering, synkronisering')."
-#: ../data/gtkpod.glade.h:352
+#: ../data/gtkpod.glade.h:349
msgid ""
"Use selected encoding (on the 'General' page)\n"
"when writing tags"
@@ -1635,26 +1637,23 @@
"Använd vald teckenkodning (från sidan 'Allmänt')\n"
"vid skrivning av taggar"
-#: ../data/gtkpod.glade.h:354
-#, fuzzy
+#: ../data/gtkpod.glade.h:351
msgid "Use selected encoding also when updating or syncing tracks"
-msgstr ""
-"Använd också vald kodning vid uppdatering\n"
-"eller synkronisering av spår"
+msgstr "Använd också vald kodning vid uppdatering eller synkronisering av spår"
-#: ../data/gtkpod.glade.h:355
+#: ../data/gtkpod.glade.h:352
msgid "Use this template to parse filename for tag information:"
msgstr "Använd mallen för att tolka filnamnet som tagginformation:"
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:353
msgid "Username to be used for mserv database lookup."
msgstr "Användarnamn att använda vid uppslagning i mserv databasen."
-#: ../data/gtkpod.glade.h:357
+#: ../data/gtkpod.glade.h:354
msgid "Username:"
msgstr "Användarnamn:"
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:355
msgid ""
"Usually you don't want to set the title of several tracks to the same text. "
"This option might avoid unwanted results (especially since there is no "
@@ -1664,11 +1663,15 @@
"alternativet kan undvika oönskade resultat (särskilt eftersom funktionen "
"'Ångra' inte finns ännu)."
-#: ../data/gtkpod.glade.h:359
+#: ../data/gtkpod.glade.h:356
+msgid "View Full Size"
+msgstr "Visa med full storlek"
+
+#: ../data/gtkpod.glade.h:357
msgid "WAV with :"
-msgstr ""
+msgstr "Wav med: "
-#: ../data/gtkpod.glade.h:360
+#: ../data/gtkpod.glade.h:358
msgid ""
"When adding dirs/files, update information of\n"
"existing tracks with identical filenames"
@@ -1676,7 +1679,7 @@
"När kataloger och filer läggs till, uppdatera information\n"
"om befintliga spår med identiska filnamn"
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:360
msgid ""
"When copying from iPod no check is performed on whether the destination file "
"exists. Enabling this option will make gtkpod check whether the length of "
@@ -1688,11 +1691,11 @@
"från iPod. Om det är fallet hoppas filen över, vilket gör det möjligt att "
"snabbt synkronisera innehållet i iPod."
-#: ../data/gtkpod.glade.h:363
+#: ../data/gtkpod.glade.h:361
msgid "When syncing playlists"
msgstr "Vid synkronisering av spellistor"
-#: ../data/gtkpod.glade.h:364
+#: ../data/gtkpod.glade.h:362
msgid ""
"Will show a list of tracks removed and a list of tracks newly added or "
"updated."
@@ -1700,24 +1703,23 @@
"Visar en lista med borttagna spår och en lista med spår som är nytillagda "
"eller uppdaterade."
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:363
msgid "Write ID3 tags to disk when modified in gtkpod"
msgstr "Skriv ID3-taggar till disk när de ändrats i gtkpod"
-#: ../data/gtkpod.glade.h:366
+#: ../data/gtkpod.glade.h:364
msgid "Write all changes made to the disk and the iPod(s)."
msgstr "Skriv alla ändringar gjorda på disk och iPod."
-#: ../data/gtkpod.glade.h:367
-#, fuzzy
+#: ../data/gtkpod.glade.h:365
msgid ""
"Write extended information (PC filenames, SHA1 hashes,\n"
"encoding...). Recommended."
msgstr ""
-"Skriv utökad information (PC-filnamn, MD5-\n"
-"checksummor, teckenkodning). Rekommenderas."
+"Skriv utökad information (PC-filnamn, SHA1-checksummor,\n"
+"teckenkodning). Rekommenderas."
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:367
msgid ""
"You can also use the table headers, but this allows you to sort according to "
"a column that is not displayed."
@@ -1725,70 +1727,78 @@
"Du kan också använda tabellhuvuden, men här kan du sortera enligt en kolumn "
"som inte visas."
+#: ../data/gtkpod.glade.h:368
+msgid "_About gtkpod"
+msgstr "_Om gtkpod"
+
+#: ../data/gtkpod.glade.h:369
+msgid "_Add Album"
+msgstr "_Lägg till album"
+
#: ../data/gtkpod.glade.h:370
-msgid "_About"
-msgstr "_Om"
+msgid "_Add Image"
+msgstr "_Lägg till bild"
#: ../data/gtkpod.glade.h:371
+msgid "_Album"
+msgstr "_Album"
+
+#: ../data/gtkpod.glade.h:372
msgid "_All Tracks"
msgstr "_Alla spår"
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:373
msgid "_Arrange Sort Tabs"
msgstr "_Ordna sorteringsflikar"
-#: ../data/gtkpod.glade.h:373
+#: ../data/gtkpod.glade.h:374
msgid "_Check iPod's Files"
msgstr "K_ontrollera iPod-filer"
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:375
msgid "_Conversion Log"
-msgstr ""
+msgstr "_Konverteringslogg"
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:376
msgid "_Create Playlists"
-msgstr "_Skapa spellistor"
+msgstr "S_kapa spellistor"
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:377
msgid "_Create iPod's Directories"
msgstr "Skapa iPod-ka_taloger"
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:378
msgid "_Delete"
msgstr "_Ta bort"
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:379
msgid "_Display"
msgstr "_Visa"
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:380
msgid "_Displayed Tracks"
msgstr "_Visade spår"
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:381
msgid "_Edit"
msgstr "_Redigera"
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:382
msgid "_Encoding (ID3, files):"
msgstr "_Teckenkodning (ID3, filer):"
-#: ../data/gtkpod.glade.h:382
+#: ../data/gtkpod.glade.h:383
msgid "_Enqueue"
msgstr "_Köa"
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:384
msgid "_Export Tracks from Database"
-msgstr "_Exportera spår från databasen"
+msgstr "E_xportera spår från databasen"
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:385
msgid "_File"
msgstr "_Arkiv"
-#: ../data/gtkpod.glade.h:385
-msgid "_Find New"
-msgstr ""
-
#: ../data/gtkpod.glade.h:386
msgid "_General"
msgstr "_Allmänt"
@@ -1802,128 +1812,138 @@
msgstr "_Ignorera regler"
#: ../data/gtkpod.glade.h:389
+msgid "_Image"
+msgstr "B_ild"
+
+#: ../data/gtkpod.glade.h:390
msgid "_Info Window"
msgstr "_Informationsfönster"
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:391
msgid "_Last.FM"
-msgstr ""
+msgstr "_Last.FM"
-#: ../data/gtkpod.glade.h:391
+#: ../data/gtkpod.glade.h:392
msgid "_Less Sort Tabs"
msgstr "Färre _sorteringsflikar"
-#: ../data/gtkpod.glade.h:392
+#: ../data/gtkpod.glade.h:393
msgid "_Limit to"
msgstr "_Begränsa till"
-#: ../data/gtkpod.glade.h:393
+#: ../data/gtkpod.glade.h:394
msgid "_Load iPod(s)"
msgstr "_Ladda iPod"
-#: ../data/gtkpod.glade.h:394
+#: ../data/gtkpod.glade.h:395
msgid "_Local"
msgstr "_Lokal"
-#: ../data/gtkpod.glade.h:395
+#: ../data/gtkpod.glade.h:396
msgid "_M3U"
msgstr "_M3U"
-#: ../data/gtkpod.glade.h:396
+#: ../data/gtkpod.glade.h:397
+msgid "_Misc."
+msgstr "_Diverse"
+
+#: ../data/gtkpod.glade.h:398
msgid "_More Sort Tabs"
msgstr "_Fler sorteringsflikar"
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:399
msgid "_Newly Added Tracks"
msgstr "_Nytillagda spår"
-#: ../data/gtkpod.glade.h:398
+#: ../data/gtkpod.glade.h:400
msgid "_Normalize Volume"
msgstr "_Normalisera volym"
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:401
msgid "_Number of sort tabs:"
msgstr "A_ntal sorteringsflikar:"
-#: ../data/gtkpod.glade.h:400
-msgid "_Other"
-msgstr "Ö_vriga"
-
-#: ../data/gtkpod.glade.h:401
+#: ../data/gtkpod.glade.h:402
msgid "_PLS"
msgstr "_PLS"
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
msgid "_Play Now"
msgstr "S_pela nu"
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
msgid "_Podcasts"
msgstr "_Podradiosändningar"
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:405
msgid "_Prefer Local"
msgstr "_Föredra lokal"
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:406
+msgid "_Remove Album"
+msgstr "Ta bort _album"
+
+#: ../data/gtkpod.glade.h:407
+msgid "_Remove Cover Art"
+msgstr "_Ta bort omslagsbild"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Images"
+msgstr "_Ta bort bilder"
+
+#: ../data/gtkpod.glade.h:409
msgid "_Save Changes"
msgstr "_Spara ändringar"
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:410
msgid "_Save Displayed Track Order"
msgstr "Spara _visad spårordning"
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:411
msgid "_Sorting"
msgstr "S_ortera"
-#: ../data/gtkpod.glade.h:408
-#, fuzzy
+#: ../data/gtkpod.glade.h:412
msgid "_Synchronize Playlist with Dir(s)"
-msgstr "Synkronisera spellista med katalog(er)"
+msgstr "S_ynkronisera spellista med katalog(er)"
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:413
msgid "_Toolbar"
msgstr "_Verktygsrad"
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:414
msgid "_Tools"
msgstr "Verk_tyg"
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:415
msgid "_Tooltips"
msgstr "Verktygs_tips"
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:416
msgid "_Track Info"
msgstr "_Spårinformation"
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:417
msgid "_Undo All"
msgstr "Ã…_ngra alla"
-#: ../data/gtkpod.glade.h:414
-msgid "_Undo Track"
-msgstr "Å_ngra spår"
-
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:418
msgid "_Update Tracks from File"
msgstr "_Uppdatera spår från fil"
-#: ../data/gtkpod.glade.h:416
-#, fuzzy
+#: ../data/gtkpod.glade.h:419
msgid "_Video"
-msgstr "_Visa"
+msgstr "_Video"
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:420
msgid "_View"
msgstr "_Visa"
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:421
msgid "_iPod"
msgstr "_iPod"
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:423
#, no-c-format
msgid ""
"artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "
@@ -1936,28 +1956,28 @@
"flera mallar åt med ';'. Den första som stämmer med filnamnet används. "
"Exempel: '%a - %A/%T %t.mp3;%t.wav'."
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:424
msgid "folder"
msgstr "katalog"
-#: ../data/gtkpod.glade.h:422
+#: ../data/gtkpod.glade.h:425
msgid "folder.jpg"
msgstr "katalog.jpg"
-#: ../data/gtkpod.glade.h:424
+#: ../data/gtkpod.glade.h:427
#, no-c-format
msgid "folder.jpg;%a.jpg"
msgstr "katalog.jpg;%a.jpg"
-#: ../data/gtkpod.glade.h:425
+#: ../data/gtkpod.glade.h:428
msgid "gtkpod"
msgstr "gtkpod"
-#: ../data/gtkpod.glade.h:426
+#: ../data/gtkpod.glade.h:429
msgid "gtkpod Info"
msgstr "Information om gtkpod"
-#: ../data/gtkpod.glade.h:427
+#: ../data/gtkpod.glade.h:430
msgid ""
"gtkpod expects the ID3 tags and the filenames to be in the encoding "
"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "
@@ -1968,12 +1988,12 @@
"kataloger'. 'Systemets kodning' är den kodning som används i din aktuella "
"landsinställning."
-#: ../data/gtkpod.glade.h:428
+#: ../data/gtkpod.glade.h:431
msgid "gtkpod options"
msgstr "Inställningar för gtkpod"
#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
-#: ../data/gtkpod.glade.h:430
+#: ../data/gtkpod.glade.h:433
msgid ""
"iPod\n"
"Local Repository (Standard)\n"
@@ -1983,35 +2003,56 @@
"Lokalt arkiv (standard)\n"
"Lokalt arkiv (podradiosändningar)\n"
-#: ../data/gtkpod.glade.h:434
+#: ../data/gtkpod.glade.h:437
msgid "iPod mountpoint:"
msgstr "iPod monteringspunkt:"
-#: ../data/gtkpod.glade.h:435
+#: ../data/gtkpod.glade.h:438
msgid "iTunesDB backup:"
msgstr "Säkerhetskopia av iTunes databas:"
-#: ../data/gtkpod.glade.h:436
-#, fuzzy
-msgid "label"
-msgstr "etikett21"
-
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:439
msgid "mserv Root:"
msgstr "Rot för mserv:"
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:440
msgid "mserv database lookup will be done for music in this directory."
msgstr "Uppslagning av musik för mserv databasen görs i den här katalogen."
-#: ../data/gtkpod.glade.h:439 ../src/details.c:1175
+#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
msgid "n/a"
msgstr "ej tillgänglig"
-#: ../data/gtkpod.glade.h:440
+#: ../data/gtkpod.glade.h:442
msgid "special_sorttab -- Don't translate!"
msgstr "special_sorttab -- Don't translate!"
+#: ../src/autodetection.c:310
+msgid "Could not initialize GnomeVFS\n"
+msgstr "Kunde inte initiera Gnome VFS\n"
+
+#: ../src/autodetection.c:397
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
+"\n"
+msgstr ""
+"Nymonterad iPod på '%s' kunde inte laddas i gtkpod.\n"
+"\n"
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+"Nymonterad iPod på '%s' verkar redan vara laddad.\n"
+"\n"
+
+#: ../src/autodetection.c:416
+msgid "New iPod"
+msgstr "Ny iPod"
+
#: ../src/charset.c:53
msgid "Arabic (IBM-864)"
msgstr "Arabisk (IBM-864)"
@@ -2221,207 +2262,263 @@
#. we are not the first instance of gtkpod -- the socket is
#. already being used, so we pass
#: ../src/clientserver.c:214
-msgid ""
-"Another instance of gtkpod was detected. Playcount server not started.\n"
-msgstr ""
-"En annan instans av gtkpod detekterades. Spelningsservern startades inte.\n"
+msgid "Another instance of gtkpod was detected. Playcount server not started.\n"
+msgstr "En annan instans av gtkpod detekterades. Spelningsservern startades inte.\n"
#: ../src/confirmation.c:377
msgid "Confirmation Dialogue"
msgstr "Bekräftelsedialogruta"
-#: ../src/context_menus.c:359
+#: ../src/context_menus.c:362
#, c-format
msgid "Copied \"%s\" playlist to %s"
-msgstr ""
+msgstr "Kopierade spellistan \"%s\" till %s"
-#: ../src/context_menus.c:398
-#, fuzzy, c-format
+#: ../src/context_menus.c:401
+#, c-format
msgid "Copied %d track to '%s'"
msgid_plural "Copied %d tracks to '%s'"
-msgstr[0] "Kopierade %d av %d spår."
-msgstr[1] "Kopierade %d av %d spår."
+msgstr[0] "Kopierade %d spår till '%s'"
+msgstr[1] "Kopierade %d spår till '%s'"
-#: ../src/context_menus.c:426
+#: ../src/context_menus.c:429
#, c-format
msgid "Copied '%s' playlist to '%s' in '%s'"
-msgstr ""
+msgstr "Kopierade spellistan '%s'till '%s' i '%s'"
-#: ../src/context_menus.c:459
-#, fuzzy, c-format
+#: ../src/context_menus.c:462
+#, c-format
msgid "Copied %d track to '%s' in '%s'"
msgid_plural "Copied %d tracks to %s in '%s'"
-msgstr[0] "Tog bort %d spår från spellistan '%s'"
-msgstr[1] "Tog bort %d spår från spellistan '%s'"
+msgstr[0] "Kopierade %d spår till '%s' i '%s'"
+msgstr[1] "Kopierade %d spår till '%s' i '%s'"
-#: ../src/context_menus.c:619 ../src/tools.c:854
+#: ../src/context_menus.c:622 ../src/tools.c:854
msgid "Play Now"
msgstr "Spela nu"
-#: ../src/context_menus.c:625 ../src/tools.c:867
+#: ../src/context_menus.c:628 ../src/tools.c:867
msgid "Enqueue"
msgstr "Köa"
-#: ../src/context_menus.c:631
+#: ../src/context_menus.c:634
msgid "Copy Tracks to Filesystem"
msgstr "Kopiera spår till filsystem"
-#: ../src/context_menus.c:638 ../src/file_export.c:1085
+#: ../src/context_menus.c:641 ../src/file_export.c:1085
msgid "Create Playlist File"
msgstr "Skapa spellistefil"
-#: ../src/context_menus.c:645
+#: ../src/context_menus.c:648
msgid "Create new Playlist"
msgstr "Skapa ny spellista"
-#: ../src/context_menus.c:652
+#: ../src/context_menus.c:655
msgid "Update Tracks from File"
msgstr "Uppdatera spår från fil"
-#: ../src/context_menus.c:666
+#: ../src/context_menus.c:669
msgid "Sync Playlist with Dir(s)"
msgstr "Synkronisera spellista med katalog(er)"
-#: ../src/context_menus.c:676
+#: ../src/context_menus.c:679
msgid "Remove All Tracks from iPod"
msgstr "Ta bort alla spår från iPod"
-#: ../src/context_menus.c:694
+#: ../src/context_menus.c:697
msgid "Remove All Podcasts from iPod"
msgstr "Ta bort alla podradiosändningar från iPod"
-#: ../src/context_menus.c:709
+#: ../src/context_menus.c:712
msgid "Delete Including Tracks"
msgstr "Ta bort inklusive spår"
-#: ../src/context_menus.c:717
+#: ../src/context_menus.c:720
msgid "Delete But Keep Tracks"
msgstr "Ta bort men behåll spår"
-#: ../src/context_menus.c:725
+#: ../src/context_menus.c:728
msgid "Edit iPod Properties"
msgstr "Redigera iPod-egenskaper"
-#: ../src/context_menus.c:732
-#, fuzzy
+#: ../src/context_menus.c:735
msgid "Edit Repository Properties"
-msgstr "Redigera iPod-egenskaper"
+msgstr "Redigera arkivegenskaper"
-#: ../src/context_menus.c:739
+#: ../src/context_menus.c:742
msgid "Edit Playlist Properties"
msgstr "Redigera spellisteegenskaper"
-#: ../src/context_menus.c:767
+#: ../src/context_menus.c:770
msgid "View Full Size Artwork"
-msgstr ""
+msgstr "Visa omslagsbilder med full storlek"
-#: ../src/context_menus.c:774
-#, fuzzy
+#: ../src/context_menus.c:777
msgid "Select Cover From File"
-msgstr "Ta bort från iPod"
+msgstr "Välj omslag från fil"
-#: ../src/context_menus.c:781
-msgid "Find Cover on Web"
-msgstr ""
-
-#: ../src/context_menus.c:794
+#: ../src/context_menus.c:790
msgid "Load iPod"
msgstr "Ladda iPod"
-#: ../src/context_menus.c:801
+#: ../src/context_menus.c:797
msgid "Eject iPod"
msgstr "Mata ut iPod"
-#: ../src/context_menus.c:818
+#: ../src/context_menus.c:814
msgid "Remove All Tracks from Database"
msgstr "Ta bort alla spår från databasen"
-#: ../src/context_menus.c:833
+#: ../src/context_menus.c:829
msgid "Delete Including Tracks (Harddisk)"
msgstr "Ta bort inklusive spår (hårddisk)"
-#: ../src/context_menus.c:841
+#: ../src/context_menus.c:837
msgid "Delete Including Tracks (Database)"
msgstr "Ta bort inklusive spår (databas)"
-#: ../src/context_menus.c:849
+#: ../src/context_menus.c:845
msgid "Delete From iPod"
msgstr "Ta bort från iPod"
-#: ../src/context_menus.c:857
+#: ../src/context_menus.c:853
msgid "Delete From Playlist"
msgstr "Ta bort från spellista"
-#: ../src/context_menus.c:865
+#: ../src/context_menus.c:861
msgid "Delete From Harddisk"
msgstr "Ta bort från hårddisk"
-#: ../src/context_menus.c:873
+#: ../src/context_menus.c:869
msgid "Delete From Database"
msgstr "Ta bort från databas"
-#: ../src/context_menus.c:881
+#: ../src/context_menus.c:877
msgid "Alphabetize"
msgstr "Sortera alfabetiskt"
-#: ../src/context_menus.c:949 ../src/context_menus.c:998
-#, fuzzy
+#: ../src/context_menus.c:895
+msgid "Remove Album"
+msgstr "Ta bort album"
+
+#: ../src/context_menus.c:905
+msgid "Remove Photo"
+msgstr "Ta bort foto"
+
+#: ../src/context_menus.c:922
+msgid "Rename Album"
+msgstr "Byt namn på album"
+
+#: ../src/context_menus.c:981 ../src/context_menus.c:1030
msgid "Copy selected playlist to..."
-msgstr "Markerade spellista"
+msgstr "Kopiera markerad spellista till..."
-#: ../src/context_menus.c:1051
-#, fuzzy
+#: ../src/context_menus.c:1083
msgid "Copy selected track(s) to..."
-msgstr "Borttagna spår"
+msgstr "Kopiera markerade spår till..."
#: ../src/date_parser.l:269
#, c-format
msgid "Date format error: unrecognized character: '%s'\n"
msgstr "Fel i datumformat: tecknet känns inte igen: '%s'\n"
-#: ../src/details.c:700
+#: ../src/details.c:82
+msgid "Audio/Video"
+msgstr "Ljud och video"
+
+#: ../src/details.c:83
+msgid "Audio"
+msgstr "Ljud"
+
+#: ../src/details.c:84
+msgid "Video"
+msgstr "Video"
+
+#: ../src/details.c:85
+msgid "Podcast"
+msgstr "Podradiosändning"
+
+#: ../src/details.c:86
+msgid "Video Podcast"
+msgstr "Podvideosändning"
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr "Ljudbok"
+
+#: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
+msgid "Music Video"
+msgstr "Musikvideo"
+
+#: ../src/details.c:89 ../src/display_spl.c:107 ../src/display_spl.c:210
+#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
+msgid "TV Show"
+msgstr "Tv-program"
+
+#: ../src/details.c:90
+msgid "TV Show & Music Video"
+msgstr "Tv-program och musikvideo"
+
+#: ../src/details.c:836
#, c-format
msgid "%s (image data corrupted or unreadable)"
-msgstr ""
+msgstr "%s (bilddata förstörd eller oläsbar)"
-#: ../src/details.c:1246
+#: ../src/details.c:973
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr "Rapportera gärna okänd mediatyp %x\n"
+
+#: ../src/details.c:1418
msgid "<b>n/a</b>"
msgstr "<b>ej tillgänglig</b>"
-#: ../src/display.c:647
+#: ../src/details.c:1906
+#, c-format
+msgid "Error occurred dropping an image onto the details window: %s\n"
+msgstr "Fel uppstod när en bild släpptes på fönstret med detaljinformation: %s\n"
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2128
+msgid "Successfully set new coverart for selected tracks"
+msgstr "Nya omslagsbilder för markerade spår tillagda med lyckat resultat"
+
+#: ../src/display.c:490
+#, c-format
+msgid "<b>Image Dimensions: %s</b>"
+msgstr "<b>Bilddimensioner: %s</b>"
+
+#: ../src/display.c:744
msgid "Edit selected entry of which sort tab?"
msgstr "Redigera markerad rad för vilken sorts flik?"
#. no entry selected
-#: ../src/display.c:654 ../src/misc_confirm.c:435 ../src/misc_track.c:2059
+#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
msgid "No entry selected."
msgstr "Ingen rad markerad."
-#: ../src/display.c:813 ../src/display.c:1133 ../src/display.c:1189
-#: ../src/display.c:1243 ../src/display.c:1298 ../src/display.c:1559
+#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
+#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
#, c-format
msgid "No entry selected in Sort Tab %d"
msgstr "Ingen rad markerad i sorteringsflik %d"
-#: ../src/display.c:852
+#: ../src/display.c:949
msgid "Remove entry of which sort tab from database?"
msgstr "Ta bort rad för vilken sorts flik från databasen?"
-#: ../src/display.c:860
+#: ../src/display.c:957
msgid "Remove tracks in selected entry of which filter tab from the iPod?"
msgstr "Ta bort spår i markerad rad för vilken sorts filterflik från iPod?"
-#: ../src/display.c:882
+#: ../src/display.c:979
msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
-msgstr ""
-"Ta bort spår i markerad rad för vilken sorts filterflik från hårddisken?"
+msgstr "Ta bort spår i markerad rad för vilken sorts filterflik från hårddisken?"
-#: ../src/display.c:912
+#: ../src/display.c:1009
msgid "Remove tracks in selected entry of which filter tab from playlist?"
-msgstr ""
-"Ta bort spår i markerad rad för vilken sorts filterflik från spellistan?"
+msgstr "Ta bort spår i markerad rad för vilken sorts filterflik från spellistan?"
-#: ../src/display.c:939 ../src/display.c:977
+#: ../src/display.c:1036 ../src/display.c:1074
#, c-format
msgid ""
"iPod at '%s' is not loaded.\n"
@@ -2430,77 +2527,169 @@
"iPod på '%s' har inte laddats.\n"
"Ladda den först."
-#: ../src/display.c:1014 ../src/display.c:1041
+#: ../src/display.c:1111 ../src/display.c:1138
msgid "Update selected entry of which sort tab?"
msgstr "Uppdatera markerad rad för vilken sorts flik?"
-#: ../src/display.c:1127
+#: ../src/display.c:1224
msgid "Export selected entry of which sort tab?"
msgstr "Exportera markerad rad för vilken sorts flik?"
-#: ../src/display.c:1183
+#: ../src/display.c:1280
msgid "Create playlist file from selected entry of which sort tab?"
msgstr "Skapa spellistefil från markerad rad för vilken sorts flik?"
-#: ../src/display.c:1237
+#: ../src/display.c:1334
msgid "Play tracks in selected entry of which sort tab?"
msgstr "Spela spår i markerad rad för vilken sorts flik?"
-#: ../src/display.c:1292
+#: ../src/display.c:1389
msgid "Enqueue tracks in selected entry of which sort tab?"
msgstr "Köa spår i markerad rad för vilken sorts flik?"
-#: ../src/display.c:1549
+#: ../src/display.c:1646
msgid "Normalize tracks in selected entry of which sort tab?"
msgstr "Normalisera spår i markerad rad för vilken sorts flik?"
-#: ../src/display_coverart.c:1714
+#: ../src/display_coverart.c:1713
msgid "Failed to remove the album from the album hash store."
-msgstr ""
+msgstr "Misslyckades ta bort albumet från den checksummerade albumlagringen."
+#: ../src/display_coverart.c:2098
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr "Fel uppstod när en bild släpptes på visningen av omslag: %s\n"
+
#: ../src/display_itdb.c:376
#, c-format
msgid "Failed to set cover art: '%s'\n"
msgstr "Misslyckades ange omslagsbild: '%s'\n"
-#: ../src/display_itdb.c:851 ../src/display_itdb.c:984
+#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
msgid "Local"
msgstr "Lokal"
#. add podcast playlist
-#: ../src/display_itdb.c:859 ../src/display_itdb.c:982
-#: ../src/display_itdb.c:1010
+#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
+#: ../src/display_itdb.c:1025
msgid "Podcasts"
msgstr "Podradiosändningar"
-#: ../src/display_itdb.c:868 ../src/display_itdb.c:986
+#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
#: ../src/repository.c:1186
msgid "iPod"
msgstr "iPod"
-#: ../src/display_itdb.c:1069
+#: ../src/display_itdb.c:1084
#, c-format
msgid "Increased playcount for '%s'"
msgstr "ökade spelningsantal för '%s'"
+#: ../src/display_photo.c:163
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr "Fel vid läsning av iPod fotodatabas (%s).\n"
+
+#: ../src/display_photo.c:168
+msgid "Error reading iPod photo database.\n"
+msgstr "Fel vid läsning av iPod fotodatabas.\n"
+
+#: ../src/display_photo.c:238
+msgid "Could not access the iPod's photo database."
+msgstr "Kunde inte komma åt iPod fotodatabas."
+
+#: ../src/display_photo.c:441
+msgid "Photo Albums"
+msgstr "Fotoalbum"
+
+#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+msgid "<Unnamed>"
+msgstr "<Namnlös>"
+
+#: ../src/display_photo.c:939
+msgid "The Photo Library album cannot be removed"
+msgstr "Fotobibliotekets album kan inte tas bort"
+
+#: ../src/display_photo.c:961
+msgid "Do you want to remove the album's photos too?"
+msgstr "Är du säker på att du också vill ta bort albumets foton?"
+
+#: ../src/display_photo.c:967
+msgid "Yes. Do Not Display Again"
+msgstr "Ja. Visa inte igen"
+
+#: ../src/display_photo.c:1038
+msgid ""
+"This will remove the photo selection from the selected album.\n"
+" Do you want to delete them from the database as well?"
+msgstr ""
+"Detta tar bort markerade foton från det valda albumet.\n"
+"Vill du också ta bort dem från databasen?"
+
+#: ../src/display_photo.c:1053
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr ""
+"Detta tar bort markerade foton från fotobiblioteket och alla album.\n"
+"Är du säker?"
+
+#: ../src/display_photo.c:1128
+msgid "New Photo Album Name"
+msgstr "Nytt namn på fotoalbum"
+
+#: ../src/display_photo.c:1129
+msgid "Please enter a new name for the photo album"
+msgstr "Skriv in ett nytt namn på fotoalbumet"
+
+#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+msgid "An album with that name already exists."
+msgstr "Ett album med samma namn finns redan."
+
+#: ../src/display_photo.c:1210
+msgid "New Photo Album"
+msgstr "Nytt fotoalbum"
+
+#: ../src/display_photo.c:1211
+msgid "Please enter a name for the new photo album"
+msgstr "Skriv in ett namn på det nya fotoalbumet"
+
+#: ../src/display_photo.c:1232
+msgid "The new album failed to be created."
+msgstr "Det nya albumet kunde inte skapas."
+
+#: ../src/display_photo.c:1256
+msgid "Add Image to iPod"
+msgstr "Lägg till bild på iPod"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1311
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr "Lägg till en katalog med bilder på iPod. Markera katalogen."
+
+#: ../src/display_photo.c:1699
+#, c-format
+msgid "<No members>\n"
+msgstr "<Inga medlemmar>\n"
+
#. give a notice on the statusbar -- otherwise the user
#. * will never know why the drag is not possible
-#: ../src/display_playlists.c:500 ../src/display_playlists.c:542
+#: ../src/display_playlists.c:516 ../src/display_playlists.c:558
msgid "Error: drag from iPod not possible in offline mode."
msgstr "Fel: att dra från iPod är inte möjligt i nerkopplat läge."
-#: ../src/display_playlists.c:569 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
#, c-format
msgid "Copied one track"
msgid_plural "Copied %d tracks"
msgstr[0] "Kopierade ett spår"
msgstr[1] "Kopierade %d spår"
-#: ../src/display_playlists.c:849 ../src/display_playlists.c:861
+#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
msgid "Can't reorder sorted treeview."
msgstr "Kan inte ordna om sorterad trädvy."
-#: ../src/display_playlists.c:938
+#: ../src/display_playlists.c:954
#, c-format
msgid ""
"This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2511,6 +2700,14 @@
"vore användbart att implementera, kontakta gärna upphovsmannen.\n"
"\n"
+#. no existing photo playlist found so add one
+#. * either itdb had no children or none of them
+#. * were of the photo type.
+#.
+#: ../src/display_playlists.c:1569
+msgid "Photos"
+msgstr "Foton"
+
#: ../src/display_sorttabs.c:473
msgid "'Played' condition ignored because of error."
msgstr "Tillståndet 'Spelad' ignoreras på grund av fel."
@@ -2523,32 +2720,32 @@
msgid "'Added' condition ignored because of error."
msgstr "Tillståndet 'Tillagd' ignoreras på grund av fel."
-#: ../src/display_sorttabs.c:1563 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
msgid "All"
msgstr "Alla"
-#: ../src/display_sorttabs.c:1589
+#: ../src/display_sorttabs.c:1588
msgid "Compilations"
msgstr "Samlingar"
-#: ../src/display_sorttabs.c:2960
+#: ../src/display_sorttabs.c:2988
msgid "Comp."
msgstr "Komp."
-#: ../src/display_sorttabs.c:2966 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2002 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
msgid "Year"
msgstr "Ã…r"
-#: ../src/display_sorttabs.c:2969
+#: ../src/display_sorttabs.c:2997
msgid "Special"
msgstr "Special"
-#: ../src/display_sorttabs.c:3230
+#: ../src/display_sorttabs.c:3245
msgid "Last Played"
msgstr "Senast spelad"
-#: ../src/display_sorttabs.c:3231
+#: ../src/display_sorttabs.c:3246
msgid "Last Modified"
msgstr "Senast ändrad"
@@ -2572,7 +2769,7 @@
msgid "Hz"
msgstr "Hz"
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:777
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
msgid "MB"
msgstr "Mibyte"
@@ -2605,10 +2802,6 @@
msgid "Size"
msgstr "Storlek"
-#: ../src/display_spl.c:94 ../src/display_tracks.c:1984
-msgid "Time"
-msgstr "Tid"
-
#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
msgid "Comment"
msgstr "Kommentar"
@@ -2637,33 +2830,29 @@
msgid "Grouping"
msgstr "Gruppering"
+#: ../src/display_spl.c:105
+msgid "Playlist"
+msgstr "Spellista"
+
#: ../src/display_spl.c:106
msgid "Video Kind"
-msgstr ""
+msgstr "Videotyp"
-#: ../src/display_spl.c:107 ../src/display_spl.c:210 ../src/display_spl.c:219
-#: ../src/misc_conversion.c:101
-msgid "TV Show"
-msgstr ""
-
#: ../src/display_spl.c:108
-#, fuzzy
msgid "Season number"
-msgstr "Skivnummer"
+msgstr "Säsongsnummer"
#: ../src/display_spl.c:109
msgid "Skip count"
-msgstr ""
+msgstr "Antal överhoppade"
#: ../src/display_spl.c:110
-#, fuzzy
msgid "Last skipped"
-msgstr "Senast spelad"
+msgstr "Senast överhoppad"
#: ../src/display_spl.c:111
-#, fuzzy
msgid "Album artist"
-msgstr "artist"
+msgstr "Albumartist"
#: ../src/display_spl.c:117
msgid "contains"
@@ -2728,9 +2917,8 @@
msgstr "är inte satt"
#: ../src/display_spl.c:171
-#, fuzzy
msgid "Not supported"
-msgstr "Inte listad"
+msgstr "Stöds inte"
#: ../src/display_spl.c:178
msgid "minutes"
@@ -2744,7 +2932,7 @@
msgid "hours"
msgstr "timmar"
-#: ../src/display_spl.c:182 ../src/info.c:777
+#: ../src/display_spl.c:182 ../src/info.c:780
msgid "GB"
msgstr "Gibyte"
@@ -2801,34 +2989,21 @@
msgstr "lägst betyg"
#: ../src/display_spl.c:208 ../src/display_spl.c:217
-#, fuzzy
msgid "Movie"
-msgstr "Ändrad"
+msgstr "Film"
-#: ../src/display_spl.c:209 ../src/display_spl.c:218
-#, fuzzy
-msgid "Music Video"
-msgstr "Musikrot:"
-
-#: ../src/display_spl.c:1162 ../src/display_spl.c:1177
+#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
msgid "to"
msgstr "till"
-#: ../src/display_spl.c:1455
+#: ../src/display_spl.c:1485
msgid "-"
msgstr "-"
-#: ../src/display_spl.c:1470
+#: ../src/display_spl.c:1500
msgid "+"
msgstr "+"
-#: ../src/display_spl.c:1689 ../src/misc_playlist.c:66
-#: ../src/misc_playlist.c:68 ../src/misc_playlist.c:93
-#: ../src/misc_playlist.c:95 ../src/misc_playlist.c:428
-#: ../src/misc_playlist.c:430
-msgid "New Playlist"
-msgstr "Ny spellista"
-
#: ../src/display_tracks.c:281
#, c-format
msgid "Moved one track"
@@ -2836,7 +3011,7 @@
msgstr[0] "Flyttade ett spår"
msgstr[1] "Flyttade %d spår"
-#: ../src/display_tracks.c:1717
+#: ../src/display_tracks.c:1810
#, c-format
msgid ""
"Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -2849,46 +3024,73 @@
"tillbaka till det osorterade tillståndet.\n"
"\n"
-#: ../src/display_tracks.c:1962
+#: ../src/display_tracks.c:2069
msgid "Rtng"
msgstr "Betyg"
-#: ../src/display_tracks.c:1965
+#: ../src/display_tracks.c:2072
msgid "#"
msgstr "#"
-#: ../src/display_tracks.c:1968
+#: ../src/display_tracks.c:2075
msgid "CD"
msgstr "Cd"
-#: ../src/display_tracks.c:1971
+#: ../src/display_tracks.c:2078
msgid "ID"
msgstr "Id"
-#: ../src/display_tracks.c:1974
+#: ../src/display_tracks.c:2081
msgid "Trnsfrd"
msgstr "Överfört"
-#: ../src/display_tracks.c:1978
+#: ../src/display_tracks.c:2085
msgid "Cmpl"
msgstr "Komp."
-#: ../src/display_tracks.c:1987
+#: ../src/display_tracks.c:2091
+msgid "Time"
+msgstr "Tid"
+
+#: ../src/display_tracks.c:2094
msgid "Plycnt"
msgstr "Speln."
-#: ../src/display_tracks.c:1999
+#: ../src/display_tracks.c:2106
msgid "Released"
msgstr "Utgiven"
-#: ../src/display_tracks.c:2005
+#: ../src/display_tracks.c:2112
msgid "Vol."
msgstr "Vol."
-#: ../src/display_tracks.c:2008
+#: ../src/display_tracks.c:2115
msgid "Sndchk."
msgstr "Ljudkontr."
+#: ../src/fetchcover.c:358
+msgid "Coverart file already exists"
+msgstr "Omslagsfilen finns redan"
+
+#: ../src/fetchcover.c:371
+#, c-format
+msgid ""
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
+"\n"
+"- Clicking Yes will overwrite the existing file, possibly associating\n"
+" other music files in the same directory with this coverart file.\n"
+"- Clicking No will save the file with a unique file name.\n"
+"- Clicking Cancel will abort the fetchcover operation."
+msgstr ""
+"Bildfilen %s finns redan.\n"
+"Den kan höra ihop med andra musikfiler i katalogen.\n"
+"\n"
+"- Att klicka på Ja skriver över den befintliga filen, och kopplar kanske\n"
+" ihop andra musikfiler i samma katalog med den här omslagsfilen.\n"
+"- Att klicka på Nej sparar filen med ett unikt filnamn.\n"
+"- Att klicka på Avbryt gör att omslagshämtningen avbryts."
+
#: ../src/file.c:236
#, c-format
msgid ""
@@ -2907,14 +3109,11 @@
"'%s' är inte en känd spellistefil.\n"
"\n"
-#: ../src/file.c:283
+#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/wavfile.c:107
#, c-format
-msgid ""
-"Cannot open '%s' for reading.\n"
-"\n"
-msgstr ""
-"Kan inte öppna '%s' för läsning.\n"
-"\n"
+msgid "Could not open '%s' for reading.\n"
+msgstr "Kunde inte öppna '%s' för läsning.\n"
#: ../src/file.c:369
#, c-format
@@ -2924,46 +3123,44 @@
#: ../src/file.c:374
#, c-format
msgid "Skipping '%s' to avoid adding playlist file recursively\n"
-msgstr ""
-"Hoppar över '%s' för att undvika att spellistfiler läggs till rekursivt.\n"
+msgstr "Hoppar över '%s' för att undvika att spellistfiler läggs till rekursivt.\n"
#: ../src/file.c:629
#, c-format
msgid "Unknown token '%s' in template '%s'\n"
msgstr "Okänd beteckning '%s' i mallen '%s'\n"
-#: ../src/file.c:890
+#: ../src/file.c:923
#, c-format
msgid "Local filename not valid (%s)"
msgstr "Lokalt filnamn inte giltigt (%s)"
-#: ../src/file.c:949
+#: ../src/file.c:982
#, c-format
msgid "No information found for user '%s' in '%s'"
msgstr "Ingen information hittades för användaren '%s' i '%s'"
-#: ../src/file.c:958
+#: ../src/file.c:991
#, c-format
msgid "mserv data file (%s) not available for track (%s)"
msgstr "Datafilen från mserv (%s) är inte tillgänglig för spåret (%s)"
-#: ../src/file.c:966
+#: ../src/file.c:999
#, c-format
msgid "Track (%s) not in mserv music root directory (%s)"
msgstr "Spåret (%s) finns inte i mserv rotkatalog för musik (%s)"
-#: ../src/file.c:1090
+#: ../src/file.c:1123
#, c-format
-msgid ""
-"The following track could not be processed (file does not exist): '%s'\n"
+msgid "The following track could not be processed (file does not exist): '%s'\n"
msgstr "Följande spår kunde inte behandlas (filen finns inte): '%s'\n"
-#: ../src/file.c:1169
+#: ../src/file.c:1209
#, c-format
msgid "The following track could not be processed (filetype unknown): '%s'\n"
msgstr "Följande spår kunde inte behandlas (filtypen okänd): '%s'\n"
-#: ../src/file.c:1262
+#: ../src/file.c:1307
#, c-format
msgid ""
"The following track could not be processed (filetype is known but analysis "
@@ -2972,33 +3169,33 @@
"Följande spår kunde inte behandlas (filtypen känd, men analys misslyckades): "
"'%s'\n"
-#: ../src/file.c:1292 ../src/file.c:1346
+#: ../src/file.c:1337 ../src/file.c:1391
msgid "Nothing to update"
msgstr "Ingenting att uppdatera"
-#: ../src/file.c:1313
+#: ../src/file.c:1358
#, c-format
msgid "Updating %s"
msgstr "Uppdaterar %s"
-#: ../src/file.c:1327
+#: ../src/file.c:1372
msgid "Updated selected tracks with info from file."
msgstr "Uppdaterar markerade spår med information från fil."
-#: ../src/file.c:1361
+#: ../src/file.c:1406
#, c-format
msgid "Retrieving mserv data %s"
msgstr "Hämtar data från mserv %s"
-#: ../src/file.c:1366
+#: ../src/file.c:1411
msgid "no filename available"
msgstr "inget filnamn tillgängligt"
-#: ../src/file.c:1371
+#: ../src/file.c:1416
msgid "Updated selected tracks with data from mserv."
msgstr "Uppdaterar markerade spår med data från mserv."
-#: ../src/file.c:1392
+#: ../src/file.c:1437
#, c-format
msgid "The following track could not be updated"
msgid_plural "The following %d tracks could not be updated"
@@ -3007,11 +3204,11 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1398
+#: ../src/file.c:1443
msgid "Failed Track Update"
msgstr "Uppdatering av spår misslyckades"
-#: ../src/file.c:1456
+#: ../src/file.c:1501
#, c-format
msgid "The following track has been updated"
msgid_plural "The following %d tracks have been updated"
@@ -3020,60 +3217,59 @@
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1462
+#: ../src/file.c:1507
msgid "Successful Track Update"
msgstr "Uppdatering av spår lyckades"
-#: ../src/file.c:1521
+#: ../src/file.c:1566
#, c-format
msgid "No mserv information could be retrieved for the following track"
-msgid_plural ""
-"No mserv information could be retrieved for the following %d tracks"
+msgid_plural "No mserv information could be retrieved for the following %d tracks"
msgstr[0] "Ingen information kunde hämtas från mserv för följande spår"
msgstr[1] "Ingen information kunde hämtas från mserv för följande %d spår"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:1527
+#: ../src/file.c:1572
msgid "mserv data retrieval problem"
msgstr "Problem att hämta data från mserv"
-#: ../src/file.c:1616
+#: ../src/file.c:1661
msgid "no local filename available, file on the iPod will be used instead"
msgstr "inget lokalt filnamn tillgängligt, filen på iPod används istället"
-#: ../src/file.c:1622
+#: ../src/file.c:1667
msgid "no local filename available and copy on iPod cannot be found"
msgstr "inget lokalt filnamn tillgängligt och kopian på iPod kan inte hittas"
-#: ../src/file.c:1626 ../src/file.c:1644
+#: ../src/file.c:1671 ../src/file.c:1689
msgid "no local filename available"
msgstr "inget lokalt filnamn tillgängligt"
-#: ../src/file.c:1634
+#: ../src/file.c:1679
msgid "local file could not be found, file on the iPod will be used instead"
msgstr "den lokala filen kunde inte hittas, filen på iPod används istället"
-#: ../src/file.c:1640
+#: ../src/file.c:1685
msgid "local file as well as copy on the iPod cannot be found"
msgstr "den lokala filen samt kopian på iPod kan inte hittas"
#. update not successful -- log this track for later display
-#: ../src/file.c:1728
-msgid "update failed (format no supported?)"
+#: ../src/file.c:1788
+msgid "update failed (format not supported?)"
msgstr "uppdatering misslyckades (formatet stöds kanske inte)"
-#: ../src/file.c:1813
+#: ../src/file.c:1873 ../src/misc_playlist.c:916
#, c-format
msgid "Processing '%s'..."
msgstr "Behandlar '%s'..."
-#: ../src/file.c:1819
+#: ../src/file.c:1879
#, c-format
-msgid "File skipped. match exclude masks: '%s'\n"
-msgstr "Filen hoppades över. Den passar med masker att undanta: '%s'\n"
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "Hoppar över '%s' eftersom det motsvarar filmasker att utesluta.\n"
-#: ../src/file.c:1939 ../src/misc_track.c:1694 ../src/misc_track.c:1799
+#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
#, c-format
msgid ""
"Podcast already present: '%s'\n"
@@ -3082,7 +3278,7 @@
"Podradiosändning finns redan: '%s'\n"
"\n"
-#: ../src/file.c:2004
+#: ../src/file.c:2064
#, c-format
msgid ""
"Writing to video files not yet supported (%s).\n"
@@ -3091,35 +3287,35 @@
"Att skriva till videofiler stöds inte än (%s).\n"
"\n"
-#: ../src/file.c:2056 ../src/file.c:2070
+#: ../src/file.c:2116 ../src/file.c:2130
#, c-format
msgid "Couldn't change tags of file: %s\n"
msgstr "Kunde inte ändra taggar för filen: %s\n"
-#: ../src/file.c:2172
+#: ../src/file.c:2232
#, c-format
msgid "Could not open '%s' for reading and writing.\n"
msgstr "Kunde inte öppna '%s' för läsning och skrivning.\n"
-#: ../src/file.c:2179
+#: ../src/file.c:2239
#, c-format
msgid "Could not obtain lock on '%s'.\n"
msgstr "Kunde inte låsa '%s'.\n"
#. error!
-#: ../src/file.c:2196 ../src/file.c:2205 ../src/file.c:2216 ../src/file.c:2226
+#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
#, c-format
msgid "Malformed line in '%s': %s\n"
msgstr "Felaktig rad i '%s': %s\n"
#. gint id,
#. gboolean modal,
-#: ../src/file.c:2255
+#: ../src/file.c:2315
msgid "Remove offline playcounts?"
msgstr "Ta bort nerkopplade spelningsantal?"
#. title
-#: ../src/file.c:2256
+#: ../src/file.c:2316
msgid ""
"Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
"remove them from the offline playcount file, 'Cancel' to keep them."
@@ -3128,12 +3324,12 @@
"Klicka på 'Ok' för att ta bort dem från filen med nerkopplade "
"spelningsantal, eller 'Avbryt' för att behålla dem."
-#: ../src/file.c:2273
+#: ../src/file.c:2333
#, c-format
msgid "Error writing to '%s'.\n"
msgstr "Fel vid skrivning till '%s'.\n"
-#: ../src/file.c:2330 ../src/tools.c:271
+#: ../src/file.c:2390 ../src/tools.c:270
#, c-format
msgid ""
"Normalization failed: file type not supported (%s).\n"
@@ -3142,7 +3338,7 @@
"Normalisering misslyckades: Filtypen stöds inte (%s).\n"
"\n"
-#: ../src/file.c:2346 ../src/tools.c:288
+#: ../src/file.c:2406 ../src/tools.c:287
#, c-format
msgid ""
"Normalization failed: file not available (%s).\n"
@@ -3153,119 +3349,133 @@
#: ../src/file_convert.c:316
msgid "Summary status of conversion processes"
-msgstr ""
+msgstr "Sammanfattning av konverteringsprocessens status"
#: ../src/file_convert.c:564
msgid "active"
-msgstr ""
+msgstr "aktiv"
#: ../src/file_convert.c:569
msgid "inactive"
-msgstr ""
+msgstr "inaktiv"
#: ../src/file_convert.c:580
#, c-format
msgid "Active threads: %d. Scheduled tracks: %d."
-msgstr ""
+msgstr "Aktiva trådar: %d. Schemalagda spår: %d."
-#: ../src/file_convert.c:1061
-#, fuzzy, c-format
+#: ../src/file_convert.c:1071
+#, c-format
msgid "Original filename not available for '%s.'\n"
-msgstr ""
-"Normalisering misslyckades: Filen inte tillgänglig (%s).\n"
-"\n"
+msgstr "Originalfilnamnet inte tillgängligt för '%s'.\n"
-#: ../src/file_convert.c:1076
+#: ../src/file_convert.c:1086
#, c-format
msgid "Filename '%s' is no longer valid for '%s'.\n"
-msgstr ""
+msgstr "Filnamnet '%s' är inte längre giltigt för '%s'.\n"
-#: ../src/file_convert.c:1127
+#: ../src/file_convert.c:1137
msgid "Ogg Vorbis"
-msgstr ""
+msgstr "Ogg Vorbis"
-#: ../src/file_convert.c:1133
+#: ../src/file_convert.c:1143
msgid "FLAC"
-msgstr ""
+msgstr "FLAC"
-#: ../src/file_convert.c:1188
+#: ../src/file_convert.c:1198
#, c-format
msgid ""
"Files of type '%s' are not supported by the iPod. Please go to the "
"Preferences to set up and turn on a suitable conversion script for '%s'.\n"
"\n"
msgstr ""
+"Filer med typen '%s' stöds inte av iPod. Gå till inställningarna för att "
+"ställa in och aktivera ett lämpligt konverteringsskript för '%s'.\n"
+"\n"
-#: ../src/file_convert.c:1274
-#, fuzzy
+#: ../src/file_convert.c:1284
msgid "No information available"
-msgstr "inget filnamn tillgängligt"
+msgstr "Ingen information tillgänglig"
-#: ../src/file_convert.c:1313
+#: ../src/file_convert.c:1323
#, c-format
msgid "Could not create '%s'. Filetype conversion will not work.\n"
-msgstr ""
+msgstr "Kunde inte skapa '%s'. Konvertering av filtyp kommer inte att fungera.\n"
-#: ../src/file_convert.c:1631 ../src/file_convert.c:3040
-#, fuzzy, c-format
+#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#, c-format
msgid ""
"Transfer of '%s' failed. %s\n"
"\n"
msgstr ""
-"Körning av '%s' misslyckades.\n"
+"Överföring av '%s' misslyckades. %s\n"
"\n"
-#: ../src/file_convert.c:2035 ../src/file_convert.c:2313
-#, fuzzy, c-format
+#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#, c-format
msgid ""
"Conversion of '%s' failed: '%s'.\n"
"\n"
msgstr ""
-"Körning av '%s' misslyckades.\n"
+"Konvertering av '%s' misslyckades: '%s'.\n"
"\n"
-#: ../src/file_convert.c:2050
+#: ../src/file_convert.c:2062
#, c-format
msgid ""
"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
"\n"
msgstr ""
+"Konvertering av '%s' misslyckades: '%s %s' returnerade status %d.\n"
+"\n"
-#: ../src/file_convert.c:2079
+#: ../src/file_convert.c:2091
#, c-format
msgid ""
-"Conversion of '%s' failed: '%s %s' did not return filename extension as "
+"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
"expected.\n"
"\n"
msgstr ""
+"Konvertering av '%s' misslyckades: '\"%s\" %s' returnerade inte "
+"filnamnsändelse som förväntat.\n"
+"\n"
-#: ../src/file_convert.c:2155
+#: ../src/file_convert.c:2167
#, c-format
msgid ""
-"Covnersion of '%s' failed: Could not access original file '%s' (%s).\n"
+"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
"\n"
msgstr ""
+"Körning av '%s' misslyckades: Kunde inte komma åt originalfil '%s' (%s).\n"
+"\n"
-#: ../src/file_convert.c:2210
+#: ../src/file_convert.c:2222
#, c-format
msgid ""
"Conversion of '%s' failed: Could not create directory '%s'.\n"
"\n"
msgstr ""
+"Konvertering av '%s'misslyckades: Kunde inte skapa katalogen '%s'.\n"
+"\n"
-#: ../src/file_convert.c:2344
+#: ../src/file_convert.c:2356
#, c-format
msgid ""
"Conversion of '%s' failed: '%s' returned exit status %d.\n"
"\n"
msgstr ""
+"Konvertering av '%s'misslyckades: '%s' returnerade status %d.\n"
+"\n"
-#: ../src/file_convert.c:2383
+#: ../src/file_convert.c:2395
#, c-format
msgid ""
"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
"\n"
msgstr ""
+"Konvertering av '%s'misslyckades: kunde inte hämta information för den "
+"konverterade filen '%s'.\n"
+"\n"
#: ../src/file_export.c:182
#, c-format
@@ -3287,22 +3497,17 @@
msgid "Error copying '%s' to '%s' (%s)\n"
msgstr "Fel vid kopiering av '%s' till '%s' (%s)\n"
-#: ../src/file_export.c:217
-#, c-format
-msgid "Unable to open '%s' for reading\n"
-msgstr "Kan inte öppna '%s' för läsning.\n"
-
#: ../src/file_export.c:327
#, c-format
msgid "Could find file for '%s' on the iPod\n"
msgstr "Kunde hitta fil för '%s' på iPod\n"
#. create the dialog window
-#: ../src/file_export.c:395 ../src/tools.c:361
+#: ../src/file_export.c:395 ../src/tools.c:360
msgid "Information"
msgstr "Information"
-#: ../src/file_export.c:406 ../src/tools.c:373
+#: ../src/file_export.c:406 ../src/tools.c:372
msgid "Press button to abort."
msgstr "Tryck på knappen för att avbryta."
@@ -3322,7 +3527,7 @@
msgstr[0] "Kopierade %d av %d spår."
msgstr[1] "Kopierade %d av %d spår."
-#: ../src/file_export.c:505 ../src/tools.c:519
+#: ../src/file_export.c:505 ../src/tools.c:518
#, c-format
msgid "%d%% (%d:%02d:%02d left)"
msgstr "%d%% (%d:%02d:%02d kvar)"
@@ -3382,26 +3587,27 @@
"Kunde inte öppna '%s' för skrivning (%s).\n"
"\n"
-#: ../src/file_itunesdb.c:127
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:129
+#, c-format
msgid "Matching SHA1 checksum for file %d/%d"
-msgstr "Matchande MD5-checksumma för filen %d/%d"
+msgstr "Matchande SHA1-checksumma för filen %d/%d"
-#: ../src/file_itunesdb.c:234
-msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
-msgstr "Kunde inte öppna \"iTunesDB.ext\" för att läsa utökad information.\n"
+#: ../src/file_itunesdb.c:236
+#, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "Kunde inte öppna \"%s\" för att läsa utökad information.\n"
-#: ../src/file_itunesdb.c:241
+#: ../src/file_itunesdb.c:243
msgid "Could not create hash value from itunesdb\n"
msgstr "Kunde inte skapa checksumma från itunesdb\n"
-#: ../src/file_itunesdb.c:255
+#: ../src/file_itunesdb.c:259
#, c-format
msgid "Error while reading extended info: %s\n"
msgstr "Fel vid läsning av utökad information: %s\n"
-#: ../src/file_itunesdb.c:272
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:276
+#, c-format
msgid ""
"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
"gtkpod will try to match the information using SHA1 checksums. This may take "
@@ -3410,11 +3616,11 @@
msgstr ""
"Checksumman för iTunes databas '%s' stämmer inte med den i filen '%s' med "
"utökad information.\n"
-"Ett försök görs av gtkpod att passa ihop informationen med MD5-checksummor. "
+"Ett försök görs av gtkpod att passa ihop informationen med SHA1-checksummor. "
"Det kan ta lång tid.\n"
"\n"
-#: ../src/file_itunesdb.c:284
+#: ../src/file_itunesdb.c:288
#, c-format
msgid ""
"%s:\n"
@@ -3423,7 +3629,7 @@
"%s:\n"
"Förväntande \"itunesdb_hash=\", men hittade \"%s\"\n"
-#: ../src/file_itunesdb.c:344
+#: ../src/file_itunesdb.c:348
#, c-format
msgid ""
"%s:\n"
@@ -3432,8 +3638,7 @@
"%s:\n"
"Formatfel: %s\n"
-#: ../src/file_itunesdb.c:387
-#, fuzzy
+#: ../src/file_itunesdb.c:393
msgid ""
"No SHA1 checksums on individual tracks are available.\n"
"\n"
@@ -3442,14 +3647,14 @@
"than gtkpod.\n"
"\n"
msgstr ""
-"Inga MD5-checksummor är tillgängliga för enskilda spår.\n"
+"Inga SHA1-checksummor är tillgängliga för enskilda spår.\n"
"\n"
"För att undvika situationen i framtiden, aktivera antingen detektering av "
-"duplikat (som tillhandahåller MD5-checksummor) eller undvik att använda iPod "
-"med andra program än gtkpod.\n"
+"duplikat (som tillhandahåller SHA1-checksummor) eller undvik att använda "
+"iPod med andra program än gtkpod.\n"
"\n"
-#: ../src/file_itunesdb.c:451
+#: ../src/file_itunesdb.c:457
msgid ""
"Extended info will not be used. If you have non-transferred tracks,\n"
"these will be lost.\n"
@@ -3457,15 +3662,15 @@
"Utökad information kommer inte att användas. Om\n"
"du har spår som inte överförts, går de förlorade.\n"
-#: ../src/file_itunesdb.c:459
+#: ../src/file_itunesdb.c:465
msgid "Offline iPod database successfully imported"
msgstr "Nerkopplad iPod-databas importerad med lyckat resultat"
-#: ../src/file_itunesdb.c:462
+#: ../src/file_itunesdb.c:468
msgid "Local database successfully imported"
msgstr "Lokal databas importerad med lyckat resultat"
-#: ../src/file_itunesdb.c:470
+#: ../src/file_itunesdb.c:476
#, c-format
msgid ""
"Offline iPod database import failed: '%s'\n"
@@ -3474,7 +3679,7 @@
"Import av nerkopplad iPod-databas misslyckades: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:474
+#: ../src/file_itunesdb.c:480
#, c-format
msgid ""
"Local database import failed: '%s'\n"
@@ -3483,7 +3688,7 @@
"Import av lokal databas misslyckades: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:481
+#: ../src/file_itunesdb.c:487
msgid ""
"Offline iPod database import failed: \n"
"\n"
@@ -3491,7 +3696,7 @@
"Import av nerkopplad iPod-databas misslyckades: \n"
"\n"
-#: ../src/file_itunesdb.c:484
+#: ../src/file_itunesdb.c:490
msgid ""
"Local database import failed: \n"
"\n"
@@ -3499,7 +3704,7 @@
"Import av lokal databas misslyckades: \n"
"\n"
-#: ../src/file_itunesdb.c:491
+#: ../src/file_itunesdb.c:497
#, c-format
msgid ""
"'%s' does not exist. Import aborted.\n"
@@ -3508,15 +3713,15 @@
"'%s' finns inte. Import avbruten.\n"
"\n"
-#: ../src/file_itunesdb.c:514
+#: ../src/file_itunesdb.c:520
msgid "Extended info will not be used.\n"
msgstr "Utökad information kommer inte att användas.\n"
-#: ../src/file_itunesdb.c:521
+#: ../src/file_itunesdb.c:527
msgid "iPod Database Successfully Imported"
msgstr "iPod-databasen importerad med lyckat resultat"
-#: ../src/file_itunesdb.c:528
+#: ../src/file_itunesdb.c:534
#, c-format
msgid ""
"iPod Database Import Failed: '%s'\n"
@@ -3525,7 +3730,7 @@
"Import av iPod-databasen misslyckades: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:540
msgid ""
"iPod Database Import Failed.\n"
"\n"
@@ -3533,7 +3738,7 @@
"Import av iPod-databasen misslyckades.\n"
"\n"
-#: ../src/file_itunesdb.c:543
+#: ../src/file_itunesdb.c:549
#, c-format
msgid ""
"'%s' (or similar) does not exist. Import aborted.\n"
@@ -3542,7 +3747,7 @@
"'%s' (eller liknande) finns inte. Import avbruten.\n"
"\n"
-#: ../src/file_itunesdb.c:859
+#: ../src/file_itunesdb.c:865
#, c-format
msgid ""
"Could not find iPod directory structure at '%s'.\n"
@@ -3557,89 +3762,101 @@
"\n"
"Vill du skapa katalogstrukturen nu?\n"
-#: ../src/file_itunesdb.c:1140
+#: ../src/file_itunesdb.c:1180
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
msgstr "Kunde inte öppna \"%s\" för att skriva utökad information.\n"
-#: ../src/file_itunesdb.c:1155
+#: ../src/file_itunesdb.c:1195
msgid "Aborted writing of extended info.\n"
msgstr "Avbröt skrivning av utökad information.\n"
-#: ../src/file_itunesdb.c:1356
+#: ../src/file_itunesdb.c:1397
#, c-format
msgid "%d%%"
-msgstr ""
+msgstr "%d %%"
-#: ../src/file_itunesdb.c:1370
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1411
+#, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left)"
-msgstr "%d%% (%d:%02d:%02d kvar)"
+msgstr "%d %% (%d/%d %d:%02d:%02d kvar)"
-#: ../src/file_itunesdb.c:1412
+#: ../src/file_itunesdb.c:1463
msgid "Status: Deleting File"
-msgstr ""
+msgstr "Status: Tar bort fil"
-#: ../src/file_itunesdb.c:1473
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1524
+#, c-format
msgid ""
"Could not remove the following file: '%s'\n"
"\n"
msgstr ""
-"Kunde inte öppna '%s' för skrivning (%s).\n"
+"Kunde inte ta bort följande fil: '%s'\n"
"\n"
-#: ../src/file_itunesdb.c:1581
-#, fuzzy
+#: ../src/file_itunesdb.c:1632
msgid ""
"The following track could not be converted successfully:\n"
"\n"
msgid_plural ""
"The following tracks could not be converted successfully:\n"
"\n"
-msgstr[0] "Följande spår kunde inte uppdateras"
-msgstr[1] "Följande %d spår kunde inte uppdateras"
+msgstr[0] ""
+"Följande spår kunde inte konverteras med lyckat resultat:\n"
+"\n"
+msgstr[1] ""
+"Följande spår kunde inte konverteras med lyckat resultat:\n"
+"\n"
-#: ../src/file_itunesdb.c:1591
-#, fuzzy
+#: ../src/file_itunesdb.c:1642
msgid ""
"The following track could not be transferred successfully:\n"
"\n"
msgid_plural ""
"The following tracks could not be transferred successfully:\n"
"\n"
-msgstr[0] "Följande spår kunde inte uppdateras"
-msgstr[1] "Följande %d spår kunde inte uppdateras"
+msgstr[0] ""
+"Följande spår kunde inte överföras med lyckat resultat:\n"
+"\n"
+msgstr[1] ""
+"Följande spår kunde inte överföras med lyckat resultat:\n"
+"\n"
#. ID
#. modal,
#. gint id,
#. gboolean modal,
-#: ../src/file_itunesdb.c:1600 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
msgid "Warning"
msgstr "Varning"
#. title
-#: ../src/file_itunesdb.c:1601
+#: ../src/file_itunesdb.c:1652
msgid ""
"The iPod could not be ejected. Please fix the problems mentioned below and "
"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
"for conversion and transfer."
msgstr ""
+"Kunde inte mata ut iPod. Rätta problemen som nämns nedan och mata därefter "
+"ut iPod igen. Att klicka på 'Ok' gör att misslyckade spår schemaläggs för "
+"konvertering och överföring igen."
-#: ../src/file_itunesdb.c:1663
+#: ../src/file_itunesdb.c:1715
+#, c-format
msgid "Status: Copying track"
-msgstr ""
+msgstr "Status: Kopierar spår"
-#: ../src/file_itunesdb.c:1669
+#: ../src/file_itunesdb.c:1721
+#, c-format
msgid "Status: Waiting for conversion to complete"
-msgstr ""
+msgstr "Status: Väntar på att konvertering ska bli klar"
-#: ../src/file_itunesdb.c:1673
+#: ../src/file_itunesdb.c:1725
+#, c-format
msgid "Status: Finished transfer"
-msgstr ""
+msgstr "Status: Överföring klar"
-#: ../src/file_itunesdb.c:1714
+#: ../src/file_itunesdb.c:1770
#, c-format
msgid ""
"One track could not be transferred because your iPod is full. Either delete "
@@ -3650,9 +3867,15 @@
"some tracks or otherwise create space on the iPod before ejecting the iPod "
"again."
msgstr[0] ""
+"Ett spår kunde inte överföras eftersom iPod är full. Ta antingen bort några "
+"spår eller skapa utrymme på iPod på något annat sätt innan iPod matas ut "
+"igen."
msgstr[1] ""
+"Ett spår kunde inte överföras eftersom iPod är full. Ta antingen bort några "
+"spår eller skapa utrymme på iPod på något annat sätt innan iPod matas ut "
+"igen."
-#: ../src/file_itunesdb.c:1792
+#: ../src/file_itunesdb.c:1852
#, c-format
msgid ""
"You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -3669,7 +3892,7 @@
"lagringen. Om du avbryter, kan du importera befintlig databas innan du "
"använder den här funktionen igen.\n"
-#: ../src/file_itunesdb.c:1827
+#: ../src/file_itunesdb.c:1887
msgid ""
"iPod directory structure must be present before synching to the iPod can be "
"performed.\n"
@@ -3677,92 +3900,115 @@
"Katalogstrukturen i iPod måste finnas innan synkronisering av iPod kan "
"utföras.\n"
-#: ../src/file_itunesdb.c:1836
+#: ../src/file_itunesdb.c:1896
msgid "Some tracks could not be deleted from the iPod. Export aborted!"
msgstr "Vissa spår kunde inte tas bort från iPod. Export avbruten."
-#: ../src/file_itunesdb.c:1854
-msgid "Now writing database. Please wait..."
-msgstr "Skriver nu databas. Vänta..."
+#: ../src/file_itunesdb.c:1914
+#, c-format
+msgid "Now writing database '%s'. Please wait..."
+msgstr "Skriver nu databas '%s'. Vänta..."
-#: ../src/file_itunesdb.c:1901
+#: ../src/file_itunesdb.c:1963
#, c-format
msgid "Extended information file not deleted: '%s'"
msgstr "Filen med utökad information inte borttagen: '%s'"
-#: ../src/file_itunesdb.c:1987
+#: ../src/file_itunesdb.c:2070
#, c-format
msgid "%s: Database saved"
msgstr "%s: Databas sparad"
-#: ../src/file_itunesdb.c:1991
+#: ../src/file_itunesdb.c:2074
#, c-format
msgid "%s: Changes saved"
msgstr "%s: Ändringar sparade"
-#: ../src/fileselection.c:128
+#: ../src/fileselection.c:129
msgid "Successfully added files"
msgstr "Filer tillagda med lyckat resultat"
-#: ../src/fileselection.c:130
+#: ../src/fileselection.c:131
msgid "Some files were not added successfully"
msgstr "Vissa filer kunde inte läggas till med lyckat resultat"
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:160
-msgid "Add Files"
-msgstr "Lägg till filer"
+#: ../src/fileselection.c:164 ../src/fileselection.c:305
+#: ../src/fileselection.c:792
+msgid "Please select a playlist or repository before adding tracks."
+msgstr "Välj en spellista eller arkiv innan spår läggs till."
-#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:253
-msgid "Add Playlists"
-msgstr "Lägg till spellistor"
+#: ../src/fileselection.c:175 ../src/fileselection.c:314
+#: ../src/fileselection.c:803
+msgid "Please load the iPod before adding tracks."
+msgstr "Ladda iPod innan spår läggs till."
+#: ../src/fileselection.c:185
+#, c-format
+msgid "Add files to '%s'"
+msgstr "Lägg till filer i '%s'"
+
+#: ../src/fileselection.c:189
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr "Lägg till filer i '%s/%s'"
+
+#. Create window title
+#: ../src/fileselection.c:322
+#, c-format
+msgid "Add playlist files to '%s'"
+msgstr "Lägg till spellistefiler i '%s'"
+
#. Create the file chooser, and handle the response
-#: ../src/fileselection.c:300
+#: ../src/fileselection.c:378
msgid "Set Cover"
msgstr "Ange omslag"
-#: ../src/fileselection.c:721
-msgid "Select directory to add recursively"
-msgstr "Markera katalog att lägga till rekursivt"
+#: ../src/fileselection.c:816
+#, c-format
+msgid "Add directories to '%s'"
+msgstr "Lägg till kataloger i '%s'"
-#: ../src/fileselection.c:992
+#: ../src/fileselection.c:820
+#, c-format
+msgid "Add directories to '%s/%s'"
+msgstr "Lägg till kataloger i '%s/%s'"
+
+#: ../src/fileselection.c:1097
msgid "Ok"
msgstr "Ok"
-#: ../src/fileselection.c:1001
+#: ../src/fileselection.c:1106
msgid "Cancel"
msgstr "Avbryt"
-#: ../src/flacfile.c:33
-#, fuzzy, c-format
+#: ../src/flacfile.c:62
+#, c-format
msgid "'%s' does not appear to be an FLAC audio file.\n"
-msgstr "'%s' verkar inte vara en mp4-ljudfil.\n"
+msgstr "'%s' verkar inte vara en FLAC-ljudfil.\n"
-#: ../src/flacfile.c:52
-#, fuzzy, c-format
+#: ../src/flacfile.c:78
+#, c-format
msgid "Error retrieving tags for '%s'.\n"
-msgstr "Fel vid skrivning till '%s'.\n"
+msgstr "Fel vid hämtning av taggar för '%s'.\n"
-#: ../src/flacfile.c:119
-#, fuzzy, c-format
+#: ../src/flacfile.c:165
+#, c-format
msgid ""
"Import of '%s' failed: FLAC not supported without the FLAC library. You must "
"compile the gtkpod source together with the FLAC library.\n"
msgstr ""
-"Import av '%s' misslyckades: m4a/m4p/m4b stöds inte utan biblioteket mp4v2. "
-"Du måste kompilera källkoden för gtkpod tillsammans med biblioteket mp4v2.\n"
+"Import av '%s' misslyckades: FLAC stöds inte utan FLAC-biblioteket. Du måste "
+"kompilera källkoden för gtkpod tillsammans med FLAC-biblioteket.\n"
-#: ../src/flacfile.c:125
-#, fuzzy, c-format
+#: ../src/flacfile.c:171
+#, c-format
msgid ""
"FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
"library. You must compile the gtkpod source together with the FLAC library.\n"
msgstr ""
-"Uppdatering av m4a/m4p/m4b metadata för '%s' misslyckades: m4a/m4p/m4b stöds "
-"inte utan biblioteket mp4v2. Du måste kompilera källkoden för gtkpod "
-"tillsammans med biblioteket mp4v2.\n"
+"Uppdatering av FLAC metadata för '%s' misslyckades: FLAC stöds inte utan "
+"FLAC-biblioteket. Du måste kompilera källkoden för gtkpod tillsammans med "
+"FLAC-biblioteket.\n"
#: ../src/getopt.c:681
#, c-format
@@ -3827,448 +4073,454 @@
msgid "n/c"
msgstr "okänt"
-#: ../src/info.c:388 ../src/info.c:835
+#: ../src/info.c:388 ../src/info.c:838
msgid "offline"
msgstr "nerkopplad"
-#: ../src/info.c:483
+#: ../src/info.c:486
#, c-format
msgid " P:%d T:%d/%d"
msgstr " L:%d S:%d/%d"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "B"
msgstr "byte"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "kB"
msgstr "Kibyte"
-#: ../src/info.c:777
+#: ../src/info.c:780
msgid "TB"
msgstr "Tibyte"
-#: ../src/info.c:820
+#: ../src/info.c:823
#, c-format
msgid " %s Free"
msgstr " %s fritt"
-#: ../src/info.c:825
+#: ../src/info.c:828
#, c-format
msgid " %s Pending"
msgstr " %s återstår"
-#: ../src/info.c:830
+#: ../src/info.c:833
msgid " disconnected"
msgstr " nerkopplad"
-#: ../src/info.c:881
+#: ../src/info.c:884
msgid "No database or playlist selected"
msgstr "Ingen databas eller spellista markerad"
-#: ../src/info.c:886
+#: ../src/info.c:889
msgid "No tracks selected"
msgstr "Inga spår markerade"
-#: ../src/info.c:891
+#: ../src/info.c:894
msgid "No playlist selected"
msgstr "Ingen spellista markerad"
-#: ../src/info.c:896
+#: ../src/info.c:899
msgid "No iPod or iPod playlist selected"
msgstr "Ingen iPod eller iPod-spellista markerad"
#. Strings used several times
#: ../src/ipod_init.c:48
msgid "Select or enter your model"
-msgstr ""
+msgstr "Välj eller skriv in modell"
#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
msgid "Select mountpoint"
msgstr "Markera monteringspunkt"
#: ../src/ipod_init.c:359
-#, fuzzy, c-format
+#, c-format
msgid "Error initialising iPod: %s\n"
-msgstr "Fel vid skrivning till '%s'.\n"
+msgstr "Fel vid initiering av iPod: %s\n"
#: ../src/ipod_init.c:366
msgid "Error initialising iPod, unknown error\n"
-msgstr ""
+msgstr "Fel vid initiering av iPod: okänt fel\n"
#: ../src/ipod_init.c:422
-#, fuzzy, c-format
+#, c-format
msgid "<b>Please select your iPod model at </b><i>%s</i>"
-msgstr "<b>Välj monteringsplats och iPod-modell</b>"
+msgstr "<b>Välj iPod-modell på </b><i>%s</i>"
-#: ../src/misc.c:86
-#, c-format
+#: ../src/ipod_init.c:463
msgid ""
-"gtkpod Version %s: Cross-Platform Multi-Lingual Interface to Apple's iPod"
-"(tm)."
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
msgstr ""
-"gtkpod version %s: Plattformsoberoende flerspråkigt gränssnitt för Apples "
-"iPodâ„¢."
+"Kunde inte avgöra vald modell: Detta kan vara ett fel eller en "
+"inkompatibilitet i biblioteken GTK+ eller glade.\n"
-#: ../src/misc.c:90
-#, fuzzy
+#: ../src/misc.c:70
msgid ""
-"(C) 2002 - 2007\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
"Corey Donohoe (atmos at atmos dot org)\n"
-"\n"
-"\n"
msgstr ""
-"© 2002 - 2005\n"
+"© 2002 - 2007\n"
"Jorg Schuler (jcsjcs snabela users punkt sourceforge punkt net)\n"
"Corey Donohoe (atmos snabela atmos punkt org)\n"
-"\n"
-"\n"
-#: ../src/misc.c:96
+#: ../src/misc.c:74
msgid ""
-"This program is free software; you can redistribute it and/or modify it "
-"under the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT "
-"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
-"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
-"more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-msgstr ""
-"Detta program är fri programvara. Du kan distribuera det och/ellerändra det "
-"under villkoren i GNU General Public License, publicerad av Free Software "
-"Foundation, antingen version 2 av licensen, eller (om du så önskar) någon "
-"senare version.\n"
-"\n"
-"Detta program distribueras i hopp om att det ska vara användbart, men UTAN "
-"NÅGON SOM HELST GARANTI, Även utan underförstådd garanti om SÄLJBARHET eller "
-"LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för "
-"ytterligare information.\n"
-"\n"
-"Du ska ha fått en kopia av GNU General Public License tillsammans med detta "
-"program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple "
-"Place, Suite 330, Boston, MA 02111-1307, USA.\n"
-"\n"
-"\n"
-
-#: ../src/misc.c:104
-msgid ""
"Patches were supplied by the following people (list may be incomplete -- "
"please contact me)\n"
-"\n"
msgstr ""
"Programfixar har tillhandahållits av följande personer (listan kan vara "
"ofullständig: kontakta mig då gärna)\n"
-"\n"
-#: ../src/misc.c:106
-msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)\n"
-msgstr ""
-"Ramesh Dharan: Redigera flera (redigera taggar för flera spår på en gång)\n"
+#: ../src/misc.c:75
+msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
+msgstr "Ramesh Dharan: Redigera flera (redigera taggar för flera spår på en gång)"
-#: ../src/misc.c:108
-msgid "Hiroshi Kawashima: Japanese charset autodetecion feature\n"
+#: ../src/misc.c:76
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
msgstr ""
"Hiroshi Kawashima: Funktion för automatisk detektering av japansk "
-"teckenkodning\n"
+"teckenkodning"
-#: ../src/misc.c:110
-msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c\n"
-msgstr ""
-"Adrian Ulrich: överföring av spellistans kod från mktunes.pl till itunesdb."
-"c\n"
+#: ../src/misc.c:77
+msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
+msgstr "Adrian Ulrich: överföring av spellistans kod från mktunes.pl till itunesdb.c"
-#: ../src/misc.c:112
+#: ../src/misc.c:78
msgid ""
"Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
-"newlines at the end\n"
+"newlines at the end"
msgstr ""
"Walter Bell: riktig hantering av drag och släpp information med "
-"specialtecken och/eller returtecken/nyrader i slutet\n"
+"specialtecken och/eller returtecken/nyrader i slutet"
-#: ../src/misc.c:114
-msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod\n"
-msgstr "Sam Clegg: användardefinierade filnamn vid export av spår från iPod\n"
+#: ../src/misc.c:79
+msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
+msgstr "Sam Clegg: användardefinierade filnamn vid export av spår från iPod"
-#: ../src/misc.c:116
-msgid "Chris Cutler: automatic creation of various playlist types\n"
-msgstr "Chris Cutler: skapa olika sorters spellistor automatiskt\n"
+#: ../src/misc.c:80
+msgid "Chris Cutler: automatic creation of various playlist types"
+msgstr "Chris Cutler: skapa olika sorters spellistor automatiskt"
-#: ../src/misc.c:118
+#: ../src/misc.c:81
msgid ""
"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
-"dialogue during sync\n"
+"dialogue during sync"
msgstr ""
"Graeme Wilford: läsning och skrivning av ID3-taggar för 'Kompositör', "
-"förloppsdialog under synkronisering\n"
+"förloppsdialog under synkronisering"
-#: ../src/misc.c:120
+#: ../src/misc.c:82
msgid ""
"Edward Matteucci: debugging, special playlist creation, most of the volume "
-"normalizing code\n"
+"normalizing code"
msgstr ""
"Edward Matteucci: felsökning, skapa speciella spellistor, den största delen "
-"av koden för volymnormalisering\n"
+"av koden för volymnormalisering"
-#: ../src/misc.c:122
-msgid "Jens Lautenbach: some optical improvements\n"
-msgstr "Jens Lautenbach: några visuella förbättringar\n"
+#: ../src/misc.c:83
+msgid "Jens Lautenbach: some optical improvements"
+msgstr "Jens Lautenbach: några visuella förbättringar"
-#: ../src/misc.c:124
-msgid "Alex Tribble: iPod eject patch\n"
-msgstr "Alex Tribble: programfix för att mata ut iPod\n"
+#: ../src/misc.c:84
+msgid "Alex Tribble: iPod eject patch"
+msgstr "Alex Tribble: programfix för att mata ut iPod"
-#: ../src/misc.c:126
-msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling\n"
-msgstr "Yaroslav Halchenko: hantering av övergivna filer och saknade spår\n"
+#: ../src/misc.c:85
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+msgstr "Yaroslav Halchenko: hantering av övergivna filer och saknade spår"
-#: ../src/misc.c:128
-msgid ""
-"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes\n"
+#: ../src/misc.c:86
+msgid "Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
msgstr ""
"Andrew Huntwork: rättning av skiftlägeskänsliga filnamn och diverse andra "
-"felrättningar\n"
+"felrättningar"
-#: ../src/misc.c:130
+#: ../src/misc.c:87
msgid ""
"Ero Carrera: Filename validation and quick sync when copying tracks from the "
-"iPod\n"
+"iPod"
msgstr ""
"Ero Carrera: validering av filnamn och snabbsynkronisering när spår kopieras "
-"från iPod\n"
+"från iPod"
-#: ../src/misc.c:132
-msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume\n"
+#: ../src/misc.c:88
+msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
msgstr ""
"Jens Taprogge: stöd för spelningsnivåtagg från LAME vid normalisering av "
-"volym\n"
+"volym"
-#: ../src/misc.c:134
-msgid "Armando Atienza: Support with external playcounts\n"
-msgstr "Armando Atienza: stöd med externa spelningsantal\n"
+#: ../src/misc.c:89
+msgid "Armando Atienza: Support with external playcounts"
+msgstr "Armando Atienza: stöd med externa spelningsantal"
-#: ../src/misc.c:136
-msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)\n"
-msgstr "D.L. Sharp: stöd för m4b-filer (AAC-filer med bokmärken)\n"
+#: ../src/misc.c:90
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+msgstr "D.L. Sharp: stöd för m4b-filer (AAC-filer med bokmärken)"
-#: ../src/misc.c:138
-msgid "Jim Hall: Decent INSTALL file\n"
-msgstr "Jim Hall: hygglig INSTALL-fil\n"
+#: ../src/misc.c:91
+msgid "Jim Hall: Decent INSTALL file"
+msgstr "Jim Hall: hygglig INSTALL-fil"
-#: ../src/misc.c:140
+#: ../src/misc.c:92
msgid ""
"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
-"contacts to the iPod\n"
+"contacts to the iPod"
msgstr ""
"Juergen Helmers, Markus Gaugusch: konverteringsskript för att synkronisera "
-"kalender och kontakter i iPod\n"
+"kalender och kontakter i iPod"
#. J"urgen!
-#: ../src/misc.c:142
-msgid "Flavio Stanchina: bugfixes\n"
-msgstr "Flavio Stanchina: felrättningar\n"
+#: ../src/misc.c:93
+msgid "Flavio Stanchina: bugfixes"
+msgstr "Flavio Stanchina: felrättningar"
-#: ../src/misc.c:144
+#: ../src/misc.c:94
msgid ""
"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title\n"
-msgstr ""
-"Chris Micacchi: ignorera 'the' och liknande i titelns början vid sortering\n"
+"the title"
+msgstr "Chris Micacchi: ignorera 'the' och liknande i titelns början vid sortering"
-#: ../src/misc.c:146
-msgid "Steve Jay: use statvfs() instead of df (better portability, faster)\n"
-msgstr ""
-"Steve Jay: använd statvfs() istället för df (bättre flyttbarhet, snabbare)\n"
+#: ../src/misc.c:95
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
+msgstr "Steve Jay: använd statvfs() istället för df (bättre flyttbarhet, snabbare)"
-#: ../src/misc.c:149
+#: ../src/misc.c:97
msgid ""
"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
-"tags\n"
+"tags"
msgstr ""
"Christoph Kunz: hantering av kompatibilitetsfrågor när MP3-taggar av typ "
-"id3v2.4 skrivs\n"
+"id3v2.4 skrivs"
-#: ../src/misc.c:152
+#: ../src/misc.c:99
msgid ""
"James Liggett:\n"
-" replacement of old GTK file selection dialogs with new GTK filechooser "
+"replacement of old GTK file selection dialogs with new GTK filechooser "
"dialogs\n"
-" refactored user preferences system.\n"
+"refactored user preferences system."
msgstr ""
"James Ligget:\n"
-" ersättning av gamla GTK dialogrutor för filmarkering med nya GTK "
-"dialogrutor för filval, omgjort system för användarinställningar.\n"
+"ersättning av gamla GTK dialogrutor för filmarkering med nya GTK\n"
+"dialogrutor för filval, omgjort system för användarinställningar."
-#: ../src/misc.c:157
-msgid "Daniel Kercher: sync scripts for abook and webcalendar\n"
-msgstr "Daniel Kercher: synkroniseringsskript för abook och webbkalender\n"
+#: ../src/misc.c:103
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
+msgstr "Daniel Kercher: synkroniseringsskript för abook och webbkalender"
-#: ../src/misc.c:160
-msgid "Clinton Gormley: sync scripts for thunderbird\n"
-msgstr "Clinton Gormley: synkroniseringsskript för thunderbird\n"
+#: ../src/misc.c:105
+msgid "Clinton Gormley: sync scripts for thunderbird"
+msgstr "Clinton Gormley: synkroniseringsskript för thunderbird"
-#: ../src/misc.c:163
-msgid "Sebastien Beridot: sync script for ldif addressbook format\n"
-msgstr "Sebastien Beridot: synkroniseringsskript för LDIF-adressboksformat\n"
+#: ../src/misc.c:107
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
+msgstr "Sebastien Beridot: synkroniseringsskript för LDIF-adressboksformat"
-#: ../src/misc.c:166
-msgid "Sebastian Scherer: sync script for kNotes\n"
-msgstr "Sebastian Scherer: synkroniseringsskript för Knotes\n"
+#: ../src/misc.c:109
+msgid "Sebastian Scherer: sync script for kNotes"
+msgstr "Sebastian Scherer: synkroniseringsskript för Knotes"
-#: ../src/misc.c:169
-msgid "Nick Piper: sync script for Palm, type-ahead search\n"
-msgstr ""
-"Nick Piper: synkroniseringsskript för Palm, sökning under inskrivning\n"
+#: ../src/misc.c:111
+msgid "Nick Piper: sync script for Palm, type-ahead search"
+msgstr "Nick Piper: synkroniseringsskript för Palm, sökning under inskrivning"
-#: ../src/misc.c:172
-msgid "Uwe Hermann: help with support for iPod Video\n"
-msgstr "Uwe Hermann: hjälp med stöd för iPod-video\n"
+#: ../src/misc.c:113
+msgid "Uwe Hermann: help with support for iPod Video"
+msgstr "Uwe Hermann: hjälp med stöd för iPod-video"
-#: ../src/misc.c:175
+#: ../src/misc.c:115
msgid ""
"Iain Benson: support for compilation tag in mp3 files and separate display "
-"of compilations in the sort tab.\n"
+"of compilations in the sort tab."
msgstr ""
"Iain Benson: stöd för samlingstaggen i mp3-filer och separat visning av "
-"samlingar i sorteringsfliken.\n"
+"samlingar i sorteringsfliken."
-#: ../src/misc.c:177
+#: ../src/misc.c:116
msgid ""
"Nicolas Chariot: icons of buttons\n"
"\n"
-"\n"
msgstr ""
"Nicolas Chariot: ikoner för knappar\n"
"\n"
-"\n"
-#: ../src/misc.c:181
-msgid "This program borrows code from the following projects:\n"
-msgstr "Detta program lånar kod från följande projekt:\n"
+#: ../src/misc.c:118
+msgid "This program borrows code from the following projects:"
+msgstr "Detta program lånar kod från följande projekt:"
-#: ../src/misc.c:183
+#: ../src/misc.c:119
msgid ""
-" gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB "
-"(http://www.gnu.org/software/gnupod/)\n"
+"gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://"
+"www.gnu.org/software/gnupod/)"
msgstr ""
-" gnutools: (mktunes.pl, överförd till C) läsning och skrivning av iTunes "
-"databas (http://www.gnu.org/software/gnupod/)\n"
+"gnutools: (mktunes.pl, överförd till C) läsning och skrivning av iTunes "
+"databas (http://www.gnu.org/software/gnupod/)"
-#: ../src/misc.c:185
+#: ../src/misc.c:120
msgid ""
-" iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some "
-"code for smart playlists is based on his C++-classes.\n"
+"iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
+"for smart playlists is based on his C++-classes."
msgstr ""
-" iPod.cpp, iPod.h av Samuel Wood (sam punkt wood snabela gmail punkt "
-"com): viss kod för smarta spellistor är baserad på hans C++ klasser.\n"
+"iPod.cpp, iPod.h av Samuel Wood (sam punkt wood snabela gmail punkt "
+"com): viss kod för smarta spellistor är baserad på hans C++ klasser."
-#: ../src/misc.c:187
-msgid " mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)\n"
-msgstr ""
-" mp3info: detektering av MP3-spelningslängd (http://ibiblio.org/"
-"mp3info/)\n"
+#: ../src/misc.c:121
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
+msgstr "mp3info: detektering av MP3-spelningslängd (http://ibiblio.org/mp3info/)"
-#: ../src/misc.c:189
-msgid ""
-" xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)\n"
+#: ../src/misc.c:122
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
msgstr ""
-" xmms: katalogbläddring, detektering av MP3-spelningslängd (http://"
-"www.xmms.org)\n"
+"xmms: katalogbläddring, detektering av MP3-spelningslängd "
+"(http://www.xmms.org)"
-#: ../src/misc.c:192
-msgid ""
-"The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"
-msgstr ""
-"Det grafiska gränssnittet skapades med hjälp av glade-2 (http://glade.gnome."
-"org/).\n"
+#: ../src/misc.c:124
+msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
+msgstr "Det grafiska gränssnittet skapades med hjälp av glade-2 (http://glade.gnome.org/)."
-#: ../src/misc.c:207
-msgid "French: David Le Brun (david at dyn-ns dot net)\n"
-msgstr "Franska: David Le Brun (david snabela dyn-ns punkt net)\n"
+#: ../src/misc.c:128
+msgid "French: David Le Brun (david at dyn-ns dot net)"
+msgstr "Franska: David Le Brun (david snabela dyn-ns punkt net)"
-#: ../src/misc.c:209
-msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+#: ../src/misc.c:129
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr "Franska: Éric Lassauge (rpmfarm snabela free punkt fr)"
+
+#: ../src/misc.c:130
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+msgstr "Tyska: Jorg Schuler (jcsjcs snabela users punkt sourceforge punkt net)"
+
+#: ../src/misc.c:131
+msgid "German: Kai-Ove"
+msgstr "Tyska: Kai-Ove"
+
+#: ../src/misc.c:132
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+msgstr "Hebreiska: Assaf Gillat (gillata snabela gmail punkt com)"
+
+#: ../src/misc.c:133
+msgid "Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
msgstr ""
-"Tyska: Jorg Schuler (jcsjcs snabela users punkt sourceforge punkt net)\n"
+"Italienska: Edward Matteucci (edward_matteucc snabela users punkt "
+"sourceforge punkt net)"
-#: ../src/misc.c:211
-msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)\n"
-msgstr "Hebreiska: Assaf Gillat (gillata snabela gmail punkt com)\n"
+#: ../src/misc.c:134
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr "Italienska: Daniele Forsi (dforsi snabela gmail punkt com)"
-#: ../src/misc.c:213
+#: ../src/misc.c:135
+msgid "Japanese: Ayako Sano"
+msgstr "Japanska: Ayako Sano"
+
+#: ../src/misc.c:136
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+msgstr "Japanska: Kentaro Fukuchi (fukuchi snabela users punkt sourceforge punkt net)"
+
+#: ../src/misc.c:137
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr "Rumänska: Alex Eftimie (alexeftimie snabela gmail punkt com)"
+
+#: ../src/misc.c:138
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr "Spanska: Alejandro Lamas Daviña (alejandro.lamas snabela ific punkt uv punkt es)"
+
+#: ../src/misc.c:139
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
+msgstr "Svenska: Stefan Asserhäll (stefan asserhall snabela comhem punkt se)"
+
+#: ../src/misc.c:144
msgid ""
-"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net)\n"
+"This program is free software; you can redistribute it and/or\n"
+"modify it under the terms of the GNU General Public License as\n"
+"published by the Free Software Foundation; either version 2 of the\n"
+"License, or (at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but\n"
+"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+"the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public\n"
+"License along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+"02111-1307, USA."
msgstr ""
-"Italienska: Edward Matteucci (edward_matteucc snabela users punkt "
-"sourceforge punkt net)\n"
+"Detta program är fri programvara. Du kan distribuera det\n"
+"och/eller ändra det under villkoren i GNU General Public License,\n"
+"publicerad av Free Software Foundation, antingen version 2 av\n"
+"licensen, eller (om du så önskar) någon senare version.\n"
+"\n"
+"Detta program distribueras i hopp om att det ska vara användbart,\n"
+"men UTAN NÅGON SOM HELST GARANTI, Även utan underförstådd\n"
+"garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT\n"
+"ÄNDAMÅL. Se GNU General Public License för ytterligare information.\n"
+"\n"
+"Du ska ha fått en kopia av GNU General Public License tillsammans\n"
+"med detta program. Om inte, skriv till Free Software Foundation, Inc.,\n"
+"59 Temple Place, Suite 330, Boston, MA 02111-1307, USA."
-#: ../src/misc.c:215
-msgid "Japanese: Ayako Sano\n"
-msgstr "Japanska: Ayako Sano\n"
-
-#: ../src/misc.c:217
-msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
+#: ../src/misc.c:159
+msgid ""
+"© 2002-2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
msgstr ""
-"Japanska: Kentaro Fukuchi (fukuchi snabela users punkt sourceforge punkt "
-"net)\n"
+"© 2002 - 2007\n"
+"Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
+"Corey Donohoe <atmos at atmos.org>"
-#: ../src/misc.c:219
-msgid "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
-msgstr "Svenska: Stefan Asserhäll (stefan asserhall snabela comhem punkt se)\n"
+#: ../src/misc.c:167
+msgid "Cross-platform multilingual interface to Apple's iPodâ„¢"
+msgstr "Plattformsoberoende flerspråkigt gränssnitt för Apples iPod™"
-#: ../src/misc.c:975
+#: ../src/misc.c:934
#, c-format
msgid "Could not process '%s' (no filename available)"
msgstr "Kunde inte behandla '%s' (inget filnamn tillgängligt)"
-#: ../src/misc.c:1129
+#: ../src/misc.c:1088
#, c-format
msgid "Unknown token '%%%c' in template '%s'"
msgstr "Okänd beteckning '%%%c' i mallen '%s'"
-#: ../src/misc.c:1212
+#: ../src/misc.c:1171
#, c-format
msgid "Template ('%s') does not match file type '%s'\n"
msgstr "Mallen ('%s') passar inte ihop med filtypen '%s'\n"
-#: ../src/misc.c:1298
+#: ../src/misc.c:1257
#, c-format
msgid "Error creating %s: %s\n"
msgstr "Fel när %s skulle skapas: %s\n"
-#: ../src/misc.c:1777
-#, fuzzy, c-format
+#: ../src/misc.c:1691
+#, c-format
msgid ""
"Writing preferences file '%s' failed (%s).\n"
"\n"
msgstr ""
-"Körning av '%s' misslyckades.\n"
+"Skrivning av inställningsfilen '%s' misslyckades (%s).\n"
"\n"
-#: ../src/misc.c:1779
+#: ../src/misc.c:1693
msgid "unspecified error"
-msgstr ""
+msgstr "ospecificerat fel"
-#: ../src/misc.c:1787
+#: ../src/misc.c:1701
#, c-format
msgid ""
"Writing preferences to the iPod (%s) failed: could not get path to Control "
"Directory.\n"
"\n"
msgstr ""
+"Skrivning av inställningar till iPod (%s) misslyckades: kunde inte hämta "
+"sökväg till katalogen Control.\n"
+"\n"
#. title
#: ../src/misc_confirm.c:71
-#, fuzzy
msgid "The following has occurred:"
msgstr "Följande har inträffat:"
@@ -4296,15 +4548,12 @@
#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
#, c-format
-msgid ""
-"Are you sure you want to remove the following track from the playlist \"%s\"?"
+msgid "Are you sure you want to remove the following track from the playlist \"%s\"?"
msgid_plural ""
"Are you sure you want to remove the following tracks from the playlist \"%s"
"\"?"
-msgstr[0] ""
-"Är du säker på att du vill ta bort följande spår från spellistan \"%s\"?"
-msgstr[1] ""
-"Är du säker på att du vill ta bort följande spår från spellistan \"%s\"?"
+msgstr[0] "Är du säker på att du vill ta bort följande spår från spellistan \"%s\"?"
+msgstr[1] "Är du säker på att du vill ta bort följande spår från spellistan \"%s\"?"
#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
msgid "Remove Track From Playlist?"
@@ -4394,6 +4643,7 @@
msgstr "Tog bort alla %d spår från iPod"
#: ../src/misc_confirm.c:541
+#, c-format
msgid "Removed all podcasts from the iPod"
msgstr "Tog bort alla podradiosändningar från iPod"
@@ -4423,10 +4673,12 @@
msgstr "Tog bort alla %d spår från databasen"
#: ../src/misc_confirm.c:695
+#, c-format
msgid "Are you sure you want to remove all tracks from your iPod?"
msgstr "Är du säker på att du vill ta bort alla spår från iPod?"
#: ../src/misc_confirm.c:700
+#, c-format
msgid "Are you sure you want to remove all podcasts from your iPod?"
msgstr "Är du säker på att du vill ta bort alla podradiosändningar från iPod?"
@@ -4434,18 +4686,18 @@
#, c-format
msgid ""
"Are you sure you want to delete playlist '%s' and the following track "
-"completely from your ipod? The number of playlists this track is a member of "
+"completely from your iPod? The number of playlists this track is a member of "
"is indicated in parentheses."
msgid_plural ""
"Are you sure you want to delete playlist '%s' and the following tracks "
-"completely from your ipod? The number of playlists the tracks are member of "
+"completely from your iPod? The number of playlists the tracks are member of "
"is indicated in parentheses."
msgstr[0] ""
"Är du säker på att du vill ta bort spellistan '%s' och följande spår helt "
"från iPod? Antal spellistor som spåret finns i anges inom parentes."
msgstr[1] ""
"Är du säker på att du vill ta bort spellistan '%s' och följande spår helt "
-"från iPod? Antal spellistor som spåren finns i anges inom parentes."
+"från iPod? Antal spellistor som spåret finns i anges inom parentes."
#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
#, c-format
@@ -4470,6 +4722,7 @@
"från hårddisken? Antal spellistor som spåren finns i anges inom parentes."
#: ../src/misc_confirm.c:753
+#, c-format
msgid "Are you sure you want to remove all tracks from the database?"
msgstr "Är du säker på att du vill ta bort alla spår från databasen?"
@@ -4602,122 +4855,155 @@
#. 40
#: ../src/misc_conversion.c:100
msgid "Media Type"
-msgstr ""
+msgstr "Mediatyp"
#: ../src/misc_conversion.c:102
msgid "TV Episode"
-msgstr ""
+msgstr "Tv-episod"
#: ../src/misc_conversion.c:103
msgid "TV Network"
-msgstr ""
+msgstr "Tv-kanal"
#: ../src/misc_conversion.c:104
msgid "Season Nr"
-msgstr ""
+msgstr "Säsongsnummer"
#. 45
#: ../src/misc_conversion.c:105
msgid "Episode Nr"
-msgstr ""
+msgstr "Episodnummer"
-#: ../src/misc_conversion.c:118
+#: ../src/misc_conversion.c:106
+msgid "Album Artist"
+msgstr "Albumartist"
+
+#: ../src/misc_conversion.c:107
+msgid "Sort Artist"
+msgstr "Sorterade artister"
+
+#: ../src/misc_conversion.c:108
+msgid "Sort Title"
+msgstr "Sorterade titlar"
+
+#: ../src/misc_conversion.c:109
+msgid "Sort Album"
+msgstr "Sorterade album"
+
+#. 50
+#: ../src/misc_conversion.c:110
+msgid "Sort Album Artist"
+msgstr "Sorterade albumartister"
+
+#: ../src/misc_conversion.c:111
+msgid "Sort Composer"
+msgstr "Sorterade kompositörer"
+
+#: ../src/misc_conversion.c:112
+msgid "Sort TV Show"
+msgstr "Sorterade tv-program"
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr "Flagga för spår utan mellanrum"
+
+#: ../src/misc_conversion.c:126
msgid "Name of file on PC, if available"
msgstr "Filens namn på PC:n, om tillgängligt"
-#: ../src/misc_conversion.c:119
+#: ../src/misc_conversion.c:127
msgid "Name of file on the iPod"
msgstr "Filens namn på iPod"
#. 10
-#: ../src/misc_conversion.c:121
+#: ../src/misc_conversion.c:129
msgid "Track Nr. and total number of tracks on CD"
msgstr "Spårnummer och totalt antal spår på cd:n"
-#: ../src/misc_conversion.c:122
+#: ../src/misc_conversion.c:130
msgid "Whether the file has already been transferred to the iPod or not"
msgstr "Om filen redan har överförts till iPod eller inte"
-#: ../src/misc_conversion.c:128
-msgid ""
-"Supposedly something that tells the iPod to increase or decrease the "
-"playback speed"
-msgstr ""
-"Antagligen något som talar om för iPod att öka eller minska "
-"uppspelningshastigheten"
+#: ../src/misc_conversion.c:136
+msgid "Beats per minute"
+msgstr "Taktslag per minut"
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:137
msgid "Number of times the track has been played"
msgstr "Antal gånger spåret har spelats"
-#: ../src/misc_conversion.c:131
+#: ../src/misc_conversion.c:138
msgid "Star rating from 0 to 5"
msgstr "Betyg med stjärnor från 0 till 5"
-#: ../src/misc_conversion.c:132
+#: ../src/misc_conversion.c:139
msgid "Date and time track has been added"
msgstr "Datum och tid då spåret lades till"
#. 20
-#: ../src/misc_conversion.c:133
+#: ../src/misc_conversion.c:140
msgid "Date and time track has last been played"
msgstr "Datum och tid då spåret senast spelades"
-#: ../src/misc_conversion.c:134
+#: ../src/misc_conversion.c:141
msgid "Date and time track has last been modified"
msgstr "Datum och tid då spåret senast ändrades"
-#: ../src/misc_conversion.c:135
+#: ../src/misc_conversion.c:142
msgid "Manual volume adjust"
msgstr "Manuell volymjustering"
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:143
msgid ""
"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
"the iPod"
-msgstr ""
-"Volymjustering i dB (spelningsnivå): Du måste aktivera 'ljudkontroll' på iPod"
+msgstr "Volymjustering i dB (spelningsnivå): Du måste aktivera 'ljudkontroll' på iPod"
#. 25
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:146
msgid "CD Nr. and total number of CDS in set"
msgstr "Cd-nummer och totalt antal cd i albumet"
-#: ../src/misc_conversion.c:142
-msgid ""
-"The category (e.g. 'Technology' or 'Music') where the podcast was located."
+#: ../src/misc_conversion.c:149
+msgid "The category (e.g. 'Technology' or 'Music') where the podcast was located."
msgstr "Kategorin (t.ex. 'Teknik' eller 'Musik') där podradiosändningen fanns."
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:150
msgid "Accessible by selecting the center button on the iPod."
msgstr "Kan kommas åt genom att trycka på iPod-mittenknappen."
-#: ../src/misc_conversion.c:147
+#: ../src/misc_conversion.c:154
msgid "Release date (for podcasts displayed next to the title on the iPod)"
-msgstr ""
-"Utgivningsdatum (för podradiosändningar visas det intill titeln på iPod)"
+msgstr "Utgivningsdatum (för podradiosändningar visas det intill titeln på iPod)"
-#: ../src/misc_conversion.c:713
+#. 50
+#: ../src/misc_conversion.c:168 ../src/misc_conversion.c:169
+#: ../src/misc_conversion.c:170 ../src/misc_conversion.c:171
+#: ../src/misc_conversion.c:172 ../src/misc_conversion.c:173
+msgid "Used for sorting on the iPod"
+msgstr "Används för sortering på iPod"
+
+#: ../src/misc_conversion.c:735
#, c-format
msgid "The URI '%s' is not an absolute URI using the file scheme"
msgstr "Webbadressen '%s' är inte en absolut webbadress med filschema"
-#: ../src/misc_conversion.c:723
+#: ../src/misc_conversion.c:745
#, c-format
msgid "The local file URI '%s' may not include a '#'"
msgstr "Webbadressen '%s' för lokal fil kan inte innehålla '#'"
-#: ../src/misc_conversion.c:740
+#: ../src/misc_conversion.c:762
#, c-format
msgid "The URI '%s' is invalid"
msgstr "Webbadressen '%s' är ogiltig"
-#: ../src/misc_conversion.c:752
+#: ../src/misc_conversion.c:774
#, c-format
msgid "The hostname of the URI '%s' is invalid"
msgstr "Värddator för webbadressen '%s' är ogiltig"
-#: ../src/misc_conversion.c:768
+#: ../src/misc_conversion.c:790
#, c-format
msgid "The URI '%s' contains invalidly escaped characters"
msgstr "Webbadressen '%s' innehåller felaktiga specialtecken"
@@ -4786,6 +5072,7 @@
msgstr "Oftast lyssnade på (%d)"
#: ../src/misc_playlist.c:584
+#, c-format
msgid "Never Listened"
msgstr "Aldrig lyssnade på"
@@ -4824,11 +5111,6 @@
msgid "Dangling tracks with no files on PC were removed."
msgstr "Spår med saknade filer utan filer på PC:n har tagits bort."
-#: ../src/misc_playlist.c:916
-#, c-format
-msgid "Processing '%s'"
-msgstr "Behandlar '%s'"
-
#: ../src/misc_playlist.c:943
msgid "Dangling tracks with files on PC were handled."
msgstr "Spår med saknade filer som har filer på PC:n har hanterats."
@@ -4945,8 +5227,7 @@
#: ../src/misc_track.c:205
#, c-format
-msgid ""
-"The following duplicate track has not been added to the master play list."
+msgid "The following duplicate track has not been added to the master play list."
msgid_plural ""
"The following %d duplicate tracks have not been added to the master play "
"list."
@@ -4959,72 +5240,72 @@
msgid "Duplicate detection"
msgstr "Detektering av duplikat"
-#: ../src/misc_track.c:1269
+#: ../src/misc_track.c:1339
msgid "Local Database"
msgstr "Lokal databas"
#. artwork is set
-#: ../src/misc_track.c:1280
+#: ../src/misc_track.c:1350
msgid "Embedded or filename was lost"
msgstr "Inbäddad eller förlorat filnamn"
-#: ../src/misc_track.c:1284
+#: ../src/misc_track.c:1354
msgid "Artwork not set"
msgstr "Omslagsbild inte angiven"
-#: ../src/misc_track.c:1737
-#, fuzzy, c-format
+#: ../src/misc_track.c:1816
+#, c-format
msgid "Could not find source file for '%s'. Track not copied."
-msgstr "Kunde hitta fil för '%s' på iPod\n"
+msgstr "Kunde hitta källfilen för '%s'. Spåret kopierades inte."
-#: ../src/misc_track.c:1973
+#: ../src/misc_track.c:2052
#, c-format
msgid "drag and drop: ignored '%s'\n"
msgstr "drag och släpp: ignorerade '%s'\n"
-#: ../src/mp3file.c:1282
+#: ../src/mp3file.c:1336
#, c-format
msgid "Error setting ID3 field: %s\n"
msgstr "Fel när ID3-fält skulle ändras: %s\n"
-#: ../src/mp3file.c:1306 ../src/mp3file.c:1399 ../src/mp3file.c:1548
-#: ../src/mp3file.c:2186
+#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
+#: ../src/mp3file.c:2733
#, c-format
msgid "ERROR while opening file: '%s' (%s).\n"
msgstr "FEL när filen skulle öppnas: '%s' (%s).\n"
-#: ../src/mp3file.c:1619
+#: ../src/mp3file.c:1688
#, c-format
msgid "ERROR while writing tag to file: '%s' (%s).\n"
msgstr "FEL när tagg skulle skrivas till filen: '%s' (%s).\n"
#. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2352
+#: ../src/mp3file.c:2770
#, c-format
msgid "File \"%s\" has zero play length. Ignoring.\n"
msgstr "Filen \"%s\" har spelningslängden noll. Ignoreras.\n"
-#: ../src/mp4file.c:227 ../src/mp4file.c:359
-#, fuzzy, c-format
+#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#, c-format
msgid "'%s' does not appear to be a mp4 audio or video file.\n"
-msgstr "'%s' verkar inte vara en mp4-ljudfil.\n"
+msgstr "'%s' verkar inte vara en mp4 ljud- eller videofil.\n"
-#: ../src/mp4file.c:237 ../src/mp4file.c:369
+#: ../src/mp4file.c:253 ../src/mp4file.c:414
#, c-format
msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
msgstr "Kunde inte öppna '%s' för läsning, eller är filen inte en mp4-fil.\n"
-#: ../src/mp4file.c:478
+#: ../src/mp4file.c:529
#, c-format
msgid "'%s' does not appear to be a mp4 audio file.\n"
msgstr "'%s' verkar inte vara en mp4-ljudfil.\n"
-#: ../src/mp4file.c:489
+#: ../src/mp4file.c:540
#, c-format
msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
msgstr "Kunde inte öppna '%s' för skrivning, eller är filen inte en mp4-fil.\n"
-#: ../src/mp4file.c:502
+#: ../src/mp4file.c:553
#, c-format
msgid ""
"Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5033,7 +5314,7 @@
"Import av '%s' misslyckades: m4a/m4p/m4b stöds inte utan biblioteket mp4v2. "
"Du måste kompilera källkoden för gtkpod tillsammans med biblioteket mp4v2.\n"
-#: ../src/mp4file.c:508
+#: ../src/mp4file.c:559
#, c-format
msgid ""
"m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5044,7 +5325,7 @@
"inte utan biblioteket mp4v2. Du måste kompilera källkoden för gtkpod "
"tillsammans med biblioteket mp4v2.\n"
-#: ../src/mp4file.c:514
+#: ../src/mp4file.c:565
#, c-format
msgid ""
"m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5055,120 +5336,114 @@
"inte utan biblioteket mp4v2. Du måste kompilera källkoden för gtkpod "
"tillsammans med biblioteket mp4v2.\n"
-#: ../src/oggfile.c:62 ../src/wavfile.c:107
+#: ../src/oggfile.c:73
#, c-format
-msgid "Could not open '%s' for reading.\n"
-msgstr "Kunde inte öppna '%s' för läsning.\n"
-
-#: ../src/oggfile.c:73
-#, fuzzy, c-format
msgid "'%s' does not appear to be an ogg audio file.\n"
-msgstr "'%s' verkar inte vara en mp4-ljudfil.\n"
+msgstr "'%s' verkar inte vara en ogg ljudfil.\n"
-#: ../src/oggfile.c:150
-#, fuzzy, c-format
+#: ../src/oggfile.c:154
+#, c-format
msgid ""
"Import of '%s' failed: ogg not supported without the ogg library. You must "
"compile the gtkpod source together with the ogg library.\n"
msgstr ""
-"Import av '%s' misslyckades: m4a/m4p/m4b stöds inte utan biblioteket mp4v2. "
-"Du måste kompilera källkoden för gtkpod tillsammans med biblioteket mp4v2.\n"
+"Import av '%s' misslyckades: ogg stöds inte utan biblioteket ogg. Du måste "
+"kompilera källkoden för gtkpod tillsammans med biblioteket ogg.\n"
-#: ../src/oggfile.c:156
-#, fuzzy, c-format
+#: ../src/oggfile.c:160
+#, c-format
msgid ""
"ogg metadata update for '%s' failed: ogg not supported without the ogg "
"library. You must compile the gtkpod source together with the ogg library.\n"
msgstr ""
-"Uppdatering av m4a/m4p/m4b metadata för '%s' misslyckades: m4a/m4p/m4b stöds "
-"inte utan biblioteket mp4v2. Du måste kompilera källkoden för gtkpod "
-"tillsammans med biblioteket mp4v2.\n"
+"Uppdatering av ogg metadata för '%s' misslyckades: ogg stöds inte utan "
+"biblioteket ogg. Du måste kompilera källkoden för gtkpod tillsammans med "
+"biblioteket ogg.\n"
-#: ../src/prefs.c:356
+#: ../src/prefs.c:357
#, c-format
msgid "gtkpod version %s usage:\n"
msgstr "Användning av gtkpod version %s:\n"
-#: ../src/prefs.c:357
+#: ../src/prefs.c:358
msgid " -h, --help: display this message\n"
msgstr " -h, --help: visa det här meddelandet\n"
-#: ../src/prefs.c:358
-#, fuzzy
+#: ../src/prefs.c:359
msgid " -p <file>: increment playcount for file by one\n"
msgstr " -p <filnamn>: öka spelningsantalet för filen med ett\n"
-#: ../src/prefs.c:359
+#: ../src/prefs.c:360
msgid " --hash <file>:print gtkpod hash for file\n"
-msgstr ""
+msgstr " --hash <fil>: skriv ut gtkpod checksumma för filen\n"
-#: ../src/prefs.c:360
+#: ../src/prefs.c:361
msgid " -m path: define the mountpoint of your iPod\n"
msgstr " -m sökväg: definiera monteringspunkt för iPod\n"
-#: ../src/prefs.c:361
+#: ../src/prefs.c:362
msgid " --mountpoint: same as '-m'.\n"
msgstr " --mountpoint: samma som '-m'.\n"
-#: ../src/prefs.c:362
+#: ../src/prefs.c:363
msgid " -a: import database automatically after start.\n"
msgstr " -a: importera databas automatiskt efter start.\n"
-#: ../src/prefs.c:363
+#: ../src/prefs.c:364
msgid " --auto: same as '-a'.\n"
msgstr " --auto: samma som '-a'.\n"
-#: ../src/prefs.c:560
+#: ../src/prefs.c:561
#, c-format
msgid "Couldn't create ~/.gtkpod\n"
-msgstr ""
+msgstr "Kunde inte skapa ~/.gtkpod\n"
-#: ../src/prefs_window.c:134
+#: ../src/prefs_window.c:133
msgid "Please select command for 'Play Now'"
msgstr "Välj kommando för 'Spela nu'"
-#: ../src/prefs_window.c:135
+#: ../src/prefs_window.c:134
msgid "Please select command for 'Enqueue'"
msgstr "Välj kommando för 'Köa'"
-#: ../src/prefs_window.c:136
+#: ../src/prefs_window.c:135
msgid "Please select the mp3gain executable"
msgstr "Välj körbart program mp3gain"
-#: ../src/prefs_window.c:137
+#: ../src/prefs_window.c:136
msgid "Please select the aacgain executable"
msgstr "Välj körbart program accgain"
-#: ../src/prefs_window.c:138
+#: ../src/prefs_window.c:137
msgid "Select the mserv music root directory"
msgstr "Välj mserv rotkatalog för musik"
-#: ../src/prefs_window.c:139
+#: ../src/prefs_window.c:138
msgid "Select the mserv trackinfo root directory"
msgstr "Välj mserv rotkatalog för spårinformation"
-#: ../src/prefs_window.c:140
+#: ../src/prefs_window.c:139
msgid "Select the ogg/vorbis converter command"
-msgstr ""
+msgstr "Välj kommando för konvertering av ogg/vorbis."
-#: ../src/prefs_window.c:141
+#: ../src/prefs_window.c:140
msgid "Select the flac converter command"
-msgstr ""
+msgstr "Välj kommando för konvertering av FLAC."
-#: ../src/prefs_window.c:142
+#: ../src/prefs_window.c:141
msgid "Select the m4a converter command."
-msgstr ""
+msgstr "Välj kommando för konvertering av m4a."
-#: ../src/prefs_window.c:143
+#: ../src/prefs_window.c:142
msgid "Select the mp3 converter command."
-msgstr ""
+msgstr "Välj kommando för konvertering av mp3."
-#: ../src/prefs_window.c:144
+#: ../src/prefs_window.c:143
msgid "Select the wav converter command."
-msgstr ""
+msgstr "Välj kommando för konvertering av wav."
-#: ../src/prefs_window.c:211 ../src/repository.c:662
-#, fuzzy, c-format
+#: ../src/prefs_window.c:201 ../src/repository.c:662
+#, c-format
msgid ""
"<i>Have a look at the scripts provided in '%s'. If you write a new script or "
"improve an existing one, please send it to jcsjcs at users.sourceforge.net "
@@ -5178,11 +5453,11 @@
"skript, skicka det gärna till \"jcsjcs snabela users.sourceforge.net\" för "
"att lägga till det i nästa utgåva.</i>"
-#: ../src/prefs_window.c:986 ../src/prefs_window.c:1004
+#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
msgid "Preferences not updated"
msgstr "Inställningarna har inte uppdaterats"
-#: ../src/prefs_window.c:1013
+#: ../src/prefs_window.c:1232
msgid "Preferences applied"
msgstr "Inställningar ändrade"
@@ -5243,9 +5518,9 @@
msgstr "Filen med checksumma har storleken 0 byte\n"
#: ../src/sha1.c:239
-#, fuzzy, c-format
+#, c-format
msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
-msgstr "Kunde inte öppna '%s' för att beräkna MD5-checksumma: %s\n"
+msgstr "Kunde inte öppna '%s' för att beräkna SHA1-checksumma: %s\n"
#: ../src/syncdir.c:237
#, c-format
@@ -5260,8 +5535,7 @@
#: ../src/syncdir.c:255
msgid "The following track has been completely removed from the iPod:\n"
-msgid_plural ""
-"The following tracks have been completely removed from the iPod:\n"
+msgid_plural "The following tracks have been completely removed from the iPod:\n"
msgstr[0] "Följande spår har fullständigt tagits bort från iPod:\n"
msgstr[1] "Följande spår har fullständigt tagits bort från iPod:\n"
@@ -5285,8 +5559,8 @@
msgid "Sync summary"
msgstr "Sammanfattning av synkronisering"
-#: ../src/tools.c:119
-#, fuzzy, c-format
+#: ../src/tools.c:118
+#, c-format
msgid ""
"Could not find '%s'.\n"
"Please specifiy the exact path in the Tools section of the preference dialog "
@@ -5299,7 +5573,7 @@
"programmet om det inte är installerat på systemet.\n"
"\n"
-#: ../src/tools.c:204
+#: ../src/tools.c:203
#, c-format
msgid ""
"Execution of '%s' failed.\n"
@@ -5308,7 +5582,7 @@
"Körning av '%s' misslyckades.\n"
"\n"
-#: ../src/tools.c:249
+#: ../src/tools.c:248
#, c-format
msgid ""
"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
@@ -5317,7 +5591,7 @@
"Normaliserade inte '%s'. Ställ in sökväg till mp3gain under Verktyg i "
"inställningsdialogrutan.\n"
-#: ../src/tools.c:259
+#: ../src/tools.c:258
#, c-format
msgid ""
"Did not normalize '%s'. Set aacgain path in the Tools section of the "
@@ -5326,24 +5600,24 @@
"Normaliserade inte '%s'. Ställ in sökväg till accgain under Verktyg i "
"inställningsdialogrutan.\n"
-#: ../src/tools.c:386
+#: ../src/tools.c:385
msgid "Normalizing..."
msgstr "Normaliserar..."
-#: ../src/tools.c:436
+#: ../src/tools.c:435
#, c-format
msgid "%s - %s"
msgstr "%s - %s"
-#: ../src/tools.c:462
+#: ../src/tools.c:461
msgid "Aborting..."
msgstr "Avbryter..."
-#: ../src/tools.c:466
+#: ../src/tools.c:465
msgid "Will abort after current mp3gain process ends."
msgstr "Avbryter efter aktuell mp3gain process slutar."
-#: ../src/tools.c:492
+#: ../src/tools.c:491
#, c-format
msgid ""
"'%s-%s' (%s) could not be normalized.\n"
@@ -5352,21 +5626,20 @@
"'%s-%s' (%s) kunde inte normaliseras.\n"
"\n"
-#: ../src/tools.c:531
+#: ../src/tools.c:530
#, c-format
msgid "Normalized %d of %d tracks."
msgid_plural "Normalized %d of %d tracks."
msgstr[0] "Normaliserade %d av %d spår."
msgstr[1] "Normaliserade %d av %d spår."
-#: ../src/tools.c:634
+#: ../src/tools.c:633
msgid ""
"Please specify the command to be called on the 'Tools' section of the "
"preferences dialog.\n"
-msgstr ""
-"Ange kommandot som ska anropas under 'Verktyg' i inställningsdialogrutan.\n"
+msgstr "Ange kommandot som ska anropas under 'Verktyg' i inställningsdialogrutan.\n"
-#: ../src/tools.c:646
+#: ../src/tools.c:645
#, c-format
msgid ""
"Could not find the command '%s'.\n"
@@ -5403,74 +5676,3 @@
msgid "%s does not appear to be a supported wav file.\n"
msgstr "%s verkar inte vara en wav-fil som stöds.\n"
-#, fuzzy
-#~ msgid "label21"
-#~ msgstr "etikett21"
-
-#~ msgid "window1"
-#~ msgstr "fönster1"
-
-#~ msgid "<b>Import</b>"
-#~ msgstr "<b>Importera</b>"
-
-#~ msgid "Automatically import iTunesDBs on startup"
-#~ msgstr "Importera automatiskt iTunes databaser vid start"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Kunde inte hitta bildpunktsavbildningsfil: %s"
-
-#~ msgid "_Synchronize Playlist"
-#~ msgstr "_Synkronisera spellista"
-
-#~ msgid "Stop Display Update"
-#~ msgstr "Stoppa uppdatering av skärmen"
-
-#~ msgid "Stop"
-#~ msgstr "Stoppa"
-
-#~ msgid ""
-#~ "It is much faster to sort the display after all tracks have been added. "
-#~ "Some people might feel irritated by this behaviour and should uncheck "
-#~ "this option."
-#~ msgstr ""
-#~ "Det går mycket snabbare att sortera skärmen efter alla spår har lagts "
-#~ "till. Några personer kanske känner sig irriterade av detta beteende, och "
-#~ "kan då avmarkera alternativet."
-
-#~ msgid ""
-#~ "Temporarily disable sorting when changing playlist\n"
-#~ "or tab entry (faster!)"
-#~ msgstr ""
-#~ "Inaktivera sortering tillfälligt när spellistor\n"
-#~ "eller flikar ändras (snabbare)"
-
-#~ msgid ""
-#~ "The display can be blocked after changing a selection. The display update "
-#~ "is faster, but you have to wait until it's finished. When using this "
-#~ "option, sorting is also temporarily disabled (see option above)."
-#~ msgstr ""
-#~ "Skärmen kan blockeras efter en markering ändrats. Skärmuppdateringen blir "
-#~ "snabbare, men du måste vänta till den är klar. När du använder det här "
-#~ "alternativet är sortering också tillfälligt avstängd (se alternativet "
-#~ "ovan)."
-
-#~ msgid ""
-#~ "Block display when changing playlist or tab\n"
-#~ " entry (faster!)"
-#~ msgstr ""
-#~ "Blockera skärmen när spellistor\n"
-#~ "eller flikar ändras (snabbare)"
-
-#~ msgid "deleting..."
-#~ msgstr "tar bort..."
-
-#~ msgid "preparing to copy..."
-#~ msgstr "förbereder kopiering..."
-
-#~ msgid "Copied %d of %d new track."
-#~ msgid_plural "Copied %d of %d new tracks."
-#~ msgstr[0] "Kopierade %d av %d nya spår."
-#~ msgstr[1] "Kopierade %d av %d nya spår."
-
-#~ msgid "Some tracks were not written to iPod. Export aborted!"
-#~ msgstr "Vissa spår skrevs inte till iPod. Export avbruten."
Property changes on: gtkpod/branches/etch-bpo/po/sv.po
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/scripts/Makefile.am
===================================================================
--- gtkpod/branches/etch-bpo/scripts/Makefile.am 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/Makefile.am 2008-04-17 18:50:56 UTC (rev 306)
@@ -5,6 +5,11 @@
# these scripts will be installed
script_SCRIPTS = \
+ convert-2m4a.sh \
+ convert-2mp3.sh \
+ gtkpod-convert-common.sh \
+ ldif2vcf.sh \
+ mab2vcard \
sync-abook.sh \
sync-evocalendar.sh \
sync-evolution.sh \
@@ -14,22 +19,10 @@
sync-ldif.sh \
sync-notes.sh \
sync-palm-jppy.py \
- sync-thunderbird.sh \
sync-thunderbird-nano.sh \
+ sync-thunderbird.sh \
sync-tomboy.sh \
- sync-webcalendar.sh \
- ldif2vcf.sh \
- mab2vcard \
- convert-ogg2mp3.sh \
- convert-ogg2m4a.sh \
- convert-flac2mp3.sh \
- convert-flac2m4a.sh \
- convert-m4a2mp3.sh \
- convert-mp32m4a.sh \
- convert-ogg2mp3.sh \
- convert-ogg2m4a.sh \
- convert-wav2mp3.sh \
- convert-wav2m4a.sh
+ sync-webcalendar.sh
# these scripts will of course also go in the distribution tarball.
EXTRA_DIST=$(script_SCRIPTS)
Property changes on: gtkpod/branches/etch-bpo/scripts/Makefile.am
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/scripts/Makefile.in
===================================================================
--- gtkpod/branches/etch-bpo/scripts/Makefile.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/Makefile.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
@@ -14,16 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +30,25 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+subdir = scripts
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(scriptdir)"
+scriptSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(script_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -64,17 +73,22 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -85,14 +99,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -104,28 +116,31 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+LIBGNOMECANVAS_LIBS = @LIBGNOMECANVAS_LIBS@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOUNT = @MOUNT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -143,24 +158,28 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-have_pkgconfig = @have_pkgconfig@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -175,6 +194,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -182,14 +202,22 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
# where to install the scripts
scriptdir = $(pkgdatadir)/scripts
# these scripts will be installed
script_SCRIPTS = \
+ convert-2m4a.sh \
+ convert-2mp3.sh \
+ gtkpod-convert-common.sh \
+ ldif2vcf.sh \
+ mab2vcard \
sync-abook.sh \
sync-evocalendar.sh \
sync-evolution.sh \
@@ -199,53 +227,55 @@
sync-ldif.sh \
sync-notes.sh \
sync-palm-jppy.py \
+ sync-thunderbird-nano.sh \
sync-thunderbird.sh \
- sync-thunderbird-nano.sh \
sync-tomboy.sh \
- sync-webcalendar.sh \
- ldif2vcf.sh \
- mab2vcard \
- convert-ogg2mp3.sh \
- convert-ogg2m4a.sh \
- convert-flac2mp3.sh \
- convert-flac2m4a.sh \
- convert-m4a2mp3.sh \
- convert-mp32m4a.sh \
- convert-ogg2mp3.sh \
- convert-ogg2m4a.sh \
- convert-wav2mp3.sh \
- convert-wav2m4a.sh
+ sync-webcalendar.sh
# these scripts will of course also go in the distribution tarball.
EXTRA_DIST = $(script_SCRIPTS)
-subdir = scripts
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SCRIPTS = $(script_SCRIPTS)
-
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu scripts/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-scriptSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-scriptSCRIPTS: $(script_SCRIPTS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(scriptdir)
+ test -z "$(scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdir)"
@list='$(script_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " $(scriptSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(scriptdir)/$$f"; \
- $(scriptSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(scriptdir)/$$f; \
+ echo " $(scriptSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(scriptdir)/$$f'"; \
+ $(scriptSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptdir)/$$f"; \
else :; fi; \
done
@@ -253,38 +283,32 @@
@$(NORMAL_UNINSTALL)
@list='$(script_SCRIPTS)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
- echo " rm -f $(DESTDIR)$(scriptdir)/$$f"; \
- rm -f $(DESTDIR)$(scriptdir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(scriptdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(scriptdir)/$$f"; \
done
-uninstall-info-am:
tags: TAGS
TAGS:
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
distdir: $(DISTFILES)
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -298,9 +322,10 @@
check-am: all-am
check: check-am
all-am: Makefile $(SCRIPTS)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(scriptdir)
+ for dir in "$(DESTDIR)$(scriptdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -320,7 +345,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -337,18 +362,28 @@
dvi-am:
+html: html-am
+
info: info-am
info-am:
install-data-am: install-scriptSCRIPTS
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -367,17 +402,20 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-scriptSCRIPTS
+uninstall-am: uninstall-scriptSCRIPTS
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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 \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-scriptSCRIPTS install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
- uninstall-scriptSCRIPTS
+ pdf-am ps ps-am uninstall uninstall-am uninstall-scriptSCRIPTS
# 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.
Property changes on: gtkpod/branches/etch-bpo/scripts/Makefile.in
___________________________________________________________________
Name: svn:eol-style
- native
Copied: gtkpod/branches/etch-bpo/scripts/convert-2m4a.sh (from rev 305, gtkpod/tags/0.99.12-1/scripts/convert-2m4a.sh)
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-2m4a.sh (rev 0)
+++ gtkpod/branches/etch-bpo/scripts/convert-2m4a.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Script that converts a file into an m4a file
+#
+# USAGE:
+#
+# convert-2m4a.sh [options] inputfile
+#
+# For a list of allowed options please consult gtkpod-convert-common.sh
+#
+# STDOUT's last line is the converted filename.
+# Return Codes:
+# 0 ok
+# 1 input file not found
+# 2 output file cannot be created
+# 3 cannot get info
+# 4 cannot exec decoding
+# 5 cannot exec encoding
+# 6 conversion failed
+# 7 unknown option
+#
+
+# Constants
+extension="m4a"
+ENCODER_OPTS="-q 150 -c 22000"
+# use the following for better quality (25% increase in file size) or simply
+# specify your options with "-q ..."
+#ENCODER_OPTS="-q 256 -c 44100"
+ENCODER="faac"
+
+. ${0%/*}/gtkpod-convert-common.sh
+
+if [ $filetype = "wav" ]; then
+ "$encoder" -o "$outfile" $ENCODER_OPTS -w --artist "$artist" --title "$title" --year "$year" --album "$album" --track "$track" --genre "$genre" --comment "$comment" "$infile"
+else
+ "$decoder" $options "$infile" | "$encoder" -o "$outfile" $ENCODER_OPTS -w --artist "$artist" --title "$title" --year "$year" --album "$album" --track "$track" --genre "$genre" --comment "$comment" -
+fi
+# Check result
+if [ "x$?" != "x0" ]; then
+ exit 6
+fi
+
+# Seems to be ok: display filename for gtkpod
+echo $outfile
+exit 0
Copied: gtkpod/branches/etch-bpo/scripts/convert-2mp3.sh (from rev 305, gtkpod/tags/0.99.12-1/scripts/convert-2mp3.sh)
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-2mp3.sh (rev 0)
+++ gtkpod/branches/etch-bpo/scripts/convert-2mp3.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,59 @@
+#!/bin/sh
+# Script that converts a file into an mp3 file
+#
+# USAGE:
+#
+# convert-2mp3.sh [options] inputfile
+#
+# For a list of allowed options please consult gtkpod-convert-common.sh
+#
+# STDOUT's last line is the converted filename.
+# Return Codes:
+# 0 ok
+# 1 input file not found
+# 2 output file cannot be created
+# 3 cannot get info
+# 4 cannot exec decoding
+# 5 cannot exec encoding
+# 6 conversion failed
+# 7 unknown option
+#
+
+# Constants
+extension="mp3"
+ENCODER_OPTS="--preset standard"
+ENCODER="lame"
+
+. ${0%/*}/gtkpod-convert-common.sh
+
+# Check if the genre is one which lame supports
+if [ -n "$genre" ] && `"$encoder" --genre-list | grep -qi "\b$genre\b"`; then
+ usegenre=$genre
+else
+ usegenre=""
+ # check for id3v2
+ id3v2=`which id3v2`
+ if [ -n "$id3v2" ]; then
+ useid3v2=1
+ fi
+fi
+
+if [ $filetype = "wav" ]; then
+ "$encoder" $ENCODER_OPTS --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$track" --tg "$usegenre" "$infile" "$outfile"
+else
+ "$decoder" $options "$infile" | "$encoder" $ENCODER_OPTS --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$track" --tg "$usegenre" - "$outfile"
+fi
+# Check result
+if [ "x$?" != "x0" ]; then
+ exit 6
+fi
+
+# Try to set the genre with id3v2 if needed. This may fail as older versions of
+# id3v2 did not support genre strings in place of numeric genre id's
+if [ -n "$useid3v2" ]; then
+ $id3v2 -g "$genre" "$mp3file" || :
+fi
+
+# Seems to be ok: display filename for gtkpod
+echo $outfile
+exit 0
Deleted: gtkpod/branches/etch-bpo/scripts/convert-flac2m4a.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-flac2m4a.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/convert-flac2m4a.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,98 +0,0 @@
-#!/bin/sh
-# Simple script that converts a flac file into an m4a file
-#
-# USAGE:
-#
-# convert-flac2m4a.sh [options] flacfile
-#
-# -x Print converted filename extension and exit
-# -f Set converted filename
-# -a Artist tag
-# -A Album tag
-# -T Track tag
-# -t Title tag
-# -g Genre tag
-# -y Year tag
-# -c Comment tag
-#
-# STDOUT's last line is the converted filename.
-# Return Codes:
-# 0 ok
-# 1 input file not found
-# 2 output file cannot be created
-# 3 cannot get info
-# 4 cannot exec decoding
-# 5 cannot exec encoding
-# 6 conversion failed
-# 7 unknown option
-
-# Constants
-extension="m4a"
-
-# Get parameters
-while getopts a:A:T:t:g:c:y:f:x opt ; do
- case "$opt" in
- x) echo "$extension"; exit 0 ;;
- f) outfile="$OPTARG" ;;
- a) artist="$OPTARG" ;;
- A) album="$OPTARG" ;;
- T) track="$OPTARG" ;;
- t) title="$OPTARG" ;;
- g) genre="$OPTARG" ;;
- y) year="$OPTARG" ;;
- c) comment="$OPTARG" ;;
- ?) exit 7 ;;
- esac
-done
-shift $(($OPTIND - 1))
-infile="$1"
-
-if [ "$outfile" = "" ]; then
- # Build output file
- outfile=`basename "$infile"`
- outfile=${outfile%%.flac}
- outfile="/tmp/$outfile.$extension"
-fi
-
-# Default values
-[ -z "$comment" ] && comment="Encoded for gtkpod with faac"
-
-#echo "Converting \"$infile\" into \"$outfile\""
-
-# Checking input file
-if [ "$infile" = "" ]; then
- exit 1
-fi
-if [ ! -f "$infile" ]; then
- exit 1
-fi
-
-# Checking output file
-touch "$outfile"
-if [ "x$?" != "x0" ]; then
- exit 2
-fi
-
-# Check for the existence of flac
-flac=`which flac`
-if [ -z "$flac" ]; then
- exit 4
-fi
-
-# Check for the existence of faac
-faac=`which faac`
-if [ -z "$faac" ]; then
- exit 5
-fi
-
-# Launch command
-exec "$flac" -d -c -- "$infile" | "$faac" -o "$outfile" -q 150 -c 22000 -w --artist "$artist" --title "$title" --year "$year" --album "$album" --track "$track" --genre "$genre" --comment "$comment" -
-
-# Check result
-if [ "x$?" != "x0" ]; then
- exit 6
-fi
-
-# Seems to be ok: display filename for gtkpod
-echo $outfile
-exit 0
Deleted: gtkpod/branches/etch-bpo/scripts/convert-flac2mp3.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-flac2mp3.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/convert-flac2mp3.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,115 +0,0 @@
-#!/bin/sh
-# Simple script that converts a flac file into an mp3 file
-#
-# USAGE:
-#
-# convert-flac2mp3.sh [options] flacfile
-#
-# -x Print converted filename extension and exit
-# -f Set converted filename
-# -a Artist tag
-# -A Album tag
-# -T Track tag
-# -t Title tag
-# -g Genre tag
-# -y Year tag
-# -c Comment tag
-#
-# STDOUT's last line is the converted filename.
-# Return Codes:
-# 0 ok
-# 1 input file not found
-# 2 output file cannot be created
-# 3 cannot get info
-# 4 cannot exec decoding
-# 5 cannot exec encoding
-# 6 conversion failed
-# 7 unknown option
-
-# Constants
-extension="mp3"
-
-# Get parameters
-while getopts a:A:T:t:g:c:y:f:x opt ; do
- case "$opt" in
- x) echo "$extension"; exit 0 ;;
- f) outfile="$OPTARG" ;;
- a) artist="$OPTARG" ;;
- A) album="$OPTARG" ;;
- T) track="$OPTARG" ;;
- t) title="$OPTARG" ;;
- g) genre="$OPTARG" ;;
- y) year="$OPTARG" ;;
- c) comment="$OPTARG" ;;
- ?) exit 7 ;;
- esac
-done
-shift $(($OPTIND - 1))
-infile="$1"
-
-if [ "$outfile" = "" ]; then
- # Build output file
- outfile=`basename "$infile"`
- outfile=${outfile%%.flac}
- outfile="/tmp/$outfile.$extension"
-fi
-
-# Default values
-[ -z "$comment" ] && comment="Encoded for gtkpod with lame"
-
-#echo "Converting \"$infile\" into \"$outfile\""
-
-# Checking input file
-if [ "$infile" = "" ]; then
- exit 1
-fi
-if [ ! -f "$infile" ]; then
- exit 1
-fi
-
-# Checking output file
-touch "$outfile"
-if [ "x$?" != "x0" ]; then
- exit 2
-fi
-
-# Check for the existence of flac
-flac=`which flac`
-if [ -z "$flac" ]; then
- exit 4
-fi
-
-# Check for the existence of lame
-lame=`which lame`
-if [ -z "$lame" ]; then
- exit 5
-fi
-
-# Check if the genre is one which lame supports
-if [ -n "$genre" ] && `$lame --genre-list | grep -qi "\b$genre\b"`; then
- genreopt="--tg \"$genre\""
-else
- # check for id3v2
- id3v2=`which id3v2`
- if [ -n "$id3v2" ]; then
- useid3v2=1
- fi
-fi
-
-# Launch command
-exec "$flac" -d -c -- "$infile" | "$lame" --preset standard --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$track" "$genreopt" - "$outfile"
-
-# Check result
-if [ "x$?" != "x0" ]; then
- exit 6
-fi
-
-# Try to set the genre with id3v2 if needed. This may fail as older versions of
-# id3v2 did not support genre strings in place of numeric genre id's
-if [ -n "$useid3v2" ]; then
- $id3v2 -g "$genre" "$mp3file" || :
-fi
-
-# Seems to be ok: display filename for gtkpod
-echo $outfile
-exit 0
Deleted: gtkpod/branches/etch-bpo/scripts/convert-m4a2mp3.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-m4a2mp3.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/convert-m4a2mp3.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,97 +0,0 @@
-#!/bin/sh
-# Simple script that converts an m4a file into an mp3 file
-#
-# USAGE:
-#
-# convert-m4a2mp3.sh [options] m4afile
-#
-# -x Print converted filename extension and exit
-# -f Set converted filename
-# -a Artist tag
-# -A Album tag
-# -T Track tag
-# -t Title tag
-# -g Genre tag
-# -y Year tag
-# -c Comment tag
-#
-# STDOUT's last line is the converted filename.
-# Return Codes:
-# 0 ok
-# 1 input file not found
-# 2 output file cannot be created
-# 3 cannot get info
-# 4 cannot exec decoding
-# 5 cannot exec encoding
-# 6 conversion failed
-# 7 unknown option
-
-# Constants
-extension="mp3"
-
-# Get parameters
-while getopts a:A:T:t:g:c:y:f:x opt ; do
- case "$opt" in
- x) echo "$extension"; exit 0 ;;
- f) outfile="$OPTARG" ;;
- a) artist="$OPTARG" ;;
- A) album="$OPTARG" ;;
- T) track="$OPTARG" ;;
- t) title="$OPTARG" ;;
- g) genre="$OPTARG" ;;
- y) year="$OPTARG" ;;
- c) comment="$OPTARG" ;;
- ?) exit 7 ;;
- esac
-done
-shift $(($OPTIND - 1))
-infile="$1"
-
-if [ "$outfile" = "" ]; then
- # Build output file
- outfile=`basename "$infile"`
- outfile=${outfile%%.flac}
- outfile="/tmp/$outfile.$extension"
-fi
-
-# Default values
-[ -z "$comment" ] && comment="Encoded for gtkpod with lame"
-
-#echo "Converting \"$infile\" into \"$outfile\""
-
-# Checking input file
-if [ "$infile" = "" ]; then
- exit 1
-fi
-if [ ! -f "$infile" ]; then
- exit 1
-fi
-
-# Checking output file
-touch "$outfile"
-if [ "x$?" != "x0" ]; then
- exit 2
-fi
-
-# Check for the existence of faad
-faac=`which faad`
-if [ -z "$faad" ]; then
- exit 4
-fi
-
-# Check for the existence of lame
-lame=`which lame`
-if [ -z "$lame" ]; then
- exit 5
-fi
-
-# Launch command
-exec "$faad" -o - "$infile" | "$lame" --preset standard --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$track" --tg "$genre" - "$outfile"
-
-# Check result
-if [ "x$?" != "x0" ]; then
- exit 6
-fi
-# Seems to be ok: display filename for gtkpod
-echo $outfile
-exit 0
Deleted: gtkpod/branches/etch-bpo/scripts/convert-mp32m4a.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-mp32m4a.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/convert-mp32m4a.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,97 +0,0 @@
-#!/bin/sh
-# Simple script that converts an mp3 file into an m4a file
-#
-# USAGE:
-#
-# convert-mp32m4a.sh [options] mp3file
-#
-# -x Print converted filename extension and exit
-# -f Set converted filename
-# -a Artist tag
-# -A Album tag
-# -T Track tag
-# -t Title tag
-# -g Genre tag
-# -y Year tag
-# -c Comment tag
-#
-# STDOUT's last line is the converted filename.
-# Return Codes:
-# 0 ok
-# 1 input file not found
-# 2 output file cannot be created
-# 3 cannot get info
-# 4 cannot exec decoding
-# 5 cannot exec encoding
-# 6 conversion failed
-# 7 unknown option
-
-# Constants
-extension="m4a"
-
-# Get parameters
-while getopts a:A:T:t:g:c:y:f:x opt ; do
- case "$opt" in
- x) echo "$extension"; exit 0 ;;
- f) outfile="$OPTARG" ;;
- a) artist="$OPTARG" ;;
- A) album="$OPTARG" ;;
- T) track="$OPTARG" ;;
- t) title="$OPTARG" ;;
- g) genre="$OPTARG" ;;
- y) year="$OPTARG" ;;
- c) comment="$OPTARG" ;;
- ?) exit 7 ;;
- esac
-done
-shift $(($OPTIND - 1))
-infile="$1"
-
-if [ "$outfile" = "" ]; then
- # Build output file
- outfile=`basename "$infile"`
- outfile=${outfile%%.flac}
- outfile="/tmp/$outfile.$extension"
-fi
-
-# Default values
-[ -z "$comment" ] && comment="Encoded for gtkpod with faac"
-
-#echo "Converting \"$infile\" into \"$outfile\""
-
-# Checking input file
-if [ "$infile" = "" ]; then
- exit 1
-fi
-if [ ! -f "$infile" ]; then
- exit 1
-fi
-
-# Checking output file
-touch "$outfile"
-if [ "x$?" != "x0" ]; then
- exit 2
-fi
-
-# Check for the existence of lame
-lame=`which lame`
-if [ -z "$lame" ]; then
- exit 4
-fi
-
-# Check for the existence of faac
-faac=`which faac`
-if [ -z "$faac" ]; then
- exit 5
-fi
-
-# Launch command
-exec "$lame" --decode "$infile" - | "$faac" -o "$outfile" -q 150 -c 22000 -w --artist "$artist" --title "$title" --year "$year" --album "$album" --track "$track" --genre "$genre" --comment "$comment" -
-
-# Check result
-if [ "x$?" != "x0" ]; then
- exit 6
-fi
-# Seems to be ok: display filename for gtkpod
-echo $outfile
-exit 0
Deleted: gtkpod/branches/etch-bpo/scripts/convert-ogg2m4a.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-ogg2m4a.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/convert-ogg2m4a.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,97 +0,0 @@
-#!/bin/sh
-# Simple script that converts a ogg file into an m4a file
-#
-# USAGE:
-#
-# convert-ogg2m4a.sh [options] oggfile
-#
-# -x Print converted filename extension and exit
-# -f Set converted filename
-# -a Artist tag
-# -A Album tag
-# -T Track tag
-# -t Title tag
-# -g Genre tag
-# -y Year tag
-# -c Comment tag
-#
-# STDOUT's last line is the converted filename.
-# Return Codes:
-# 0 ok
-# 1 input file not found
-# 2 output file cannot be created
-# 3 cannot get info
-# 4 cannot exec decoding
-# 5 cannot exec encoding
-# 6 conversion failed
-# 7 unknown option
-
-# Constants
-extension="m4a"
-
-# Get parameters
-while getopts a:A:T:t:g:c:y:f:x opt ; do
- case "$opt" in
- x) echo "$extension"; exit 0 ;;
- f) outfile="$OPTARG" ;;
- a) artist="$OPTARG" ;;
- A) album="$OPTARG" ;;
- T) track="$OPTARG" ;;
- t) title="$OPTARG" ;;
- g) genre="$OPTARG" ;;
- y) year="$OPTARG" ;;
- c) comment="$OPTARG" ;;
- ?) exit 7 ;;
- esac
-done
-shift $(($OPTIND - 1))
-infile="$1"
-
-if [ "$outfile" = "" ]; then
- # Build output file
- outfile=`basename "$infile"`
- outfile=${outfile%%.flac}
- outfile="/tmp/$outfile.$extension"
-fi
-
-# Default values
-[ -z "$comment" ] && comment="Encoded for gtkpod with faac"
-
-#echo "Converting \"$infile\" into \"$outfile\""
-
-# Checking input file
-if [ "$infile" = "" ]; then
- exit 1
-fi
-if [ ! -f "$infile" ]; then
- exit 1
-fi
-
-# Checking output file
-touch "$outfile"
-if [ "x$?" != "x0" ]; then
- exit 2
-fi
-
-# Check for the existence of oggdec
-oggdec=`which oggdec`
-if [ -z "$oggdec" ]; then
- exit 4
-fi
-
-# Check for the existence of faac
-faac=`which faac`
-if [ -z "$faac" ]; then
- exit 5
-fi
-
-# Launch command
-exec "$oggdec" --output - -- "$infile" | "$faac" -o "$outfile" -q 150 -c 22000 -w --artist "$artist" --title "$title" --year "$year" --album "$album" --track "$track" --genre "$genre" --comment "$comment" -
-
-# Check result
-if [ "x$?" != "x0" ]; then
- exit 6
-fi
-# Seems to be ok: display filename for gtkpod
-echo $outfile
-exit 0
Deleted: gtkpod/branches/etch-bpo/scripts/convert-ogg2mp3.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-ogg2mp3.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/convert-ogg2mp3.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,115 +0,0 @@
-#!/bin/sh
-# Simple script that converts a ogg file into an mp3 file
-#
-# USAGE:
-#
-# convert-ogg2mp3.sh [options] oggfile
-#
-# -x Print converted filename extension and exit
-# -f Set converted filename
-# -a Artist tag
-# -A Album tag
-# -T Track tag
-# -t Title tag
-# -g Genre tag
-# -y Year tag
-# -c Comment tag
-#
-# STDOUT's last line is the converted filename.
-# Return Codes:
-# 0 ok
-# 1 input file not found
-# 2 output file cannot be created
-# 3 cannot get info
-# 4 cannot exec decoding
-# 5 cannot exec encoding
-# 6 conversion failed
-# 7 unknown option
-
-# Constants
-extension="mp3"
-
-# Get parameters
-while getopts a:A:T:t:g:c:y:f:x opt ; do
- case "$opt" in
- x) echo "$extension"; exit 0 ;;
- f) outfile="$OPTARG" ;;
- a) artist="$OPTARG" ;;
- A) album="$OPTARG" ;;
- T) track="$OPTARG" ;;
- t) title="$OPTARG" ;;
- g) genre="$OPTARG" ;;
- y) year="$OPTARG" ;;
- c) comment="$OPTARG" ;;
- ?) exit 7 ;;
- esac
-done
-shift $(($OPTIND - 1))
-infile="$1"
-
-if [ "$outfile" = "" ]; then
- # Build output file
- outfile=`basename "$infile"`
- outfile=${outfile%%.flac}
- outfile="/tmp/$outfile.$extension"
-fi
-
-# Default values
-[ -z "$comment" ] && comment="Encoded for gtkpod with lame"
-
-#echo "Converting \"$infile\" into \"$outfile\""
-
-# Checking input file
-if [ "$infile" = "" ]; then
- exit 1
-fi
-if [ ! -f "$infile" ]; then
- exit 1
-fi
-
-# Checking output file
-touch "$outfile"
-if [ "x$?" != "x0" ]; then
- exit 2
-fi
-
-# Check for the existence of oggdec
-oggdec=`which oggdec`
-if [ -z "$oggdec" ]; then
- exit 4
-fi
-
-# Check for the existence of lame
-lame=`which lame`
-if [ -z "$lame" ]; then
- exit 5
-fi
-
-# Check if the genre is one which lame supports
-if [ -n "$genre" ] && `$lame --genre-list | grep -qi "\b$genre\b"`; then
- genreopt="--tg \"$genre\""
-else
- # check for id3v2
- id3v2=`which id3v2`
- if [ -n "$id3v2" ]; then
- useid3v2=1
- fi
-fi
-
-# Launch command
-exec "$oggdec" --output - -- "$infile" | "$lame" --preset standard --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$track" "$genreopt" - "$outfile"
-
-# Check result
-if [ "x$?" != "x0" ]; then
- exit 6
-fi
-
-# Try to set the genre with id3v2 if needed. This may fail as older versions of
-# id3v2 did not support genre strings in place of numeric genre id's
-if [ -n "$useid3v2" ]; then
- $id3v2 -g "$genre" "$outfile" || :
-fi
-
-# Seems to be ok: display filename for gtkpod
-echo $outfile
-exit 0
Deleted: gtkpod/branches/etch-bpo/scripts/convert-wav2m4a.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-wav2m4a.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/convert-wav2m4a.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,91 +0,0 @@
-#!/bin/sh
-# Simple script that converts a wav file into an m4a file
-#
-# USAGE:
-#
-# convert-wav2m4a.sh [options] wavfile
-#
-# -x Print converted filename extension and exit
-# -f Set converted filename
-# -a Artist tag
-# -A Album tag
-# -T Track tag
-# -t Title tag
-# -g Genre tag
-# -y Year tag
-# -c Comment tag
-#
-# STDOUT's last line is the converted filename.
-# Return Codes:
-# 0 ok
-# 1 input file not found
-# 2 output file cannot be created
-# 3 cannot get info
-# 4 cannot exec decoding
-# 5 cannot exec encoding
-# 6 conversion failed
-# 7 unknown option
-
-# Constants
-extension="m4a"
-
-# Get parameters
-while getopts a:A:T:t:g:c:y:f:x opt ; do
- case "$opt" in
- x) echo "$extension"; exit 0 ;;
- f) outfile="$OPTARG" ;;
- a) artist="$OPTARG" ;;
- A) album="$OPTARG" ;;
- T) track="$OPTARG" ;;
- t) title="$OPTARG" ;;
- g) genre="$OPTARG" ;;
- y) year="$OPTARG" ;;
- c) comment="$OPTARG" ;;
- ?) exit 7 ;;
- esac
-done
-shift $(($OPTIND - 1))
-infile="$1"
-
-if [ "$outfile" = "" ]; then
- # Build output file
- outfile=`basename "$infile"`
- outfile=${outfile%%.flac}
- outfile="/tmp/$outfile.$extension"
-fi
-
-# Default values
-[ -z "$comment" ] && comment="Encoded for gtkpod with faac"
-
-#echo "Converting \"$infile\" into \"$outfile\""
-
-# Checking input file
-if [ "$infile" = "" ]; then
- exit 1
-fi
-if [ ! -f "$infile" ]; then
- exit 1
-fi
-
-# Checking output file
-touch "$outfile"
-if [ "x$?" != "x0" ]; then
- exit 2
-fi
-
-# Check for the existence of faac
-faac=`which faac`
-if [ -z "$faac" ]; then
- exit 5
-fi
-
-# Launch command
-"$faac" -o "$outfile" -q 150 -c 22000 -w --artist "$artist" --title "$title" --year "$year" --album "$album" --track "$track" --genre "$genre" --comment "$comment" "$infile"
-
-# Check result
-if [ "x$?" != "x0" ]; then
- exit 6
-fi
-# Seems to be ok: display filename for gtkpod
-echo $outfile
-exit 0
Deleted: gtkpod/branches/etch-bpo/scripts/convert-wav2mp3.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/convert-wav2mp3.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/convert-wav2mp3.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,109 +0,0 @@
-#!/bin/sh
-# Simple script that converts a wav file into an mp3 file
-#
-# USAGE:
-#
-# convert-wav2mp3.sh [options] wavfile
-#
-# -x Print converted filename extension and exit
-# -f Set converted filename
-# -a Artist tag
-# -A Album tag
-# -T Track tag
-# -t Title tag
-# -g Genre tag
-# -y Year tag
-# -c Comment tag
-#
-# STDOUT's last line is the converted filename.
-# Return Codes:
-# 0 ok
-# 1 input file not found
-# 2 output file cannot be created
-# 3 cannot get info
-# 4 cannot exec decoding
-# 5 cannot exec encoding
-# 6 conversion failed
-# 7 unknown option
-
-# Constants
-extension="mp3"
-
-# Get parameters
-while getopts a:A:T:t:g:c:y:f:x opt ; do
- case "$opt" in
- x) echo "$extension"; exit 0 ;;
- f) outfile="$OPTARG" ;;
- a) artist="$OPTARG" ;;
- A) album="$OPTARG" ;;
- T) track="$OPTARG" ;;
- t) title="$OPTARG" ;;
- g) genre="$OPTARG" ;;
- y) year="$OPTARG" ;;
- c) comment="$OPTARG" ;;
- ?) exit 7 ;;
- esac
-done
-shift $(($OPTIND - 1))
-infile="$1"
-
-if [ "$outfile" = "" ]; then
- # Build output file
- outfile=`basename "$infile"`
- outfile=${outfile%%.flac}
- outfile="/tmp/$outfile.$extension"
-fi
-
-# Default values
-[ -z "$comment" ] && comment="Encoded for gtkpod with lame"
-
-#echo "Converting \"$infile\" into \"$outfile\""
-
-# Checking input file
-if [ "$infile" = "" ]; then
- exit 1
-fi
-if [ ! -f "$infile" ]; then
- exit 1
-fi
-
-# Checking output file
-touch "$outfile"
-if [ "x$?" != "x0" ]; then
- exit 2
-fi
-
-# Check for the existence of lame
-lame=`which lame`
-if [ -z "$lame" ]; then
- exit 5
-fi
-
-# Check if the genre is one which lame supports
-if [ -n "$genre" ] && `$lame --genre-list | grep -qi "\b$genre\b"`; then
- genreopt="--tg \"$genre\""
-else
- # check for id3v2
- id3v2=`which id3v2`
- if [ -n "$id3v2" ]; then
- useid3v2=1
- fi
-fi
-
-# Launch command
-"$lame" --preset standard --add-id3v2 --tt "$title" --ta "$artist" --tl "$album" --ty "$year" --tc "$comment" --tn "$track" "$genreopt" "$infile" "$outfile"
-
-# Check result
-if [ "x$?" != "x0" ]; then
- exit 6
-fi
-
-# Try to set the genre with id3v2 if needed. This may fail as older versions of
-# id3v2 did not support genre strings in place of numeric genre id's
-if [ -n "$useid3v2" ]; then
- $id3v2 -g "$genre" "$outfile" || :
-fi
-
-# Seems to be ok: display filename for gtkpod
-echo $outfile
-exit 0
Copied: gtkpod/branches/etch-bpo/scripts/gtkpod-convert-common.sh (from rev 305, gtkpod/tags/0.99.12-1/scripts/gtkpod-convert-common.sh)
===================================================================
--- gtkpod/branches/etch-bpo/scripts/gtkpod-convert-common.sh (rev 0)
+++ gtkpod/branches/etch-bpo/scripts/gtkpod-convert-common.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,106 @@
+#!/bin/sh
+# Script that converts a file into an mp3 or an m4a file
+#
+# USAGE:
+#
+# Called by convert-2mp3.sh and convert-2m4a.sh.
+#
+# The following command line arguments are being used
+#
+# -x Print converted filename extension and exit
+# -f Set converted filename
+# -a Artist tag
+# -A Album tag
+# -T Track tag
+# -t Title tag
+# -g Genre tag
+# -y Year tag
+# -c Comment tag
+# -q Quality (overwrites standard encoder options)
+# For mp3 files this could be "--vbr-new -V<number>".
+#
+# Return Codes:
+# 0 ok
+# 1 input file not found
+# 2 output file cannot be created
+# 3 cannot get info
+# 4 cannot exec decoding
+# 5 cannot exec encoding
+# 6 conversion failed
+# 7 unknown option
+
+# Get parameters
+while getopts q:a:A:T:t:g:c:y:f:x opt ; do
+ case "$opt" in
+ x) echo "$extension"; exit 0 ;;
+ f) outfile="$OPTARG" ;;
+ a) artist="$OPTARG" ;;
+ A) album="$OPTARG" ;;
+ T) track="$OPTARG" ;;
+ t) title="$OPTARG" ;;
+ g) genre="$OPTARG" ;;
+ y) year="$OPTARG" ;;
+ c) comment="$OPTARG" ;;
+ q) ENCODER_OPTS="$OPTARG" ;;
+ ?) exit 7 ;;
+ esac
+done
+shift $(($OPTIND - 1))
+
+infile="$1"
+infile_extension=${infile##*.}
+
+# Convert the source parameters to lowercase.
+filetype=`echo ${infile_extension}| tr [:upper:] [:lower:]`
+if [ $filetype != flac ] && [ $filetype != ogg ] && [ $filetype != wav ] && [ $filetype != m4a ]; then
+ exit 4
+fi
+
+if [ "$outfile" = "" ]; then
+ # Build output file
+ outfile=`basename "$infile"`
+ outfile=${outfile%.$infile_extension}
+ tmp=${TMPDIR-/tmp}
+ outfile="$tmp/$outfile.$extension"
+fi
+
+# Default values
+[ -z "$comment" ] && comment="Encoded for gtkpod with $ENCODER"
+
+# echo "Converting \"$infile\" into \"$outfile\""
+
+# Checking input file
+if [ "$infile" = "" ]; then
+ exit 1
+fi
+if [ ! -f "$infile" ]; then
+ exit 1
+fi
+
+# Checking output file
+touch "$outfile"
+if [ "x$?" != "x0" ]; then
+ exit 2
+fi
+
+# Check for the existence of encoder
+encoder=`which $ENCODER`
+if [ -z "$encoder" ]; then
+ exit 5
+fi
+
+# Determine decoder
+case $filetype in
+ flac) decoder="flac" ; options="-d -c --" ;;
+ ogg) decoder="oggdec" ; options="--output - --" ;;
+ m4a) decoder="faad" ; options="-o -" ;;
+ wav) decoder="" ;;
+esac
+
+# Check for the existence of decoder
+if [ $decoder ]; then
+ decoder=`which "$decoder"`
+ if [ -z "$decoder" ]; then
+ exit 4
+ fi
+fi
Property changes on: gtkpod/branches/etch-bpo/scripts/ldif2vcf.sh
___________________________________________________________________
Name: svn:executable
+ *
Property changes on: gtkpod/branches/etch-bpo/scripts/mab2vcard
___________________________________________________________________
Name: svn:eol-style
- native
Name: svn:executable
+ *
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-abook.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-evocalendar.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/scripts/sync-evolution.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-evolution.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/sync-evolution.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -14,9 +14,16 @@
# with the following defaults:
IPOD_MOUNT=/mnt/ipod # mountpoint of ipod
-EVOPATH='/opt/gnome/libexec/evolution/2.0:/usr/lib/evolution/2.0:/opt/gnome/bin' # additional path
ENCODING=ISO-8859-15 # encoding used by ipod
+# try to find the path to evolution-addressbook-export
+for i in {/opt/gnome,/usr,/usr/local}/{bin,lib*}/{,evolution/*/}evolution-addressbook-export; do
+ if [ -x "$i" ]; then
+ EVOPATH=`dirname "$i"`
+ break
+ fi
+done
+
# Unless called with "-e=none" this script requires "iconv" available
# from http://www.gnu.org/software/libiconv/
@@ -80,10 +87,10 @@
evolution-addressbook-export --help >/dev/null 2>&1
if [ ! $? == 0 ]; then
- echo "** Error: Couldn't find evolution-addressbook-export in your PATH:"
- echo $PATH
- echo ""
- echo "Please specify \"-d <path to evolution-addressbook-export>\" when you call this script"
+ echo "** Error: Couldn't find evolution-addressbook-export in your PATH:"
+ echo $PATH
+ echo ""
+ echo "Please specify \"-d <path to evolution-addressbook-export>\" when you call this script"
exit 1
fi
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-evolution.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-kaddressbook.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-knotes.sh
___________________________________________________________________
Name: svn:executable
+ *
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-korganizer.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-ldif.sh
___________________________________________________________________
Name: svn:executable
+ *
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-notes.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-palm-jppy.py
___________________________________________________________________
Name: svn:executable
+ *
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-thunderbird-nano.sh
___________________________________________________________________
Name: svn:executable
+ *
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-thunderbird.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/scripts/sync-tomboy.sh
===================================================================
--- gtkpod/branches/etch-bpo/scripts/sync-tomboy.sh 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/scripts/sync-tomboy.sh 2008-04-17 18:50:56 UTC (rev 306)
@@ -110,7 +110,7 @@
fi
# check if iPod mountpoint exists
-if [ ! -d $IPOD_MOUNT/Notes ]; then
+if [ ! -d "$IPOD_MOUNT/Notes" ]; then
echo "Error: Cannot find iPod at $IPOD_MOUNT"
exit 1
fi
@@ -120,7 +120,7 @@
# Seeing all notes should be under 4K, easier to delete and recopy rather than checking all files sizes
echo -n "Syncing iPod ... [Notes] "
-rm -rf $IPOD_MOUNT/Notes/*
+rm -rf "$IPOD_MOUNT/Notes/*"
rm -f $NOTESPATH/*~
cd $NOTESPATH
@@ -137,19 +137,21 @@
START=`echo $LIMITS | cut -d " " -f 1`
END=`echo $LIMITS | cut -d " " -f 2`
- # Get the notes titles, we can use this as the filename
- TITLE=`cat "$FILE" | cut -d "
-" -f $START | cut -d ">" -f 3`
-
- # Get the Lines with the useful data
- DATA=`cat "$FILE" | cut -d "
-" -f $(( $START + 2 ))-$END`
+ DATA=`cat "$FILE"`
# Strip the tomboy stuff :(
for i in "<\/note-content>" "<\/text>" "<link:broken>" "<\/link:broken>" "<link:internal>" "<\/link:internal>" "<link:external>" "<\/link:external>" "<\/list>" "<list>" "<\/list-item>" "<list-item dir=\"ltr\">"; do
DATA=`printf "$DATA" | sed "s/$i//g"`
done
+ # Get the notes titles, we can use this as the filename
+ TITLE=`echo "$DATA" | cut -d "
+" -f $START | cut -d ">" -f 3 | tr : -`
+
+ # Get the Lines with the useful data
+ DATA=`echo "$DATA" | cut -d "
+" -f $(( $START + 2 ))-$END`
+
printf "$DATA" | $RECODE > "$IPOD_MOUNT/Notes/$TITLE"
read FILE
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-tomboy.sh
___________________________________________________________________
Name: svn:executable
+ *
Property changes on: gtkpod/branches/etch-bpo/scripts/sync-webcalendar.sh
___________________________________________________________________
Name: svn:mime-type
- text/x-sh
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/Makefile.am
===================================================================
--- gtkpod/branches/etch-bpo/src/Makefile.am 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/Makefile.am 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,11 +1,7 @@
## Process this file with automake to produce Makefile.in
-AM_CFLAGS = @PACKAGE_CFLAGS@
-
-INCLUDES = @PACKAGE_CFLAGS@ \
- -DMOUNT_BIN=\""@MOUNT@\"" \
+INCLUDES = -DMOUNT_BIN=\""@MOUNT@\"" \
-DUMOUNT_BIN=\""@UMOUNT@\"" \
- -DEJECT_BIN=\""@EJECT@\"" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
@@ -28,6 +24,7 @@
display.c display_playlists.c display_sorttabs.c \
display.h display_private.h \
display_itdb.c display_itdb.h \
+ display_photo.c display_photo.h \
display_spl.c display_tracks.c \
fetchcover.c fetchcover.h \
file.c file.h file_export.c \
@@ -51,11 +48,12 @@
prefs_window.c prefs_window.h \
repository.c repository.h \
sha1.c sha1.h \
+ stock_icons.c stock_icons.h \
syncdir.c syncdir.h \
tools.c tools.h \
wavfile.c wavfile.h
-gtkpod_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) @LIBOBJS@
+gtkpod_LDADD = $(LIBS) $(INTLLIBS) @LIBOBJS@
EXTRA_DIST = getopt.h
Property changes on: gtkpod/branches/etch-bpo/src/Makefile.am
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/Makefile.in
===================================================================
--- gtkpod/branches/etch-bpo/src/Makefile.in 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/Makefile.in 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 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.
@@ -14,16 +14,11 @@
@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,11 +30,62 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+bin_PROGRAMS = gtkpod$(EXEEXT)
+subdir = src
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ date_parser.c date_parser2.c getopt.c getopt1.c
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_gtkpod_OBJECTS = autodetection.$(OBJEXT) charset.$(OBJEXT) \
+ clientserver.$(OBJEXT) confirmation.$(OBJEXT) \
+ context_menus.$(OBJEXT) date_parser.$(OBJEXT) \
+ date_parser2.$(OBJEXT) details.$(OBJEXT) \
+ display_coverart.$(OBJEXT) display.$(OBJEXT) \
+ display_playlists.$(OBJEXT) display_sorttabs.$(OBJEXT) \
+ display_itdb.$(OBJEXT) display_photo.$(OBJEXT) \
+ display_spl.$(OBJEXT) display_tracks.$(OBJEXT) \
+ fetchcover.$(OBJEXT) file.$(OBJEXT) file_export.$(OBJEXT) \
+ file_convert.$(OBJEXT) file_itunesdb.$(OBJEXT) \
+ fileselection.$(OBJEXT) flacfile.$(OBJEXT) info.$(OBJEXT) \
+ ipod_init.$(OBJEXT) main.$(OBJEXT) misc.$(OBJEXT) \
+ misc_confirm.$(OBJEXT) misc_conversion.$(OBJEXT) \
+ misc_input.$(OBJEXT) misc_playlist.$(OBJEXT) \
+ misc_track.$(OBJEXT) mp3file.$(OBJEXT) mp4file.$(OBJEXT) \
+ oggfile.$(OBJEXT) podcast.$(OBJEXT) prefs.$(OBJEXT) \
+ prefs_window.$(OBJEXT) repository.$(OBJEXT) sha1.$(OBJEXT) \
+ stock_icons.$(OBJEXT) syncdir.$(OBJEXT) tools.$(OBJEXT) \
+ wavfile.$(OBJEXT)
+gtkpod_OBJECTS = $(am_gtkpod_OBJECTS)
+am__DEPENDENCIES_1 =
+gtkpod_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ @LIBOBJS@ $(am__empty)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ at MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
+LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+YLWRAP = $(top_srcdir)/ylwrap
+SOURCES = $(gtkpod_SOURCES)
+DIST_SOURCES = $(gtkpod_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -64,17 +110,22 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GMODULE_CFLAGS = @GMODULE_CFLAGS@
+GMODULE_LIBS = @GMODULE_LIBS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
GREP = @GREP@
+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
+GTHREAD_LIBS = @GTHREAD_LIBS@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
HAL_CFLAGS = @HAL_CFLAGS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@
-HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@
-HAVE_HAL_FALSE = @HAVE_HAL_FALSE@
-HAVE_HAL_TRUE = @HAVE_HAL_TRUE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -85,14 +136,12 @@
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
@@ -104,29 +153,31 @@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
-
LEX_OUTPUT_ROOT = lex.yy
+LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@
+LIBGLADE_LIBS = @LIBGLADE_LIBS@
+LIBGNOMECANVAS_CFLAGS = @LIBGNOMECANVAS_CFLAGS@
+LIBGNOMECANVAS_LIBS = @LIBGNOMECANVAS_LIBS@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MOUNT = @MOUNT@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -144,24 +195,28 @@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
-have_pkgconfig = @have_pkgconfig@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -176,6 +231,7 @@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -183,21 +239,16 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
-AM_CFLAGS = @PACKAGE_CFLAGS@
-
-INCLUDES = @PACKAGE_CFLAGS@ \
- -DMOUNT_BIN=\""@MOUNT@\"" \
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+INCLUDES = -DMOUNT_BIN=\""@MOUNT@\"" \
-DUMOUNT_BIN=\""@UMOUNT@\"" \
- -DEJECT_BIN=\""@EJECT@\"" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
-
-bin_PROGRAMS = gtkpod
-
gtkpod_SOURCES = \
autodetection.c autodetection.h \
charset.c charset.h \
@@ -210,6 +261,7 @@
display.c display_playlists.c display_sorttabs.c \
display.h display_private.h \
display_itdb.c display_itdb.h \
+ display_photo.c display_photo.h \
display_spl.c display_tracks.c \
fetchcover.c fetchcover.h \
file.c file.h file_export.c \
@@ -233,112 +285,57 @@
prefs_window.c prefs_window.h \
repository.c repository.h \
sha1.c sha1.h \
+ stock_icons.c stock_icons.h \
syncdir.c syncdir.h \
tools.c tools.h \
wavfile.c wavfile.h
-
-gtkpod_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) @LIBOBJS@
-
+gtkpod_LDADD = $(LIBS) $(INTLLIBS) @LIBOBJS@
EXTRA_DIST = getopt.h
-
CLEANFILES = date_parser.c date_parser2.c
-subdir = src
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = gtkpod$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_gtkpod_OBJECTS = autodetection.$(OBJEXT) charset.$(OBJEXT) \
- clientserver.$(OBJEXT) confirmation.$(OBJEXT) \
- context_menus.$(OBJEXT) date_parser.$(OBJEXT) \
- date_parser2.$(OBJEXT) details.$(OBJEXT) \
- display_coverart.$(OBJEXT) display.$(OBJEXT) \
- display_playlists.$(OBJEXT) display_sorttabs.$(OBJEXT) \
- display_itdb.$(OBJEXT) display_spl.$(OBJEXT) \
- display_tracks.$(OBJEXT) fetchcover.$(OBJEXT) file.$(OBJEXT) \
- file_export.$(OBJEXT) file_convert.$(OBJEXT) \
- file_itunesdb.$(OBJEXT) fileselection.$(OBJEXT) \
- flacfile.$(OBJEXT) info.$(OBJEXT) ipod_init.$(OBJEXT) \
- main.$(OBJEXT) misc.$(OBJEXT) misc_confirm.$(OBJEXT) \
- misc_conversion.$(OBJEXT) misc_input.$(OBJEXT) \
- misc_playlist.$(OBJEXT) misc_track.$(OBJEXT) mp3file.$(OBJEXT) \
- mp4file.$(OBJEXT) oggfile.$(OBJEXT) podcast.$(OBJEXT) \
- prefs.$(OBJEXT) prefs_window.$(OBJEXT) repository.$(OBJEXT) \
- sha1.$(OBJEXT) syncdir.$(OBJEXT) tools.$(OBJEXT) \
- wavfile.$(OBJEXT)
-gtkpod_OBJECTS = $(am_gtkpod_OBJECTS)
-gtkpod_DEPENDENCIES = @LIBOBJS@
-gtkpod_LDFLAGS =
-
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = $(DEPDIR)/getopt.Po $(DEPDIR)/getopt1.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/autodetection.Po ./$(DEPDIR)/charset.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/clientserver.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/confirmation.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/context_menus.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/date_parser.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/date_parser2.Po ./$(DEPDIR)/details.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/display.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/display_coverart.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/display_itdb.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/display_playlists.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/display_sorttabs.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/display_spl.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/display_tracks.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/fetchcover.Po ./$(DEPDIR)/file.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/file_convert.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/file_export.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/file_itunesdb.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/fileselection.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/flacfile.Po ./$(DEPDIR)/info.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/ipod_init.Po ./$(DEPDIR)/main.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/misc.Po ./$(DEPDIR)/misc_confirm.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/misc_conversion.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/misc_input.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/misc_playlist.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/misc_track.Po ./$(DEPDIR)/mp3file.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mp4file.Po ./$(DEPDIR)/oggfile.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/podcast.Po ./$(DEPDIR)/prefs.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/prefs_window.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/repository.Po ./$(DEPDIR)/sha1.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/syncdir.Po ./$(DEPDIR)/tools.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/wavfile.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
-YLWRAP = $(top_srcdir)/ylwrap
-DIST_SOURCES = $(gtkpod_SOURCES)
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am date_parser.c \
- date_parser2.c getopt.c getopt1.c
-SOURCES = $(gtkpod_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .l .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
else :; fi; \
done
@@ -346,18 +343,18 @@
@$(NORMAL_UNINSTALL)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
done
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
gtkpod$(EXEEXT): $(gtkpod_OBJECTS) $(gtkpod_DEPENDENCIES)
@rm -f gtkpod$(EXEEXT)
- $(LINK) $(gtkpod_LDFLAGS) $(gtkpod_OBJECTS) $(gtkpod_LDADD) $(LIBS)
+ $(LINK) $(gtkpod_OBJECTS) $(gtkpod_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -375,6 +372,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/display.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/display_coverart.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/display_itdb.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/display_photo.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/display_playlists.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/display_sorttabs.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/display_spl.Po at am__quote@
@@ -403,44 +401,28 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/prefs_window.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/repository.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha1.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stock_icons.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/syncdir.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tools.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wavfile.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@ fi
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@ fi
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.l.c:
- $(SHELL) $(YLWRAP) `test -f '$<' || echo '$(srcdir)/'`$< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
-uninstall-info-am:
+ $(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -449,6 +431,7 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -460,10 +443,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
-
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -486,28 +470,23 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
distdir: $(DISTFILES)
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -521,9 +500,10 @@
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -544,13 +524,13 @@
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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."
- -rm -f date_parser2.c
-rm -f date_parser.c
+ -rm -f date_parser2.c
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -565,18 +545,28 @@
dvi-am:
+html: html-am
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -596,18 +586,22 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+.MAKE: install-am install-strip
+
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic ctags distclean distclean-compile \
- distclean-generic distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-info-am
+ uninstall-am uninstall-binPROGRAMS
# 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.
Property changes on: gtkpod/branches/etch-bpo/src/Makefile.in
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/autodetection.c
===================================================================
--- gtkpod/branches/etch-bpo/src/autodetection.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/autodetection.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: autodetection.c 1565 2007-06-20 04:46:34Z tmzullinger $
+| $Id: autodetection.c 1681 2007-08-18 06:16:04Z jcsjcs $
*/
@@ -387,12 +387,21 @@
if (!eitdb->itdb_imported)
{
loaded_itdb = gp_load_ipod (itdb);
- loaded_itdb->usertype |= GP_ITDB_TYPE_AUTOMATIC;
- set_itdb_prefs_int (loaded_itdb, "type", loaded_itdb->usertype);
+ if (loaded_itdb)
+ {
+ loaded_itdb->usertype |= GP_ITDB_TYPE_AUTOMATIC;
+ set_itdb_prefs_int (loaded_itdb, "type", loaded_itdb->usertype);
+ }
+ else
+ {
+ gtkpod_warning (_("Newly mounted iPod at '%s' could not be loaded into gtkpod.\n\n"),
+ mountpoint);
+ }
}
else
{
- gtkpod_warning (_("Newly mounted iPod at '%s' appearss to be already loaded!\n\n"));
+ gtkpod_warning (_("Newly mounted iPod at '%s' appears to be already loaded!\n\n"),
+ mountpoint);
}
debug ("...OK (used)\n");
}
Property changes on: gtkpod/branches/etch-bpo/src/charset.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/charset.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/clientserver.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/clientserver.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/confirmation.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/confirmation.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/context_menus.c
===================================================================
--- gtkpod/branches/etch-bpo/src/context_menus.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/context_menus.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: context_menus.c 1071 2007-05-13 17:08:23Z phantom_sf $
+| $Id: context_menus.c 1827 2007-12-13 22:55:50Z phantom_sf $
*/
#ifdef HAVE_CONFIG_H
@@ -44,6 +44,7 @@
#include "repository.h"
#include "syncdir.h"
#include "display_coverart.h"
+#include "display_photo.h"
#define LOCALDEBUG 0
@@ -58,7 +59,9 @@
CM_ST,
CM_TM,
CM_NUM,
- CM_CAD
+ CM_CAD,
+ CM_PH_AV,
+ CM_PH_IV
} CM_type;
@@ -776,13 +779,6 @@
G_CALLBACK (coverart_set_cover_from_file), NULL);
}
-static GtkWidget *add_get_cover_from_web (GtkWidget *menu)
-{
- return hookup_mi (menu, _("Find Cover on Web"),
- GTK_STOCK_NETWORK,
- G_CALLBACK (coverart_set_cover_from_web), NULL);
-}
-
static GtkWidget *add_check_ipod_files (GtkWidget *menu)
{
/* FIXME */
@@ -892,7 +888,43 @@
}
#endif
+GtkWidget *gphoto_menuitem_remove_album_from_db_item(GtkWidget *menu)
+{
+ return hookup_mi (
+ menu,
+ _("Remove Album"),
+ GTK_STOCK_DELETE,
+ G_CALLBACK (gphoto_remove_album_from_database),
+ NULL);
+}
+GtkWidget *gphoto_menuitem_remove_photo_from_album_item(GtkWidget *menu)
+{
+ GtkWidget *mitem = hookup_mi (
+ menu,
+ _("Remove Photo"),
+ GTK_STOCK_DELETE,
+ G_CALLBACK (gphoto_remove_selected_photos_from_album),
+ NULL);
+
+ if (gphoto_get_selected_photo_count() == 0)
+ gtk_widget_set_sensitive (mitem, FALSE);
+ else
+ gtk_widget_set_sensitive (mitem, TRUE);
+
+ return mitem;
+}
+
+GtkWidget *gphoto_menuitem_rename_photoalbum_item(GtkWidget *menu)
+{
+ return hookup_mi (
+ menu,
+ _("Rename Album"),
+ GTK_STOCK_DELETE,
+ G_CALLBACK (gphoto_rename_selected_album),
+ NULL);
+}
+
void create_context_menu (CM_type type)
{
static GtkWidget *menu = NULL;
@@ -1062,10 +1094,16 @@
break;
case CM_CAD:
add_get_cover_from_file (menu);
- add_get_cover_from_web (menu);
add_display_big_coverart (menu);
add_edit_track_details (menu);
break;
+ case CM_PH_AV:
+ gphoto_menuitem_remove_album_from_db_item (menu);
+ gphoto_menuitem_rename_photoalbum_item (menu);
+ break;
+ case CM_PH_IV:
+ gphoto_menuitem_remove_photo_from_album_item (menu);
+ break;
case CM_NUM:
g_return_if_reached ();
}
@@ -1132,14 +1170,41 @@
if(selected_tracks)
create_context_menu (CM_CAD);
}
+
/**
+ * photo_context_menu_init - initialize the right click menu for photo management display
+ */
+void
+gphoto_context_menu_init (gint component)
+{
+ if (widgets_blocked) return;
+
+ selected_entry = NULL;
+ selected_playlist = NULL;
+ selected_tracks = NULL;
+ active_itdb = gp_get_selected_itdb ();
+ entry_inst = -1;
+
+ if (selected_tracks) g_list_free (selected_tracks);
+
+ switch (component)
+ {
+ case GPHOTO_ALBUM_VIEW:
+ create_context_menu (CM_PH_AV);
+ break;
+ case GPHOTO_ICON_VIEW:
+ create_context_menu (CM_PH_IV);
+ }
+}
+
+/**
* pm_context_menu_init - initialize the right click menu for playlists
*/
void
pm_context_menu_init(void)
{
if (widgets_blocked) return;
-
+
pm_stop_editing (TRUE);
if (selected_tracks) g_list_free (selected_tracks);
@@ -1147,6 +1212,10 @@
selected_entry = NULL;
entry_inst = -1;
selected_playlist = pm_get_selected_playlist();
+
+ /* Dont allow context menu to display if the playlist is the photo one */
+ if (gphoto_is_photo_playlist (selected_playlist)) return;
+
active_itdb = gp_get_selected_itdb ();
if(selected_playlist)
{
@@ -1154,6 +1223,7 @@
create_context_menu (CM_PL);
}
}
+
/**
* st_context_menu_init - initialize the right click menu for sort tabs
* FIXME: This needs to be hooked in.
Property changes on: gtkpod/branches/etch-bpo/src/context_menus.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/context_menus.h
===================================================================
--- gtkpod/branches/etch-bpo/src/context_menus.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/context_menus.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -22,7 +22,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: context_menus.h 1036 2007-04-15 13:27:42Z jcsjcs $
+| $Id: context_menus.h 1750 2007-11-01 21:57:01Z phantom_sf $
*/
#ifndef CONTEXT_MENUS_H
#define CONTEXT_MENUS_H
@@ -33,5 +33,6 @@
void st_context_menu_init(gint inst);
void pm_context_menu_init(void);
void cad_context_menu_init(void);
+void gphoto_context_menu_init (gint component);
#endif
Property changes on: gtkpod/branches/etch-bpo/src/context_menus.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/date_parser.c
===================================================================
--- gtkpod/branches/etch-bpo/src/date_parser.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/date_parser.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -6,6 +6,25 @@
/* A lexical scanner generated by flex */
+#define yy_create_buffer lexdp_create_buffer
+#define yy_delete_buffer lexdp_delete_buffer
+#define yy_flex_debug lexdp_flex_debug
+#define yy_init_buffer lexdp_init_buffer
+#define yy_flush_buffer lexdp_flush_buffer
+#define yy_load_buffer_state lexdp_load_buffer_state
+#define yy_switch_to_buffer lexdp_switch_to_buffer
+#define yyin lexdpin
+#define yyleng lexdpleng
+#define yylex lexdplex
+#define yylineno lexdplineno
+#define yyout lexdpout
+#define yyrestart lexdprestart
+#define yytext lexdptext
+#define yywrap lexdpwrap
+#define yyalloc lexdpalloc
+#define yyrealloc lexdprealloc
+#define yyfree lexdpfree
+
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
@@ -336,7 +355,7 @@
/* Begin user sect3 */
-#define lexdpwrap() 1
+#define lexdpwrap(n) 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -561,7 +580,7 @@
/* e.g. +8:54.23 */
/* e.g. 5d6m3s */
/* e.g. -3M5d */
-#line 565 "date_parser.c"
+#line 584 "date_parser.c"
#define INITIAL 0
@@ -715,7 +734,7 @@
#line 116 "date_parser.l"
-#line 719 "date_parser.c"
+#line 738 "date_parser.c"
if ( !(yy_init) )
{
@@ -988,7 +1007,7 @@
#line 273 "date_parser.l"
ECHO;
YY_BREAK
-#line 992 "date_parser.c"
+#line 1011 "date_parser.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1219,7 +1238,7 @@
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ (yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -1683,7 +1702,7 @@
/** Setup the input buffer state to scan a string. The next call to lexdplex() will
* scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
+ * @param str a NUL-terminated string to scan
*
* @return the newly allocated buffer state object.
* @note If you want to scan bytes that may contain NUL values, then use
Property changes on: gtkpod/branches/etch-bpo/src/date_parser.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/date_parser.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/date_parser.l
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/date_parser2.c
===================================================================
--- gtkpod/branches/etch-bpo/src/date_parser2.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/date_parser2.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -6,6 +6,25 @@
/* A lexical scanner generated by flex */
+#define yy_create_buffer lexdp2_create_buffer
+#define yy_delete_buffer lexdp2_delete_buffer
+#define yy_flex_debug lexdp2_flex_debug
+#define yy_init_buffer lexdp2_init_buffer
+#define yy_flush_buffer lexdp2_flush_buffer
+#define yy_load_buffer_state lexdp2_load_buffer_state
+#define yy_switch_to_buffer lexdp2_switch_to_buffer
+#define yyin lexdp2in
+#define yyleng lexdp2leng
+#define yylex lexdp2lex
+#define yylineno lexdp2lineno
+#define yyout lexdp2out
+#define yyrestart lexdp2restart
+#define yytext lexdp2text
+#define yywrap lexdp2wrap
+#define yyalloc lexdp2alloc
+#define yyrealloc lexdp2realloc
+#define yyfree lexdp2free
+
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
@@ -336,7 +355,7 @@
/* Begin user sect3 */
-#define lexdp2wrap() 1
+#define lexdp2wrap(n) 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
@@ -547,7 +566,7 @@
scripts may be lexyy.c or similar. To make the code portable again
(hopefully), I also define "LEX_OUTPUT_ROOT = lex.yy" in
Makefile.am */
-#line 551 "date_parser2.c"
+#line 570 "date_parser2.c"
#define INITIAL 0
@@ -704,7 +723,7 @@
#line 87 "date_parser2.l"
-#line 708 "date_parser2.c"
+#line 727 "date_parser2.c"
if ( !(yy_init) )
{
@@ -910,7 +929,7 @@
#line 150 "date_parser2.l"
ECHO;
YY_BREAK
-#line 914 "date_parser2.c"
+#line 933 "date_parser2.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1141,7 +1160,7 @@
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), (size_t) num_to_read );
+ (yy_n_chars), num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -1608,7 +1627,7 @@
/** Setup the input buffer state to scan a string. The next call to lexdp2lex() will
* scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
+ * @param str a NUL-terminated string to scan
*
* @return the newly allocated buffer state object.
* @note If you want to scan bytes that may contain NUL values, then use
Property changes on: gtkpod/branches/etch-bpo/src/date_parser2.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/date_parser2.l
___________________________________________________________________
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/details.c
===================================================================
--- gtkpod/branches/etch-bpo/src/details.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/details.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: details.c 1596 2007-06-26 14:33:01Z dforsi $
+| $Id: details.c 1755 2007-11-05 01:16:19Z phantom_sf $
*/
/* This file provides functions for the details window */
@@ -37,6 +37,7 @@
#include "display_coverart.h"
#include "misc_track.h"
#include "prefs.h"
+#include "info.h"
#include <string.h>
#include <glib/gstdio.h>
@@ -90,6 +91,14 @@
{ 0, NULL }
};
+/* Detail image drag types for dnd */
+GtkTargetEntry cover_image_drag_types [] = {
+ { "image/jpeg", 0, DND_IMAGE_JPEG },
+ { "text/uri-list", 0, DND_TEXT_URI_LIST },
+ { "text/plain", 0, DND_TEXT_PLAIN },
+ { "STRING", 0, DND_TEXT_PLAIN }
+};
+
/* Declarations */
static void details_set_track (Detail *detail, Track *track);
static void details_free (Detail *detail);
@@ -99,9 +108,10 @@
static gboolean details_copy_artwork (Track *frtrack, Track *totrack);
static void details_undo_track (Detail *detail, Track *track);
static void details_update_headline (Detail *detail);
+static gboolean dnd_details_art_drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, guint time, gpointer user_data);
+static void dnd_details_art_drag_data_received(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, GtkSelectionData *data, guint info, guint time, gpointer user_data);
+static gboolean dnd_details_art_drag_motion (GtkWidget *widget, GdkDragContext *dc, gint x, gint y, guint time, gpointer user_data);
-
-
/* Store the window size */
static void details_store_window_state (Detail *detail)
{
@@ -301,6 +311,7 @@
g_return_if_fail (etr);
gp_track_set_thumbnails (tr, filename);
etr->tchanged = TRUE;
+ etr->tartwork_changed = TRUE;
}
}
else
@@ -309,6 +320,7 @@
g_return_if_fail (etr);
gp_track_set_thumbnails (detail->track, filename);
etr->tchanged = TRUE;
+ etr->tartwork_changed = TRUE;
}
detail->changed = TRUE;
details_update_thumbnail (detail);
@@ -554,6 +566,7 @@
g_free (toetr->thumb_path_utf8);
toetr->thumb_path_locale = g_strdup (fretr->thumb_path_locale);
toetr->thumb_path_utf8 = g_strdup (fretr->thumb_path_utf8);
+ toetr->tartwork_changed = TRUE;
changed = TRUE;
}
/* make sure artwork gets removed, even if both thumb_paths were
@@ -562,12 +575,7 @@
{
changed |= gp_track_remove_thumbnails (totrack);
}
-
- /* Since no data changes affect the coverart display.
- * Need to force a change by calling set covers directly.
- */
- force_update_covers ();
-
+
return changed;
}
@@ -690,6 +698,7 @@
w = gtkpod_xml_get_widget (detail->xml, buf);
gtk_button_set_label (GTK_BUTTON (w),
gettext (get_t_string (item)));
+ g_free (buf);
break;
default:
buf = g_strdup_printf ("details_label_%d", item);
@@ -761,6 +770,7 @@
case T_CHECKED:
case T_REMEMBER_PLAYBACK_POSITION:
case T_SKIP_WHEN_SHUFFLING:
+ case T_GAPLESS_TRACK_FLAG:
buf = g_strdup_printf ("details_checkbutton_%d", item);
w = gtkpod_xml_get_widget (detail->xml, buf);
g_signal_connect (w, "toggled",
@@ -967,6 +977,17 @@
gtk_combo_box_set_active (GTK_COMBO_BOX (w), index);
}
break;
+ case T_GAPLESS_TRACK_FLAG:
+ if ((w = gtkpod_xml_get_widget (detail->xml, checkbutton)))
+ {
+ if (track)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
+ track->gapless_track_flag);
+ else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
+ FALSE);
+ }
+ break;
case T_ALL:
case T_ITEM_NUM:
/* cannot happen because of assertion above */
@@ -1187,6 +1208,7 @@
case T_IPOD_PATH:
case T_IPOD_ID:
case T_THUMB_PATH:
+ case T_GAPLESS_TRACK_FLAG:
/* These are read-only only */
break;
break;
@@ -1595,11 +1617,6 @@
G_CALLBACK (details_button_set_artwork_clicked),
detail);
- w = gtkpod_xml_get_widget (detail->xml, "details_button_fetch_cover");
- g_signal_connect (w, "clicked",
- G_CALLBACK (on_fetchcover_fetch_button),
- detail);
-
w = gtkpod_xml_get_widget (detail->xml, "details_button_remove_artwork");
g_signal_connect (w, "clicked",
G_CALLBACK (details_button_remove_artwork_clicked),
@@ -1640,13 +1657,36 @@
g_signal_connect (detail->window, "delete_event",
G_CALLBACK (details_delete_event), detail);
+ /* enable drag and drop for coverart window */
+ GtkImage *img;
+ img = GTK_IMAGE (gtkpod_xml_get_widget (detail->xml,
+ "details_image_thumbnail"));
+
+ gtk_drag_dest_set (
+ GTK_WIDGET(img),
+ 0,
+ cover_image_drag_types,
+ TGNR (cover_image_drag_types),
+ GDK_ACTION_COPY|GDK_ACTION_MOVE);
+ g_signal_connect ((gpointer) img, "drag-drop",
+ G_CALLBACK (dnd_details_art_drag_drop),
+ NULL);
+
+ g_signal_connect ((gpointer) img, "drag-data-received",
+ G_CALLBACK (dnd_details_art_drag_data_received),
+ NULL);
+
+ g_signal_connect ((gpointer) img, "drag-motion",
+ G_CALLBACK (dnd_details_art_drag_motion),
+ NULL);
+
details_set_tracks (detail, selected_tracks);
/* set notebook page */
w = gtkpod_xml_get_widget (detail->xml, "details_notebook");
page = prefs_get_int (DETAILS_WINDOW_NOTEBOOK_PAGE);
- if ((page >= 0) && (page <= 3))
+ if ((page >= 0) && (page <= 4))
gtk_notebook_set_current_page (GTK_NOTEBOOK (w), page);
/* set default size */
@@ -1691,3 +1731,225 @@
{
return details->data;
}
+
+static gboolean dnd_details_art_drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, guint time, gpointer user_data)
+{
+ GdkAtom target;
+ target = gtk_drag_dest_find_target (widget, drag_context, NULL);
+
+ if (target != GDK_NONE)
+ {
+ gtk_drag_get_data (widget, drag_context, target, time);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean dnd_details_art_drag_motion (GtkWidget *widget,
+ GdkDragContext *dc,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
+{
+ GdkAtom target;
+ iTunesDB *itdb;
+ ExtraiTunesDBData *eitdb;
+
+ itdb = gp_get_selected_itdb ();
+ /* no drop is possible if no playlist/repository is selected */
+ if (itdb == NULL)
+ {
+ gdk_drag_status (dc, 0, time);
+ return FALSE;
+ }
+
+ eitdb = itdb->userdata;
+ g_return_val_if_fail (eitdb, FALSE);
+ /* no drop is possible if no repository is loaded */
+ if (!eitdb->itdb_imported)
+ {
+ gdk_drag_status (dc, 0, time);
+ return FALSE;
+ }
+
+ target = gtk_drag_dest_find_target (widget, dc, NULL);
+ /* no drop possible if no valid target can be found */
+ if (target == GDK_NONE)
+ {
+ gdk_drag_status (dc, 0, time);
+ return FALSE;
+ }
+
+ gdk_drag_status (dc, dc->suggested_action, time);
+
+ return TRUE;
+}
+
+static void dnd_details_art_drag_data_received(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, GtkSelectionData *data, guint info, guint time, gpointer user_data)
+{
+ g_return_if_fail (widget);
+ g_return_if_fail (dc);
+ g_return_if_fail (data);
+ g_return_if_fail (data->data);
+ g_return_if_fail (data->length > 0);
+
+#if DEBUG
+ printf ("data length = %d\n", data->length);
+ printf ("data->data = %s\n", data->data);
+#endif
+
+ Detail *detail;
+ GList *tracks;
+ gchar *url = NULL;
+ Fetch_Cover *fcover;
+ gchar *filename = NULL;
+ gboolean image_status = FALSE;
+ gchar *image_error = NULL;
+ /* For use with DND_IMAGE_JPEG */
+ GdkPixbuf *pixbuf;
+ GError *error = NULL;
+
+ /* Find the selected detail item for the coverart image */
+ detail = details_get_selected_detail ();
+ tracks = detail->tracks;
+
+ switch (info)
+ {
+ case DND_IMAGE_JPEG:
+#if DEBUG
+ printf ("Using DND_IMAGE_JPEG\n");
+#endif
+ pixbuf = gtk_selection_data_get_pixbuf (data);
+ if (pixbuf != NULL)
+ {
+ /* initialise the url string with a safe value as not used if already have image */
+ url = "local image";
+ /* Initialise a fetchcover object */
+ fcover = fetchcover_new (url, tracks);
+ fcover->parent_window = GTK_WINDOW(detail->window);
+ coverart_block_change (TRUE);
+
+ /* find the filename with which to save the pixbuf to */
+ if (fetchcover_select_filename (fcover))
+ {
+ filename = g_build_filename(fcover->dir, fcover->filename, NULL);
+ if (! gdk_pixbuf_save (pixbuf, filename, "jpeg", &error, NULL))
+ {
+ /* Save failed for some reason */
+ fcover->err_msg = g_strdup (error->message);
+ g_error_free (error);
+ }
+ else
+ {
+ /* Image successfully saved */
+ image_status = TRUE;
+ }
+ }
+ /* record any errors and free the fetchcover */
+ if (fcover->err_msg != NULL)
+ image_error = g_strdup(fcover->err_msg);
+
+ free_fetchcover (fcover);
+ gdk_pixbuf_unref (pixbuf);
+ coverart_block_change (FALSE);
+ }
+ else
+ {
+ /* despite the data being of type image/jpeg, the pixbuf is NULL */
+ image_error = "jpeg data flavour was used but the data did not contain a GdkPixbuf object";
+ }
+ break;
+ case DND_TEXT_PLAIN:
+#if DEBUG
+ printf ("Defaulting to using DND_TEXT_PLAIN\n");
+#endif
+
+#ifdef HAVE_CURL
+ /* initialise the url string with the data from the dnd */
+ url = g_strdup ((gchar *) data->data);
+ /* Initialise a fetchcover object */
+ fcover = fetchcover_new (url, tracks);
+ /* assign details window as the parent window so the file exists dialog is
+ * properly centred and visible if a file has to be overwritten
+ */
+ fcover->parent_window = GTK_WINDOW(detail->window);
+ coverart_block_change (TRUE);
+
+ if (fetchcover_net_retrieve_image (fcover))
+ {
+#if DEBUG
+ printf ("Successfully retrieved\n");
+ printf ("Url of fetch cover: %s\n", fcover->url->str);
+ printf ("filename of fetch cover: %s\n", fcover->filename);
+#endif
+
+ filename = g_build_filename(fcover->dir, fcover->filename, NULL);
+ image_status = TRUE;
+ }
+
+ /* record any errors and free the fetchcover */
+ if (fcover->err_msg != NULL)
+ image_error = g_strdup(fcover->err_msg);
+
+ free_fetchcover (fcover);
+ coverart_block_change (FALSE);
+#else
+ image_error = "Item had to be downloaded but gtkpod was not compiled with curl.";
+ image_status = FALSE;
+#endif
+ }
+
+ if (!image_status || filename == NULL)
+ {
+ gtkpod_warning (_("Error occurred dropping an image onto the details window: %s\n"), image_error);
+
+ if (image_error)
+ g_free (image_error);
+ if (filename)
+ g_free (filename);
+
+ gtk_drag_finish (dc, FALSE, FALSE, time);
+ return;
+ }
+
+ if (details_writethrough(detail))
+ {
+ GList *list;
+ for (list = detail->tracks; list; list = list->next)
+ {
+ ExtraTrackData *etd;
+ Track *track = list->data;
+
+ if (!track)
+ break;
+
+ etd = track->userdata;
+ gp_track_set_thumbnails(track, filename);
+ etd->tchanged = TRUE;
+ etd->tartwork_changed = TRUE;
+ }
+ }
+ else
+ {
+ ExtraTrackData *etd = detail->track->userdata;
+ if (etd)
+ {
+ gp_track_set_thumbnails(detail->track, filename);
+ etd->tchanged = TRUE;
+ etd->tartwork_changed = TRUE;
+ }
+ }
+ detail->changed = TRUE;
+ details_update_thumbnail(detail);
+ details_update_buttons(detail);
+
+ if (image_error)
+ g_free (image_error);
+
+ g_free (filename);
+ gtkpod_statusbar_message (_("Successfully set new coverart for selected tracks"));
+ gtk_drag_finish (dc, FALSE, FALSE, time);
+ return;
+}
Modified: gtkpod/branches/etch-bpo/src/display.c
===================================================================
--- gtkpod/branches/etch-bpo/src/display.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-04-23 22:24:05 jcs>
+/* Time-stamp: <2007-12-13 01:02:57 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display.c 1053 2007-04-23 15:33:31Z jcsjcs $
+| $Id: display.c 1825 2007-12-13 13:28:20Z dforsi $
*/
#ifdef HAVE_CONFIG_H
@@ -45,6 +45,7 @@
#include "tools.h"
#include <stdlib.h>
#include <string.h>
+#include <glib/gprintf.h>
GtkWidget *gtkpod_window = NULL;
@@ -75,8 +76,13 @@
tm_create_treeview ();
st_create_tabs ();
+ pm_create_treeview ();
+
+ /* initialize sorting */
+ tm_sort (prefs_get_int("tm_sortcol"), prefs_get_int("tm_sort"));
+
st_set_default_sizes ();
- pm_create_treeview ();
+
/* Hide/Show the toolbar */
display_show_hide_toolbar ();
/* Hide/Show tooltips */
@@ -201,6 +207,7 @@
gtk_widget_set_sensitive (edit3, FALSE);
gtk_widget_set_sensitive (edit4, FALSE);
gtk_widget_set_sensitive (edit5, FALSE);
+ gtk_widget_set_sensitive (espl, FALSE);
}
else
{
@@ -442,8 +449,98 @@
file_convert_update_default_sizes ();
}
+/**
+ * display_image_dialog
+ *
+ * @GdkPixbuf: image
+ *
+ * function to load a transient dialog displaying the provided image at either
+ * it maximum size or the size of the screen (whichever is smallest).
+ *
+ */
+void display_image_dialog (GdkPixbuf *image)
+{
+ g_return_if_fail (image);
+
+ GladeXML *preview_xml;
+ GtkWidget *dialog;
+ GtkWidget *canvasbox;
+ GtkWidget *res_label;
+ GdkPixbuf *scaled = NULL;
+ gchar *text;
+
+ preview_xml = glade_xml_new (xml_file, "coverart_preview_dialog", NULL);
+
+ dialog = gtkpod_xml_get_widget (preview_xml, "coverart_preview_dialog");
+ canvasbox = gtkpod_xml_get_widget (preview_xml, "coverart_preview_dialog_vbox");
+ res_label = gtkpod_xml_get_widget (preview_xml, "coverart_preview_dialog_res_lbl");
+ g_return_if_fail (dialog);
+ g_return_if_fail (canvasbox);
+ g_return_if_fail (res_label);
+
+ /* Set the dialog parent */
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (gtkpod_window));
+
+ gint pixheight = gdk_pixbuf_get_height (image);
+ gint pixwidth = gdk_pixbuf_get_width (image);
+
+ /* Set the resolution in the label */
+ gchar *resvalues = (gchar *) g_malloc (sizeof(gint) + (sizeof(gchar) * 3) + sizeof(gint));
+ g_sprintf (resvalues, "%d x %d", pixwidth, pixheight);
+ text = g_markup_printf_escaped (_("<b>Image Dimensions: %s</b>"), resvalues);
+ gtk_label_set_markup (GTK_LABEL (res_label), text);
+ g_free (text);
+
+ gint scrheight = gdk_screen_height() - 100;
+ gint scrwidth = gdk_screen_width() - 100;
+
+ gdouble ratio = (gdouble) pixwidth / (gdouble) pixheight;
+ if (pixwidth > scrwidth)
+ {
+ pixwidth = scrwidth;
+ pixheight = pixwidth / ratio;
+ }
+
+ if (pixheight > scrheight)
+ {
+ pixheight = scrheight;
+ pixwidth = pixheight * ratio;
+ }
+
+ GnomeCanvas *canvas;
+ canvas = GNOME_CANVAS (gnome_canvas_new());
+ gtk_widget_set_size_request ( GTK_WIDGET(canvas),
+ pixwidth,
+ pixheight);
+
+ gnome_canvas_set_scroll_region ( canvas,
+ 0.0, 0.0,
+ pixwidth,
+ pixheight);
+ GnomeCanvasItem *canvasitem;
+ canvasitem = gnome_canvas_item_new( gnome_canvas_root(canvas),
+ GNOME_TYPE_CANVAS_PIXBUF, NULL);
+
+ scaled = gdk_pixbuf_scale_simple (image, pixwidth, pixheight, GDK_INTERP_NEAREST);
+
+ /* Apply the image to the canvas */
+ gnome_canvas_item_set ( canvasitem,
+ "pixbuf", scaled);
+ gtk_box_pack_start_defaults (GTK_BOX(canvasbox), GTK_WIDGET (canvas));
+
+ /* Display the dialog and block everything else until the
+ * dialog is closed.
+ */
+ gtk_widget_show_all (dialog);
+ gtk_dialog_run (GTK_DIALOG(dialog));
+
+ /* Destroy the dialog as no longer required */
+ gdk_pixbuf_unref (scaled);
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
/* Utility function: returns a copy of the tracks currently
selected. This means:
Property changes on: gtkpod/branches/etch-bpo/src/display.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/display.h
===================================================================
--- gtkpod/branches/etch-bpo/src/display.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display.h 1570 2007-06-21 15:27:11Z jcsjcs $
+| $Id: display.h 1765 2007-11-08 20:02:42Z phantom_sf $
*/
#ifndef __DISPLAY_H__
@@ -256,6 +256,7 @@
T_SORT_ALBUMARTIST,
T_SORT_COMPOSER,
T_SORT_TVSHOW,
+ T_GAPLESS_TRACK_FLAG,
T_ITEM_NUM,
} T_item;
@@ -276,7 +277,8 @@
DND_GTKPOD_TM_PATHLIST,
DND_GTKPOD_PLAYLISTLIST,
DND_TEXT_URI_LIST,
- DND_TEXT_PLAIN
+ DND_TEXT_PLAIN,
+ DND_IMAGE_JPEG
};
/* used for the ST_CAT_SPECIAL user_data (see st_create_special and
@@ -293,6 +295,7 @@
GList *display_get_selected_members (gint inst);
void display_remove_autoscroll_row_timeout (GtkWidget *widget);
void display_install_autoscroll_row_timeout (GtkWidget *widget);
+void display_image_dialog (GdkPixbuf *image);
Playlist* pm_get_selected_playlist (void);
gint pm_get_position_for_itdb (iTunesDB *itdb);
Property changes on: gtkpod/branches/etch-bpo/src/display.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/display_coverart.c
===================================================================
--- gtkpod/branches/etch-bpo/src/display_coverart.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_coverart.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,11 +23,11 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_coverart.c 1600 2007-06-27 18:45:37Z tmzullinger $
+| $Id: display_coverart.c 1776 2007-11-12 22:38:00Z phantom_sf $
*/
#ifdef HAVE_CONFIG_H
-# include <config.h>
+ #include <config.h>
#endif
#include "display_private.h"
@@ -39,26 +39,30 @@
#include "details.h"
#include "fileselection.h"
#include "fetchcover.h"
+#include "info.h"
+#define DEBUG 0
+
/* Declarations */
static void free_album (Album_Item *album);
static void free_CDWidget ();
static gint compare_album_keys (gchar *a, gchar *b);
static void set_display_dimensions ();
-static GdkPixbuf *draw_blank_cdimage ();
-static void set_highlight (Cover_Item *cover, gboolean ismain);
+static void set_highlight (Cover_Item *cover, gint index);
static void raise_cdimages (GPtrArray *cdcovers);
-/*static void scroll_covers (gint direction);*/
static void remove_track_from_album (Album_Item *album, Track *track, gchar *key, gint index, GList *keylistitem);
static void on_cover_display_button_clicked (GtkWidget *widget, gpointer data);
static gint on_main_cover_image_clicked (GnomeCanvasItem *canvasitem, GdkEvent *event, gpointer data);
static void on_cover_display_slider_value_changed (GtkRange *range, gpointer user_data);
-static void set_cover_dimensions (Cover_Item *cover, int cover_index);
+static void set_cover_dimensions (Cover_Item *cover, int cover_index, gdouble img_width, gdouble img_height);
static void coverart_sort_images (GtkSortType order);
static void prepare_canvas ();
static void set_slider_range (gint index);
static void set_covers (gboolean force_imgupdate);
static void set_cover_item (gint ndex, Cover_Item *cover, gchar *key, gboolean force_imgupdate);
+static gboolean dnd_coverart_drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, guint time, gpointer user_data);
+static void dnd_coverart_drag_data_received(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, GtkSelectionData *data, guint info, guint time, gpointer user_data);
+static gboolean dnd_coverart_drag_motion (GtkWidget *widget, GdkDragContext *dc, gint x, gint y, guint time, gpointer user_data);
/* Prefs keys */
const gchar *KEY_DISPLAY_COVERART="display_coverart";
@@ -73,12 +77,6 @@
static gint HEIGHT;
static gint DEFAULT_WIDTH;
static gint DEFAULT_HEIGHT;
-/* Dimensions used for the smaller 8 cd cover images */
-static gdouble SMALL_IMG_WIDTH;
-static gdouble SMALL_IMG_HEIGHT;
-/* Dimensions used for the main cd cover image */
-static gdouble BIG_IMG_WIDTH;
-static gdouble BIG_IMG_HEIGHT;
/* Path of the png file used for albums without cd covers */
static gchar *DEFAULT_FILE;
/* Path of the png file used for the highlighting of cd covers */
@@ -92,6 +90,15 @@
static gulong window_signal_id;
static gulong contentpanel_signal_id;
+static GtkTargetEntry coverart_drop_types [] = {
+ /* Konqueror supported flavours */
+ { "image/jpeg", 0, DND_IMAGE_JPEG },
+
+ /* Fallback flavours */
+ { "text/plain", 0, DND_TEXT_PLAIN },
+ { "STRING", 0, DND_TEXT_PLAIN }
+};
+
#if 0
static void debug_albums ()
{
@@ -127,11 +134,12 @@
/**
*
+ * free_CDWidget
+ *
* destroy the CD Widget and free everything currently
* in memory.
- *
*/
- static void free_CDWidget()
+ static void free_CDWidget ()
{
gint i;
g_signal_handler_disconnect (cdwidget->leftbutton, lbutton_signal_id);
@@ -179,50 +187,6 @@
}
/**
- * draw_blank_cdimage:
- *
- * creates a blank "black" pixbuf cd image to represent the
- * display when the playlist has no tracks in it.
- *
- * Returns:
- * pixbuf of blank pixbuf
- */
-static GdkPixbuf *draw_blank_cdimage ()
-{
- gdouble width = 4;
- gdouble height = 4;
- gint pixel_offset, rowstride, x, y;
- guchar *drawbuf;
-
- drawbuf = g_malloc ((gint) (width * 16) * (gint) height);
-
- /* drawing buffer length multiplied by 4
- * due to 1 width per R, G, B & ALPHA
- */
- rowstride = width * 4;
-
- for(y = 0; y < height; ++y)
- {
- for(x = 0; x < width; ++x)
- {
- pixel_offset = (y * rowstride) + (x * 4);
- drawbuf[pixel_offset] = 0;
- drawbuf[pixel_offset + 1] = 0;
- drawbuf[pixel_offset + 2] = 0;
- drawbuf[pixel_offset + 3] = 255;
- }
- }
- return gdk_pixbuf_new_from_data(drawbuf,
- GDK_COLORSPACE_RGB,
- TRUE,
- 8,
- width,
- height,
- rowstride,
- (GdkPixbufDestroyNotify) g_free, NULL);
-}
-
-/**
* set_highlight:
*
* Sets the highlighted image to the cover to give shine
@@ -231,32 +195,31 @@
* @cover: A Cover_Item object which the higlighted is added to.
*
*/
-static void set_highlight (Cover_Item *cover, gboolean ismain)
+static void set_highlight (Cover_Item *cover, gint index)
{
- GdkPixbuf *image;
- GError *error = NULL;
- GdkPixbuf *scaled;
-
- if(ismain)
- image = gdk_pixbuf_new_from_file(HIGHLIGHT_FILE_MAIN, &error);
- else
- image = gdk_pixbuf_new_from_file(HIGHLIGHT_FILE, &error);
+ GdkPixbuf *image;
+ GError *error = NULL;
+ GdkPixbuf *scaled;
+
+ if(index == IMG_MAIN)
+ image = gdk_pixbuf_new_from_file(HIGHLIGHT_FILE_MAIN, &error);
+ else
+ image = gdk_pixbuf_new_from_file(HIGHLIGHT_FILE, &error);
- if(error != NULL)
- {
- printf("Error occurred loading file - \nCode: %d\nMessage: %s\n", error->code, error->message);
- g_return_if_fail (image);
- }
+ if(error != NULL)
+ {
+ printf("Error occurred loading file - \nCode: %d\nMessage: %s\n", error->code, error->message);
+ g_error_free (error);
+ g_return_if_fail (image);
+ }
- scaled = gdk_pixbuf_scale_simple(image, cover->img_width, ((cover->img_height * 2) + 6), GDK_INTERP_NEAREST);
- gdk_pixbuf_unref (image);
+ scaled = gdk_pixbuf_scale_simple(image, cover->img_width, ((cover->img_height * 2) + 6), GDK_INTERP_NEAREST);
+ gdk_pixbuf_unref (image);
- gnome_canvas_item_set (cover->highlight,
+ gnome_canvas_item_set (cover->highlight,
"pixbuf", scaled,
NULL);
- gdk_pixbuf_unref (scaled);
-
- gnome_canvas_item_hide (cover->highlight);
+ gdk_pixbuf_unref (scaled);
}
/**
@@ -350,39 +313,19 @@
if (key == NULL)
{
- GdkPixbuf *imgbuf;
- album = NULL;
- imgbuf = draw_blank_cdimage ();
-
- /* Hide the highlight */
- gnome_canvas_item_hide (cover->highlight);
-
- /* Set the cover */
- scaled = gdk_pixbuf_scale_simple (imgbuf, cover->img_width, cover->img_height, GDK_INTERP_NEAREST);
- gnome_canvas_item_set (cover->cdimage,
- "pixbuf", scaled,
- NULL);
-
+ /* Clear everything */
+ gnome_canvas_item_hide (cover->cdimage);
/* Set the reflection to blank too */
- reflection = gdk_pixbuf_flip (scaled, FALSE);
- gnome_canvas_item_set (cover->cdreflection,
- "pixbuf", reflection,
- NULL);
-
+ gnome_canvas_item_hide (cover->cdreflection);
+ /* Set the highlight to black too */
+ if (cover->highlight != NULL)
+ gnome_canvas_item_hide (cover->highlight);
+
if (index == IMG_MAIN)
{
- /* Set the text to blank */
- gnome_canvas_item_set (GNOME_CANVAS_ITEM (cdwidget->cvrtext),
- "text", "No Artist",
- "fill_color", "black",
- "justification", GTK_JUSTIFY_CENTER,
- NULL);
- }
-
- gdk_pixbuf_unref (reflection);
- gdk_pixbuf_unref (scaled);
- gdk_pixbuf_unref (imgbuf);
-
+ /* Hide the artist/album text*/
+ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (cdwidget->cvrtext));
+ }
return;
}
@@ -392,20 +335,29 @@
album = g_hash_table_lookup (album_hash, key);
cover->album = album;
- Track *track;
if (force_imgupdate)
{
gdk_pixbuf_unref (album->albumart);
album->albumart = NULL;
}
+ Track *track;
if (album->albumart == NULL)
{
track = g_list_nth_data (album->tracks, 0);
- album->albumart = coverart_get_track_thumb (track, track->itdb->device);
+ album->albumart = coverart_get_track_thumb (track, track->itdb->device, DEFAULT_IMG_SIZE);
}
+ /* Set the x, y, height and width of the CD cover */
+ set_cover_dimensions (
+ cover,
+ index,
+ gdk_pixbuf_get_width (album->albumart),
+ gdk_pixbuf_get_height (album->albumart));
+
/* Display the highlight */
+ set_highlight (cover, index);
+
gnome_canvas_item_show (cover->highlight);
/* Set the Cover */
@@ -413,12 +365,21 @@
gnome_canvas_item_set (cover->cdimage,
"pixbuf", scaled,
NULL);
-
+
+ gnome_canvas_item_show (cover->cdimage);
+
+ gnome_canvas_item_set (cover->cdcvrgrp,
+ "x", (gdouble) cover->img_x,
+ "y", (gdouble) cover->img_y,
+ NULL);
+
/* flip image vertically to create reflection */
reflection = gdk_pixbuf_flip (scaled, FALSE);
gnome_canvas_item_set (cover->cdreflection,
"pixbuf", reflection,
+ "y", (gdouble) (cover->img_height + 4),
NULL);
+ gnome_canvas_item_show (cover->cdreflection);
gdk_pixbuf_unref (reflection);
gdk_pixbuf_unref (scaled);
@@ -431,19 +392,12 @@
gnome_canvas_item_set (GNOME_CANVAS_ITEM (cdwidget->cvrtext),
"text", text,
"fill_color", "white",
+ "y", (gdouble) cover->img_y + cover->img_height + 10,
"justification", GTK_JUSTIFY_CENTER,
NULL);
+
+ gnome_canvas_item_show (GNOME_CANVAS_ITEM (cdwidget->cvrtext));
g_free (text);
-
- /*
- int i;
- Track *track;
- for (i = 0; i < g_list_length(album->tracks); ++i)
- {
- track = g_list_nth_data (album->tracks, i);
- printf ("Track artist:%s album:%s title:%s\n", track->artist, track->album, track->title);
- }
- */
}
}
@@ -607,36 +561,24 @@
{
gint i;
Cover_Item *cover = NULL;
- GdkPixbuf *buf;
- buf = draw_blank_cdimage ();
-
for (i = 0; i < IMG_TOTAL; i++)
{
- GdkPixbuf *buf2;
/* Reset the pixbuf */
cover = g_ptr_array_index(cdwidget->cdcovers, i);
cover->album = NULL;
- buf2 = gdk_pixbuf_scale_simple(buf, cover->img_width, cover->img_height, GDK_INTERP_NEAREST);
- gnome_canvas_item_set(cover->cdimage, "pixbuf", buf2, NULL);
- gnome_canvas_item_set(cover->cdreflection, "pixbuf", buf2, NULL);
- gnome_canvas_item_hide (cover->highlight);
+ gnome_canvas_item_hide (cover->cdimage);
+ gnome_canvas_item_hide (cover->cdreflection);
- gdk_pixbuf_unref (buf2);
+ if (cover->highlight != NULL)
+ gnome_canvas_item_hide (cover->highlight);
- /* Reset track list too */
- cover->album = NULL;
-
if (i == IMG_MAIN)
{
/* Set the text to display details of the main image */
- gnome_canvas_item_set (GNOME_CANVAS_ITEM (cdwidget->cvrtext),
- "text", "No Artist",
- "fill_color", "black",
- NULL);
+ gnome_canvas_item_hide (GNOME_CANVAS_ITEM (cdwidget->cvrtext));
}
}
- gdk_pixbuf_unref(buf);
}
/**
@@ -645,17 +587,23 @@
* Retrieve the artwork pixbuf from the given track.
*
* @track: Track from where the pixbuf is obtained.
+ * @device: Reference to the device upon which the track is located
+ * @default_img_size: If the default image must be used then this may contain a default value
+ * for its size.
*
* Returns:
* pixbuf referenced by the provided track or the pixbuf of the
* default file if track has no cover art.
*/
-GdkPixbuf *coverart_get_track_thumb (Track *track, Itdb_Device *device)
+GdkPixbuf *coverart_get_track_thumb (Track *track, Itdb_Device *device, gint default_size)
{
- GdkPixbuf *pixbuf = NULL;
+ GdkPixbuf *pixbuf = NULL;
+ GdkPixbuf *image = NULL;
Thumb *thumb;
ExtraTrackData *etd;
-
+ gint w, h;
+ float ratio;
+
etd = track->userdata;
g_return_val_if_fail (etd, NULL);
@@ -663,13 +611,50 @@
ITDB_THUMB_COVER_LARGE);
if (thumb)
{
- pixbuf = itdb_thumb_get_gdk_pixbuf (device, thumb);
+ image = itdb_thumb_get_gdk_pixbuf (device, thumb);
+ w = gdk_pixbuf_get_width (image);
+ h = gdk_pixbuf_get_height (image);
+
+ if (default_size > 0)
+ {
+ if (w > default_size || h > default_size)
+ {
+ /* need to scale the image back down to size */
+ if (w == h)
+ {
+ w = default_size;
+ h = default_size;
+ }
+ else if (h > w)
+ {
+ ratio = h / w;
+ h = default_size;
+ w = (gint) (default_size / ratio);
+ }
+ else
+ {
+ ratio = w / h;
+ w = default_size;
+ h = (gint) (default_size / ratio);
+ }
+ pixbuf = gdk_pixbuf_scale_simple(image, w, h, GDK_INTERP_NEAREST);
+ }
+ else
+ pixbuf = gdk_pixbuf_copy (image);
+
+ gdk_pixbuf_unref (image);
+ }
+ else
+ {
+ pixbuf = gdk_pixbuf_scale_simple(image, DEFAULT_IMG_SIZE, DEFAULT_IMG_SIZE, GDK_INTERP_NEAREST);
+ gdk_pixbuf_unref (image);
+ }
}
if (pixbuf == NULL)
{
/* Could not get a viable thumbnail so get default pixbuf */
- pixbuf = coverart_get_default_track_thumb ();
+ pixbuf = coverart_get_default_track_thumb (default_size);
}
return pixbuf;
@@ -700,74 +685,46 @@
*/
void coverart_display_big_artwork ()
{
- GtkWidget *dialog;
Cover_Item *cover;
- GdkPixbuf *imgbuf;
+ ExtraTrackData *etd;
+ GdkPixbuf *imgbuf = NULL;
cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
g_return_if_fail (cover);
if (cover->album == NULL)
return;
+
+ Track *track;
+ track = g_list_nth_data (cover->album->tracks, 0);
+ etd = track->userdata;
+ if (etd && etd->thumb_path_locale)
+ {
+ GError *error = NULL;
+ imgbuf = gdk_pixbuf_new_from_file (etd->thumb_path_locale, &error);
+ if (error != NULL)
+ {
+ g_error_free (error);
+ }
+ }
- /* Set the dialog title */
- gchar *text = g_strconcat (cover->album->artist, ": ", cover->album->albumname, NULL);
- dialog = gtk_dialog_new_with_buttons ( text,
- GTK_WINDOW (gtkpod_xml_get_widget (main_window_xml, "gtkpod")),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_CLOSE,
- NULL);
-
- g_free (text);
-
- if (cover->album->albumart != NULL)
- imgbuf = cover->album->albumart;
- else
+ /* Either thumb was null or the attempt at getting a pixbuf failed
+ * due to invalid file. For example, some nut (like me) decided to
+ * apply an mp3 file to the track as its cover file
+ */
+ if (imgbuf == NULL)
{
- Track *track;
- track = g_list_nth_data (cover->album->tracks, 0);
- imgbuf = coverart_get_track_thumb (track, track->itdb->device);
+ /* Could not get a viable thumbnail so get default pixbuf */
+ imgbuf = coverart_get_default_track_thumb (256);
}
+
+ display_image_dialog (imgbuf);
- gint pixheight = gdk_pixbuf_get_height (imgbuf);
- gint pixwidth = gdk_pixbuf_get_width (imgbuf);
-
- gtk_window_resize ( GTK_WINDOW(dialog), pixwidth, pixheight + 40);
-
- GnomeCanvas *canvas;
- canvas = GNOME_CANVAS (gnome_canvas_new());
- gtk_widget_set_size_request ( GTK_WIDGET(canvas),
- pixwidth,
- pixheight);
- gnome_canvas_set_scroll_region ( canvas,
- 0.0, 0.0,
- pixwidth,
- pixheight);
- GnomeCanvasItem *canvasitem;
- canvasitem = gnome_canvas_item_new( gnome_canvas_root(canvas),
- GNOME_TYPE_CANVAS_PIXBUF, NULL);
-
- /* Apply the image to the canvas */
- gnome_canvas_item_set ( canvasitem,
- "pixbuf", imgbuf);
-
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), GTK_WIDGET(canvas));
-
/* Unreference pixbuf if it is not pointing to
* the album's artwork
*/
if (cover->album->albumart == NULL)
gdk_pixbuf_unref (imgbuf);
-
- /* Display the dialog and block everything else until the
- * dialog is closed.
- */
- gtk_widget_show_all (dialog);
- gtk_dialog_run (GTK_DIALOG(dialog));
-
- /* Destroy the dialog as no longer required */
- gtk_widget_destroy (GTK_WIDGET (dialog));
}
/**
@@ -778,19 +735,28 @@
* Returns:
* pixbuf of the default file for tracks with no cover art.
*/
-GdkPixbuf *coverart_get_default_track_thumb (void)
+GdkPixbuf *coverart_get_default_track_thumb (gint default_img_size)
{
GdkPixbuf *pixbuf = NULL;
+ GdkPixbuf *scaled = NULL;
+ gdouble default_size = 140;
GError *error = NULL;
+ if (default_img_size != 0)
+ default_size = (gdouble) default_img_size;
+
pixbuf = gdk_pixbuf_new_from_file(DEFAULT_FILE, &error);
if (error != NULL)
{
printf("Error occurred loading the default file - \nCode: %d\nMessage: %s\n", error->code, error->message);
g_return_val_if_fail(pixbuf, NULL);
}
+
+ scaled = gdk_pixbuf_scale_simple(pixbuf, default_size, default_size, GDK_INTERP_NEAREST);
+ gdk_pixbuf_unref (pixbuf);
+
- return pixbuf;
+ return scaled;
}
/**
@@ -864,16 +830,16 @@
if (!DEFAULT_FILE)
{
- DEFAULT_FILE = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "default-cover.png", NULL);
+ DEFAULT_FILE = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "default-cover.png", NULL);
}
if (!HIGHLIGHT_FILE)
{
- HIGHLIGHT_FILE = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "cdshine.png", NULL);
+ HIGHLIGHT_FILE = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "cdshine.png", NULL);
}
if (!HIGHLIGHT_FILE_MAIN)
{
- HIGHLIGHT_FILE_MAIN = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "cdshine_main.png", NULL);
- }
+ HIGHLIGHT_FILE_MAIN = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "cdshine_main.png", NULL);
+ }
}
/**
@@ -952,8 +918,7 @@
if ( ! prefs_get_int (KEY_DISPLAY_COVERART))
return FALSE;
- gint width, i;
- Cover_Item *cover;
+ gint width;
width = gtk_paned_get_position (GTK_PANED(widget));
if ((width >= DEFAULT_WIDTH) && (width != WIDTH))
@@ -963,18 +928,7 @@
"x", (gdouble) WIDTH / 2,
NULL);
- for(i = 0; i < IMG_TOTAL; ++i)
- {
- cover = g_ptr_array_index(cdwidget->cdcovers, i);
- set_cover_dimensions (cover, i);
- if(i == IMG_MAIN)
- set_highlight (cover, FALSE);
- else
- set_highlight (cover, TRUE);
- }
-
- set_covers (FALSE);
-
+ set_covers (FALSE);
}
return FALSE;
@@ -1072,88 +1026,90 @@
* @cover_index: index of the widget. Used to determine whether
* cover is the main cover or not
*/
-static void set_cover_dimensions (Cover_Item *cover, int cover_index)
+static void set_cover_dimensions (Cover_Item *cover, int cover_index, gdouble img_width, gdouble img_height)
{
- gdouble x = 0, y = 0, img_width = 0, img_height = 0;
+ gdouble x = 0, y = 0;
+ gdouble small_img_width, small_img_height;
+ gdouble display_width = 0, display_height = 0;
+ gdouble display_diff = 0, display_ratio = 0;
+ gint temp_index = 0;
- SMALL_IMG_WIDTH = WIDTH / 3;
- SMALL_IMG_HEIGHT = HEIGHT / 3;
- BIG_IMG_WIDTH = WIDTH / 2;
- BIG_IMG_HEIGHT = HEIGHT / 2;
+ small_img_width = img_width * 0.75;
+ small_img_height = img_height * 0.75;
- img_width = SMALL_IMG_WIDTH;
- img_height = SMALL_IMG_HEIGHT;
+ /* WIDTH is the width of the display_coverart window
+ * BORDER is the 10 pixel frame around the images
+ */
+ display_width = (WIDTH / 2) - (BORDER * 2);
+
+ display_diff = display_width - small_img_width;
+
+ /* Set the x location of the cover image */
+ switch(cover_index) {
+ case 0:
+ case 1:
+ case 2:
+ case 3:
+ display_ratio = ((gdouble) cover_index) / 4;
+ x = BORDER + (display_ratio * display_diff);
+ break;
+ case IMG_MAIN:
+ /* The Main Image CD Cover Image */
+ x = (WIDTH - img_width) / 2;
+ break;
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ temp_index = cover_index - 8;
+ if (temp_index < 0)
+ temp_index = temp_index * -1;
+
+ display_ratio = ((gdouble) temp_index) / 4;
+ x = WIDTH - (BORDER + small_img_width + (display_ratio * display_diff));
+ break;
+ }
- /* Set the x location of the cover image */
- switch(cover_index) {
- case 0:
- x = BORDER;
- break;
- case 1:
- x = BORDER * 1.6;
- break;
- case 2:
- x = BORDER * 2.2;
- break;
- case 3:
- x = BORDER * 2.8;
- break;
- case IMG_MAIN:
- /* The Main Image CD Cover Image */
- x = (WIDTH - BIG_IMG_WIDTH) / 2;
- img_width = BIG_IMG_WIDTH;
- break;
- case 5:
- x = WIDTH - (SMALL_IMG_WIDTH + (BORDER * 2.8));
- break;
- case 6:
- x = WIDTH - (SMALL_IMG_WIDTH + (BORDER * 2.2));
- break;
- case 7:
- x = WIDTH - (SMALL_IMG_WIDTH + (BORDER * 1.6));
- break;
- case 8:
- x = WIDTH - (SMALL_IMG_WIDTH + BORDER);
- break;
- }
+ /* Set the y location of the cover image. The y location must be determined by
+ * height of the cover image so that the hightlight and shadow fit in correctly.
+ */
+ display_height = HEIGHT - (BORDER * 2);
+
+ switch(cover_index) {
+ case 0:
+ case 8:
+ y = display_height - (small_img_height + (BORDER * 15));
+ break;
+ case 1:
+ case 7:
+ y = display_height - (small_img_height + (BORDER * 12));
+ break;
+ case 2:
+ case 6:
+ y = display_height - (small_img_height + (BORDER * 9));
+ break;
+ case 3:
+ case 5:
+ y = display_height - (small_img_height + (BORDER * 6));
+ break;
+ case IMG_MAIN:
+ /* The Main Image CD Cover Image */
+ y = HEIGHT - (img_height + (BORDER * 4));
+ }
+
+ cover->img_x = x;
+ cover->img_y = y;
- /* Set the y location of the cover image */
- switch(cover_index) {
- case 0:
- case 8:
- y = BORDER;
- break;
- case 1:
- case 7:
- y = BORDER * 3;
- break;
- case 2:
- case 6:
- y = BORDER * 5;
- break;
- case 3:
- case 5:
- y = BORDER * 7;
- break;
- case IMG_MAIN:
- /* The Main Image CD Cover Image */
- y = HEIGHT - (BIG_IMG_HEIGHT + (BORDER * 4));
- img_height = BIG_IMG_HEIGHT;
- }
-
- cover->img_x = x;
- cover->img_y = y;
+ if (cover_index == IMG_MAIN)
+ {
cover->img_height = img_height;
cover->img_width = img_width;
-
- gnome_canvas_item_set (cover->cdcvrgrp,
- "x", (gdouble) cover->img_x,
- "y", (gdouble) cover->img_y,
- NULL);
-
- gnome_canvas_item_set (cover->cdreflection,
- "y", (gdouble) (cover->img_height + 4),
- NULL);
+ }
+ else
+ {
+ cover->img_height = small_img_height;
+ cover->img_width = small_img_width;
+ }
}
/**
@@ -1240,34 +1196,28 @@
cover->cdreflection = gnome_canvas_item_new((GnomeCanvasGroup *) cover->cdcvrgrp,
GNOME_TYPE_CANVAS_PIXBUF,
NULL);
-
- set_cover_dimensions (cover, i);
cover->highlight = gnome_canvas_item_new((GnomeCanvasGroup *) cover->cdcvrgrp,
GNOME_TYPE_CANVAS_PIXBUF,
- NULL);
-
+ NULL);
+
if(i == IMG_MAIN)
- {
- set_highlight (cover, TRUE);
-
+ {
/* set up some callback events on the main scaled image */
g_signal_connect(GTK_OBJECT(cover->cdimage), "event", GTK_SIGNAL_FUNC(on_main_cover_image_clicked), NULL);
cdwidget->cvrtext = GNOME_CANVAS_TEXT(gnome_canvas_item_new(gnome_canvas_root(cdwidget->canvas),
GNOME_TYPE_CANVAS_TEXT,
- "text", "No Artist",
+ "text", " ",
"x", (gdouble) WIDTH / 2,
- "y", (gdouble) cover->img_y + cover ->img_height,
+ "y", (gdouble) 0,
"justification", GTK_JUSTIFY_CENTER,
"anchor", GTK_ANCHOR_NORTH,
- "fill_color", "black",
+ "fill_color", "white",
"font", "-*-clean-medium-r-normal-*-12-*-*-*-*-*-*",
NULL));
}
- else
- set_highlight (cover, FALSE);
-
+
g_ptr_array_add(cdwidget->cdcovers, cover);
cover = NULL;
}
@@ -1367,7 +1317,27 @@
prepare_canvas ();
gtk_box_pack_start_defaults (GTK_BOX(cdwidget->canvasbox), GTK_WIDGET(cdwidget->canvas));
-
+
+/* Dnd destinaton for foreign image files */
+ gtk_drag_dest_set (
+ cdwidget->canvasbox,
+ 0,
+ coverart_drop_types,
+ TGNR (coverart_drop_types),
+ GDK_ACTION_COPY|GDK_ACTION_MOVE);
+
+ g_signal_connect ((gpointer) cdwidget->canvasbox, "drag-drop",
+ G_CALLBACK (dnd_coverart_drag_drop),
+ NULL);
+
+ g_signal_connect ((gpointer) cdwidget->canvasbox, "drag-data-received",
+ G_CALLBACK (dnd_coverart_drag_data_received),
+ NULL);
+
+ g_signal_connect ((gpointer) cdwidget->canvasbox, "drag-motion",
+ G_CALLBACK (dnd_coverart_drag_motion),
+ NULL);
+
contentpanel_signal_id = g_signal_connect (G_OBJECT(cdwidget->contentpanel), "scroll-event",
G_CALLBACK(on_contentpanel_scroll_wheel_turned), NULL);
@@ -1517,6 +1487,10 @@
* e) A track has been created and its artist and album are not in the displaylist
*/
+ /* If coverart not displayed then ignore */
+ if (! prefs_get_int (KEY_DISPLAY_COVERART))
+ return;
+
trk_key = g_strconcat (track->artist, "_", track->album, NULL);
/* Determine the index of the found album */
keypos = g_list_find_custom (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
@@ -1650,6 +1624,14 @@
if (index != -1)
{
/* Track exists in the album list so ignore the change and return */
+ ExtraTrackData *etd;
+ etd = track->userdata;
+ if (etd->tartwork_changed == TRUE)
+ {
+ etd->tartwork_changed = FALSE;
+ set_covers(TRUE);
+ }
+
return;
}
else
@@ -1797,9 +1779,9 @@
if (tracks == NULL)
return;
- gchar *album_key;
while (tracks)
{
+ gchar *album_key;
track = tracks->data;
album_key = g_strconcat (track->artist, "_", track->album, NULL);
@@ -1820,14 +1802,15 @@
/* Insert the new Album Item into the hash */
g_hash_table_insert (album_hash, album_key, album);
/* Add the key to the list for sorting and other functions */
- album_key_list = g_list_append (album_key_list, g_strdup(album_key));
+ album_key_list = g_list_append (album_key_list, album_key);
}
else
{
- /* Album Item found in the album hash so append the track to
- * the end of the track list
- */
- album->tracks = g_list_append (album->tracks, track);
+ /* Album Item found in the album hash so
+ * append the track to the end of the
+ * track list */
+ g_free (album_key);
+ album->tracks = g_list_append (album->tracks, track);
}
tracks = tracks->next;
@@ -1928,40 +1911,223 @@
set_covers (FALSE);
}
-/**
- * coverart_set_cover_from_web:
- *
- * Find a cover on tinternet and apply it as the cover
- * of the main displayed album
- *
- */
-void coverart_set_cover_from_web ()
+static gboolean dnd_coverart_drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, guint time, gpointer user_data)
{
+ GdkAtom target;
+ target = gtk_drag_dest_find_target (widget, drag_context, NULL);
+
+ if (target != GDK_NONE)
+ {
+ gtk_drag_get_data (widget, drag_context, target, time);
+ return TRUE;
+ }
+ /*
+ printf ("drop item\n");
+ gint i = 0;
+ for (i = 0; i < g_list_length(drag_context->targets); ++i)
+ {
+ target = g_list_nth_data (drag_context->targets, i);
+ printf ("Atom: %s\n", gdk_atom_name(target));
+ gtk_drag_get_data (widget, drag_context, target, time);
+ return TRUE;
+ }
+ */
+ return FALSE;
+}
+
+static gboolean dnd_coverart_drag_motion (GtkWidget *widget,
+ GdkDragContext *dc,
+ gint x,
+ gint y,
+ guint time,
+ gpointer user_data)
+{
+ GdkAtom target;
+ iTunesDB *itdb;
+ ExtraiTunesDBData *eitdb;
+
+ itdb = gp_get_selected_itdb ();
+ /* no drop is possible if no playlist/repository is selected */
+ if (itdb == NULL)
+ {
+ gdk_drag_status (dc, 0, time);
+ return FALSE;
+ }
+
+ eitdb = itdb->userdata;
+ g_return_val_if_fail (eitdb, FALSE);
+ /* no drop is possible if no repository is loaded */
+ if (!eitdb->itdb_imported)
+ {
+ gdk_drag_status (dc, 0, time);
+ return FALSE;
+ }
+
+ target = gtk_drag_dest_find_target (widget, dc, NULL);
+ /* no drop possible if no valid target can be found */
+ if (target == GDK_NONE)
+ {
+ gdk_drag_status (dc, 0, time);
+ return FALSE;
+ }
+
+ gdk_drag_status (dc, dc->suggested_action, time);
+
+ return TRUE;
+}
+
+static void dnd_coverart_drag_data_received(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, GtkSelectionData *data, guint info,
+ guint time, gpointer user_data)
+{
+ g_return_if_fail (widget);
+ g_return_if_fail (dc);
+ g_return_if_fail (data);
+ g_return_if_fail (data->data);
+ g_return_if_fail (data->length > 0);
+
+ /* mozilla bug 402394 */
+
+#if DEBUG
+ printf ("data length = %d\n", data->length);
+ printf ("data->data = %s\n", data->data);
+#endif
+
+ Cover_Item *cover;
GList *tracks;
- Cover_Item *cover;
-
+ gchar *url = NULL;
+ Fetch_Cover *fcover;
+ Track *track;
+ gchar *filename = NULL;
+ gboolean image_status = FALSE;
+ gchar *image_error = NULL;
+ /* For use with DND_IMAGE_JPEG */
+ GdkPixbuf *pixbuf;
+ GError *error = NULL;
+
+ /* Find the display cover item in the cover display */
cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
tracks = cover->album->tracks;
+
+ switch (info)
+ {
+ case DND_IMAGE_JPEG:
+#if DEBUG
+ printf ("Using DND_IMAGE_JPEG\n");
+#endif
+ pixbuf = gtk_selection_data_get_pixbuf (data);
+ if (pixbuf != NULL)
+ {
+ /* initialise the url string with a safe value as not used if already have image */
+ url = "local image";
+ /* Initialise a fetchcover object */
+ fcover = fetchcover_new (url, tracks);
+ coverart_block_change (TRUE);
+
+ /* find the filename with which to save the pixbuf to */
+ if (fetchcover_select_filename (fcover))
+ {
+ filename = g_build_filename(fcover->dir, fcover->filename, NULL);
+ if (! gdk_pixbuf_save (pixbuf, filename, "jpeg", &error, NULL))
+ {
+ /* Save failed for some reason */
+ if (error->message)
+ fcover->err_msg = g_strdup (error->message);
+ else
+ fcover->err_msg = "Saving image to file failed. No internal error message was returned.";
+
+ g_error_free (error);
+ }
+ else
+ {
+ /* Image successfully saved */
+ image_status = TRUE;
+ }
+ }
+ /* record any errors and free the fetchcover */
+ if (fcover->err_msg != NULL)
+ image_error = g_strdup(fcover->err_msg);
+
+ free_fetchcover (fcover);
+ gdk_pixbuf_unref (pixbuf);
+ coverart_block_change (FALSE);
+ }
+ else
+ {
+ /* despite the data being of type image/jpeg, the pixbuf is NULL */
+ image_error = "jpeg data flavour was used but the data did not contain a GdkPixbuf object";
+ }
+ break;
+ case DND_TEXT_PLAIN:
+#if DEBUG
+ printf ("Defaulting to using DND_TEXT_PLAIN\n");
+#endif
+
+#ifdef HAVE_CURL
+ /* initialise the url string with the data from the dnd */
+ url = g_strdup ((gchar *) data->data);
+ /* Initialise a fetchcover object */
+ fcover = fetchcover_new (url, tracks);
+ coverart_block_change (TRUE);
+
+ if (fetchcover_net_retrieve_image (fcover))
+ {
+ #if DEBUG
+ printf ("Successfully retrieved\n");
+ printf ("Url of fetch cover: %s\n", fcover->url->str);
+ printf ("filename of fetch cover: %s\n", fcover->filename);
+ #endif
+
+ filename = g_build_filename(fcover->dir, fcover->filename, NULL);
+ image_status = TRUE;
+ }
+
+ /* record any errors and free the fetchcover */
+ if (fcover->err_msg != NULL)
+ image_error = g_strdup(fcover->err_msg);
+
+ free_fetchcover (fcover);
+ coverart_block_change (FALSE);
+#else
+ image_error = g_strdup ("Item had to be downloaded but gtkpod was not compiled with curl.");
+ image_status = FALSE;
+#endif
+ }
- /*
- int i;
- for (i = 0; i < g_list_length (tracks); ++i)
+ if (!image_status || filename == NULL)
{
- Track *trk = g_list_nth_data(tracks, i);
- printf ("Track: %s-%s\n", trk->artist, trk->album);
+ gtkpod_warning (_("Error occurred dropping an image onto the coverart display: %s\n"), image_error);
+
+ if (image_error)
+ g_free (image_error);
+ if (filename)
+ g_free (filename);
+
+ gtk_drag_finish (dc, FALSE, FALSE, time);
+ return;
}
- */
- /* Nullify and free the album art pixbuf so that it will pick it up
- * from the art assigned to the tracks
- */
- if (cover->album->albumart)
- {
- gdk_pixbuf_unref (cover->album->albumart);
- cover->album->albumart = NULL;
- }
-
- on_coverart_context_menu_click (tracks);
+ while (tracks)
+ {
+ track = tracks->data;
+
+ if (gp_track_set_thumbnails (track, filename))
+ data_changed (track->itdb);
+
+ tracks = tracks->next;
+ }
+ /* Nullify so that the album art is picked up from the tracks again */
+ cover->album->albumart = NULL;
+
+ set_covers (FALSE);
+
+ if (image_error)
+ g_free (image_error);
- set_covers (FALSE);
+ g_free (filename);
+
+ gtkpod_statusbar_message (_("Successfully set new coverart for selected tracks"));
+ gtk_drag_finish (dc, FALSE, FALSE, time);
+ return;
}
+
+
Modified: gtkpod/branches/etch-bpo/src/display_coverart.h
===================================================================
--- gtkpod/branches/etch-bpo/src/display_coverart.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_coverart.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_coverart.h 1600 2007-06-27 18:45:37Z tmzullinger $
+| $Id: display_coverart.h 1731 2007-10-21 15:07:42Z phantom_sf $
*/
#ifndef __DISPLAY_COVERART_H__
@@ -37,6 +37,7 @@
#define IMG_PREV 2
#define IMG_TOTAL 9
#define BORDER 10
+#define DEFAULT_IMG_SIZE 140
#define COVERART_REMOVE_SIGNAL 1
#define COVERART_CREATE_SIGNAL 2
@@ -80,7 +81,7 @@
void coverart_display_big_artwork ();
GList *coverart_get_displayed_tracks (void);
-GdkPixbuf *coverart_get_default_track_thumb (void);
+GdkPixbuf *coverart_get_default_track_thumb (gint default_img_size);
void coverart_init (gchar *progpath);
void force_update_covers ();
void coverart_select_cover (Itdb_Track *track);
@@ -89,7 +90,6 @@
void coverart_clear_images ();
void coverart_block_change (gboolean val);
void coverart_init_display ();
-GdkPixbuf *coverart_get_track_thumb (Track *track, Itdb_Device *device);
+GdkPixbuf *coverart_get_track_thumb (Track *track, Itdb_Device *device, gint default_img_size);
void coverart_set_cover_from_file ();
-void coverart_set_cover_from_web ();
#endif
Modified: gtkpod/branches/etch-bpo/src/display_itdb.c
===================================================================
--- gtkpod/branches/etch-bpo/src/display_itdb.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_itdb.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_itdb.c 1596 2007-06-26 14:33:01Z dforsi $
+| $Id: display_itdb.c 1723 2007-10-08 03:45:55Z tiffman $
*/
#ifdef HAVE_CONFIG_H
@@ -998,8 +998,16 @@
itdb_playlist_set_mpl (pl);
itdb_playlist_add (itdb, pl, -1);
- eitdb->data_changed = FALSE;
- eitdb->itdb_imported = FALSE;
+ if ((type & GP_ITDB_TYPE_PODCASTS) || (type & GP_ITDB_TYPE_LOCAL))
+ {
+ eitdb->data_changed = TRUE;
+ eitdb->itdb_imported = TRUE;
+ }
+ else
+ {
+ eitdb->data_changed = FALSE;
+ eitdb->itdb_imported = FALSE;
+ }
}
else
{
Property changes on: gtkpod/branches/etch-bpo/src/display_itdb.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/display_itdb.h
===================================================================
--- gtkpod/branches/etch-bpo/src/display_itdb.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_itdb.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_itdb.h 1590 2007-06-25 20:49:55Z phantom_sf $
+| $Id: display_itdb.h 1750 2007-11-01 21:57:01Z phantom_sf $
*/
#ifndef __DISPLAY_ITDB_H__
@@ -53,8 +53,10 @@
(only for GP_ITDP_TYPE_IPOD) */
gboolean offline; /* offline mode? */
gboolean data_changed; /* data changed since import? */
+ gboolean photo_data_changed; /* photo data changed since import? */
gboolean itdb_imported; /* has in iTunesDB been imported? */
gboolean ipod_ejected; /* if iPod was ejected */
+ PhotoDB *photodb; /* Photo DB reference used if the ipod supports photos */
} ExtraiTunesDBData;
typedef struct
Property changes on: gtkpod/branches/etch-bpo/src/display_itdb.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Copied: gtkpod/branches/etch-bpo/src/display_photo.c (from rev 305, gtkpod/tags/0.99.12-1/src/display_photo.c)
===================================================================
--- gtkpod/branches/etch-bpo/src/display_photo.c (rev 0)
+++ gtkpod/branches/etch-bpo/src/display_photo.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,1704 @@
+/*
+ |Copyright (C) 2007 P.G. Richardson <phantom_sf at users.sourceforge.net>
+ |Part of the gtkpod project.
+ |
+ |URL: http://www.gtkpod.org/
+ |URL: http://gtkpod.sourceforge.net/
+ |
+ |This program is free software; you can redistribute it and/or modify
+ |it under the terms of the GNU General Public License as published by
+ |the Free Software Foundation; either version 2 of the License, or
+ |(at your option) any later version.
+ |
+ |This program is distributed in the hope that it will be useful,
+ |but WITHOUT ANY WARRANTY; without even the implied warranty of
+ |MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ |GNU General Public License for more details.
+ |
+ |You should have received a copy of the GNU General Public License
+ |along with this program; if not, write to the Free Software
+ |Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ |
+ |iTunes and iPod are trademarks of Apple
+ |
+ |This product is not supported/written/published by Apple!
+ |
+ */
+
+#include "display_photo.h"
+#include "display_private.h"
+#include "misc.h"
+#include "prefs.h"
+#include "fileselection.h"
+#include "context_menus.h"
+#include <glib/gprintf.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <string.h>
+#include "display.h"
+
+
+#define DEBUG 0
+
+#define PHOTO_YES_DONT_DISPLAY_RESPONSE 1
+
+/* Array recording the current pages of the sorttabs so they can be redisplayed
+ * if another playlist is selected.
+ */
+static gint sorttab_pages [SORT_TAB_MAX];
+
+/* ipod database */
+static iTunesDB *ipod_itdb;
+/* Photo Database of selected ipod */
+static PhotoDB *photodb;
+/* Itdb Device for use with getting pixbufs from the database */
+static Itdb_Device *device;
+/* Main viewport containing all of the photo related components */
+static GtkWidget *photo_viewport= NULL;
+/* Window displaying the list of albums */
+static GtkWidget *photo_album_window= NULL;
+/* Window displaying the thumbnails of the photos */
+static GtkWidget *photo_thumb_window= NULL;
+/* pointer to the treeview for the photo album display */
+static GtkTreeView *album_view= NULL;
+/* pointer to the treeview for the photo thumbnail display */
+static GtkIconView *thumbnail_view= NULL;
+/* pointer to the gtkimage that holds the preview image */
+static GtkImage *photo_preview_image= NULL;
+/* Menu Items */
+static GtkMenuItem *photo_add_album_menuItem = NULL;
+static GtkMenuItem *photo_add_image_menuItem = NULL;
+static GtkMenuItem *photo_add_image_dir_menuItem = NULL;
+static GtkMenuItem *photo_remove_album_menuItem = NULL;
+static GtkMenuItem *photo_remove_image_menuItem = NULL;
+static GtkMenuItem *photo_view_full_size_menuItem = NULL;
+static GtkMenuItem *photo_rename_album_menuItem = NULL;
+
+/* Drag n Drop Definitions */
+static GtkTargetEntry photo_drag_types [] = {
+ { DND_GTKPOD_PHOTOIMAGELIST_TYPE, 0, DND_GTKPOD_PHOTOIMAGELIST },
+ { "text/plain", 0, DND_TEXT_PLAIN },
+ { "STRING", 0, DND_TEXT_PLAIN }
+};
+
+static GtkTargetEntry photo_drop_types [] = {
+ { DND_GTKPOD_PHOTOIMAGELIST_TYPE, 0, DND_GTKPOD_PHOTOIMAGELIST },
+ { "text/plain", 0, DND_TEXT_PLAIN },
+ { "STRING", 0, DND_TEXT_PLAIN }
+};
+
+/* Photo types to try and use in displaying thumbnails */
+static gint photo_types[] = {
+ ITDB_THUMB_PHOTO_SMALL,
+ ITDB_THUMB_PHOTO_LARGE,
+ ITDB_THUMB_PHOTO_FULL_SCREEN,
+ ITDB_THUMB_PHOTO_TV_SCREEN
+ };
+static gint PHOTO_TYPES_SIZE = 4;
+
+/* Declarations */
+static void gphoto_create_albumview();
+static void gphoto_create_thumbnailview();
+static void gphoto_build_thumbnail_model(gchar *album_name);
+static void gphoto_album_selection_changed(GtkTreeSelection *selection, gpointer user_data);
+static void gphoto_thumb_selection_changed(GtkIconView *iconview, gpointer user_data);
+static void gphoto_display_photo_preview(Artwork *artwork);
+void on_photodb_add_album_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data);
+void on_photodb_add_image_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data);
+void on_photodb_add_image_dir_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data);
+void on_photodb_remove_album_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data);
+void on_photodb_remove_image_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data);
+void on_photodb_view_full_size_menuItem_activate (GtkMenuItem *menuItem, gpointer user_data);
+void on_photodb_rename_album_menuItem_activate (GtkMenuItem *menuItem, gpointer user_data);
+static void signal_data_changed();
+static gchar *gphoto_get_selected_album_name();
+static void gphoto_add_image_to_database(gchar *photo_filename);
+static void gphoto_add_image_to_iconview(Artwork *photo, gint index);
+static gboolean gphoto_button_press(GtkWidget *w, GdkEventButton *e, gpointer data);
+/* DnD */
+static gboolean dnd_album_drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, guint time, gpointer user_data);
+static void dnd_album_drag_data_received(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, GtkSelectionData *data, guint info, guint time, gpointer user_data);
+static void dnd_images_drag_data_get(GtkWidget *widget, GdkDragContext *dc, GtkSelectionData *data, guint info, guint time, gpointer user_data);
+
+enum
+{
+ COL_ALBUM_NAME = 0,
+ NUM_ALBUM_COLUMNS
+};
+
+enum
+{
+ COL_THUMB_NAIL = 0,
+ COL_THUMB_FILENAME,
+ COL_THUMB_ARTWORK,
+ NUM_THUMB_COLUMNS
+};
+
+/**
+ * gphoto_load_photodb:
+ *
+ * Using the info in the provided itunes db, load the photo db
+ * from the ipod if there is one present. Reference it in the
+ * extra itunes db data structure for later use.
+ *
+ * @ itdb: itunes database
+ *
+ */
+void gphoto_load_photodb(iTunesDB *itdb)
+{
+ ExtraiTunesDBData *eitdb;
+ PhotoDB *db;
+ const gchar *mp;
+ GError *error= NULL;
+
+ if (itdb == NULL)
+ return;
+
+ eitdb = itdb->userdata;
+ mp = itdb_get_mountpoint (itdb);
+ db = itdb_photodb_parse (mp, &error);
+ if (db == NULL)
+ {
+ if (error)
+ {
+ gtkpod_warning (_("Error reading iPod photo database (%s).\n"), error->message);
+ g_error_free (error);
+ error = NULL;
+ } else
+ {
+ gtkpod_warning (_("Error reading iPod photo database.\n"));
+ }
+ eitdb->photodb = NULL;
+ return;
+ }
+
+ /* Set the reference to the photo database */
+ eitdb->photodb = db;
+ /*printf ("Reference to photo db successfully set\n");*/
+
+ /* A photo database is */
+}
+
+/**
+ * gphoto_ipod_supports_photos
+ *
+ * Convenience function that passes onto libgpod and requests
+ * whether the ipod has photo support
+ *
+ * Returns:
+ * true/false whether the ipod has photo support
+ */
+gboolean gphoto_ipod_supports_photos(iTunesDB *itdb)
+{
+ gboolean status = itdb_device_supports_photo (itdb->device);
+
+ return status;
+}
+
+/**
+ * gphoto_is_photo_playlist
+ *
+ * Convenience function that determines whether the
+ * playlist is the photo playlist.
+ *
+ * @ pl: playlist
+ *
+ * Returns:
+ * true/false whether the playlist is the photo playlist
+ */
+gboolean gphoto_is_photo_playlist(Playlist *pl)
+{
+ return pl->type == GP_PL_TYPE_PHOTO;
+}
+
+/**
+ * gphoto_display_photo_window
+ *
+ * When the photo playlist is clicked on, it hands off to this
+ * function which changes the entire display to the photo
+ * window
+ *
+ * @itdb: itunes db associated with the photo playlist clicked on
+ */
+void gphoto_display_photo_window(iTunesDB *itdb)
+{
+ ExtraiTunesDBData *eitdb;
+
+ ipod_itdb = itdb;
+#if DEBUG
+ printf ("Displaying photo window\n");
+ debug_list_photos (itdb);
+#endif
+
+ eitdb = itdb->userdata;
+ photodb = eitdb->photodb;
+ device = itdb->device;
+
+ if (!photodb)
+ {
+ gtkpod_warning (_("Could not access the iPod's photo database."));
+ return;
+ }
+
+ gphoto_change_to_photo_window (TRUE);
+
+ gphoto_create_albumview ();
+ gphoto_create_thumbnailview ();
+
+ if (eitdb->photo_data_changed != TRUE)
+ eitdb->photo_data_changed = FALSE;
+}
+
+/**
+ * gphoto_change_to_photo_window
+ *
+ * When the photo playlist is NOT clicked on;
+ * this changes the entire display back to original
+ * rather than the photo window.
+ *
+ */
+void gphoto_change_to_photo_window(gboolean showflag)
+{
+ GtkWidget *paned1 = gtkpod_xml_get_widget (main_window_xml, "paned1");
+ GtkWidget *downbutton = gtkpod_xml_get_widget (main_window_xml, "cover_down_button");
+ GtkWidget *coverpanel = gtkpod_xml_get_widget (main_window_xml, "cover_display_window");
+ GtkWidget *controlbox = gtkpod_xml_get_widget (main_window_xml, "cover_display_controlbox");
+ GtkWidget *upbutton = gtkpod_xml_get_widget (main_window_xml, "cover_up_button");
+
+ GtkWidget *addfilesbutton = gtkpod_xml_get_widget (main_window_xml, "add_files_button");
+ GtkWidget *adddirsbutton = gtkpod_xml_get_widget (main_window_xml, "add_dirs_button");
+ GtkWidget *menu_add_files = gtkpod_xml_get_widget (main_window_xml, "add_files1");
+ GtkWidget *menu_add_dirs = gtkpod_xml_get_widget (main_window_xml, "add_directory1");
+ GtkWidget *menu_update_file = gtkpod_xml_get_widget (main_window_xml, "update_menu");
+ GtkWidget *menu_mserv_file = gtkpod_xml_get_widget (main_window_xml, "mserv_from_file_menu");
+ GtkWidget *sync_menu = gtkpod_xml_get_widget (main_window_xml, "sync_menu");
+ GtkWidget *export_menu = gtkpod_xml_get_widget (main_window_xml, "export_menu");
+ GtkWidget *create_pl_menu = gtkpod_xml_get_widget (main_window_xml, "create_playlist_file_menu");
+ GtkWidget *edit_menu = gtkpod_xml_get_widget (main_window_xml, "edit_menu");
+ GtkWidget *more_sort_tabs = gtkpod_xml_get_widget (main_window_xml, "more_sort_tabs");
+ GtkWidget *less_sort_tabs = gtkpod_xml_get_widget (main_window_xml, "less_sort_tabs");
+ GtkWidget *arr_sort_tabs = gtkpod_xml_get_widget (main_window_xml, "arrange_sort_tabs");
+ GtkWidget *tools_menu = gtkpod_xml_get_widget (main_window_xml, "tools1");
+ GtkWidget *main_vbox = gtkpod_xml_get_widget (main_window_xml, "main_vbox");
+ GladeXML *photo_xml;
+ GtkWidget *photowin;
+ gint i;
+
+ if (showflag)
+ {
+ /* Record which pages are selected in the visible sorttabs */
+ for (i = 0; i < SORT_TAB_MAX; ++i)
+ {
+ sorttab_pages[i] = st_get_sorttab_page_number (i);
+ }
+
+ /* Hide track related panes */
+ gtk_widget_hide_all (paned1);
+ /* Hide the coverart display */
+ gtk_widget_hide (downbutton);
+ gtk_widget_hide_all (coverpanel);
+ gtk_widget_hide_all (controlbox);
+ gtk_widget_show (upbutton);
+ /* Hide menu entries and buttons */
+ gtk_widget_set_sensitive (upbutton, FALSE);
+ gtk_widget_set_sensitive (addfilesbutton, FALSE);
+ gtk_widget_set_sensitive (adddirsbutton, FALSE);
+ gtk_widget_set_sensitive (menu_add_files, FALSE);
+ gtk_widget_set_sensitive (menu_add_dirs, FALSE);
+ gtk_widget_set_sensitive (menu_update_file, FALSE);
+ gtk_widget_set_sensitive (menu_mserv_file, FALSE);
+ gtk_widget_set_sensitive (sync_menu, FALSE);
+ gtk_widget_set_sensitive (export_menu, FALSE);
+ gtk_widget_set_sensitive (create_pl_menu, FALSE);
+ gtk_widget_set_sensitive (edit_menu, FALSE);
+ gtk_widget_set_sensitive (more_sort_tabs, FALSE);
+ gtk_widget_set_sensitive (less_sort_tabs, FALSE);
+ gtk_widget_set_sensitive (arr_sort_tabs, FALSE);
+ gtk_widget_set_sensitive (tools_menu, FALSE);
+
+ if (photo_viewport == NULL)
+ {
+ photo_xml = glade_xml_new (xml_file, "photo_panel", NULL);
+ photowin = gtkpod_xml_get_widget (photo_xml, "photo_panel");
+ photo_album_window = gtkpod_xml_get_widget (photo_xml, "photo_album_window");
+ photo_thumb_window = gtkpod_xml_get_widget (photo_xml, "photo_thumbnail_window");
+ photo_preview_image = GTK_IMAGE (gtkpod_xml_get_widget (photo_xml, "photo_preview_image"));
+ photo_add_album_menuItem = GTK_MENU_ITEM (gtkpod_xml_get_widget (photo_xml, "photo_add_album_menuItem"));
+ photo_add_image_menuItem = GTK_MENU_ITEM (gtkpod_xml_get_widget (photo_xml, "photo_add_image_menuItem"));
+ photo_add_image_dir_menuItem = GTK_MENU_ITEM (gtkpod_xml_get_widget (photo_xml, "photo_add_image_dir_menuItem"));
+ photo_remove_album_menuItem = GTK_MENU_ITEM (gtkpod_xml_get_widget (photo_xml, "photo_remove_album_menuItem"));
+ photo_remove_image_menuItem = GTK_MENU_ITEM (gtkpod_xml_get_widget (photo_xml, "photo_remove_image_menuItem"));
+ photo_view_full_size_menuItem = GTK_MENU_ITEM (gtkpod_xml_get_widget (photo_xml, "photo_view_full_size_menuItem"));
+ photo_rename_album_menuItem = GTK_MENU_ITEM (gtkpod_xml_get_widget (photo_xml, "photo_rename_album_menuItem"));
+
+ photo_viewport = gtkpod_xml_get_widget (photo_xml, "photo_viewport");
+ g_object_ref (photo_album_window);
+ g_object_ref (photo_thumb_window);
+ g_object_ref (photo_preview_image);
+ g_object_ref (photo_viewport);
+ gtk_container_remove (GTK_CONTAINER (photowin), photo_viewport);
+ /* we don't need this any more */
+ gtk_widget_destroy (photowin);
+ }
+
+ if (gtk_widget_get_parent (photo_viewport) == NULL)
+ gtk_container_add (GTK_CONTAINER (main_vbox), photo_viewport);
+
+ /* Bring the menus to life */
+ g_signal_connect (G_OBJECT(photo_add_album_menuItem), "activate", G_CALLBACK(on_photodb_add_album_menuItem_activate),
+ NULL);
+ g_signal_connect (G_OBJECT(photo_add_image_menuItem), "activate", G_CALLBACK(on_photodb_add_image_menuItem_activate),
+ NULL);
+ g_signal_connect (G_OBJECT(photo_add_image_dir_menuItem), "activate", G_CALLBACK(on_photodb_add_image_dir_menuItem_activate),
+ NULL);
+ g_signal_connect (G_OBJECT(photo_remove_album_menuItem), "activate", G_CALLBACK(on_photodb_remove_album_menuItem_activate),
+ NULL);
+ g_signal_connect (G_OBJECT(photo_remove_image_menuItem), "activate", G_CALLBACK(on_photodb_remove_image_menuItem_activate),
+ NULL);
+ g_signal_connect (G_OBJECT(photo_view_full_size_menuItem), "activate", G_CALLBACK(on_photodb_view_full_size_menuItem_activate),
+ NULL);
+ g_signal_connect (G_OBJECT(photo_rename_album_menuItem), "activate", G_CALLBACK(on_photodb_rename_album_menuItem_activate),
+ NULL);
+
+ } else
+ {
+ if (!GTK_WIDGET_VISIBLE (paned1))
+ {
+ if (gtk_widget_get_parent (photo_viewport) != NULL)
+ gtk_container_remove (GTK_CONTAINER (main_vbox), photo_viewport);
+
+ /* Show track related panes */
+ gtk_widget_show_all (paned1);
+ st_show_visible();
+
+ /* Reselect the originally selected sorttab pages */
+ for (i = 0; i < SORT_TAB_MAX; ++i)
+ {
+ /* Need to change current category in sorttab */
+ st_set_sorttab_page ((gint) i, sorttab_pages [i]);
+ }
+ }
+
+ if (prefs_get_int (KEY_DISPLAY_COVERART))
+ {
+ /* Show the coverart display */
+ gtk_widget_show (downbutton);
+ gtk_widget_show_all (coverpanel);
+ gtk_widget_show_all (controlbox);
+ gtk_widget_hide (upbutton);
+ }
+ gtk_widget_set_sensitive (upbutton, TRUE);
+ gtk_widget_set_sensitive (addfilesbutton, TRUE);
+ gtk_widget_set_sensitive (adddirsbutton, TRUE);
+ gtk_widget_set_sensitive (menu_add_files, TRUE);
+ gtk_widget_set_sensitive (menu_add_dirs, TRUE);
+ gtk_widget_set_sensitive (menu_update_file, TRUE);
+ gtk_widget_set_sensitive (menu_mserv_file, TRUE);
+ gtk_widget_set_sensitive (sync_menu, TRUE);
+ gtk_widget_set_sensitive (export_menu, TRUE);
+ gtk_widget_set_sensitive (create_pl_menu, TRUE);
+ gtk_widget_set_sensitive (edit_menu, TRUE);
+ gtk_widget_set_sensitive (more_sort_tabs, TRUE);
+ gtk_widget_set_sensitive (less_sort_tabs, TRUE);
+ gtk_widget_set_sensitive (arr_sort_tabs, TRUE);
+ gtk_widget_set_sensitive (tools_menu, TRUE);
+ }
+}
+
+/**
+ * gphoto_create_albumview:
+ *
+ * Construct the album tree based upon the albums
+ * stored on the iPod. If necessary destory and old
+ * existing tree object.
+ *
+ */
+static void gphoto_create_albumview()
+{
+ GtkListStore *model;
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ GtkCellRenderer *renderer;
+ GList *gl_album;
+
+ /* destroy old listview */
+ if (album_view)
+ {
+ model = GTK_LIST_STORE (gtk_tree_view_get_model (album_view));
+ g_return_if_fail (model);
+ g_object_unref (model);
+ gtk_widget_destroy (GTK_WIDGET (album_view));
+ album_view = NULL;
+ }
+
+ /* === Create New One === */
+
+ /* create tree view */
+ album_view = GTK_TREE_VIEW (gtk_tree_view_new ());
+ if (!GTK_WIDGET_REALIZED(album_view))
+ gtk_widget_set_events (GTK_WIDGET(album_view), GDK_KEY_PRESS_MASK);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (album_view, -1, _("Photo Albums"), renderer, "text", COL_ALBUM_NAME,
+ NULL);
+
+ /* create model */
+ model = gtk_list_store_new (NUM_ALBUM_COLUMNS, G_TYPE_STRING);
+ for (gl_album=photodb->photoalbums; gl_album; gl_album=gl_album->next)
+ {
+ PhotoAlbum *album = gl_album->data;
+ g_return_if_fail (album);
+
+ gchar *name = album->name ? album->name : _("<Unnamed>");
+ /*printf ("name of album: %s\n", name);*/
+ /* Add a new row to the model */
+ gtk_list_store_append (model, &iter);
+ gtk_list_store_set (model, &iter, COL_ALBUM_NAME, name, -1);
+ }
+
+ /* set tree model */
+ gtk_tree_view_set_model (album_view, GTK_TREE_MODEL (model));
+ gtk_tree_view_set_rules_hint (album_view, TRUE);
+
+ gtk_tree_selection_set_mode (gtk_tree_view_get_selection (album_view), GTK_SELECTION_SINGLE);
+
+ gtk_container_add (GTK_CONTAINER (photo_album_window), GTK_WIDGET(album_view));
+ gtk_widget_show_all (photo_album_window);
+
+ /* function to be enacted when the album is changed */
+ selection = gtk_tree_view_get_selection (album_view);
+ g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (gphoto_album_selection_changed),
+ NULL);
+
+ g_signal_connect (G_OBJECT (album_view), "button-press-event", G_CALLBACK (gphoto_button_press), (gpointer) GPHOTO_ALBUM_VIEW);
+
+ /* Disable the remove album menu item until an album is selected */
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_remove_album_menuItem), FALSE);
+
+ /* Dnd destinaton for album view */
+ gtk_drag_dest_set (
+ GTK_WIDGET (album_view),
+ GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT,
+ photo_drop_types,
+ TGNR (photo_drop_types),
+ GDK_ACTION_COPY|GDK_ACTION_MOVE);
+
+ g_signal_connect ((gpointer) album_view, "drag-drop",
+ G_CALLBACK (dnd_album_drag_drop),
+ NULL);
+
+ g_signal_connect ((gpointer) album_view, "drag-data-received",
+ G_CALLBACK (dnd_album_drag_data_received),
+ NULL);
+}
+
+/**
+ * gphoto_create_thumbnailview:
+ *
+ * Construct the thumbnail tree based upon the
+ * photos stored on the iPod associated with the
+ * selected album.
+ *
+ */
+static void gphoto_create_thumbnailview()
+{
+ /* destroy old listview */
+ if (thumbnail_view)
+ {
+ gtk_widget_destroy (GTK_WIDGET (thumbnail_view));
+ thumbnail_view = NULL;
+ }
+
+ /* === Create New One === */
+ if (thumbnail_view == NULL)
+ thumbnail_view = GTK_ICON_VIEW (gtk_icon_view_new ());
+
+ if (!GTK_WIDGET_REALIZED(thumbnail_view))
+ gtk_widget_set_events (GTK_WIDGET(thumbnail_view), GDK_KEY_PRESS_MASK);
+
+ gphoto_build_thumbnail_model (NULL);
+
+ gtk_container_add (GTK_CONTAINER (photo_thumb_window), GTK_WIDGET(thumbnail_view));
+ gtk_widget_show_all (photo_thumb_window);
+
+ g_signal_connect (G_OBJECT (thumbnail_view), "button-press-event", G_CALLBACK (gphoto_button_press), (gpointer) GPHOTO_ICON_VIEW);
+
+ /* DnD */
+ gtk_drag_source_set (
+ GTK_WIDGET (thumbnail_view),
+ GDK_BUTTON1_MASK,
+ photo_drag_types,
+ TGNR (photo_drag_types),
+ GDK_ACTION_COPY|GDK_ACTION_MOVE);
+
+ g_signal_connect ((gpointer) thumbnail_view, "drag-data-get",
+ G_CALLBACK (dnd_images_drag_data_get),
+ NULL);
+}
+
+/**
+ * gphoto_build_thumbnail_model:
+ *
+ * Create the model for the thumbnail view
+ * based upon the selected album.
+ *
+ * @ album_name: name of the selected album or null if none selected
+ *
+ */
+static void gphoto_build_thumbnail_model(gchar *album_name)
+{
+ GtkListStore *model;
+ PhotoAlbum *album;
+ GList *photos;
+ gint i;
+
+ model = GTK_LIST_STORE (gtk_icon_view_get_model (thumbnail_view));
+ if (model)
+ gtk_list_store_clear (model);
+ else
+ {
+ /* create model */
+ model = gtk_list_store_new (NUM_THUMB_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
+ gtk_icon_view_set_model (thumbnail_view, GTK_TREE_MODEL(model));
+ }
+
+ /* Get currently selected album from photo database */
+ album = itdb_photodb_photoalbum_by_name (photodb, album_name);
+ g_return_if_fail (album);
+
+ for (i = 0, photos = album->members; i < g_list_length (photos); ++i)
+ {
+ Artwork *photo = g_list_nth_data (photos, i);
+ g_return_if_fail (photo);
+
+ gphoto_add_image_to_iconview (photo, (i + 1));
+
+ /* On creation of the model, place the first image into the preview pane */
+ if (i == 0)
+ gphoto_display_photo_preview (photo);
+ }
+
+ gtk_icon_view_set_pixbuf_column (thumbnail_view, 0);
+ gtk_icon_view_set_text_column (thumbnail_view, 1);
+ gtk_icon_view_set_selection_mode (thumbnail_view, GTK_SELECTION_MULTIPLE);
+ gtk_icon_view_set_columns (thumbnail_view, 0);
+ gtk_icon_view_set_item_width(thumbnail_view, -1); // let the model decide how wide
+
+ /* function to be enacted when the thumbnail is changed */
+ g_signal_connect (thumbnail_view, "selection-changed", G_CALLBACK (gphoto_thumb_selection_changed),
+ NULL);
+
+ /* Disable the remove image menu item until an image is selected */
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_remove_image_menuItem), FALSE);
+ /* Disable the view full size menu item until an image is selected */
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_view_full_size_menuItem), FALSE);
+ /* Disable the rename menu item untill an album is selected */
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_rename_album_menuItem), FALSE);
+}
+
+/**
+ * gphoto_album_selection_changed:
+ *
+ * When the album selection is changed, rebuild the thumbnail model
+ * to display those thumbnails only associated with the album.
+ *
+ * @ selection: album name selection
+ * @ user_data: not used.
+ *
+ */
+static void gphoto_album_selection_changed(GtkTreeSelection *selection, gpointer user_data)
+{
+ gchar *album_name= NULL;
+ PhotoAlbum *selected_album = NULL;
+
+ album_name = gphoto_get_selected_album_name (selection);
+
+ /* if album_name returns NULL then it merely selects the default Photo Library */
+ gphoto_build_thumbnail_model (album_name);
+
+ if (album_name != NULL)
+ {
+ /* Enable the remove album menu item now that one is selected */
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_remove_album_menuItem), TRUE);
+
+ selected_album = itdb_photodb_photoalbum_by_name (photodb, album_name);
+ if (selected_album->album_type != 0x01)
+ {
+ /* Only allow renaming of album if not the Photo Library */
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_rename_album_menuItem), TRUE);
+ return;
+ }
+ }
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_rename_album_menuItem), FALSE);
+ return;
+}
+
+/**
+ * gphoto_thumb_selection_changed:
+ *
+ * When the thumb view selection is changed, update the
+ * preview image to display that which is selected.
+ *
+ * @ iconview: thumbnail view
+ * @ user_data: not used
+ *
+ */
+static void gphoto_thumb_selection_changed(GtkIconView *iconview, gpointer user_data)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ Artwork *artwork;
+ GList *selected_items= NULL;
+
+ selected_items = gtk_icon_view_get_selected_items (iconview);
+
+ if (selected_items == NULL|| g_list_length (selected_items) == 0)
+ return;
+
+ model = gtk_icon_view_get_model (iconview);
+ gtk_tree_model_get_iter (model, &iter, selected_items->data);
+ gtk_tree_model_get (model, &iter, COL_THUMB_ARTWORK, &artwork, -1);
+ g_return_if_fail (artwork);
+ gphoto_display_photo_preview (artwork);
+
+ /* Enable the remove image menu item until an album is selected */
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_remove_image_menuItem), TRUE);
+ /* Enable the view full size menu item */
+ gtk_widget_set_sensitive (GTK_WIDGET(photo_view_full_size_menuItem), TRUE);
+}
+
+/**
+ * gphoto_display_photo_preview:
+ *
+ * Display the supplied photo is the preview window.
+ *
+ * @ artwork: photo to be displayed
+ *
+ */
+static void gphoto_display_photo_preview(Artwork *artwork)
+{
+ Thumb *thumb = NULL;
+ GdkPixbuf *pixbuf, *scaled;
+ gint width, height;
+ gdouble ratio;
+ gint i;
+
+ g_return_if_fail (artwork);
+
+ for (i = (PHOTO_TYPES_SIZE - 1); i >= 0 && thumb == NULL; --i)
+ {
+ /* Start from biggest photo type and go smaller */
+ thumb = itdb_artwork_get_thumb_by_type (artwork, photo_types[i]);
+ }
+
+ /* should have a thumb now but check anyway and fire off a warning if it is still null */
+ g_return_if_fail (thumb);
+
+ pixbuf = itdb_thumb_get_gdk_pixbuf (device, thumb);
+ g_return_if_fail (pixbuf);
+
+ /* Size of the preview GtkImage is set to 220x176, technically
+ * the same as PHOTO_FULL_SCREEN for a normal ipod.
+ */
+ width = gdk_pixbuf_get_width (pixbuf);
+ height = gdk_pixbuf_get_height (pixbuf);
+ ratio = (gdouble) width / (gdouble) height;
+
+ if (height > PHOTO_FULL_SCREEN_HEIGHT)
+ {
+ height = PHOTO_FULL_SCREEN_HEIGHT;
+ width = ratio * height;
+ }
+
+ if (width > PHOTO_FULL_SCREEN_WIDTH)
+ {
+ width = PHOTO_FULL_SCREEN_WIDTH;
+ height = width / ratio;
+ }
+
+ scaled = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_NEAREST);
+ gdk_pixbuf_unref (pixbuf);
+
+ gtk_image_set_from_pixbuf (photo_preview_image, scaled);
+ gtk_misc_set_padding (GTK_MISC(photo_preview_image), 20, 20);
+}
+
+/**
+ *
+ * signal_data_changed:
+ *
+ * Convenience function that sets the flags on the Extra iTunes Database
+ * that the photo database has changed and will need saving
+ *
+ */
+static void signal_data_changed()
+{
+ ExtraiTunesDBData *eitdb;
+
+ eitdb = ipod_itdb->userdata;
+ eitdb->photo_data_changed = TRUE;
+ eitdb->data_changed = TRUE;
+
+ gtk_image_clear (photo_preview_image);
+}
+
+/**
+ * get_selected_album_name
+ *
+ * Given the selection of the album_treeview,
+ * return the album name selected..
+ *
+ * @ selection: GtkTreeSelection
+ *
+ * Returns:
+ * string value representing the album name selected
+ */
+static gchar *gphoto_get_selected_album_name(GtkTreeSelection *selection)
+{
+ gchar *album_name= NULL;
+ GtkTreeModel *album_model;
+ GtkTreeIter iter;
+
+ if (selection == NULL)
+ return NULL;
+
+ if (gtk_tree_selection_get_selected (selection, &album_model, &iter) == TRUE)
+ { /* handle new selection */
+ gtk_tree_model_get (album_model, &iter, COL_ALBUM_NAME, &album_name, -1);
+ }
+
+ return album_name;
+}
+
+/**
+ * gphoto_get_selected_photo_count
+ *
+ * Function to return the number of photos
+ * currently selected in the iconview.
+ *
+ */
+gint gphoto_get_selected_photo_count ()
+{
+ GList *selected_items= NULL;
+
+ selected_items = gtk_icon_view_get_selected_items (thumbnail_view);
+
+ if (selected_items == NULL)
+ return 0;
+
+ return g_list_length (selected_items);
+}
+
+/**
+ * gphoto_add_image_to_database
+ *
+ * Add a photo from file name to the photo database and
+ * hence to the gui. If an album is selected other than the
+ * Photo Library then the photo is added to it.
+ *
+ * @ photo_filename: gchar *
+ *
+ */
+static void gphoto_add_image_to_database(gchar *photo_filename)
+{
+ gchar *album_name= NULL;
+ PhotoAlbum *selected_album;
+ GError *error= NULL;
+ Artwork *image= NULL;
+
+ /* Add the photo to the photo database and the
+ * default photo library album
+ */
+ image = itdb_photodb_add_photo (photodb, photo_filename, -1, GDK_PIXBUF_ROTATE_NONE, &error);
+
+ if (image == NULL)
+ {
+ if (error && error->message)
+ gtkpod_warning ("%s\n\n", error->message);
+ else
+ g_warning ("error->message == NULL!\n");
+
+ g_error_free (error);
+ error = NULL;
+ return;
+ }
+
+ /* Add the image to the selected album if there is one selected */
+ album_name= gphoto_get_selected_album_name (gtk_tree_view_get_selection (album_view));
+
+ /* Find the selected album. If no selection then returns the Main Album */
+ selected_album = itdb_photodb_photoalbum_by_name (photodb, album_name);
+ g_return_if_fail (selected_album);
+
+ if (selected_album->album_type != 0x01)
+ {
+ /* Add the photo to the selected album only if it is not
+ * the Photo Library, as already done that.
+ */
+ itdb_photodb_photoalbum_add_photo (photodb, selected_album, image, -1);
+ }
+
+ gphoto_add_image_to_iconview (image, g_list_length (selected_album->members));
+
+ signal_data_changed ();
+}
+
+/**
+ * gphoto_add_image_to_iconview
+ *
+ * Add an Artwork image to the icon_view
+ *
+ * @ photo: Artwork
+ *
+ */
+static void gphoto_add_image_to_iconview(Artwork *photo, gint index)
+{
+ GdkPixbuf *pixbuf= NULL;
+ GdkPixbuf *scaled = NULL;
+ Thumb *thumb= NULL;
+ GtkListStore *model= NULL;
+ GtkTreeIter iter;
+ gint i;
+ /* default sizes taken from smallest photo image type in itdb_device.c */
+ gint icon_width = 42, icon_height = 30;
+ gfloat pixbuf_width, pixbuf_height;
+ gfloat ratio;
+
+ model = GTK_LIST_STORE (gtk_icon_view_get_model (thumbnail_view));
+ for (i = 0; i < PHOTO_TYPES_SIZE && thumb == NULL; ++i)
+ {
+ thumb = itdb_artwork_get_thumb_by_type (photo, photo_types[i]);
+ }
+
+ /* should have a thumb now but check anyway and fire off a warning if it is still null */
+ g_return_if_fail (thumb);
+
+ pixbuf = itdb_thumb_get_gdk_pixbuf (device, thumb);
+ g_return_if_fail (pixbuf);
+
+ pixbuf_width = gdk_pixbuf_get_width (pixbuf);
+ pixbuf_height = gdk_pixbuf_get_height (pixbuf);
+ ratio = pixbuf_width / pixbuf_height;
+
+ if (pixbuf_width > icon_width)
+ {
+ pixbuf_width = icon_width;
+ pixbuf_height = pixbuf_width / ratio;
+ }
+
+ if (pixbuf_height > icon_height)
+ {
+ pixbuf_height = icon_height;
+ pixbuf_width = pixbuf_height * ratio;
+ }
+
+ scaled = gdk_pixbuf_scale_simple(pixbuf, pixbuf_width, pixbuf_height, GDK_INTERP_NEAREST);
+ gdk_pixbuf_unref (pixbuf);
+
+ gchar *index_str= NULL;
+ index_str = (gchar *) g_malloc (sizeof(gint));
+ g_sprintf (index_str, "%d", index);
+
+ /* Add a new row to the model */
+ gtk_list_store_append (model, &iter);
+ gtk_list_store_set (model, &iter, COL_THUMB_NAIL, scaled, COL_THUMB_FILENAME, index_str, COL_THUMB_ARTWORK, photo, -1);
+ g_free (index_str);
+}
+
+/**
+ * gphoto_remove_album_from_database
+ *
+ * Remove the selected album from the photo database and the view
+ *
+ */
+void gphoto_remove_album_from_database()
+{
+ GtkTreeModel *album_model;
+ GtkTreeIter iter;
+ GtkTreeSelection *curr_selection;
+ gchar *album_name;
+ PhotoAlbum *selected_album;
+
+ curr_selection = gtk_tree_view_get_selection (album_view);
+ if (curr_selection == NULL)
+ return;
+
+ if (gtk_tree_selection_get_selected (curr_selection, &album_model, &iter) == TRUE)
+ gtk_tree_model_get (album_model, &iter, COL_ALBUM_NAME, &album_name, -1);
+ else
+ return;
+
+ g_return_if_fail (album_name);
+
+ /* Find the selected album. If no selection then returns the Main Album */
+ selected_album = itdb_photodb_photoalbum_by_name (photodb, album_name);
+ g_return_if_fail (selected_album);
+ g_free (album_name);
+
+ if (selected_album->album_type == 0x01)
+ {
+ gtkpod_warning (_("The Photo Library album cannot be removed"));
+ return;
+ }
+
+ gboolean remove_pics = FALSE;
+ if (prefs_get_int("photo_library_confirm_delete") == FALSE ||
+ g_list_length (selected_album->members) <= 0)
+ {
+ /* User has chosen to assume yes and not display a confirm dialog
+ * or the album is empty
+ */
+ remove_pics = TRUE;
+ }
+ else
+ {
+ /* Display a dialog asking if the user wants the photos removed as well */
+ gint result;
+ GtkWindow *parent = GTK_WINDOW (gtkpod_xml_get_widget (main_window_xml, "gtkpod"));
+ GtkWidget *dialog = gtk_message_dialog_new (parent,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ _("Do you want to remove the album's photos too?"));
+ gtk_dialog_add_buttons (
+ GTK_DIALOG (dialog),
+ GTK_STOCK_YES, GTK_RESPONSE_YES,
+ GTK_STOCK_NO, GTK_RESPONSE_NO,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ _("Yes. Do Not Display Again"), PHOTO_YES_DONT_DISPLAY_RESPONSE,
+ NULL);
+
+ result = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
+ switch (result)
+ {
+ case PHOTO_YES_DONT_DISPLAY_RESPONSE:
+ prefs_set_int("photo_library_confirm_delete", FALSE);
+ case GTK_RESPONSE_YES:
+ remove_pics = TRUE;
+ break;
+ case GTK_RESPONSE_NO:
+ remove_pics = FALSE;
+ break;
+ case GTK_RESPONSE_REJECT:
+ return;
+ default:
+ break;
+ }
+ }
+
+ album_model = gtk_tree_view_get_model (album_view);
+ gtk_list_store_remove (GTK_LIST_STORE(album_model), &iter);
+
+ itdb_photodb_photoalbum_remove (photodb, selected_album, remove_pics);
+
+ /* Display the default Photo Library */
+ gphoto_build_thumbnail_model (NULL);
+
+ signal_data_changed ();
+}
+
+/**
+ * gphoto_remove_image_from_album
+ *
+ * Remove the selected image from the album
+ *
+ */
+void gphoto_remove_selected_photos_from_album (gboolean show_dialogs)
+{
+ GList *selected_images;
+ GtkTreeModel *thumbnail_model;
+ gint i;
+ GtkTreeIter image_iter;
+ Artwork *image;
+ gchar *album_name;
+ PhotoAlbum *selected_album;
+
+ /* Find which images are selected */
+ selected_images = gtk_icon_view_get_selected_items (thumbnail_view);
+ if (g_list_length (selected_images) == 0)
+ return;
+
+ /* Find which album is selected if any */
+ album_name = gphoto_get_selected_album_name (gtk_tree_view_get_selection (album_view));
+
+ selected_album = itdb_photodb_photoalbum_by_name (photodb, album_name);
+ GtkWindow *parent = GTK_WINDOW (gtkpod_xml_get_widget (main_window_xml, "gtkpod"));
+ GtkWidget *dialog;
+ gboolean delete_pics = FALSE;
+
+ if (show_dialogs)
+ {
+ if (selected_album != NULL&& selected_album->album_type != 0x01)
+ {
+ dialog = gtk_message_dialog_new (parent,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ _("This will remove the photo selection from the selected album.\n Do you want to delete them from the database as well?"));
+
+ gtk_dialog_add_buttons (
+ GTK_DIALOG (dialog),
+ GTK_STOCK_YES, GTK_RESPONSE_YES,
+ GTK_STOCK_NO, GTK_RESPONSE_NO,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ NULL);
+ }
+ else
+ {
+ dialog = gtk_message_dialog_new (parent,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_QUESTION,
+ GTK_BUTTONS_NONE,
+ _("This will delete the photo selection from the Photo Library and all albums. Are you sure?"));
+
+ gtk_dialog_add_buttons (
+ GTK_DIALOG (dialog),
+ GTK_STOCK_YES, GTK_RESPONSE_YES,
+ GTK_STOCK_NO, GTK_RESPONSE_REJECT,
+ NULL);
+ }
+ /* Display the dialog */
+ gint result = gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+
+ switch (result)
+ {
+ case GTK_RESPONSE_YES:
+ delete_pics = TRUE;
+ break;
+ case GTK_RESPONSE_NO:
+ delete_pics = FALSE;
+ break;
+ case GTK_RESPONSE_REJECT:
+ return;
+ default:
+ return;
+ }
+ }
+ else
+ {
+ delete_pics = FALSE;
+ }
+
+ thumbnail_model = gtk_icon_view_get_model (thumbnail_view);
+ for (i = 0; i < g_list_length (selected_images); ++i)
+ {
+ /* Find the selected image and remove it */
+ gtk_tree_model_get_iter (thumbnail_model, &image_iter, g_list_nth_data (selected_images, i));
+ gtk_tree_model_get (thumbnail_model, &image_iter, COL_THUMB_ARTWORK, &image, -1);
+
+ gtk_list_store_remove (GTK_LIST_STORE(thumbnail_model), &image_iter);
+ if (delete_pics)
+ itdb_photodb_remove_photo (photodb, NULL, image); /* pass in NULL to delete pics as well */
+ else
+ itdb_photodb_remove_photo (photodb, selected_album, image);
+ }
+
+ g_free (album_name);
+
+ signal_data_changed ();
+}
+
+/**
+ * gphoto_rename_selected_album
+ *
+ * Remove the selected image from the album
+ *
+ */
+void gphoto_rename_selected_album ()
+{
+ gchar *album_name= NULL;
+ PhotoAlbum *selected_album;
+ GtkTreeSelection *selection;
+ /* Get the currently selected album */
+ selection = gtk_tree_view_get_selection (album_view);
+ album_name= gphoto_get_selected_album_name (selection);
+ /* Find the selected album. If no selection then returns the Main Album */
+ selected_album = itdb_photodb_photoalbum_by_name (photodb, album_name);
+ g_return_if_fail (selected_album);
+
+ if (selected_album->album_type == 0x01)
+ {
+ /* Dont rename the Photo Library */
+ return;
+ }
+
+ gchar *new_album_name = get_user_string (
+ _("New Photo Album Name"),
+ _("Please enter a new name for the photo album"),
+ NULL,
+ NULL,
+ NULL);
+ if (new_album_name == NULL|| strlen (new_album_name) == 0)
+ return;
+
+ /* Check an album with this name doesnt already exist */
+ PhotoAlbum *curr_album;
+ curr_album = itdb_photodb_photoalbum_by_name (photodb, new_album_name);
+ if (curr_album != NULL)
+ {
+ gtkpod_warning (_("An album with that name already exists."));
+ g_free (new_album_name);
+ return;
+ }
+
+ /* Rename the album in the database */
+ selected_album->name = g_strdup (new_album_name);
+
+ /* Update the row in the album view */
+ GtkTreeModel *album_model;
+ GtkTreeIter iter;
+
+ album_model = gtk_tree_view_get_model (album_view);
+ if (gtk_tree_selection_get_selected (selection, &album_model, &iter) == TRUE)
+ {
+ gtk_list_store_set (GTK_LIST_STORE(album_model), &iter, COL_ALBUM_NAME, new_album_name, -1);;
+ }
+
+ g_free (new_album_name);
+
+ signal_data_changed();
+
+ /* Using the existing selection, reselect the album so it reloads the preview of the first image */
+ gphoto_album_selection_changed (selection, NULL);
+}
+
+/**
+ *
+ * gphoto_button_press:
+ *
+ * When right mouse button is pressed on one of the widgets,
+ * a popup menu is displayed.
+ *
+ * @ w: widget upon which button press has occurred
+ * @ e: button event
+ * @ data: not used
+ */
+static gboolean gphoto_button_press(GtkWidget *w, GdkEventButton *e, gpointer data)
+{
+ g_return_val_if_fail (w && e, FALSE);
+ switch (e->button)
+ {
+ case 3:
+ gphoto_context_menu_init (GPOINTER_TO_INT(data));
+ return TRUE;
+ default:
+ break;
+ }
+ return FALSE;
+}
+
+/* Callbacks for the menu items in the photo window */
+
+/**
+ * on_photodb_add_album_menuItem_activate:
+ *
+ * Callback for add album menu item
+ *
+ * @ menuitem: add album menu item
+ * @ user_data: not used
+ *
+ */
+void on_photodb_add_album_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data)
+{
+ PhotoAlbum *new_album;
+ GtkTreeIter iter;
+ GtkListStore *model;
+
+ gchar *album_name = get_user_string (
+ _("New Photo Album"),
+ _("Please enter a name for the new photo album"),
+ NULL,
+ NULL,
+ NULL);
+
+ if (album_name == NULL|| strlen (album_name) == 0)
+ return;
+
+ /* Check an album with this name doesnt already exist */
+ new_album = itdb_photodb_photoalbum_by_name (photodb, album_name);
+ if (new_album != NULL)
+ {
+ gtkpod_warning (_("An album with that name already exists."));
+ g_free (album_name);
+ return;
+ }
+
+ /* Album doesn't exist so create it */
+ new_album = itdb_photodb_photoalbum_create (photodb, album_name, -1);
+ if (new_album == NULL)
+ {
+ gtkpod_warning (_("The new album failed to be created."));
+ g_free (album_name);
+ return;
+ }
+
+ model = GTK_LIST_STORE (gtk_tree_view_get_model (album_view));
+ gtk_list_store_append (model, &iter);
+ gtk_list_store_set (model, &iter, COL_ALBUM_NAME, album_name, -1);
+
+ g_free (album_name);
+ signal_data_changed ();
+}
+
+/**
+ * on_photodb_add_image_menuItem_activate:
+ *
+ * Callback for add image menu item
+ *
+ * @ menuitem: add image menu item
+ * @ user_data: not used
+ *
+ */
+void on_photodb_add_image_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data)
+{
+ gchar *image_name = fileselection_get_file_or_dir (_("Add Image to iPod"),
+ NULL, GTK_FILE_CHOOSER_ACTION_OPEN);
+
+ if (image_name == NULL)
+ return;
+
+ gphoto_add_image_to_database (image_name);
+
+ g_free (image_name);
+}
+
+/**
+ * _strptrcmp:
+ *
+ * Comparision function for comparing the filenames
+ * of newly added images.
+ *
+ * @ a: filename 1
+ * @ b: filename 2
+ *
+ */
+static int _strptrcmp(const void* _a, const void* _b)
+{
+ const char* const* a = (const char* const*) _a;
+ const char* const* b = (const char* const*) _b;
+
+ /* paranoia */
+ if (a == b)
+ return 0;
+ else if (!a)
+ return -1;
+ else if (!b)
+ return 1;
+ /* real work */
+ else if (*a == *b)
+ return 0;
+ else
+ return strcmp(*a, *b);
+}
+
+/**
+ * on_photodb_add_image_dir_menuItem_activate:
+ *
+ * Callback for add image directory menu item
+ *
+ * @ menuitem: add album menu item
+ * @ user_data: not used
+ *
+ */
+void on_photodb_add_image_dir_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data)
+{
+ GDir *directory;
+ GError *error= NULL;
+
+ /* Open a dialog directory chooser window */
+ gchar*dir_name = fileselection_get_file_or_dir (_("Add a Directory of Images to the iPod. Select the Directory."),
+ NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+
+ if (dir_name == NULL)
+ return;
+
+ if (!g_file_test (dir_name, G_FILE_TEST_IS_DIR))
+ {
+ g_free (dir_name);
+ return;
+ }
+
+ /* Get the directory from the name chosen */
+ directory = g_dir_open (dir_name, 0, &error);
+
+ if (directory == NULL)
+ {
+ if (error && error->message)
+ gtkpod_warning ("%s\n\n", error->message);
+ else
+ g_warning ("error->message == NULL!\n");
+
+ g_error_free (error);
+ error = NULL;
+ g_free (dir_name);
+ return;
+ }
+
+ /* Leaf through all the files inside the directory and check if they are image
+ * files. If they are then add them to the database.
+ */
+ G_CONST_RETURN gchar *filename;
+ GPtrArray* filename_arr = g_ptr_array_new();
+ unsigned u;
+
+ do
+ {
+ filename = g_dir_read_name(directory);
+ if (filename != NULL)
+ {
+ g_ptr_array_add(filename_arr, (void*) filename);
+ }
+ } while (filename != NULL);
+
+ /* Conduct an alphabetical sort on the filenames so
+ * they are added in order.
+ */
+ g_ptr_array_sort(filename_arr, _strptrcmp);
+
+ for (u = 0; u < filename_arr->len; ++u)
+ {
+ gchar *full_filename;
+ GdkPixbufFormat *fileformat= NULL;
+
+ filename = g_ptr_array_index(filename_arr, u);
+ full_filename = g_build_filename (dir_name, filename, NULL);
+
+ /* Only allow valid image files to be added to the photo db. If it file is not a
+ * valid image according to pixbuf then that is good enough for me!
+ */
+ fileformat = gdk_pixbuf_get_file_info (full_filename, NULL, NULL);
+ if (fileformat != NULL)
+ {
+ gphoto_add_image_to_database (full_filename);
+ }
+ g_free (full_filename);
+ }
+
+ g_ptr_array_free(filename_arr, TRUE);
+ g_dir_close(directory);
+ g_free(dir_name);
+}
+
+/**
+ * on_photodb_remove_album_menuItem_activate:
+ *
+ * Callback for remove album menu item
+ *
+ * @ menuitem: remove album menu item
+ * @ user_data: not used
+ *
+ */
+void on_photodb_remove_album_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data)
+{
+ gphoto_remove_album_from_database ();
+}
+
+/**
+ * on_photodb_remove_image_menuItem_activate:
+ *
+ * Callback for remove image menu item
+ *
+ * @ menuitem: remove image menu item
+ * @ user_data: not used
+ *
+ */
+void on_photodb_remove_image_menuItem_activate(GtkMenuItem *menuItem, gpointer user_data)
+{
+ gphoto_remove_selected_photos_from_album (TRUE);
+}
+
+/**
+ * on_photodb_view_full_size_menuItem_activate
+ *
+ * Callback used to display a dialog contain a full
+ * size / screen size version of the selected image.
+ * Same as that used in coverart display.
+ *
+ * @ menuitem: remove image menu item
+ * @ user_data: not used
+ *
+ */
+void on_photodb_view_full_size_menuItem_activate (GtkMenuItem *menuItem, gpointer user_data)
+{
+ GList * selected_images;
+ GtkTreeModel *model;
+ GtkTreePath *treePath = NULL;
+ GtkTreeIter iter;
+ Artwork *artwork = NULL;
+ GdkPixbuf * pixbuf;
+ gint i;
+ Thumb *thumb = NULL;
+
+ /* Find which images are selected */
+ selected_images = gtk_icon_view_get_selected_items (GTK_ICON_VIEW(thumbnail_view));
+ if (selected_images == NULL|| g_list_length (selected_images) == 0)
+ return;
+
+ /* Using the model find the first Artwork object from the selected images list
+ * Should only be one in the list if the toolbar button is being enabled/disabled
+ * correctly.
+ */
+ model = gtk_icon_view_get_model (GTK_ICON_VIEW(thumbnail_view));
+
+ treePath = g_list_nth_data (selected_images, 0);
+ gtk_tree_model_get_iter (model, &iter, treePath);
+ gtk_tree_model_get (model, &iter, COL_THUMB_ARTWORK, &artwork, -1);
+
+ /* Find the biggest thumb that exists on the pod */
+ for (i = (PHOTO_TYPES_SIZE - 1); i >= 0 && thumb == NULL; --i)
+ {
+ /* Start from biggest photo type and go smaller */
+ thumb = itdb_artwork_get_thumb_by_type (artwork, photo_types[i]);
+ }
+ /* should have a thumb now but check anyway and fire off a warning if it is still null */
+ g_return_if_fail (thumb);
+
+ pixbuf = itdb_thumb_get_gdk_pixbuf (device, thumb);
+ g_return_if_fail (pixbuf);
+
+ display_image_dialog (pixbuf);
+
+}
+
+/**
+ * on_photodb_rename_album_menuItem_activate
+ *
+ * Callback used to rename an album.
+ *
+ * @ menuitem: remove image menu item
+ * @ user_data: not used
+ *
+ */
+void on_photodb_rename_album_menuItem_activate (GtkMenuItem *menuItem, gpointer user_data)
+{
+ gphoto_rename_selected_album ();
+}
+
+/* -----------------------------------------------------------*/
+/* Section for album display */
+/* drag and drop */
+/* -----------------------------------------------------------*/
+
+/**
+ * dnd_album_drag_drop:
+ *
+ * Allow dnd of an image onto an album row in the
+ * album tree. Gives ability to add an image to a
+ * different album.
+ *
+ */
+static gboolean dnd_album_drag_drop(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, guint time, gpointer user_data)
+{
+ GdkAtom target;
+ target = gtk_drag_dest_find_target (widget, drag_context, NULL);
+
+ if (target != GDK_NONE)
+ {
+ gboolean rowfound;
+
+ /* determine whether a row has been dropped over in album view */
+ rowfound = gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW(widget), x, y, NULL, NULL);
+ if (rowfound == TRUE)
+ {
+ gtk_drag_get_data (widget, drag_context, target, time);
+ return TRUE;
+ }
+ else
+ return FALSE;
+ }
+ return FALSE;
+}
+
+/**
+ * dnd_images_drag_data_get:
+ *
+ * Provide the images which are to be dnded
+ * onto the new album in the album tree.
+ *
+ */
+static void dnd_images_drag_data_get(GtkWidget *widget, GdkDragContext *dc, GtkSelectionData *data, guint info, guint time,
+ gpointer user_data)
+{
+ GtkTreeModel *model;
+ GList *selected_images;
+ gint i;
+
+ if (!data)
+ return;
+
+ /* Find which images are selected */
+ selected_images = gtk_icon_view_get_selected_items (GTK_ICON_VIEW(widget));
+ if (selected_images == NULL|| g_list_length (selected_images) == 0)
+ return;
+
+ model = gtk_icon_view_get_model (GTK_ICON_VIEW(widget));
+
+ GtkTreePath *treePath = NULL;
+ GtkTreeIter iter;
+ Artwork *artwork = NULL;
+ GString *reply = g_string_sized_new (2000);
+
+ for (i = 0; i < g_list_length(selected_images); ++i)
+ {
+ treePath = g_list_nth_data (selected_images, i);
+ gtk_tree_model_get_iter (model, &iter, treePath);
+ gtk_tree_model_get (model, &iter, COL_THUMB_ARTWORK, &artwork, -1);
+ g_string_append_printf (reply, "%p\n", artwork);
+ }
+
+ switch (info)
+ {
+ case DND_GTKPOD_PHOTOIMAGELIST:
+ gtk_selection_data_set(data, data->target, 8, reply->str, reply->len);
+ g_string_free (reply, TRUE);
+ break;
+ default:
+ g_warning ("Programming error: pm_drag_data_get received unknown info type (%d)\n", info);
+ break;
+ }
+}
+
+/**
+ * dnd_album_data_received:
+ *
+ * The final part of the dnd images onto album dnd
+ * operation. This uses the data received and adds
+ * the images to the new album.
+ *
+ */
+static void dnd_album_drag_data_received(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, GtkSelectionData *data, guint info,
+ guint time, gpointer user_data)
+{
+ g_return_if_fail (widget);
+ g_return_if_fail (dc);
+ g_return_if_fail (data);
+ g_return_if_fail (data->length > 0);
+ g_return_if_fail (data->data);
+ g_return_if_fail (data->format == 8);
+
+ gboolean rowfound;
+ GtkTreePath *treepath;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *tgt_name;
+ gchar *src_name;
+ PhotoAlbum *tgt_album;
+ PhotoAlbum *src_album;
+
+ /* determine whether a row has been dropped over in album view */
+ rowfound = gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW(widget), x, y, &treepath, NULL);
+ if (! rowfound)
+ {
+ gtk_drag_finish (dc, FALSE, FALSE, time);
+ return;
+ }
+
+ g_return_if_fail (treepath);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW(widget));
+
+ /* Find the target album to drop the artwork into */
+ if(gtk_tree_model_get_iter (model, &iter, treepath))
+ gtk_tree_model_get (model, &iter, COL_ALBUM_NAME, &tgt_name, -1);
+
+ gtk_tree_path_free (treepath);
+ treepath = NULL;
+ g_return_if_fail (tgt_name);
+
+ tgt_album = itdb_photodb_photoalbum_by_name (photodb, tgt_name);
+ g_return_if_fail (tgt_album);
+ if (tgt_name != NULL)
+ g_free (tgt_name);
+
+ /* Find the selected album, ie. the source, or else the Photo Library if no selection */
+ GtkTreeSelection *selection = NULL;
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(widget));
+ if (selection != NULL)
+ src_name = gphoto_get_selected_album_name (selection);
+ else
+ src_name = NULL;
+
+ /* Find the selected album. If no selection then returns the Photo Library */
+ src_album = itdb_photodb_photoalbum_by_name (photodb, src_name);
+ g_return_if_fail (src_album);
+ if (src_name != NULL)
+ g_free (src_name);
+
+ if (src_album == tgt_album)
+ {
+ gtk_drag_finish (dc, FALSE, FALSE, time);
+ return;
+ }
+
+ Artwork *artwork;
+ GList *artwork_list = NULL;
+ gchar *datap = data->data;
+ gint i = 0;
+
+ /* parse artwork and add each one to a GList */
+ while (parse_artwork_from_string (&datap, &artwork))
+ artwork_list = g_list_append (artwork_list, artwork);
+
+ if (tgt_album->album_type != 0x01)
+ {
+ /* Only if the target is not the Photo Library (which should have the photo
+ * already) should the artwork be added to the album
+ */
+ for (i = 0; i < g_list_length (artwork_list); ++i)
+ {
+ artwork = g_list_nth_data (artwork_list, i);
+ itdb_photodb_photoalbum_add_photo (photodb, tgt_album, artwork, -1);
+ }
+ }
+
+ /* Remove the artwork from the selected album if it is not the Photo Library */
+ if (src_album->album_type != 0x01)
+ gphoto_remove_selected_photos_from_album (FALSE);
+
+ signal_data_changed ();
+}
+
+#if DEBUG
+static void debug_list_photos(iTunesDB *itdb)
+{
+ ExtraiTunesDBData *eitdb;
+ PhotoDB *db;
+ GList *gl_album;
+
+ eitdb = itdb->userdata;
+ db = eitdb->photodb;
+ if (db == NULL)
+ {
+ printf ("Reference to photo database is null\n");
+ return;
+ }
+
+ printf ("List of Photos stored on the ipod\n");
+ for (gl_album=db->photoalbums; gl_album; gl_album=gl_album->next)
+ {
+ GList *gl_photo;
+ PhotoAlbum *album = gl_album->data;
+ g_return_if_fail (album);
+
+ printf ("%s: ", album->name ? album->name : _("<Unnamed>"));
+
+ for (gl_photo=album->members; gl_photo; gl_photo=gl_photo->next)
+ {
+ Artwork *photo = gl_photo->data;
+ g_return_if_fail (photo);
+
+ printf ("%d ", photo->id);
+ }
+ if (g_list_length (album->members) > 0)
+ {
+ printf ("\n");
+ } else
+ {
+ printf (_("<No members>\n"));
+ }
+ }
+}
+#endif
+
Copied: gtkpod/branches/etch-bpo/src/display_photo.h (from rev 305, gtkpod/tags/0.99.12-1/src/display_photo.h)
===================================================================
--- gtkpod/branches/etch-bpo/src/display_photo.h (rev 0)
+++ gtkpod/branches/etch-bpo/src/display_photo.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,66 @@
+/*
+| Copyright (C) 2007 P.G. Richardson <phantom_sf at users.sourceforge.net>
+| Part of the gtkpod project.
+|
+| URL: http://www.gtkpod.org/
+| URL: http://gtkpod.sourceforge.net/
+|
+| This program is free software; you can redistribute it and/or modify
+| it under the terms of the GNU General Public License as published by
+| the Free Software Foundation; either version 2 of the License, or
+| (at your option) any later version.
+|
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; if not, write to the Free Software
+| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+|
+| iTunes and iPod are trademarks of Apple
+|
+| This product is not supported/written/published by Apple!
+|
+*/
+
+#ifndef DISPLAY_PHOTO_H_
+#define DISPLAY_PHOTO_H_
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <gtk/gtk.h>
+#include "display_itdb.h"
+
+/* Gtkpod value for the photo playlists on the ipod.
+ * This means a different value from both the mpl and podcast playlist values defined in libgpod.
+ * Dont want to change latter as this is not a real playlist defined on the ipod but used for gtkpod
+ * purposes only.
+ */
+#define GP_PL_TYPE_PHOTO 2
+/* The values set in itdb_artwork.c for the width and height of ITDB_THUMB_PHOTO_FULL_SCREEN */
+#define PHOTO_FULL_SCREEN_WIDTH 220
+#define PHOTO_FULL_SCREEN_HEIGHT 176
+
+/* Drag n Drop */
+#define DND_GTKPOD_PHOTOIMAGELIST_TYPE "application/gtkpod-photoimagelist"
+#define DND_GTKPOD_PHOTOIMAGELIST 1
+
+#define GPHOTO_ALBUM_VIEW 0
+#define GPHOTO_ICON_VIEW 1
+#define GPHOTO_PREVIEW 2
+
+void gphoto_load_photodb (iTunesDB *itdb);
+gboolean gphoto_ipod_supports_photos (iTunesDB *itdb);
+gboolean gphoto_is_photo_playlist (Playlist *pl);
+void gphoto_display_photo_window (iTunesDB *itdb);
+void gphoto_change_to_photo_window (gboolean showflag);
+gint gphoto_get_selected_photo_count ();
+void gphoto_remove_selected_photos_from_album (gboolean show_dialogs);
+void gphoto_remove_album_from_database ();
+void gphoto_rename_selected_album ();
+
+#endif /*DISPLAY_PHOTO_H_*/
Modified: gtkpod/branches/etch-bpo/src/display_playlists.c
===================================================================
--- gtkpod/branches/etch-bpo/src/display_playlists.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_playlists.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_playlists.c 1596 2007-06-26 14:33:01Z dforsi $
+| $Id: display_playlists.c 1776 2007-11-12 22:38:00Z phantom_sf $
*/
#ifdef HAVE_CONFIG_H
@@ -40,6 +40,8 @@
#include "misc_track.h"
#include "info.h"
#include "context_menus.h"
+#include "display_photo.h"
+#include "stock_icons.h"
/* pointer to the treeview for the playlist display */
static GtkTreeView *playlist_treeview = NULL;
@@ -1174,8 +1176,7 @@
{
if (!current_playlist) return;
- if (prefs_get_int (KEY_DISPLAY_COVERART))
- coverart_track_changed (track, COVERART_CHANGE_SIGNAL);
+ coverart_track_changed (track, COVERART_CHANGE_SIGNAL);
/* Check if track is member of current playlist */
if (g_list_find (current_playlist->members, track))
@@ -1414,12 +1415,24 @@
{
space_set_ipod_itdb (new_playlist->itdb);
}
+
+ if (gphoto_is_photo_playlist (new_playlist))
+ {
+ /* This is the photo playlist so need to load photo database
+ * rather than get tracks.
+ */
+ gphoto_display_photo_window (new_playlist->itdb);
+ }
+ else
+ {
+ gphoto_change_to_photo_window (FALSE);
+ }
/* remove all entries from sort tab 0 */
/* printf ("removing entries: %x\n", current_playlist);*/
st_init (-1, 0);
- current_playlist = new_playlist;
+ current_playlist = new_playlist;
if (new_playlist->is_spl && new_playlist->splpref.liveupdate)
itdb_spl_update (new_playlist);
if (new_playlist->members)
@@ -1512,6 +1525,54 @@
if (itdb_playlist_is_mpl (pl)) pm_add_playlist (pl, pos);
else pm_add_playlist (pl, -1);
}
+
+ /* Add the photo playlist onto IPOD itdb if the
+ * IPOD supports photos
+ */
+ if (gphoto_ipod_supports_photos (itdb))
+ { /* add photo playlist */
+/* printf ("Photos supported. Adding node.\n"); */
+ GtkTreeIter itdb_iter;
+
+ if (pm_get_iter_for_itdb (itdb, &itdb_iter))
+ {
+ gboolean createpl = TRUE;
+ GtkTreeIter pl_iter;
+ GtkTreeModel *model;
+ Playlist *pl;
+
+ model = GTK_TREE_MODEL (gtk_tree_view_get_model (playlist_treeview));
+
+ /* go down one hierarchy and try all other iters */
+ if (gtk_tree_model_iter_children (model, &pl_iter, &itdb_iter))
+ {
+ do
+ {
+ gtk_tree_model_get (model, &pl_iter,
+ PM_COLUMN_PLAYLIST, &pl,
+ -1);
+ if (pl->type == GP_PL_TYPE_PHOTO)
+ {
+ /* Photo playlist already found so dont need to readd */
+ createpl = FALSE;
+ break;
+ }
+ } while (gtk_tree_model_iter_next (model, &pl_iter));
+ }
+
+ if (createpl)
+ {
+ /* no existing photo playlist found so add one
+ * either itdb had no children or none of them
+ * were of the photo type.
+ */
+ Playlist *pl = itdb_playlist_new (_("Photos"), FALSE);
+ pl->type = GP_PL_TYPE_PHOTO;
+ pl->itdb = itdb;
+ pm_add_playlist (pl, -1);
+ }
+ }
+ }
}
@@ -1934,7 +1995,14 @@
}
else if (!itdb_playlist_is_mpl (playlist))
{
- stock_id = GTK_STOCK_JUSTIFY_LEFT;
+ if (gphoto_is_photo_playlist (playlist))
+ {
+ stock_id = GPHOTO_PLAYLIST_ICON_STOCK_ID;
+ }
+ else
+ {
+ stock_id = TUNES_PLAYLIST_ICON_STOCK_ID;
+ }
}
else
{
Property changes on: gtkpod/branches/etch-bpo/src/display_playlists.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/display_private.h
===================================================================
--- gtkpod/branches/etch-bpo/src/display_private.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_private.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_private.h 1009 2007-03-19 14:46:08Z jcsjcs $
+| $Id: display_private.h 1750 2007-11-01 21:57:01Z phantom_sf $
*/
#ifndef __DISPLAY_PRIVATE_H__
@@ -74,9 +74,11 @@
void st_cleanup (void);
void st_set_default_sizes (void);
void st_update_default_sizes (void);
+void st_set_sorttab_page (int inst, gint category);
void tm_update_default_sizes (void);
void st_show_hide_tooltips (void);
GList *st_get_selected_members (guint32 inst);
+gint st_get_sorttab_page_number (int inst);
void st_enable_disable_view_sort (gint inst, gboolean enable);
void tm_enable_disable_view_sort (gboolean enable);
Property changes on: gtkpod/branches/etch-bpo/src/display_private.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/display_sorttabs.c
===================================================================
--- gtkpod/branches/etch-bpo/src/display_sorttabs.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_sorttabs.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_sorttabs.c 1596 2007-06-26 14:33:01Z dforsi $
+| $Id: display_sorttabs.c 1750 2007-11-01 21:57:01Z phantom_sf $
*/
#ifdef HAVE_CONFIG_H
@@ -1032,7 +1032,6 @@
return -1;
}
-
/* returns the selected entry */
TabEntry *st_get_selected_entry (gint inst)
{
@@ -1980,6 +1979,25 @@
coverart_set_images (order == SORT_NONE);
}
+gint st_get_sorttab_page_number (int inst)
+{
+ if (sorttab[inst])
+ return gtk_notebook_get_current_page (sorttab[inst]->notebook);
+ else
+ return -1;
+}
+
+void st_set_sorttab_page (gint inst, gint category)
+{
+ if (sorttab[inst])
+ {
+ gtk_notebook_set_current_page (sorttab[inst]->notebook, category);
+ st_page_selected (sorttab[inst]->notebook, category);
+
+ while (gtk_events_pending ()) gtk_main_iteration ();
+ }
+}
+
gboolean st_set_selection (Itdb_Track *track)
{
GtkTreeSelection *selection;
@@ -2054,6 +2072,7 @@
return TRUE;
}
+
static void st_selection_changed_cb (gpointer user_data1, gpointer user_data2)
{
GtkTreeSelection *selection = (GtkTreeSelection *)user_data1;
Property changes on: gtkpod/branches/etch-bpo/src/display_sorttabs.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/display_spl.c
===================================================================
--- gtkpod/branches/etch-bpo/src/display_spl.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_spl.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -22,7 +22,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_spl.c 1057 2007-04-27 16:12:39Z jcsjcs $
+| $Id: display_spl.c 1798 2007-11-17 16:12:06Z jcsjcs $
*/
#ifdef HAVE_CONFIG_H
@@ -91,7 +91,7 @@
{ ITDB_SPLFIELD_DATE_MODIFIED, N_("Date modified") },
{ ITDB_SPLFIELD_TRACKNUMBER, N_("Track number") },
{ ITDB_SPLFIELD_SIZE, N_("Size") },
- { ITDB_SPLFIELD_TIME, N_("Time") },
+ { ITDB_SPLFIELD_TIME, N_("Play time") },
{ ITDB_SPLFIELD_COMMENT, N_("Comment") },
{ ITDB_SPLFIELD_DATE_ADDED, N_("Date added") },
{ ITDB_SPLFIELD_COMPOSER, N_("Composer") },
@@ -635,10 +635,17 @@
switch (type)
{
case spl_ET_FROMVALUE:
- splr->fromvalue = atol (str);
- if (splr->field == ITDB_SPLFIELD_RATING)
+ switch (splr->field)
{
- splr->fromvalue *= ITDB_RATING_STEP;
+ case ITDB_SPLFIELD_RATING:
+ splr->fromvalue = ITDB_RATING_STEP * atol (str);
+ break;
+ case ITDB_SPLFIELD_TIME:
+ splr->fromvalue = 1000 * strtod (str, NULL);
+ break;
+ default:
+ splr->fromvalue = atol (str);
+ break;
}
break;
case spl_ET_FROMVALUE_DATE:
@@ -650,10 +657,17 @@
splr->fromdate = atol (str);
break;
case spl_ET_TOVALUE:
- splr->tovalue = atol (str);
- if (splr->field == ITDB_SPLFIELD_RATING)
+ switch (splr->field)
{
- splr->tovalue *= ITDB_RATING_STEP;
+ case ITDB_SPLFIELD_RATING:
+ splr->tovalue = ITDB_RATING_STEP * atol (str);
+ break;
+ case ITDB_SPLFIELD_TIME:
+ splr->tovalue = 1000 * strtod (str, NULL);
+ break;
+ default:
+ splr->tovalue = atol (str);
+ break;
}
break;
case spl_ET_TOVALUE_DATE:
@@ -1004,22 +1018,27 @@
enum entrytype et)
{
gchar *strp = str;
- gint stepsize = 1; /* for FROMVALUE/TOVALUE (20 for rating) */
g_return_val_if_fail (str, NULL);
g_return_val_if_fail (splr, NULL);
- if (splr->field == ITDB_SPLFIELD_RATING)
- {
- stepsize = ITDB_RATING_STEP;
- }
-
switch (et)
{
case spl_ET_FROMVALUE:
if (splr->fromvalue == ITDB_SPL_DATE_IDENTIFIER)
splr->fromvalue = 0;
- snprintf (str, WNLEN, "%lld", (long long int)(splr->fromvalue / stepsize));
+ switch (splr->field)
+ {
+ case ITDB_SPLFIELD_RATING:
+ snprintf (str, WNLEN, "%lld", (long long int)(splr->fromvalue / ITDB_RATING_STEP));
+ break;
+ case ITDB_SPLFIELD_TIME:
+ snprintf (str, WNLEN, "%.10g", ((gdouble)splr->fromvalue/1000));
+ break;
+ default:
+ snprintf (str, WNLEN, "%lld", (long long int)(splr->fromvalue));
+ break;
+ }
break;
case spl_ET_FROMVALUE_DATE:
if (splr->fromvalue == ITDB_SPL_DATE_IDENTIFIER)
@@ -1032,7 +1051,18 @@
case spl_ET_TOVALUE:
if (splr->tovalue == ITDB_SPL_DATE_IDENTIFIER)
splr->tovalue = 0;
- snprintf (str, WNLEN, "%lld", (long long int)(splr->tovalue / stepsize));
+ switch (splr->field )
+ {
+ case ITDB_SPLFIELD_RATING:
+ snprintf (str, WNLEN, "%lld", (long long int)(splr->tovalue / ITDB_RATING_STEP));
+ break;
+ case ITDB_SPLFIELD_TIME:
+ snprintf (str, WNLEN, "%.10g", ((gdouble)splr->tovalue/1000));
+ break;
+ default:
+ snprintf (str, WNLEN, "%lld", (long long int)(splr->tovalue));
+ break;
+ }
break;
case spl_ET_TOVALUE_DATE:
if (splr->tovalue == ITDB_SPL_DATE_IDENTIFIER)
Property changes on: gtkpod/branches/etch-bpo/src/display_spl.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/display_tracks.c
===================================================================
--- gtkpod/branches/etch-bpo/src/display_tracks.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/display_tracks.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: display_tracks.c 1589 2007-06-25 14:23:59Z jcsjcs $
+| $Id: display_tracks.c 1815 2007-12-12 15:36:40Z jcsjcs $
*/
#ifdef HAVE_CONFIG_H
@@ -838,6 +838,7 @@
{
case TM_COLUMN_TITLE:
case TM_COLUMN_ALBUM:
+ case TM_COLUMN_ALBUMARTIST:
case TM_COLUMN_ARTIST:
case TM_COLUMN_GENRE:
case TM_COLUMN_COMPOSER:
@@ -870,6 +871,12 @@
case TM_COLUMN_TV_NETWORK:
case TM_COLUMN_SEASON_NR:
case TM_COLUMN_EPISODE_NR:
+ case TM_COLUMN_SORT_TITLE:
+ case TM_COLUMN_SORT_ALBUM:
+ case TM_COLUMN_SORT_ALBUMARTIST:
+ case TM_COLUMN_SORT_COMPOSER:
+ case TM_COLUMN_SORT_TVSHOW:
+ case TM_COLUMN_SORT_ARTIST:
changed = track_set_text (track, new_text, TM_to_T (column));
if (changed && (column == TM_COLUMN_TRACKLEN))
{ /* be on the safe side and reset starttime, stoptime and
@@ -903,9 +910,16 @@
break;
}
break;
- default:
- g_warning ("Programming error: tm_cell_edited: unknown track cell (%d) edited\n", column);
- break;
+ case TM_COLUMN_IPOD_ID:
+ case TM_COLUMN_PC_PATH:
+ case TM_COLUMN_TRANSFERRED:
+ case TM_COLUMN_SIZE:
+ case TM_COLUMN_IPOD_PATH:
+ case TM_COLUMN_COMPILATION:
+ case TM_COLUMN_THUMB_PATH:
+ case TM_NUM_COLUMNS:
+ /* These are not editable text fields */
+ break;
}
/* printf (" changed: %d\n", changed); */
if (changed)
@@ -1057,6 +1071,39 @@
+/* This function is analogous to tm_cell_data_func(), but is only used
+ for the title column to distinguish between the text and the toggle
+ button there. The other toggle buttons (e.g. compilation) can
+ easily be handled in the original tm_cell_data_func() */
+static void tm_cell_data_func_toggle (GtkTreeViewColumn *tree_column,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ Track *track;
+ TM_item column;
+
+ column = (TM_item)g_object_get_data (G_OBJECT (renderer), "column");
+ gtk_tree_model_get (model, iter, READOUT_COL, &track, -1);
+
+ /* printf ("tm_cell_data_func_toggle() entered\n"); */
+
+ switch (column)
+ {
+ case TM_COLUMN_TITLE:
+ g_object_set (G_OBJECT (renderer),
+ "active", !track->checked,
+ "activatable", TRUE, NULL);
+ break;
+ default:
+ g_warning ("Programming error: unknown column in tm_cell_data_func_toggle: %d\n", column);
+ break;
+ }
+}
+
+
+
/* Called when a toggle cell is being changed. Stores new data to the
track list. */
static void
@@ -1077,7 +1124,7 @@
selection = gtk_tree_view_get_selection(track_treeview);
row_list = gtk_tree_selection_get_selected_rows(selection, &model);
-/* printf("tm_cell_toggled: column: %d, arg1: %p\n", column, arg1); */
+ /* printf("tm_cell_toggled: column: %d, arg1: %p\n", column, arg1); */
sel_rows_num = g_list_length (row_list);
@@ -1117,9 +1164,55 @@
if (!active) track->compilation = 1;
else track->compilation = 0;
break;
- default:
- g_warning ("Programming error: tm_cell_toggled: unknown track cell (%d) edited\n", column);
- break;
+ case TM_COLUMN_ARTIST:
+ case TM_COLUMN_ALBUM:
+ case TM_COLUMN_GENRE:
+ case TM_COLUMN_COMPOSER:
+ case TM_COLUMN_TRACK_NR:
+ case TM_COLUMN_IPOD_ID:
+ case TM_COLUMN_PC_PATH:
+ case TM_COLUMN_TRANSFERRED:
+ case TM_COLUMN_SIZE:
+ case TM_COLUMN_TRACKLEN:
+ case TM_COLUMN_BITRATE:
+ case TM_COLUMN_PLAYCOUNT:
+ case TM_COLUMN_RATING:
+ case TM_COLUMN_TIME_PLAYED:
+ case TM_COLUMN_TIME_MODIFIED:
+ case TM_COLUMN_VOLUME:
+ case TM_COLUMN_YEAR:
+ case TM_COLUMN_CD_NR:
+ case TM_COLUMN_TIME_ADDED:
+ case TM_COLUMN_IPOD_PATH:
+ case TM_COLUMN_SOUNDCHECK:
+ case TM_COLUMN_SAMPLERATE:
+ case TM_COLUMN_BPM:
+ case TM_COLUMN_FILETYPE:
+ case TM_COLUMN_GROUPING:
+ case TM_COLUMN_COMMENT:
+ case TM_COLUMN_CATEGORY:
+ case TM_COLUMN_DESCRIPTION:
+ case TM_COLUMN_PODCASTURL:
+ case TM_COLUMN_PODCASTRSS:
+ case TM_COLUMN_SUBTITLE:
+ case TM_COLUMN_TIME_RELEASED:
+ case TM_COLUMN_THUMB_PATH:
+ case TM_COLUMN_MEDIA_TYPE:
+ case TM_COLUMN_TV_SHOW:
+ case TM_COLUMN_TV_EPISODE:
+ case TM_COLUMN_TV_NETWORK:
+ case TM_COLUMN_SEASON_NR:
+ case TM_COLUMN_EPISODE_NR:
+ case TM_COLUMN_ALBUMARTIST:
+ case TM_COLUMN_SORT_ARTIST:
+ case TM_COLUMN_SORT_TITLE:
+ case TM_COLUMN_SORT_ALBUM:
+ case TM_COLUMN_SORT_ALBUMARTIST:
+ case TM_COLUMN_SORT_COMPOSER:
+ case TM_COLUMN_SORT_TVSHOW:
+ case TM_NUM_COLUMNS:
+ /* these are not toggle buttons */
+ break;
}
/* printf (" changed: %d\n", changed); */
if (changed)
@@ -1147,36 +1240,7 @@
-/* The track data is stored in a separate list (static GList *tracks)
- and only pointers to the corresponding Track structure are placed
- into the model.
- This function reads the data for the given cell from the list and
- passes it to the renderer. */
-static void tm_cell_data_func_toggle (GtkTreeViewColumn *tree_column,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data)
-{
- Track *track;
- TM_item column;
- column = (TM_item)g_object_get_data (G_OBJECT (renderer), "column");
- gtk_tree_model_get (model, iter, READOUT_COL, &track, -1);
-
- switch (column)
- {
- case TM_COLUMN_TITLE:
- g_object_set (G_OBJECT (renderer),
- "active", !track->checked,
- "activatable", TRUE, NULL);
- break;
- default:
- g_warning ("Programming error: unknown column in tm_cell_data_func_toggle: %d\n", column);
- break;
- }
-}
-
/**
* tm_get_nr_of_tracks - get the number of tracks displayed
* currently in the track model Returns - the number of tracks displayed
@@ -1451,6 +1515,7 @@
{
case TM_COLUMN_TITLE:
case TM_COLUMN_ALBUM:
+ case TM_COLUMN_ALBUMARTIST:
case TM_COLUMN_GENRE:
case TM_COLUMN_COMPOSER:
case TM_COLUMN_COMMENT:
@@ -1465,6 +1530,12 @@
case TM_COLUMN_TV_SHOW:
case TM_COLUMN_TV_EPISODE:
case TM_COLUMN_TV_NETWORK:
+ case TM_COLUMN_SORT_TITLE:
+ case TM_COLUMN_SORT_ALBUM:
+ case TM_COLUMN_SORT_ARTIST:
+ case TM_COLUMN_SORT_ALBUMARTIST:
+ case TM_COLUMN_SORT_COMPOSER:
+ case TM_COLUMN_SORT_TVSHOW:
/* string_compare_func is set to either compare_string_fuzzy or
compare_string in tm_sort_column_changed() which is called
once before the comparing begins. */
@@ -1562,8 +1633,7 @@
case TM_COLUMN_MEDIA_TYPE:
cmp = track1->mediatype - track2->mediatype;
break;
- default:
- g_warning ("Programming error: tm_data_compare_func: no sort method for tm_item %d\n", tm_item);
+ case TM_NUM_COLUMNS:
break;
}
@@ -1590,7 +1660,7 @@
Track *track1;
gboolean cmp = 0;
gtk_tree_model_get (model, iter, READOUT_COL, &track1, -1);
- switch (column)
+ switch ((TM_item)column)
{
case TM_COLUMN_TITLE:
case TM_COLUMN_ALBUM:
@@ -1613,10 +1683,17 @@
case TM_COLUMN_TV_SHOW:
case TM_COLUMN_TV_EPISODE:
case TM_COLUMN_TV_NETWORK:
- cmp = (compare_string_start_case_insensitive (
- track_get_item (track1, TM_to_T (column)),
- key) != 0);
- break;
+ case TM_COLUMN_ALBUMARTIST:
+ case TM_COLUMN_SORT_ARTIST:
+ case TM_COLUMN_SORT_TITLE:
+ case TM_COLUMN_SORT_ALBUM:
+ case TM_COLUMN_SORT_ALBUMARTIST:
+ case TM_COLUMN_SORT_COMPOSER:
+ case TM_COLUMN_SORT_TVSHOW:
+ cmp = (compare_string_start_case_insensitive (
+ track_get_item (track1, TM_to_T (column)),
+ key) != 0);
+ break;
case TM_COLUMN_TRACK_NR:
case TM_COLUMN_IPOD_ID:
case TM_COLUMN_TRANSFERRED:
@@ -1638,7 +1715,6 @@
case TM_COLUMN_SEASON_NR:
case TM_COLUMN_EPISODE_NR:
case TM_NUM_COLUMNS:
- g_warning ("Programming error: tm_search_equal_func: no sort method for column %d\n", column);
break;
}
return cmp;
@@ -1738,7 +1814,7 @@
}
-static void tm_set_search_column (gint newcol)
+static void tm_set_search_column (TM_item newcol)
{
/* printf ("track_treeview: %p, col: %d\n", track_treeview, newcol); */
g_return_if_fail (track_treeview);
@@ -1768,6 +1844,13 @@
case TM_COLUMN_TV_SHOW:
case TM_COLUMN_TV_EPISODE:
case TM_COLUMN_TV_NETWORK:
+ case TM_COLUMN_ALBUMARTIST:
+ case TM_COLUMN_SORT_ARTIST:
+ case TM_COLUMN_SORT_TITLE:
+ case TM_COLUMN_SORT_ALBUM:
+ case TM_COLUMN_SORT_ALBUMARTIST:
+ case TM_COLUMN_SORT_COMPOSER:
+ case TM_COLUMN_SORT_TVSHOW:
gtk_tree_view_set_enable_search (GTK_TREE_VIEW (track_treeview), TRUE);
break;
case TM_COLUMN_TRACK_NR:
@@ -2262,8 +2345,6 @@
G_CALLBACK (tm_sort_column_changed),
(gpointer)0);
- /* initialize sorting */
- tm_sort (prefs_get_int("tm_sortcol"), prefs_get_int("tm_sort"));
/* set correct column for typeahead */
if (prefs_get_int_value (TM_PREFS_SEARCH_COLUMN, &col))
{
Modified: gtkpod/branches/etch-bpo/src/fetchcover.c
===================================================================
--- gtkpod/branches/etch-bpo/src/fetchcover.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/fetchcover.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,1060 +1,467 @@
-/*
-| Copyright (C) 2007 P.G. Richardson <phantom_sf at users.sourceforge.net>
-| Part of the gtkpod project.
-|
-| URL: http://www.gtkpod.org/
-| URL: http://gtkpod.sourceforge.net/
-|
-| This program is free software; you can redistribute it and/or modify
-| it under the terms of the GNU General Public License as published by
-| the Free Software Foundation; either version 2 of the License, or
-| (at your option) any later version.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-| GNU General Public License for more details.
-|
-| You should have received a copy of the GNU General Public License
-| along with this program; if not, write to the Free Software
-| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-|
-| iTunes and iPod are trademarks of Apple
-|
-| This product is not supported/written/published by Apple!
-|
-| $Id: fetchcover.c 1601 2007-06-27 18:48:18Z tmzullinger $
-*/
-
+ /*
+ | Copyright (C) 2007 P.G. Richardson <phantom_sf at users.sourceforge.net>
+ | Part of the gtkpod project.
+ |
+ | URL: http://www.gtkpod.org/
+ | URL: http://gtkpod.sourceforge.net/
+ |
+ | This program is free software; you can redistribute it and/or modify
+ | it under the terms of the GNU General Public License as published by
+ | the Free Software Foundation; either version 2 of the License, or
+ | (at your option) any later version.
+ |
+ | This program is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ | GNU General Public License for more details.
+ |
+ | You should have received a copy of the GNU General Public License
+ | along with this program; if not, write to the Free Software
+ | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ |
+ | iTunes and iPod are trademarks of Apple
+ |
+ | This product is not supported/written/published by Apple!
+ |
+ | $Id: fetchcover.c 1822 2007-12-12 16:31:26Z dforsi $
+ */
+
#ifdef HAVE_CONFIG_H
-# include <config.h>
+ #include <config.h>
#endif
-
+
#include "fetchcover.h"
#include "display_coverart.h"
#include <glib/gprintf.h>
#include <glib/gstdio.h>
+#include <gdk/gdkkeysyms.h>
#undef FETCHCOVER_DEBUG
-static void fetchcover_statusbar_update (gchar *message);
-static GtkDialog *fetchcover_display_dialog (Track *track, Itdb_Device *device, GtkWindow *parent);
-static void fetchcover_debug(const gchar *format, ...);
-
-typedef struct
-{
- GdkPixbuf *image;
- GString *url;
- gchar *dir;
- gchar *filename;
-} Fetch_Cover;
-
-/* Track to search for a cover for */
-static Track *fetchcover_track = NULL;
-/* List of possible covers, including existing one (maybe default cover) */
-static GList *fetchcover_image_list = NULL;
-/* Index for controlling which cover image to display */
-static gint displayed_cover_index = 0;
-/* Pointer to the currently displayed cover */
-static Fetch_Cover *displayed_cover;
-/* Canvas widget for display of cover */
-static GnomeCanvas *fetchcover_canvas;
-/* Canvas Item widget for mounting the cover pixbuf on */
-static GnomeCanvasItem *fetchcover_canvasitem;
-/* Previous and Next buttons for cycling images */
-static GtkWidget *next_button;
-static GtkWidget *prev_button;
-/* Status bar for displaying status messages */
-static GtkWidget *fetchcover_statusbar;
-/* Flag indicating whether a new net search should be initiated */
-static gboolean netsearched = FALSE;
-
#define IMGSCALE 256
-
-#ifdef HAVE_CURL
-
-#include <curl/curl.h>
-
-/* Declarations */
-static void free_fetchcover_list();
-static void *safe_realloc(void *ptr, size_t size);
-static size_t curl_write_fetchcover_func(void *ptr, size_t itemsize, size_t numitems, void *data);
-static void net_search_track ();
-static void net_retrieve_image (GString *url);
-static void fetchcover_next_button_clicked (GtkWidget *widget, gpointer data);
-static void fetchcover_prev_button_clicked (GtkWidget *widget, gpointer data);
-static void fetchcover_cleanup();
-static gchar *fetchcover_save (GtkWindow *parent);
+
/* Display a dialog explaining the options if a file with the proposed name already exists */
-static gchar *display_file_exist_dialog (gchar *filename, GtkWindow *parent);
-
-struct chunk
-{
- gchar *memory;
- size_t size;
-};
-
-/* Data structure for use with curl */
-struct chunk fetchcover_curl_data;
-
-/**
- * safe_realloc:
- *
- * @void: ptr
- * @size_t: size
- *
- * Memory allocation function
- */
-static void *safe_realloc(void *ptr, size_t size)
-{
- if (ptr)
- return realloc(ptr, size);
- else
- return malloc(size);
-}
-
-/**
- *
- * curl_write_fetchcover_func:
- *
- * @void: *ptr
- * @size_t: itemsize
- * @size_t:numitems
- * @void: *data
- *
- * Curl writing function
- *
- * @Return size_t
- */
-static size_t curl_write_fetchcover_func(void *ptr, size_t itemsize, size_t numitems, void *data)
-{
- size_t size = itemsize * numitems;
- struct chunk *mem = (struct chunk*)data;
- mem->memory = (gchar*)safe_realloc(mem->memory, mem->size + size + 1);
+static gchar *display_file_exist_dialog (Fetch_Cover *fetch_cover);
+static gchar *fetchcover_check_file_exists (Fetch_Cover *fetch_cover);
- if (mem->memory)
+#ifdef HAVE_CURL
+
+ #include <curl/curl.h>
+
+ /* Declarations */
+ static void *safe_realloc(void *ptr, size_t size);
+ static size_t curl_write_fetchcover_func(void *ptr, size_t itemsize, size_t numitems, void *data);
+
+ struct chunk
{
- memcpy(&(mem->memory[mem->size]), ptr, size);
- mem->size += size;
- mem->memory[mem->size] = 0;
- }
- return size;
-}
+ gchar *memory;
+ size_t size;
+ };
-/**
- * net_search_track:
- *
- * Use Amazon to locate an XML file containing links to
- * cover pictures consistent with track artist and album
- */
-static void net_search_track ()
-{
- /* This key for Amazon web services belongs to Charlie Head */
- const gchar amazonkey[21] = "10K4YZTZFS562NG7EZR2";
-
- /* possible internationalization: support
- * different tld's (ja, fr, ca, etc.) - Amarok does this.
- * we assume a lot here.. may not work
- * for some international artists? --chead
- */
-
- /* Create the url string and insert the artist and album */
- GString *url = g_string_new (NULL);
- g_string_printf(url,
- "http://xml.amazon.com/onca/xml3?t=webservices-20&dev-t=%s&KeywordSearch=%s+%s&mode=music&type=lite&locale=us&page=1&f=xml",
- amazonkey, fetchcover_track->artist, fetchcover_track->album);
+ /* Data structure for use with curl */
+ struct chunk fetchcover_curl_data;
- /* Replace any spaces in the url string with +s instead */
- gint i;
- for (i = 0; i < url->len; i++)
+ /****
+ * safe_realloc:
+ *
+ * @void: ptr
+ * @size_t: size
+ *
+ * Memory allocation function
+ **/
+ static void *safe_realloc(void *ptr, size_t size)
{
- if (url->str[i] == ' ')
- url->str[i] = '+';
+ if (ptr)
+ return realloc(ptr, size);
+ else
+ return malloc(size);
}
-
- fetchcover_debug("fetchcover_next: amazon xml url: %s", url->str);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
-
- /* Use curl to perform the internet search */
- CURL *curl;
- curl_global_init(CURL_GLOBAL_ALL);
- curl = curl_easy_init();
- curl_easy_setopt(curl, CURLOPT_URL, url->str);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write_fetchcover_func);
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*) &fetchcover_curl_data);
- curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-agent/1.0");
- curl_easy_perform(curl);
- curl_easy_cleanup(curl);
- g_string_free(url, TRUE);
-
- /* Check whether curl received some hits.
- * If not return
- */
- if (!fetchcover_curl_data.memory || fetchcover_curl_data.size <= 0)
+ /****
+ *
+ * curl_write_fetchcover_func:
+ *
+ * @void: *ptr
+ * @size_t: itemsize
+ * @size_t:numitems
+ * @void: *data
+ *
+ * Curl writing function
+ *
+ * @Return size_t
+ **/
+ static size_t curl_write_fetchcover_func(void *ptr, size_t itemsize, size_t numitems, void *data)
{
- fetchcover_statusbar_update ("Failed to find any covers for track");
- if (fetchcover_curl_data.memory)
+ size_t size = itemsize * numitems;
+ struct chunk *mem = (struct chunk*)data;
+ mem->memory = (gchar*)safe_realloc(mem->memory, mem->size + size + 1);
+
+ if (mem->memory)
{
- g_free(fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
+ memcpy(&(mem->memory[mem->size]), ptr, size);
+ mem->size += size;
+ mem->memory[mem->size] = 0;
}
- return;
+ return size;
}
+#endif
+
+ /*****
+ * fetchcover_new:
+ *
+ * @GString: url
+ * @GList: trks
+ *
+ * Initialise a new fetch cover object for use with the fetchcover functions
+ **/
+ Fetch_Cover *fetchcover_new (gchar *url_path, GList *trks)
+ {
+ /*Create a fetchcover object */
+ Fetch_Cover * fcover;
+
+ fcover = g_new0(Fetch_Cover, 1);
+ fcover->url = g_string_new ((gchar*) url_path);
+ fcover->image = NULL;
+ fcover->tracks = trks;
+ fcover->err_msg = NULL;
+ fcover->parent_window = NULL;
+
+ return fcover;
+ }
- /* Curl net search successful so process the results */
- xmlDocPtr doc;
- xmlNodePtr cur;
- xmlChar *key;
-
- /* Process the data by parsing the XML and return if cannot parse */
- if ((doc = xmlReadMemory(fetchcover_curl_data.memory, fetchcover_curl_data.size, "amazon.xml", NULL, 0)) == NULL)
+#ifdef HAVE_CURL
+ /*****
+ * net_retrieve_image:
+ *
+ * @GString: url
+ *
+ * Use the url acquired from the net search to fetch the image,
+ * save it to a file inside the track's parent directory then display
+ * it as a pixbuf
+ **/
+ gboolean fetchcover_net_retrieve_image (Fetch_Cover *fetch_cover)
{
- fetchcover_statusbar_update ("Parsing failure on processing of possible track covers");
- if (fetchcover_curl_data.memory)
+ g_return_val_if_fail (fetch_cover, FALSE);
+
+ if (! g_str_has_suffix(fetch_cover->url->str, ".jpg") && ! g_str_has_suffix(fetch_cover->url->str, ".JPG"))
{
- g_free(fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
+ fetch_cover->err_msg = g_strdup("Only jpg images are currently supported at this time\n");
+ return FALSE;
}
- return;
- }
-
- /* XML parsed ok so try and get the root element */
- if ((cur = xmlDocGetRootElement(doc)) == NULL)
- {
- fetchcover_statusbar_update ("Downloaded XML file appears to be empty. No covers found for track");
- xmlFreeDoc(doc);
- if (fetchcover_curl_data.memory)
+
+ gchar *path = NULL;
+ FILE *tmpf = NULL;
+
+ fetchcover_curl_data.size = 0;
+ fetchcover_curl_data.memory = NULL;
+
+ /* Use curl to retrieve the data from the net */
+ CURL *curl;
+ curl_global_init(CURL_GLOBAL_ALL);
+ curl = curl_easy_init();
+ curl_easy_setopt(curl, CURLOPT_URL, fetch_cover->url->str);
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write_fetchcover_func);
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&fetchcover_curl_data);
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-agent/1.0");
+ curl_easy_perform(curl);
+ curl_easy_cleanup(curl);
+
+ if (fetchcover_curl_data.memory == NULL)
{
- g_free(fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
+ fetch_cover->err_msg = g_strdup("fetchcover curl data memory is null so failed to download anything!\n");
+ return FALSE;
}
- return;
- }
-
- /* Wind down through the XML nodes to obtain the urls
- * to the returned album covers
- */
- Fetch_Cover *fcover;
- cur = cur->xmlChildrenNode;
- while (cur != NULL)
- {
- if ((!xmlStrcmp(cur->name, (const xmlChar*)"Details")))
+
+ /* Check that the page returned is a valid web page */
+ if (strstr(fetchcover_curl_data.memory, "<html>") != NULL)
{
- xmlNodePtr details = cur->xmlChildrenNode;
- while (details != NULL)
+ fetch_cover->err_msg = g_strdup("fetchcover memory contains <html> tag so not a valid jpg image\n");
+ return FALSE;
+ }
+
+ if (! fetchcover_select_filename (fetch_cover))
+ return FALSE;
+
+ path = g_build_filename(fetch_cover->dir, fetch_cover->filename, NULL);
+#if DEBUG
+ printf ("path of download file is %s\n", path);
+#endif
+ if ((tmpf = fopen(path, "wb")) == NULL)
+ {
+ if (fetchcover_curl_data.memory)
{
- if ((!xmlStrcmp(details->name, (const xmlChar*)"ImageUrlLarge")))
- {
- key = xmlNodeListGetString (doc, details->xmlChildrenNode, 1);
- /* Create a fetchcover object and then add it to the list */
- fcover = g_new0(Fetch_Cover, 1);
- fcover->url = g_string_new ((gchar*) key);
- fcover->image = NULL;
-
- fetchcover_image_list = g_list_append (fetchcover_image_list, fcover);
- xmlFree(key);
- }
- details = details->next;
+ g_free(fetchcover_curl_data.memory);
+ fetchcover_curl_data.memory = NULL;
+ fetchcover_curl_data.size = 0;
}
+ g_free (path);
+ fetch_cover->err_msg = g_strdup ("Failed to create a file with the filename\n");
+ return FALSE;
}
- cur = cur->next;
- }
+
+ if (fwrite(fetchcover_curl_data.memory, fetchcover_curl_data.size, 1, tmpf) != 1)
+ {
+ if (fetchcover_curl_data.memory)
+ {
+ g_free(fetchcover_curl_data.memory);
+ fetchcover_curl_data.memory = NULL;
+ fetchcover_curl_data.size = 0;
+ }
+ fclose(tmpf);
+ g_free (path);
+ fetch_cover->err_msg = g_strdup("fetchcover failed to write the data to the new file\n");
+ return FALSE;
+ }
- xmlFreeDoc(doc);
-
- /* Clean up the curl data */
- if (fetchcover_curl_data.memory)
- {
- g_free(fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
- }
-
- /* Check whether the XML served up any cover images */
- if (g_list_length (fetchcover_image_list) == 1)
- {
- fetchcover_debug("fetchcover_next: no covers found\n");
- fetchcover_statusbar_update ("No cover images were found for this album.");
- }
- else
- {
- fetchcover_debug("fetchcover_next: successfully recovered covers\n");
- gchar *buf;
- buf = g_strdup_printf ("Found potentially %d covers. (Some covers may be blank)", g_list_length (fetchcover_image_list) - 1);
- fetchcover_statusbar_update (buf);
- g_free (buf);
- }
-
- return;
-}
-
-/**
- * net_retrieve_image:
- *
- * @GString: url
- *
- * Use the url acquired from the net search to fetch the image,
- * save it to a file inside the track's parent directory then display
- * it as a pixbuf
- */
-static void net_retrieve_image (GString *url)
-{
- gchar *path = NULL;
-
- fetchcover_debug("fetchcover_next: net_retrieve_image from: %s\n", url->str);
-
- fetchcover_curl_data.size = 0;
- fetchcover_curl_data.memory = NULL;
-
- /* Use curl to retrieve the data from the net */
- CURL *curl;
- curl_global_init(CURL_GLOBAL_ALL);
- curl = curl_easy_init();
- curl_easy_setopt(curl, CURLOPT_URL, url->str);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_write_fetchcover_func);
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)&fetchcover_curl_data);
- curl_easy_setopt(curl, CURLOPT_USERAGENT, "libcurl-agent/1.0");
- curl_easy_perform(curl);
- curl_easy_cleanup(curl);
-
- g_return_if_fail(fetchcover_curl_data.memory);
-
- /* Check that the page returned is a valid web page */
- if (strstr(fetchcover_curl_data.memory, "<html>") != NULL)
- {
- fetchcover_statusbar_update ("Image appears to no longer exist at http location");
- fetchcover_debug("fetchcover_next: http error (probably 404 or server error\n");
- return;
- }
-
- FILE *tmpf = NULL;
- ExtraTrackData *etd = fetchcover_track->userdata;
- g_return_if_fail(etd);
-
- gchar *dir = g_path_get_dirname(etd->pc_path_utf8);
- gchar *template = prefs_get_string("coverart_template");
- gchar **template_items = g_strsplit(template, ";", 0);
-
- gint i;
- gchar *filename = NULL;
-
- for (i = 0; filename == NULL && i < g_strv_length (template_items); ++i)
- {
- filename = get_string_from_template(fetchcover_track, template_items[i], FALSE, FALSE);
- if (strlen(filename) == 0)
- filename = NULL;
- }
-
- /* Check filename still equals null then take a default stance
- * to ensure the file has a name.
- */
- if (filename == NULL)
- filename = "folder.jpg";
+ fclose(tmpf);
- /* Use the index position of the cover in the glist to create a unique filename
- * Convert the index number to a string and prefix with a dot (hidden file)
- */
- gint display_cover_index;
- display_cover_index = g_list_index (fetchcover_image_list, displayed_cover);
- gchar *dcstr_index = NULL;
- dcstr_index = (gchar *) g_malloc (sizeof(gint) + (sizeof(gchar) * 3));
- g_sprintf (dcstr_index, ".%d_ at _", display_cover_index);
-
- gchar *fname = NULL;
- if (g_str_has_suffix(filename, ".jpg"))
- fname = g_strconcat(dcstr_index, filename, NULL);
- else
- fname = g_strconcat(dcstr_index, filename, ".jpg", NULL);
-
- displayed_cover->dir = dir;
- displayed_cover->filename = fname;
-
- fetchcover_debug("fetchcover_next: saving tmp cover image to %s / %s", displayed_cover->dir, displayed_cover->filename);
-
- path = g_build_filename(displayed_cover->dir, displayed_cover->filename, NULL);
- if ((tmpf = fopen(path, "wb")) == NULL)
- {
- fetchcover_debug("fetchcover_next: fopen failed\n");
- fetchcover_statusbar_update ("Downloaded image cover failed to open");
- if (fetchcover_curl_data.memory)
+ /* Check the file is a valid pixbuf type file */
+ GdkPixbufFormat *fileformat= NULL;
+ fileformat = gdk_pixbuf_get_file_info (path, NULL, NULL);
+ if (fileformat == NULL)
{
- g_free(fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
+ fetch_cover->err_msg = g_strdup("fetchcover downloaded file is not a valid image file\n");
+ return FALSE;
}
- g_free (path);
- return;
- }
- g_free (path);
-
- if (fwrite(fetchcover_curl_data.memory, fetchcover_curl_data.size, 1, tmpf) != 1)
- {
- fetchcover_debug("fetchcover_next: fwrite failed\n");
- if (fetchcover_curl_data.memory)
+
+ GError *error = NULL;
+ fetch_cover->image = gdk_pixbuf_new_from_file(path, &error);
+ if (error != NULL)
{
- g_free(fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
+ g_error_free (error);
+ if (fetchcover_curl_data.memory)
+ {
+ g_free(fetchcover_curl_data.memory);
+ fetchcover_curl_data.memory = NULL;
+ fetchcover_curl_data.size = 0;
+ }
+ g_free(path);
+ fetch_cover->err_msg = g_strconcat ("fetchcover error occurred while creating a pixbuf from the file\n", error->message, NULL);
+ return FALSE;
}
- }
-
- fclose(tmpf);
-
- GError *error = NULL;
- path = g_build_filename(displayed_cover->dir, displayed_cover->filename, NULL);
- displayed_cover->image = gdk_pixbuf_new_from_file(path, &error);
- if (error != NULL)
- {
- fetchcover_debug("fetchcover_next: gdk_pixbuf_new_from_file failed\n");
+
if (fetchcover_curl_data.memory)
- {
g_free(fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
- }
+
+ fetchcover_curl_data.memory = NULL;
+ fetchcover_curl_data.size = 0;
+ g_free(path);
+ return TRUE;
}
-
- g_free(fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
- g_strfreev(template_items);
- g_free(template);
- g_free(filename);
- g_free(path);
-}
+#endif
-/**
- * fetchcover_next_button:
- *
- * Gets new image URL list if necessary,
- * downloads next image to memory,
- * shows it in a GnomeCanvas in the fetchcover_window.
- */
-static void fetchcover_next_button_clicked (GtkWidget *widget, gpointer data)
-{
- GdkWindow *window = gtk_widget_get_parent_window (widget);
- gdk_window_set_cursor (window, gdk_cursor_new (GDK_WATCH));
- fetchcover_debug("fetchcover_next_button: getting cover for:\n- Artist: %s\n- Album: %s",
- fetchcover_track->artist, fetchcover_track->album);
-
- fetchcover_statusbar_update ("");
-
- if (netsearched == FALSE)
+ gboolean fetchcover_select_filename (Fetch_Cover *fetch_cover)
{
- net_search_track ();
- netsearched = TRUE;
- gtk_button_set_label (GTK_BUTTON(next_button), "_Next");
- gtk_widget_show (prev_button);
- }
-
- /* Whether net search this time or not, should be another image to display
- * to get this far.
- */
-
- /* Increase the index by 1 */
- displayed_cover_index++;
-
- /* fetchcover_image_list has a valid entry so do a couple of tests*/
- if (displayed_cover_index >= (g_list_length(fetchcover_image_list) - 1))
- {
- /* Something went awry so make the index
- * the index of the last cover in the list
- */
- displayed_cover_index = g_list_length(fetchcover_image_list) - 1;
- /* stop anymore button presses if last in the list */
- gtk_widget_set_sensitive (next_button, FALSE);
- }
+ GList *tracks = fetch_cover->tracks;
- if (displayed_cover_index > 0)
- {
- /* enable prev button if not first in list */
- gtk_widget_set_sensitive (prev_button, TRUE);
- }
-
- /* Set the displayed cover to be the new image */
- displayed_cover = g_list_nth_data (fetchcover_image_list, displayed_cover_index);
-
- /* If the image has not been retrieved then get it from the net */
- if (displayed_cover->image == NULL)
- {
- net_retrieve_image (displayed_cover->url);
- if (displayed_cover->image == NULL)
+ if (tracks == NULL || g_list_length (tracks) <= 0)
{
- gdk_window_set_cursor (window, NULL);
- fetchcover_statusbar_update ("Failed to retrieve image.");
- g_return_if_fail (displayed_cover->image);
+ fetch_cover->err_msg = g_strdup("fetchcover object's tracks list either NULL or no tracks were selected\n");
+ return FALSE;
}
- }
-
- fetchcover_debug("Displayed Image path: %s/%s\n", displayed_cover->dir, displayed_cover->filename);
-
- GdkPixbuf *scaled = gdk_pixbuf_scale_simple(displayed_cover->image, IMGSCALE, IMGSCALE, GDK_INTERP_NEAREST);
- gnome_canvas_item_set(fetchcover_canvasitem, "pixbuf", scaled, NULL);
-
- gdk_window_set_cursor (window, NULL);
-
- return;
-}
-
-/**
- * fetchcover_prev_button:
- *
- * Gets previous image and shows
- * it in a GnomeCanvas in the fetchcover_window.
- */
-static void fetchcover_prev_button_clicked (GtkWidget *widget, gpointer data)
-{
- /* decrease the index by 1 */
- displayed_cover_index--;
-
- fetchcover_statusbar_update ("");
-
- if (displayed_cover_index <= 0)
- {
- /* Something went awry so make the index
- * the index of the first cover in the list
- */
- displayed_cover_index = 0;
- /* stop anymore prev button press if first in the list */
- gtk_widget_set_sensitive (prev_button, FALSE);
- }
- /* fetchcover_image_list has a valid entry so do a couple of tests*/
- if (displayed_cover_index < (g_list_length(fetchcover_image_list) - 1))
- {
- /* stop anymore button presses if last in the list */
- gtk_widget_set_sensitive (next_button, TRUE);
- }
+ Track *track = g_list_nth_data (tracks, 0);
+ ExtraTrackData *etd = track->userdata;
+
+ fetch_cover->dir = g_path_get_dirname(etd->pc_path_utf8);
+ gchar *template = prefs_get_string("coverart_template");
+ gchar **template_items = g_strsplit(template, ";", 0);
- /* Set the displayed cover to be the new image */
- displayed_cover = g_list_nth_data (fetchcover_image_list, displayed_cover_index);
-
- /* If the image has not been retrieved then get it from the net */
- if (displayed_cover->image == NULL)
- {
- net_retrieve_image (displayed_cover->url);
- if (displayed_cover->image == NULL)
+ gint i;
+ for (i = 0; fetch_cover->filename == NULL && i < g_strv_length (template_items); ++i)
{
- fetchcover_statusbar_update ("Failed to retrieve image.");
- g_return_if_fail (displayed_cover->image);
+ fetch_cover->filename = get_string_from_template(track, template_items[i], FALSE, FALSE);
+ if (strlen(fetch_cover->filename) == 0)
+ fetch_cover->filename = NULL;
}
- }
-
- GdkPixbuf *scaled = gdk_pixbuf_scale_simple(displayed_cover->image, IMGSCALE, IMGSCALE, GDK_INTERP_NEAREST);
- gnome_canvas_item_set(fetchcover_canvasitem, "pixbuf", scaled, NULL);
-
- return;
-}
-
-/**
- * fetchcover_save:
- *
- * @Detail: detail
- *
- * Save the displayed cover.
- * Set thumbnails, update details window.
- * Called on response to the clicking of the save button in the dialog
- *
- * Returns:
- * Filename of chosen cover image file
- */
-gchar *fetchcover_save (GtkWindow *parent)
-{
- gchar *newname = NULL;
- /* The default cover image will have both dir and filename set
- * to null because no need to save because it is already saved (!!)
- * Thus, this whole process is avoided. Added bonus that pressing
- * save by accident if, for instance, no images are found means the
- * whole thing safely completes
- */
- if (displayed_cover->dir && displayed_cover->filename)
- {
- /* path is valid so first move the file to be the folder.jpg or
- * whatever is the preferred preference
+
+ g_strfreev(template_items);
+ g_free(template);
+
+ /* Check filename still equals null then take a default stance
+ * to ensure the file has a name. Default stance applies if the
+ * extra track data has been left as NULL
*/
+ if (fetch_cover->filename == NULL)
+ fetch_cover->filename = "folder.jpg";
+ else
+ {
+ if (! g_str_has_suffix(fetch_cover->filename, ".jpg"))
+ {
+ gchar *oldname;
+ oldname = fetch_cover->filename;
+ fetch_cover->filename = g_strconcat(oldname, ".jpg", NULL);
+ g_free (oldname);
+ }
+ }
- /* Split the existing filename to remove the prefix */
- gchar **fname_items = g_strsplit(displayed_cover->filename, "_ at _", 2);
- /* Assign the filename ready to rename the file */
- newname = g_build_filename(displayed_cover->dir, fname_items[1], NULL);
- fetchcover_debug("New name of file is %s\n", newname);
-
- while (g_file_test (newname, G_FILE_TEST_EXISTS))
+ if (fetchcover_check_file_exists (fetch_cover) == NULL)
{
- newname = display_file_exist_dialog (newname, parent);
- if (newname == NULL)
- break;
+ fetch_cover->err_msg = g_strdup("operation cancelled\n");
+ return FALSE;
}
- /* Carry the nullified value back to the original called so the
- * entire fetchcover process can be cancelled
- */
- if (newname == NULL)
- return NULL;
-
- gchar *oldname = g_build_filename(displayed_cover->dir, displayed_cover->filename, NULL);
- /* Rename the preferred choice, ie. .2_ at _After_Forever.jpg, to the preferred name,
- * ie. After_Forever.jpg.
- */
- g_rename (oldname, newname);
-
- /* Tidy up to ensure the path will not get cleaned up
- * by fetchcover_clean_up
- */
- g_free (oldname);
- g_strfreev(fname_items);
- g_free (displayed_cover->dir);
- g_free (displayed_cover->filename);
- displayed_cover->dir = NULL;
- displayed_cover->filename = NULL;
+ return TRUE;
}
- return newname;
-}
-#endif /* HAVE_CURL */
-
-static gchar *display_file_exist_dialog (gchar *filename, GtkWindow *parent)
-{
- gint result;
- gchar **splitarr = NULL;
- gchar *basename = NULL;
- gint i;
- gchar *message;
- GtkWidget *label;
- GtkWidget *dialog = gtk_dialog_new_with_buttons ("Coverart file already exists",
- parent,
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_YES,
- GTK_RESPONSE_YES,
- GTK_STOCK_NO,
- GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
- NULL);
- message = g_strdup_printf (_("The picture file %s already exists. \
-\nThis may be associated with other music files in the directory. \
-\n\n- Clicking Yes will overwrite the existing file, possibly associating \
-\n other music files in the same directory with this coverart file. \
-\n- Clicking No will save the file with a unique file name. \
-\n- Clicking Cancel will abort the fetchcover operation."), filename);
-
- label = gtk_label_new (message);
-
- /* Add the label, and show everything we've added to the dialog. */
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), label);
-
- gtk_widget_show_all (dialog);
- result = gtk_dialog_run (GTK_DIALOG(dialog));
- g_free (message);
-
- switch (result)
+
+ /*****
+ * fetchcover_check_file_exists:
+ *
+ * @Fetch_Cover
+ *
+ * Save the displayed cover.
+ * Set thumbnails, update details window.
+ * Called on response to the clicking of the save button in the dialog
+ *
+ * Returns:
+ * Filename of chosen cover image file
+ ***/
+ static gchar *fetchcover_check_file_exists (Fetch_Cover *fetch_cover)
{
- case GTK_RESPONSE_REJECT:
- /* Cancel has been clicked so no save */
- gtk_widget_destroy (dialog);
- return NULL;
- case GTK_RESPONSE_YES:
- /* Yes clicked so overwrite the file is okay. Leave final_filename intact
- * and remove the original
+ gchar *newname = NULL;
+ /* The default cover image will have both dir and filename set
+ * to null because no need to save because it is already saved (!!)
+ * Thus, this whole process is avoided. Added bonus that pressing
+ * save by accident if, for instance, no images are found means the
+ * whole thing safely completes
+ */
+ if (fetch_cover->dir && fetch_cover->filename)
+ {
+ /* path is valid so first move the file to be the folder.jpg or
+ * whatever is the preferred preference
*/
- g_remove (filename);
- gtk_widget_destroy (dialog);
- return filename;
- case GTK_RESPONSE_NO:
- /* User doesn't want to overwrite anything so need to do some work on filename */
- splitarr = g_strsplit (filename, ".", 0);
- basename = splitarr[0];
- for (i = 1; g_file_test (filename, G_FILE_TEST_EXISTS); ++i)
+ /* Assign the full path name ready to rename the file */
+ newname = g_build_filename(fetch_cover->dir, fetch_cover->filename, NULL);
+
+ if (g_file_test (newname, G_FILE_TEST_EXISTS))
{
- g_sprintf (filename, "%s%d.jpg", basename, i);
+ newname = display_file_exist_dialog (fetch_cover);
}
+ }
+ return newname;
+ }
+
+ static gchar *display_file_exist_dialog (Fetch_Cover *fetch_cover)
+ {
+ gchar *filepath;
+ gint result;
+ gchar **splitarr = NULL;
+ gchar *basename = NULL;
+ gint i;
+ gchar *message;
+ GtkWidget *label;
+
+ if (fetch_cover->parent_window == NULL)
+ fetch_cover->parent_window = GTK_WINDOW(gtkpod_window);
+
+ GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Coverart file already exists"),
+ fetch_cover->parent_window,
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_YES,
+ GTK_RESPONSE_YES,
+ GTK_STOCK_NO,
+ GTK_RESPONSE_NO,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ NULL);
+
+ filepath = g_build_filename(fetch_cover->dir, fetch_cover->filename, NULL);
+
+ message = g_strdup_printf (_("The picture file %s already exists.\n" \
+ "This may be associated with other music files in the directory.\n\n" \
+ "- Clicking Yes will overwrite the existing file, possibly associating\n" \
+ " other music files in the same directory with this coverart file.\n" \
+ "- Clicking No will save the file with a unique file name.\n" \
+ "- Clicking Cancel will abort the fetchcover operation."), filepath);
+
+ label = gtk_label_new (message);
+
+ /* Add the label, and show everything we've added to the dialog. */
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), label);
+
+ gtk_widget_show_all (dialog);
+ result = gtk_dialog_run (GTK_DIALOG(dialog));
+ g_free (message);
+
+ switch (result)
+ {
+ case GTK_RESPONSE_REJECT:
+ /* Cancel has been clicked so no save */
+ gtk_widget_destroy (dialog);
+ return NULL;
+ case GTK_RESPONSE_YES:
+ /*** Yes clicked so overwrite the file is okay. Leave final_filename intact
+ * and remove the original
+ **/
+ g_remove (filepath);
+ gtk_widget_destroy (dialog);
+ return filepath;
+ case GTK_RESPONSE_NO:
+ /* User doesn't want to overwrite anything so need to do some work on filename */
+ /* Remove the suffix from the end of the filename */
+ splitarr = g_strsplit (fetch_cover->filename, ".", 0);
+ basename = splitarr[0];
- /* Should have found a filename that really doesn't exist so this needs to be returned */
- basename = NULL;
- g_strfreev(splitarr);
- gtk_widget_destroy (dialog);
-
- return filename;
- default:
- gtk_widget_destroy (dialog);
- return NULL;
- }
-}
+ gchar *newfilename = g_strdup (fetch_cover->filename);;
+
+ for (i = 1; g_file_test (filepath, G_FILE_TEST_EXISTS); ++i)
+ {
+ g_free (newfilename);
+ gchar * intext = (gchar *) g_malloc (sizeof(gint) + (sizeof(gchar) * 4));
+ g_sprintf (intext, "%d.jpg", i);
+ newfilename = g_strconcat (basename, intext, NULL);
+
+ g_free (filepath);
+
+ filepath = g_build_filename(fetch_cover->dir, newfilename, NULL);
+ }
+
+ /* Should have found a filename that really doesn't exist so this needs to be returned */
+ g_free (fetch_cover->filename);
+ fetch_cover->filename = g_strdup (newfilename);
+ g_free (newfilename);
+ newfilename = NULL;
+ basename = NULL;
+ g_strfreev(splitarr);
+ gtk_widget_destroy (dialog);
+
+ return filepath;
+ default:
+ gtk_widget_destroy (dialog);
+ return NULL;
+ }
+ }
-/**
+/****
* free_fetchcover:
*
* @Fetch_Cover: fcover
*
* Free the elements of the passed in Fetch_Cover structure
*/
-static void free_fetchcover (Fetch_Cover *fcover)
+void free_fetchcover (Fetch_Cover *fcover)
{
if (! fcover)
return;
if (fcover->url)
g_string_free (fcover->url, TRUE);
-
+
if (fcover->image)
gdk_pixbuf_unref (fcover->image);
-
- if (fcover->dir && fcover->filename)
- {
- gint status;
- gchar *path;
- path = g_build_filename (fcover->dir, fcover->filename, NULL);
- status = g_remove (path);
- g_free(path);
+
+ if (fcover->dir)
g_free (fcover->dir);
+
+ if (fcover->filename)
g_free (fcover->filename);
- }
-}
-
-/**
- * free_fetchcover_list:
- *
- * Nullify all the urls in the url list as part of
- * cleaning up.
- *
- */
-static void free_fetchcover_list()
-{
- fetchcover_debug("free_fetchcover_list");
- gint i;
- Fetch_Cover *fcover = NULL;
- for (i = 0; i < g_list_length (fetchcover_image_list); ++i)
- {
- fcover = g_list_nth_data (fetchcover_image_list, i);
- free_fetchcover (fcover);
- }
- g_list_free (fetchcover_image_list);
- fetchcover_image_list = NULL;
-}
-
-/**
- * fetchcover_cleanup:
- *
- * Cleanup fetchcover bits and pieces
- */
-static void fetchcover_cleanup()
-{
- #ifdef HAVE_CURL
- if (fetchcover_curl_data.memory)
- {
- g_free (fetchcover_curl_data.memory);
- fetchcover_curl_data.memory = NULL;
- fetchcover_curl_data.size = 0;
- }
- #endif /* CURL */
- free_fetchcover_list();
-}
-
-/**
- * fetchcover_display_dialog:
- *
- * Create fetchcover_window, get album cover from Amazon
- *
- * @track: track to look up images for
- */
-static GtkDialog *fetchcover_display_dialog (Track *track, Itdb_Device *device, GtkWindow *parent)
-{
- GnomeCanvasItem *art_border;
- GtkBox *canvasbutton_hbox;
- GtkWidget *fetchcover_dialog;
- GladeXML *fetchcover_xml;
- GdkPixbuf *imgbuf;
+ if (fcover->err_msg)
+ g_free (fcover->err_msg);
- g_return_val_if_fail (track, NULL);
- g_return_val_if_fail (device, NULL);
+ if (fcover->parent_window)
+ fcover->parent_window = NULL;
- /* Enable searching of internet for images */
- netsearched = FALSE;
-
- fetchcover_xml = glade_xml_new (xml_file, "fetchcover_dialog", NULL);
- fetchcover_dialog = gtkpod_xml_get_widget (fetchcover_xml, "fetchcover_dialog");
- gtk_window_set_transient_for (GTK_WINDOW(fetchcover_dialog), parent);
-
- ExtraTrackData *etd;
- etd = track->userdata;
- if (etd && etd->thumb_path_locale)
- {
- GError *error = NULL;
- imgbuf = gdk_pixbuf_new_from_file(etd->thumb_path_locale, &error);
- if (error != NULL)
- {
- /* Artwork failed to load from file so try loading default */
- imgbuf = coverart_get_track_thumb (track, device);
- g_error_free (error);
- }
- }
- else
- {
- /* No thumb path available, fall back to getting the small thumbnail
- * and if that fails, the default thumbnail image.
- */
- imgbuf = coverart_get_track_thumb (track, device);
- }
-
- /* Add the cover to the image list */
- displayed_cover = g_new0 (Fetch_Cover, 1);
- displayed_cover->url = g_string_new ("default");
- /* No need to set the path for saving later as if this cover is selected:
- * a) There is an image cover already set to the template name so no need to save
- * b) There is no image cover so default ? is showing and again no save necessary
- *
- * Avoid saving by checking where url is "default"
- */
- displayed_cover->dir = NULL;
- displayed_cover->filename = NULL;
- displayed_cover->image = gdk_pixbuf_scale_simple (imgbuf, IMGSCALE, IMGSCALE, GDK_INTERP_NEAREST);
- gdk_pixbuf_unref (imgbuf);
-
- fetchcover_image_list = g_list_append (fetchcover_image_list, displayed_cover);
- displayed_cover_index = 0;
-
- fetchcover_debug("fetchcover_display_window: loaded cover file");
-
- /* Create the image cover canvas */
- fetchcover_canvas = GNOME_CANVAS (gnome_canvas_new());
- gtk_widget_set_size_request (GTK_WIDGET(fetchcover_canvas), IMGSCALE, IMGSCALE);
- gnome_canvas_set_scroll_region (fetchcover_canvas, 0.0, 0.0, IMGSCALE, IMGSCALE);
- fetchcover_canvasitem = gnome_canvas_item_new(
- gnome_canvas_root(fetchcover_canvas),
- GNOME_TYPE_CANVAS_PIXBUF,
- "x", (double) 0,
- "y", (double) 0,
- "width", (double) IMGSCALE,
- "height", (double) IMGSCALE,
- NULL);
-
- /* Apply the image cover to the canvas */
- gnome_canvas_item_set ( fetchcover_canvasitem,
- "pixbuf", displayed_cover->image,
- NULL);
-
- /* Create the canvas border */
- art_border = gnome_canvas_item_new(
- gnome_canvas_root(fetchcover_canvas),
- gnome_canvas_rect_get_type(),
- "x1", (double) 0,
- "y1", (double) 0,
- "x2", (double) IMGSCALE,
- "y2", (double) IMGSCALE,
- "outline-color-rgba", 0xAA000000,
- "width-units", (double) 3,
- NULL);
-
- gnome_canvas_item_raise_to_top (art_border);
-
- /* Add canvas to horizontal box */
- canvasbutton_hbox = GTK_BOX (gtkpod_xml_get_widget (fetchcover_xml, "canvasbutton_hbox"));
- gtk_widget_set_size_request (GTK_WIDGET(canvasbutton_hbox), IMGSCALE + 150, IMGSCALE + 20);
- gtk_box_pack_start_defaults ( canvasbutton_hbox, GTK_WIDGET (fetchcover_canvas));
-
- /* Assign the status message bar */
- fetchcover_statusbar = gtkpod_xml_get_widget (fetchcover_xml, "fetchcover_statusbar");
-
- fetchcover_track = track;
- next_button = gtkpod_xml_get_widget (fetchcover_xml, "next_button");
- prev_button = gtkpod_xml_get_widget (fetchcover_xml, "prev_button");
-
- #ifdef HAVE_CURL
-
- g_signal_connect (G_OBJECT(next_button), "clicked",
- G_CALLBACK(fetchcover_next_button_clicked), NULL);
-
- g_signal_connect (G_OBJECT(prev_button), "clicked",
- G_CALLBACK(fetchcover_prev_button_clicked), NULL);
-
- /* Check there are valid values for artist and album, otherwise disable everything */
- if (fetchcover_track->artist == NULL || fetchcover_track->album == NULL)
- {
- gtk_widget_set_sensitive (next_button, FALSE);
- fetchcover_statusbar_update ("Search cannot be performed as either the artist or album are blank");
- }
- else
- {
- gchar *buf;
- buf = g_strdup_printf ("Artist: %s\tAlbum: %s", fetchcover_track->artist, fetchcover_track->album);
- fetchcover_statusbar_update (buf);
- g_free (buf);
- }
-
- #else
- gtk_widget_set_sensitive (next_button, FALSE);
- gtk_widget_set_sensitive (prev_button, FALSE);
- fetchcover_statusbar_update ("This function is not available. You must compile the gtkpod source together with the curl library.");
- #endif /* HAVE_CURL */
-
- gtk_widget_show_all (fetchcover_dialog);
- gtk_widget_hide (prev_button);
-
- g_object_unref (fetchcover_xml);
-
- return GTK_DIALOG(fetchcover_dialog);
+ g_free (fcover);
}
-
-/**
- * fetchcover_debug:
- *
- * Print debug messages for debugging purposes
- *
- * @format of messages and message string
- */
-static void fetchcover_debug(const gchar *format, ...)
-{
-#ifdef FETCHCOVER_DEBUG
- va_list args;
- va_start (args, format);
- gchar *s = g_strdup_vprintf (format, args);
- va_end (args);
- printf ("%s\n", s);
- fflush (stdout);
- g_free (s);
-#endif
-}
-
-/**
- * fetchcover_statusbar_update:
- *
- * @gchar*: messagel
- *
- * Display a message in the status bar component of the dialog
- */
-static void fetchcover_statusbar_update (gchar *message)
-{
- if (fetchcover_statusbar)
- {
- gtk_statusbar_pop(GTK_STATUSBAR(fetchcover_statusbar), 1);
- gtk_statusbar_push(GTK_STATUSBAR(fetchcover_statusbar), 1, message);
- }
-}
-
-
-/**
- * on_coverart_context_menu_click:
- *
- * @Track: track
- *
- * Callback. Start cover selection from CoverArt Display's context menu.
- */
-void on_coverart_context_menu_click (GList *tracks)
-{
- Track *track;
- gint result;
-
- track = tracks->data;
- if (track == NULL)
- {
- g_fprintf (stderr, "Track was null so fetchcover dialog was not displayed.\nLenght of glist was %d\n", g_list_length (tracks));
- return;
- }
-
- GtkWindow *parent = GTK_WINDOW (gtkpod_xml_get_widget (main_window_xml, "gtkpod"));
- GtkDialog *dialog = fetchcover_display_dialog (track, track->itdb->device, parent);
- g_return_if_fail (dialog);
-
- result = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_hide (GTK_WIDGET(dialog));
- gtk_widget_destroy (GTK_WIDGET(dialog));
-
- #ifdef HAVE_CURL
- gchar *filename = NULL;
-
- switch (result)
- {
- case GTK_RESPONSE_ACCEPT:
- filename = fetchcover_save (parent);
- if (filename)
- {
- while (tracks)
- {
- track = tracks->data;
- if (gp_track_set_thumbnails (track, filename))
- data_changed (track->itdb);
- tracks = tracks->next;
- }
- }
- g_free (filename);
- default:
- break;
- }
-#endif /* HAVE_CURL */
-
- fetchcover_cleanup();
-}
-
-/**
- * fetchcover_fetch_button:
- *
- * @widget: widget
- * @data: data
- *
- * Callback. Start cover selection.
- * Called when "Fetch Cover..." clicked from details_window.
- */
-void on_fetchcover_fetch_button (GtkWidget *widget, gpointer data)
-{
- gint result;
- Detail *detail = details_get_selected_detail ();
- GtkWindow *parent = GTK_WINDOW(detail->window);
- GtkDialog *dialog = fetchcover_display_dialog (detail->track, detail->itdb->device, parent);
- g_return_if_fail (dialog);
-
- result = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_hide (GTK_WIDGET(dialog));
- gtk_widget_destroy (GTK_WIDGET(dialog));
-#ifdef HAVE_CURL
-
- gchar *filename = NULL;
- switch (result)
- {
- case GTK_RESPONSE_ACCEPT:
- filename = fetchcover_save (parent);
- if (filename)
- {
- if (details_writethrough(detail))
- {
- GList *list;
- for (list = detail->tracks; list; list = list->next)
- {
- ExtraTrackData *etd;
- Track *track = list->data;
-
- if (!track)
- break;
-
- etd = track->userdata;
- gp_track_set_thumbnails(track, filename);
- etd->tchanged = TRUE;
- etd->tartwork_changed = TRUE;
- }
- }
- else
- {
- ExtraTrackData *etd = fetchcover_track->userdata;
- if (etd)
- {
- gp_track_set_thumbnails(fetchcover_track, filename);
- etd->tchanged = TRUE;
- }
- }
-
- detail->changed = TRUE;
- details_update_thumbnail(detail);
- details_update_buttons(detail);
- }
- default:
- break;
- }
-#endif /* HAVE_CURL */
-
- fetchcover_cleanup();
-}
Modified: gtkpod/branches/etch-bpo/src/fetchcover.h
===================================================================
--- gtkpod/branches/etch-bpo/src/fetchcover.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/fetchcover.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: fetchcover.h 1601 2007-06-27 18:48:18Z tmzullinger $
+| $Id: fetchcover.h 1755 2007-11-05 01:16:19Z phantom_sf $
*/
#ifndef __FETCHCOVER_H__
@@ -41,8 +41,20 @@
#include "display_coverart.h"
#include "prefs.h"
+typedef struct
+{
+ GdkPixbuf *image;
+ GString *url;
+ gchar *dir;
+ gchar *filename;
+ GList *tracks;
+ gchar *err_msg;
+ GtkWindow *parent_window;
+} Fetch_Cover;
-void on_coverart_context_menu_click (GList *tracks);
-void on_fetchcover_fetch_button (GtkWidget *widget, gpointer data);
+Fetch_Cover *fetchcover_new (gchar *url_path, GList *trks);
+gboolean fetchcover_net_retrieve_image (Fetch_Cover *fetch_cover);
+gboolean fetchcover_select_filename (Fetch_Cover *fetch_cover);
+void free_fetchcover (Fetch_Cover *fcover);
#endif
Modified: gtkpod/branches/etch-bpo/src/file.c
===================================================================
--- gtkpod/branches/etch-bpo/src/file.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/file.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: file.c 1596 2007-06-26 14:33:01Z dforsi $
+| $Id: file.c 1824 2007-12-13 10:51:04Z dforsi $
*/
#ifdef HAVE_CONFIG_H
@@ -280,7 +280,7 @@
/* attempt to open playlist file */
if (!(fp = fopen (plfile, "r")))
{
- gtkpod_warning (_("Cannot open '%s' for reading.\n\n"));
+ gtkpod_warning (_("Could not open '%s' for reading.\n"), plfile);
g_free (plname);
return FALSE; /* definitely not! */
}
@@ -856,6 +856,7 @@
case T_TRANSFERRED:
case T_PLAYCOUNT:
case T_VOLUME:
+ case T_GAPLESS_TRACK_FLAG:
/* not applicable */
break;
case T_ITEM_NUM:
@@ -1761,6 +1762,9 @@
g_free (name_on_ipod);
}
+ /* Set this flag to true to ensure artwork is reread from file */
+ netr->tartwork_changed = TRUE;
+
/* notify display model */
if (netr->tchanged)
{
@@ -1768,6 +1772,14 @@
data_changed (itdb);
netr->tchanged = FALSE;
}
+ else
+ {
+ /* Rather than depend on the track data being changed, only the artwork may have changed
+ * hence the reason for the user updating from file
+ */
+ coverart_track_changed (track, COVERART_CHANGE_SIGNAL);
+ }
+
display_updated (track, NULL);
g_free (oldhash);
}
Property changes on: gtkpod/branches/etch-bpo/src/file.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/file.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/file_convert.c
===================================================================
--- gtkpod/branches/etch-bpo/src/file_convert.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/file_convert.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -25,7 +25,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: file_convert.c 1577 2007-06-23 02:07:43Z jcsjcs $
+| $Id: file_convert.c 1813 2007-12-11 12:34:20Z jcsjcs $
*/
@@ -739,7 +739,7 @@
GtkWidget *textview;
GtkTextBuffer *textbuffer;
GtkTextIter start, end;
- const gchar *ptr, *next;
+ const gchar *run, *ptr, *next;
g_return_if_fail (conv);
@@ -753,13 +753,18 @@
textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
gtk_text_buffer_get_end_iter (textbuffer, &end);
- ptr = text;
+ run = ptr = text;
while (*ptr)
{
next = g_utf8_find_next_char (ptr, NULL);
if (*ptr == '\b')
{
+ if (ptr > run)
+ {
+ gtk_text_buffer_insert (textbuffer, &end, run, ptr - run);
+ }
+ run = next;
start = end;
if (gtk_text_iter_backward_char (&start))
{
@@ -768,16 +773,21 @@
}
else if(*ptr == '\r')
{
+ if (ptr > run)
+ {
+ gtk_text_buffer_insert (textbuffer, &end, run, ptr - run);
+ }
+ run = next;
start = end;
gtk_text_iter_set_line_offset (&start, 0);
gtk_text_buffer_delete (textbuffer, &start, &end);
}
- else
- {
- gtk_text_buffer_insert (textbuffer, &end, ptr, next - ptr);
- }
ptr = next;
}
+ if (ptr > run)
+ {
+ gtk_text_buffer_insert (textbuffer, &end, run, ptr - run);
+ }
gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (textview),
&end, 0.0, FALSE, 0.0, 0.0);
@@ -1665,6 +1675,8 @@
g_free (ctr->errormessage);
ctr->errormessage = NULL;
}
+ g_free (ctr->dest_filename);
+ ctr->dest_filename = NULL;
tri->finished = g_list_prepend (tri->finished, ctr);
}
else
@@ -2076,7 +2088,7 @@
{
gchar *buf = conversion_get_track_info (NULL, ctr);
ctr->errormessage =
- g_strdup_printf (_("Conversion of '%s' failed: '%s %s' did not return filename extension as expected.\n\n"),
+ g_strdup_printf (_("Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as expected.\n\n"),
buf,
argv[0], argv[1]);
g_free (buf);
@@ -2689,11 +2701,8 @@
tri = transfer_get_tri (conv, itdb);
g_return_val_if_fail (tri, (g_mutex_unlock (conv->mutex), NULL));
- if (conv->failed || tri->failed)
- { /* move the tracks over to tri->finished by calling the
- scheduler directly */
- conversion_scheduler_unlocked (conv);
- }
+ /* Make sure all failed tracks are forwarded to tri->finished */
+ conversion_scheduler_unlocked (conv);
for (gl=tri->finished; gl; gl=gl->next)
{
Modified: gtkpod/branches/etch-bpo/src/file_export.c
===================================================================
--- gtkpod/branches/etch-bpo/src/file_export.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/file_export.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -25,7 +25,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: file_export.c 997 2007-02-24 05:48:33Z jcsjcs $
+| $Id: file_export.c 1824 2007-12-13 10:51:04Z dforsi $
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -214,7 +214,7 @@
}
else
{
- gtkpod_warning (_("Unable to open '%s' for reading\n"), file);
+ gtkpod_warning (_("Could not open '%s' for reading.\n"), file);
}
return(result);
}
Property changes on: gtkpod/branches/etch-bpo/src/file_export.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/file_itunesdb.c
===================================================================
--- gtkpod/branches/etch-bpo/src/file_itunesdb.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/file_itunesdb.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,13 +23,14 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: file_itunesdb.c 1562 2007-06-19 13:20:14Z jcsjcs $
+| $Id: file_itunesdb.c 1824 2007-12-13 10:51:04Z dforsi $
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include <ctype.h>
#include <string.h>
#include <glib/gstdio.h>
#include "charset.h"
@@ -46,6 +47,7 @@
#include "ipod_init.h"
#include "file_convert.h"
#include "display_coverart.h"
+#include "display_photo.h"
#define _TO_STR(x) #x
#define TO_STR(x) _TO_STR(x)
@@ -231,7 +233,7 @@
fp = fopen (name, "r");
if (!fp)
{
- gtkpod_warning (_("Could not open \"iTunesDB.ext\" for reading extended info.\n"),
+ gtkpod_warning (_("Could not open \"%s\" for reading extended info.\n"),
name);
return FALSE;
}
@@ -774,7 +776,7 @@
*
* Return value: pointer to the new repository
*/
-iTunesDB *gp_merge_itdb (iTunesDB *old_itdb)
+static iTunesDB *gp_merge_itdb (iTunesDB *old_itdb)
{
ExtraiTunesDBData *old_eitdb;
iTunesDB *new_itdb;
@@ -885,41 +887,72 @@
if (ok_to_load)
{
+ gchar *prefs_model = get_itdb_prefs_string (itdb, KEY_IPOD_MODEL);
+ gchar *ipod_model = itdb_device_get_sysinfo (itdb->device, "ModelNumStr");
+ if (!prefs_model && ipod_model)
+ { /* let's believe what the iPod says */
+ set_itdb_prefs_string (itdb, KEY_IPOD_MODEL, ipod_model);
+ }
+ else if (prefs_model && !ipod_model)
+ { /* verify with the user if the model is correct --
+ * incorrect mdoel information can result in loss of
+ * Artwork */
+ gp_ipod_init_set_model (itdb, prefs_model);
+ /* write out new SysInfo file -- otherwise libpod won't
+ use it. Ignore error for now. */
+ itdb_device_write_sysinfo (itdb->device, NULL);
+ }
+ else if (!prefs_model && !ipod_model)
+ {
+ /* ask the user to set the model information */
+ gp_ipod_init_set_model (itdb, NULL);
+ /* write out new SysInfo file -- otherwise libpod won't
+ use it. Ignore error for now. */
+ itdb_device_write_sysinfo (itdb->device, NULL);
+ }
+ else
+ { /* prefs_model && ipod_model are set */
+ const gchar *prefs_ptr = prefs_model;
+ const gchar *ipod_ptr = ipod_model;
+ /* Normalize model number */
+ if (isalpha (prefs_model[0])) ++prefs_ptr;
+ if (isalpha (ipod_model[0])) ++ipod_ptr;
+ if (strcmp (prefs_ptr, ipod_ptr) != 0)
+ { /* Model number is different -- confirm */
+ gp_ipod_init_set_model (itdb, ipod_model);
+ /* write out new SysInfo file -- otherwise libpod won't
+ use it. Ignore error for now. */
+ itdb_device_write_sysinfo (itdb->device, NULL);
+ }
+ }
+ g_free (prefs_model);
+ g_free (ipod_model);
+
new_itdb = gp_merge_itdb (itdb);
+
if (new_itdb)
{
GList *gl;
- gchar *old_model = get_itdb_prefs_string (new_itdb,
- KEY_IPOD_MODEL);
gchar *new_model = itdb_device_get_sysinfo (new_itdb->device,
"ModelNumStr");
- if (!old_model && new_model)
- {
- set_itdb_prefs_string (new_itdb, KEY_IPOD_MODEL, new_model);
+ if (!new_model)
+ { /* Something went wrong with setting the ipod model
+ * above */
+ prefs_model = get_itdb_prefs_string (new_itdb, KEY_IPOD_MODEL);
+ if (prefs_model)
+ {
+ itdb_device_set_sysinfo (new_itdb->device, "ModelNumStr",
+ prefs_model);
+ }
+ else
+ { /* ask again... */
+ gp_ipod_init_set_model (new_itdb, NULL);
+ }
+ g_free (prefs_model);
}
- else if (old_model && !new_model)
- {
- gp_ipod_init_set_model (new_itdb, old_model);
- }
- else if (!old_model && !new_model)
- {
- gp_ipod_init_set_model (new_itdb, NULL);
- }
- else
- { /* old_model && new_model are set */
-#if 0
- const gchar *old_ptr = old_model;
- const gchar *new_ptr = new_model;
- /* Normalize model number */
- if (isalpha (old_model[0])) ++old_ptr;
- if (isalpha (new_model[0])) ++new_ptr;
- if (strcmp (old_ptr, new_ptr) != 0)
- { /* Model number has changed -- confirm */
- }
-#endif
- set_itdb_prefs_string (new_itdb, KEY_IPOD_MODEL, new_model);
- }
+ g_free (new_model);
+
/* adjust rating and playcount in local databases */
for (gl=new_itdb->tracks; gl; gl=gl->next)
{
@@ -953,6 +986,9 @@
}
}
}
+
+ /* All successfully loaded so try loading the photo database */
+ gphoto_load_photodb (new_itdb);
return new_itdb;
}
@@ -1342,7 +1378,8 @@
time_t start, gint n, gint count, gint init_count)
{
gchar *progtext;
- gdouble fraction;
+ const gchar *progtext_old;
+ gdouble fraction, fraction_old;
g_return_if_fail (progressbar);
@@ -1375,8 +1412,18 @@
(gint)(fraction*100), count, n, (gint)hrs, (gint)mins, (gint)secs);
}
- gtk_progress_bar_set_fraction(progressbar, fraction);
- gtk_progress_bar_set_text(progressbar, progtext);
+ progtext_old = gtk_progress_bar_get_text (progressbar);
+ if (!progtext_old || (strcmp (progtext_old, progtext) != 0))
+ { /* only update progressbar text if it has changed */
+ gtk_progress_bar_set_text(progressbar, progtext);
+ }
+
+ fraction_old = gtk_progress_bar_get_fraction (progressbar);
+ if (fraction_old != fraction)
+ { /* only update progressbar fraction if it has changed */
+ gtk_progress_bar_set_fraction(progressbar, fraction);
+ }
+
g_free (progtext);
}
@@ -1651,6 +1698,7 @@
do
{
gchar *buf;
+ const gchar *buf_old;
status = file_transfer_get_status (itdb,
&to_convert_num, &converting_num,
@@ -1682,7 +1730,11 @@
"Transferred: %d. Failed: %d"),
status, to_convert_num, to_transfer_num,
transferred_num, failed_num);*/
- gtk_label_set_text (GTK_LABEL(td->textlabel), buf);
+ buf_old = gtk_label_get_text (GTK_LABEL(td->textlabel));
+ if (!buf_old || (strcmp (buf_old, buf) != 0))
+ { /* only set label if it has changed */
+ gtk_label_set_text (GTK_LABEL(td->textlabel), buf);
+ }
g_free (buf);
if ((to_convert_num != 0) && (converting_num == 0))
@@ -1985,6 +2037,29 @@
success = write_extended_info (itdb);
}
}
+
+ /* If the ipod supports photos and the photo_data_changed
+ * flag has been set to true then wrtie the photo database
+ */
+ if (success &&
+ (itdb->usertype & GP_ITDB_TYPE_IPOD) &&
+ gphoto_ipod_supports_photos (itdb) &&
+ eitdb->photodb != NULL &&
+ eitdb->photo_data_changed == TRUE)
+ {
+ GError *error = NULL;
+ if (!itdb_photodb_write (eitdb->photodb, &error))
+ {
+ success = FALSE;
+ if (error && error->message)
+ gtkpod_warning ("%s\n\n", error->message);
+ else
+ g_warning ("error->message == NULL!\n");
+
+ g_error_free (error);
+ error = NULL;
+ }
+ }
/* indicate that files and/or database is saved */
if (success)
@@ -2079,6 +2154,9 @@
g_return_if_fail (eitdb);
eitdb->data_changed = FALSE;
+ if (eitdb->photo_data_changed == TRUE)
+ eitdb->photo_data_changed = FALSE;
+
pm_itdb_name_changed (itdb);
space_data_update ();
}
Property changes on: gtkpod/branches/etch-bpo/src/file_itunesdb.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/fileselection.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/fileselection.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/flacfile.c
===================================================================
--- gtkpod/branches/etch-bpo/src/flacfile.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/flacfile.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: flacfile.c 1600 2007-06-27 18:45:37Z tmzullinger $
+| $Id: flacfile.c 1671 2007-08-06 14:46:46Z jcsjcs $
*/
#ifdef HAVE_CONFIG_H
@@ -34,6 +34,7 @@
#include "itdb.h"
#include "misc.h"
#include "flacfile.h"
+#include "mp3file.h"
/* Info on how to implement new file formats: see mp3file.c for more info */
@@ -64,13 +65,10 @@
}
else
{
+ gboolean flac_metadata_ok = FALSE;
+
track = gp_track_new ();
- track->description = g_strdup ("FLAC audio file");
- track->bitrate = stream_data.data.stream_info.bits_per_sample/1000;
- track->samplerate = stream_data.data.stream_info.sample_rate;
- track->tracklen = stream_data.data.stream_info.total_samples / (stream_data.data.stream_info.sample_rate / 1000);
-
if (prefs_get_int("readtags"))
{
if (!FLAC__metadata_get_tags (flacFileName, &tags))
@@ -85,6 +83,11 @@
else {
gint i;
+ if (tags->data.vorbis_comment.num_comments > 0)
+ {
+ flac_metadata_ok = TRUE;
+ }
+
for (i = 0 ; i < tags->data.vorbis_comment.num_comments ; i++)
{
gchar *tag = (gchar*)tags->data.vorbis_comment.comments[i].entry;
@@ -130,7 +133,19 @@
}
FLAC__metadata_object_delete (tags);
+
+ if (!flac_metadata_ok)
+ { /* fall back on ID3 */
+ id3_read_tags (flacFileName, track);
+ }
}
+
+ g_free (track->description);
+ track->description = g_strdup ("FLAC audio file");
+
+ track->bitrate = stream_data.data.stream_info.bits_per_sample/1000;
+ track->samplerate = stream_data.data.stream_info.sample_rate;
+ track->tracklen = stream_data.data.stream_info.total_samples / (stream_data.data.stream_info.sample_rate / 1000);
}
return track;
Property changes on: gtkpod/branches/etch-bpo/src/getopt.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/getopt.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/getopt1.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/info.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/info.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/itdb.h
===================================================================
--- gtkpod/branches/etch-bpo/src/itdb.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/itdb.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -30,7 +30,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: itdb.h 791 2006-06-06 00:47:07Z jcsjcs $
+| $Id: itdb.h 1750 2007-11-01 21:57:01Z phantom_sf $
*/
#ifndef ITDB_H
@@ -48,4 +48,6 @@
typedef Itdb_Thumb Thumb;
typedef Itdb_Artwork Artwork;
typedef Itdb_IpodInfo IpodInfo;
+typedef Itdb_PhotoDB PhotoDB;
+typedef Itdb_PhotoAlbum PhotoAlbum;
#endif
Property changes on: gtkpod/branches/etch-bpo/src/itdb.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/main.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/misc.c
===================================================================
--- gtkpod/branches/etch-bpo/src/misc.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/misc.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: misc.c 1558 2007-06-18 15:33:07Z jcsjcs $
+| $Id: misc.c 1822 2007-12-12 16:31:26Z dforsi $
*/
#ifdef HAVE_CONFIG_H
@@ -45,8 +45,9 @@
#include "misc.h"
#include "prefs.h"
#include "misc_track.h"
+#include "display_photo.h"
+#include "stock_icons.h"
-
#define DEBUG_MISC 0
@@ -60,210 +61,124 @@
* *
\*------------------------------------------------------------------*/
-static GtkWidget *about_window = NULL;
-
/* ATTENTION: directly used as callback in gtkpod.glade -- if you
change the arguments of this function make sure you define a
separate callback for gtkpod.glade */
void open_about_window ()
{
- GtkLabel *about_label;
- gchar *label_text;
- GtkTextView *textview;
- GtkTextIter ti;
- GtkTextBuffer *tb;
- GladeXML *about_xml;
+ const gchar *authors[] = {
+ _("© 2002 - 2007\n"
+ "Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+ "Corey Donohoe (atmos at atmos dot org)\n"
+ ""),
+ _("Patches were supplied by the following people (list may be incomplete -- please contact me)\n"),
+ _("Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"),
+ _("Hiroshi Kawashima: Japanese charset autodetection feature"),
+ _("Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"),
+ _("Walter Bell: correct handling of DND URIs with escaped characters and/or cr/newlines at the end"),
+ _("Sam Clegg: user defined filenames when exporting tracks from the iPod"),
+ _("Chris Cutler: automatic creation of various playlist types"),
+ _("Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress dialogue during sync"),
+ _("Edward Matteucci: debugging, special playlist creation, most of the volume normalizing code"),
+ _("Jens Lautenbach: some optical improvements"),
+ _("Alex Tribble: iPod eject patch"),
+ _("Yaroslav Halchenko: Orphaned and dangling tracks handling"),
+ _("Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"),
+ _("Ero Carrera: Filename validation and quick sync when copying tracks from the iPod"),
+ _("Jens Taprogge: Support for LAME's replay gain tag to normalize volume"),
+ _("Armando Atienza: Support with external playcounts"),
+ _("D.L. Sharp: Support for m4b files (bookmarkable AAC files)"),
+ _("Jim Hall: Decent INSTALL file"),
+ _("Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/contacts to the iPod"), /* J"urgen! */
+ _("Flavio Stanchina: bugfixes"),
+ _("Chris Micacchi: when sorting ignore 'the' and similar at the beginning of the title"),
+ _("Steve Jay: use statvfs() instead of df (better portability, faster)"),
+ "",
+ _("Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 tags"),
+ "",
+ _("James Liggett:\n"
+ "replacement of old GTK file selection dialogs with new GTK filechooser dialogs\n"
+ "refactored user preferences system."),
+ "",
+ _("Daniel Kercher: sync scripts for abook and webcalendar"),
+ "",
+ _("Clinton Gormley: sync scripts for thunderbird"),
+ "",
+ _("Sebastien Beridot: sync script for ldif addressbook format"),
+ "",
+ _("Sebastian Scherer: sync script for kNotes"),
+ "",
+ _("Nick Piper: sync script for Palm, type-ahead search"),
+ "",
+ _("Uwe Hermann: help with support for iPod Video"),
+ "",
+ _("Iain Benson: support for compilation tag in mp3 files and separate display of compilations in the sort tab."),
+ _("Nicolas Chariot: icons of buttons\n"
+ "\n"),
+ _("This program borrows code from the following projects:"),
+ _("gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://www.gnu.org/software/gnupod/)"),
+ _("iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code for smart playlists is based on his C++-classes."),
+ _("mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"),
+ _("xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"),
+ "",
+ _("The GUI was created with the help of glade-2 (http://glade.gnome.org/)."),
+ NULL };
- if (about_window != NULL) return;
- /* about_window = create_gtkpod_about_window (); */
+ gchar *translators[] = {
+ _("French: David Le Brun (david at dyn-ns dot net)"),
+ _("French: Éric Lassauge (rpmfarm at free dot fr)"),
+ _("German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"),
+ _("German: Kai-Ove"),
+ _("Hebrew: Assaf Gillat (gillata at gmail dot com)"),
+ _("Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"),
+ _("Italian: Daniele Forsi (dforsi at gmail dot com)"),
+ _("Japanese: Ayako Sano"),
+ _("Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"),
+ _("Romanian: Alex Eftimie (alexeftimie at gmail dot com)"),
+ _("Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"),
+ _("Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"),
+ NULL
+ };
- about_xml = glade_xml_new (xml_file, "gtkpod_about_window", NULL);
- glade_xml_signal_autoconnect (about_xml);
- about_window = gtkpod_xml_get_widget (about_xml, "gtkpod_about_window");
-
-
- about_label = GTK_LABEL (gtkpod_xml_get_widget (about_xml, "about_label"));
- label_text = g_strdup_printf (_("gtkpod Version %s: Cross-Platform Multi-Lingual Interface to Apple's iPod(tm)."), VERSION);
- gtk_label_set_text (about_label, label_text);
- g_free (label_text);
- {
- gchar *text[] = {_("\
-(C) 2002 - 2007\n\
-Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n\
-Corey Donohoe (atmos at atmos dot org)\n\
-\n\
-\n"),
- _("\
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\
-\n\
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\
-\n\
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.\n\
-\n\
-\n"),
- _("\
-Patches were supplied by the following people (list may be incomplete -- please contact me)\n\n"),
- _("\
-Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)\n"),
- _("\
-Hiroshi Kawashima: Japanese charset autodetecion feature\n"),
- _("\
-Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c\n"),
- _("\
-Walter Bell: correct handling of DND URIs with escaped characters and/or cr/newlines at the end\n"),
- _("\
-Sam Clegg: user defined filenames when exporting tracks from the iPod\n"),
- _("\
-Chris Cutler: automatic creation of various playlist types\n"),
- _("\
-Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress dialogue during sync\n"),
- _("\
-Edward Matteucci: debugging, special playlist creation, most of the volume normalizing code\n"),
- _("\
-Jens Lautenbach: some optical improvements\n"),
- _("\
-Alex Tribble: iPod eject patch\n"),
- _("\
-Yaroslav Halchenko: Orphaned and dangling tracks handling\n"),
- _("\
-Andrew Huntwork: Filename case sensitivity fix and various other bugfixes\n"),
- _("\
-Ero Carrera: Filename validation and quick sync when copying tracks from the iPod\n"),
- _("\
-Jens Taprogge: Support for LAME's replay gain tag to normalize volume\n"),
- _("\
-Armando Atienza: Support with external playcounts\n"),
- _("\
-D.L. Sharp: Support for m4b files (bookmarkable AAC files)\n"),
- _("\
-Jim Hall: Decent INSTALL file\n"),
- _("\
-Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/contacts to the iPod\n"), /* J"urgen! */
- _("\
-Flavio Stanchina: bugfixes\n"),
- _("\
-Chris Micacchi: when sorting ignore 'the' and similar at the beginning of the title\n"),
- _("\
-Steve Jay: use statvfs() instead of df (better portability, faster)\n"),
- "\n",
- _("\
-Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 tags\n"),
- "\n",
- _("\
-James Liggett:\n\
- replacement of old GTK file selection dialogs with new GTK filechooser dialogs\n\
- refactored user preferences system.\n"),
- "\n",
- _("\
-Daniel Kercher: sync scripts for abook and webcalendar\n"),
- "\n",
- _("\
-Clinton Gormley: sync scripts for thunderbird\n"),
- "\n",
- _("\
-Sebastien Beridot: sync script for ldif addressbook format\n"),
- "\n",
- _("\
-Sebastian Scherer: sync script for kNotes\n"),
- "\n",
- _("\
-Nick Piper: sync script for Palm, type-ahead search\n"),
- "\n",
- _("\
-Uwe Hermann: help with support for iPod Video\n"),
- "\n",
- _("\
-Iain Benson: support for compilation tag in mp3 files and separate display of compilations in the sort tab.\n"),
- _("\
-Nicolas Chariot: icons of buttons\n\
-\n\
-\n"),
- _("\
-This program borrows code from the following projects:\n"),
- _("\
- gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB (http://www.gnu.org/software/gnupod/)\n"),
- _("\
- iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code for smart playlists is based on his C++-classes.\n"),
- _("\
- mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)\n"),
- _("\
- xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)\n"),
- "\n",
- _("\
-The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"),
- NULL };
- gchar **strp = text;
- textview = GTK_TEXT_VIEW (gtkpod_xml_get_widget (about_xml, "credits_textview"));
- tb = gtk_text_view_get_buffer (textview);
- while (*strp)
- {
- gtk_text_buffer_get_end_iter (tb, &ti);
- gtk_text_buffer_insert (tb, &ti, *strp, -1);
- ++strp;
- }
- }
+ gchar *license = _(
+ "This program is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU General Public License as\n"
+ "published by the Free Software Foundation; either version 2 of the\n"
+ "License, or (at your option) any later version.\n"
+ "\n"
+ "This program is distributed in the hope that it will be useful, but\n"
+ "WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\n"
+ "the GNU General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n02111-1307, USA."
+ );
- {
- gchar *text[] = { _("\
-French: David Le Brun (david at dyn-ns dot net)\n"),
- _("\
-German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"),
- _("\
-Hebrew: Assaf Gillat (gillata at gmail dot com)\n"),
- _("\
-Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)\n"),
- _("\
-Japanese: Ayako Sano\n"),
- _("\
-Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"),
- _("\
-Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"),
- NULL };
- gchar **strp = text;
- textview = GTK_TEXT_VIEW (gtkpod_xml_get_widget (about_xml, "translators_textview"));
- tb = gtk_text_view_get_buffer (textview);
- while (*strp)
- {
- gtk_text_buffer_get_end_iter (tb, &ti);
- gtk_text_buffer_insert (tb, &ti, *strp, -1);
- ++strp;
- }
- }
+ gchar *copyright = _("© 2002-2007\nJorg Schuler <jcsjcs at users.sourceforge.net>\nCorey Donohoe <atmos at atmos.org>");
+ gchar *translator_credits = g_strjoinv("\n", translators);
+ GdkPixbuf *icon = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "data" G_DIR_SEPARATOR_S "gtkpod-logo.png", NULL);
- gtk_widget_show (about_window);
-}
+ gtk_show_about_dialog(GTK_WINDOW(gtkpod_window),
+ "name", "gtkpod",
+ "version", VERSION,
+ "logo", icon,
+ "comments", _("Cross-platform multilingual interface to Apple's iPodâ„¢"),
+ "copyright", copyright,
+ "website", "http://gtkpod.org",
+ "license", license,
+ "authors", authors,
+ "translator_credits", translator_credits,
+ NULL);
+ g_free(translator_credits);
-/* callback for close button */
-void
-on_about_window_close_button (GtkButton *button,
- gpointer user_data)
-{
- close_about_window (); /* in misc.c */
+ if(icon)
+ g_object_unref(icon);
}
-/* callback for window close button */
-gboolean
-on_about_window_close (GtkWidget *widget,
- GdkEvent *event,
- gpointer user_data)
-{
- close_about_window (); /* in misc.c */
- return FALSE;
-}
-
-
-void close_about_window (void)
-{
- g_return_if_fail (about_window != NULL);
- gtk_widget_destroy (about_window);
- about_window = NULL;
-}
-
-
-
-
/*------------------------------------------------------------------*\
* *
* Miscellaneous *
@@ -324,8 +239,35 @@
return FALSE;
}
+gboolean
+parse_artwork_from_string(gchar **s, Artwork **artwork)
+{
+ g_return_val_if_fail (artwork, FALSE);
+ *artwork = NULL;
+ g_return_val_if_fail (s, FALSE);
+ if(*s)
+ {
+ gchar *str = *s;
+ gchar *strp = strchr (str, '\n');
+ int tokens;
+ if (strp == NULL)
+ {
+ *artwork = NULL;
+ *s = NULL;
+ return FALSE;
+ }
+ tokens = sscanf (str, "%p", artwork);
+ ++strp;
+ if (*strp) *s = strp;
+ else *s = NULL;
+ if (tokens == 1) return TRUE;
+ else return FALSE;
+ }
+ return FALSE;
+}
+
/* Duplicate a GList (shallow copy) */
GList *glist_duplicate (GList *list)
{
@@ -427,6 +369,11 @@
/* Create a NULL-terminated array of strings given in the command
line. The last argument must be NULL.
+
+ As a special feature, the first argument is split up into
+ individual strings to allow the use of "convert-2mp3 -q <special
+ settings>". Set the first argument to NULL if you don't want this.
+
You must free the returned array with g_strfreev() after use. */
gchar **build_argv_from_strings (const gchar *first_arg, ...)
{
@@ -435,19 +382,31 @@
const gchar *str;
GPtrArray *ptra = g_ptr_array_sized_new (20);
- g_ptr_array_add (ptra, g_strdup (first_arg));
- /* add the rest of the strings */
if (first_arg)
{
- va_start (args, first_arg);
- do
+ gchar **strings = g_strsplit (first_arg, " ", 0);
+ gchar **strp = strings;
+ while (*strp)
{
- str = va_arg (args, const gchar *);
- g_ptr_array_add (ptra, g_strdup (str));
+ if (**strp)
+ { /* ignore empty strings */
+ g_ptr_array_add (ptra, g_strdup(*strp));
+ }
+ ++strp;
}
- while (str);
- va_end (args);
+ g_strfreev (strings);
}
+
+ va_start (args, first_arg);
+ do
+ {
+ str = va_arg (args, const gchar *);
+ g_ptr_array_add (ptra, g_strdup (str));
+ }
+ while (str);
+
+ va_end (args);
+
argv = (gchar **)g_ptr_array_free (ptra, FALSE);
return argv;
@@ -1900,6 +1859,7 @@
prefs_init (argc, argv);
coverart_init (argv[0]);
+ stockid_init (argv[0]);
file_convert_init ();
@@ -1930,6 +1890,11 @@
/* stop accepting requests for playcount updates */
server_shutdown ();
+ /* Change the windows back to track view to ensure the
+ * sorttab state is saved correctly/
+ */
+ gphoto_change_to_photo_window (FALSE);
+
/* Sort column order needs to be stored */
tm_store_col_order();
Property changes on: gtkpod/branches/etch-bpo/src/misc.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/misc.h
===================================================================
--- gtkpod/branches/etch-bpo/src/misc.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/misc.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: misc.h 1558 2007-06-18 15:33:07Z jcsjcs $
+| $Id: misc.h 1814 2007-12-11 12:53:22Z jcsjcs $
*/
#ifndef __MISC_H__
@@ -106,8 +106,8 @@
float get_ms_since (GTimeVal *old_time, gboolean update);
gint get_sort_tab_number (gchar *text);
void open_about_window (void);
-void close_about_window (void);
gboolean parse_tracks_from_string (gchar **s, Track **track);
+gboolean parse_artwork_from_string(gchar **s, Artwork **artwork);
void gtkpod_init (int argc, char *argv[]);
void gtkpod_shutdown (void);
Property changes on: gtkpod/branches/etch-bpo/src/misc.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/misc_confirm.c
===================================================================
--- gtkpod/branches/etch-bpo/src/misc_confirm.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/misc_confirm.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: misc_confirm.c 1065 2007-05-06 14:16:17Z jcsjcs $
+| $Id: misc_confirm.c 1822 2007-12-12 16:31:26Z dforsi $
*/
#ifdef HAVE_CONFIG_H
@@ -705,8 +705,8 @@
* delete_populate_settings() further down */
dd->tracks = g_list_copy (pl->members);
label = g_strdup_printf (
- ngettext ("Are you sure you want to delete playlist '%s' and the following track completely from your ipod? The number of playlists this track is a member of is indicated in parentheses.",
- "Are you sure you want to delete playlist '%s' and the following tracks completely from your ipod? The number of playlists the tracks are member of is indicated in parentheses.", n), pl->name);
+ ngettext ("Are you sure you want to delete playlist '%s' and the following track completely from your iPod? The number of playlists this track is a member of is indicated in parentheses.",
+ "Are you sure you want to delete playlist '%s' and the following tracks completely from your iPod? The number of playlists the tracks are member of is indicated in parentheses.", n), pl->name);
}
break;
case DELETE_ACTION_PLAYLIST:
Property changes on: gtkpod/branches/etch-bpo/src/misc_confirm.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/misc_conversion.c
===================================================================
--- gtkpod/branches/etch-bpo/src/misc_conversion.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/misc_conversion.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: misc_conversion.c 1578 2007-06-23 02:12:34Z jcsjcs $
+| $Id: misc_conversion.c 1655 2007-07-27 02:22:31Z tiffman $
*/
#ifdef HAVE_CONFIG_H
@@ -110,6 +110,7 @@
N_("Sort Album Artist"),
N_("Sort Composer"),
N_("Sort TV Show"),
+ N_("Gapless Track Flag"),
NULL };
/* Tooltips for prefs window */
@@ -169,7 +170,8 @@
N_("Used for sorting on the iPod"), /* 50 */
N_("Used for sorting on the iPod"),
N_("Used for sorting on the iPod"),
- N_("Used for sorting on the iPod")
+ N_("Used for sorting on the iPod"),
+ NULL
};
Property changes on: gtkpod/branches/etch-bpo/src/misc_conversion.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/misc_input.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/misc_playlist.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/misc_track.c
===================================================================
--- gtkpod/branches/etch-bpo/src/misc_track.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/misc_track.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -23,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: misc_track.c 1591 2007-06-26 03:33:25Z tmzullinger $
+| $Id: misc_track.c 1686 2007-08-25 03:20:11Z jcsjcs $
*/
#ifdef HAVE_CONFIG_H
@@ -431,7 +431,7 @@
else
{ /* handle track on local filesystem */
GList *gl;
- for (gl=itdb->tracks; gl; gl=gl->next)
+ for (gl=itdb->tracks; gl&&!result; gl=gl->next)
{
Track *track = gl->data;
ExtraTrackData *etr;
@@ -909,6 +909,7 @@
case T_MEDIA_TYPE:
case T_SEASON_NR:
case T_EPISODE_NR:
+ case T_GAPLESS_TRACK_FLAG:
case T_ITEM_NUM:
g_return_val_if_reached (NULL);
}
@@ -1203,6 +1204,13 @@
changed = TRUE;
}
break;
+ case T_GAPLESS_TRACK_FLAG:
+ if (frtrack->gapless_track_flag != totrack->gapless_track_flag)
+ {
+ totrack->gapless_track_flag = frtrack->gapless_track_flag;
+ changed = TRUE;
+ }
+ break;
case T_ITEM_NUM:
case T_ALL:
g_return_val_if_reached (FALSE);
@@ -1408,6 +1416,7 @@
case T_ALL:
case T_CHECKED:
case T_ITEM_NUM:
+ case T_GAPLESS_TRACK_FLAG:
break;
}
return text;
@@ -1674,6 +1683,7 @@
case T_SKIP_WHEN_SHUFFLING:
case T_CHECKED:
case T_ALL:
+ case T_GAPLESS_TRACK_FLAG:
case T_ITEM_NUM:
case T_THUMB_PATH: // TODO: this should in fact be settable
gtkpod_warning ("Programming error: track_set_text() called with illegal argument (item: %d)\n", item);
Property changes on: gtkpod/branches/etch-bpo/src/misc_track.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/misc_track.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/mp3file.c
===================================================================
--- gtkpod/branches/etch-bpo/src/mp3file.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/mp3file.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-06-26 00:39:11 jcs>
+/* Time-stamp: <2007-12-11 21:31:57 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: mp3file.c 1591 2007-06-26 03:33:25Z tmzullinger $
+| $Id: mp3file.c 1813 2007-12-11 12:34:20Z jcsjcs $
*/
@@ -39,6 +39,9 @@
* mpg123 code used in xmms-1.2.7 (Input/mpg123). Only the code needed
* for the playlength calculation has been extracted. */
+/* The code in the third section of this file is taken from the
+ * crc code used in libmad (crc.h). */
+
/* The code in the last section of this file is original gtkpod
* code. */
@@ -54,6 +57,7 @@
typedef struct _File_Tag File_Tag;
typedef struct _GainData GainData;
typedef struct _GaplessData GaplessData;
+typedef struct _LameTag LameTag;
struct _File_Tag
{
@@ -107,6 +111,41 @@
guint32 gapless_data; /* number of bytes from the first sync frame to the 8th to last frame */
};
+#define LAME_TAG_SIZE 0x24
+#define INFO_TAG_CRC_SIZE 0xBE /* number of bytes to pass to crc_compute */
+
+/* A structure to hold the various data found in a LAME info tag.
+ * Please see http://gabriel.mp3-tech.org/mp3infotag.html for full
+ * documentation.
+ */
+struct _LameTag
+{
+ gchar encoder[4];
+ gchar version_string[5];
+ guint8 info_tag_revision;
+ guint8 vbr_method;
+ guint8 lowpass;
+ float peak_signal_amplitude;
+ guint16 radio_replay_gain;
+ guint16 audiophile_replay_gain;
+ guint8 encoding_flags;
+ guint8 ath_type;
+ guint8 bitrate;
+ guint16 delay;
+ guint16 padding;
+ guint8 noise_shaping;
+ guint8 stereo_mode;
+ gboolean unwise_settings;
+ guint8 source_sample_frequency;
+ guint8 mp3_gain;
+ guint8 surround_info;
+ guint16 preset;
+ guint32 music_length;
+ guint16 music_crc;
+ guint16 info_tag_crc;
+ guint16 calculated_info_tag_crc;
+};
+
/* This code is taken from the mp3info code. Only the code needed for
* the playlength calculation has been extracted */
@@ -198,6 +237,8 @@
static guint get_track_time(gchar *path);
+/* This is for soundcheck code */
+gboolean mp3_read_lame_tag (gchar *path, LameTag *lt);
/* ------------------------------------------------------------
@@ -377,7 +418,7 @@
void get_mp3_info(MP3Info *mp3)
{
gint frame_type[15]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
- float milliseconds=0,total_rate=0;
+ double milliseconds=0,total_rate=0;
gint frames=0,frame_types=0,frames_so_far=0;
gint vbr_median=-1;
guint bitrate;
@@ -406,7 +447,7 @@
frames_so_far += frame_type[counter];
header_bitrate = mp3file_header_bitrate(&header);
if (header_bitrate != 0)
- milliseconds += (float)(8*frame_length(&header)*frame_type[counter])/header_bitrate;
+ milliseconds += 8*(double)frame_length(&header)*(double)frame_type[counter]/header_bitrate;
total_rate += header_bitrate*frame_type[counter];
if((vbr_median == -1) && (frames_so_far >= frames/2))
vbr_median=counter;
@@ -1300,7 +1341,7 @@
* Reads id3v1.x / id3v2 apic data
* @returns: TRUE on success, else FALSE.
*/
-static gboolean id3_apic_read (gchar *filename,
+static gboolean id3_apic_read (const gchar *filename,
guchar **image_data, gsize *image_data_len)
{
struct id3_file *id3file;
@@ -1394,7 +1435,7 @@
* stays to NULL
* @returns: TRUE on success, else FALSE.
*/
-gboolean id3_tag_read (gchar *filename, File_Tag *tag)
+gboolean id3_tag_read (const gchar *filename, File_Tag *tag)
{
struct id3_file *id3file;
struct id3_tag *id3tag;
@@ -1658,6 +1699,82 @@
/*
+ * Code used to calculate the CRC-16 of the info tag. Used to check the
+ * validity of the data read from the lame tag.
+ * Code taken from the libmad project, licensed under GPL
+ */
+
+static
+unsigned short const crc_table[256] = {
+ 0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,
+ 0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440,
+ 0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40,
+ 0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841,
+ 0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40,
+ 0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41,
+ 0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641,
+ 0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040,
+
+ 0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240,
+ 0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441,
+ 0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41,
+ 0xfa01, 0x3ac0, 0x3b80, 0xfb41, 0x3900, 0xf9c1, 0xf881, 0x3840,
+ 0x2800, 0xe8c1, 0xe981, 0x2940, 0xeb01, 0x2bc0, 0x2a80, 0xea41,
+ 0xee01, 0x2ec0, 0x2f80, 0xef41, 0x2d00, 0xedc1, 0xec81, 0x2c40,
+ 0xe401, 0x24c0, 0x2580, 0xe541, 0x2700, 0xe7c1, 0xe681, 0x2640,
+ 0x2200, 0xe2c1, 0xe381, 0x2340, 0xe101, 0x21c0, 0x2080, 0xe041,
+
+ 0xa001, 0x60c0, 0x6180, 0xa141, 0x6300, 0xa3c1, 0xa281, 0x6240,
+ 0x6600, 0xa6c1, 0xa781, 0x6740, 0xa501, 0x65c0, 0x6480, 0xa441,
+ 0x6c00, 0xacc1, 0xad81, 0x6d40, 0xaf01, 0x6fc0, 0x6e80, 0xae41,
+ 0xaa01, 0x6ac0, 0x6b80, 0xab41, 0x6900, 0xa9c1, 0xa881, 0x6840,
+ 0x7800, 0xb8c1, 0xb981, 0x7940, 0xbb01, 0x7bc0, 0x7a80, 0xba41,
+ 0xbe01, 0x7ec0, 0x7f80, 0xbf41, 0x7d00, 0xbdc1, 0xbc81, 0x7c40,
+ 0xb401, 0x74c0, 0x7580, 0xb541, 0x7700, 0xb7c1, 0xb681, 0x7640,
+ 0x7200, 0xb2c1, 0xb381, 0x7340, 0xb101, 0x71c0, 0x7080, 0xb041,
+
+ 0x5000, 0x90c1, 0x9181, 0x5140, 0x9301, 0x53c0, 0x5280, 0x9241,
+ 0x9601, 0x56c0, 0x5780, 0x9741, 0x5500, 0x95c1, 0x9481, 0x5440,
+ 0x9c01, 0x5cc0, 0x5d80, 0x9d41, 0x5f00, 0x9fc1, 0x9e81, 0x5e40,
+ 0x5a00, 0x9ac1, 0x9b81, 0x5b40, 0x9901, 0x59c0, 0x5880, 0x9841,
+ 0x8801, 0x48c0, 0x4980, 0x8941, 0x4b00, 0x8bc1, 0x8a81, 0x4a40,
+ 0x4e00, 0x8ec1, 0x8f81, 0x4f40, 0x8d01, 0x4dc0, 0x4c80, 0x8c41,
+ 0x4400, 0x84c1, 0x8581, 0x4540, 0x8701, 0x47c0, 0x4680, 0x8641,
+ 0x8201, 0x42c0, 0x4380, 0x8341, 0x4100, 0x81c1, 0x8081, 0x4040
+};
+
+unsigned short crc_compute(char const *data, unsigned int length,
+ unsigned short init)
+{
+ register unsigned int crc;
+
+ for (crc = init; length >= 8; length -= 8) {
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ }
+
+ switch (length) {
+ case 7: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 6: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 5: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 4: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 3: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 2: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 1: crc = crc_table[(crc ^ *data++) & 0xff] ^ (crc >> 8);
+ case 0: break;
+ }
+
+ return crc;
+}
+
+
+/*
* Code to read the ReplayGain Values stored by LAME in its own tag.
*
* Most of the relevant information has been extracted from them LAME sources
@@ -1779,6 +1896,9 @@
| (buf[2] & 0xff) << 8 | (buf[3] & 0xff);
}
+static inline guint16 parse_lame_uint16(char *buf) {
+ return (buf[0] & 0xff) << 8 | (buf[1] & 0xff);
+}
/*
* mp3_get_track_lame_replaygain - read the specified file and scan for LAME Tag
@@ -1794,22 +1914,12 @@
gboolean mp3_get_track_lame_replaygain (gchar *path, GainData *gd)
{
- struct {
- /* All members are defined in terms of chars so padding does not
- * occur. Is there a cleaner way to keep the compiler from
- * padding? */
-
- char id[3];
- char version[2];
- char flags;
- char size[4];
- } id3head;
+ g_return_val_if_fail (path, FALSE);
- FILE *file = NULL;
- char buf[4], version[5];
+ LameTag lt;
+ if (!mp3_read_lame_tag (path, <))
+ goto rg_fail;
int gain_adjust = 0;
- int sideinfo;
- guint32 ps;
g_return_val_if_fail (gd, FALSE);
@@ -1820,106 +1930,23 @@
gd->audiophile_gain_set = FALSE;
gd->peak_signal_set = FALSE;
- if (!path)
- goto rg_fail;
-
- file = fopen (path, "r");
-
- if (!file)
- goto rg_fail;
-
- /* Skip ID3 header if appropriate */
- if (fread(&id3head, 1, sizeof(id3head), file) !=
- sizeof(id3head))
- goto rg_fail;
-
- if (!strncmp(id3head.id, "ID3", 3)) {
- int realsize = 0;
-
- realsize = (id3head.size[0] & 0x7f) << 21
- | (id3head.size[1] & 0x7f) << 14
- | (id3head.size[2] & 0x7f) << 7
- | (id3head.size[3] & 0x7f);
-
- if (id3head.flags & TAG_FOOTER) {
- /* footer is copy of header */
- realsize += sizeof(id3head);
- }
-
- if (fseek(file, realsize-1, SEEK_CUR) ||
- (!fread(&buf[0], 1, 1, file)))
- goto rg_fail;
- } else {
- /* no ID3 Tag - go back */
- fseek(file, -sizeof(id3head), SEEK_CUR);
- }
-
- /* Search Xing header. The location is dependant on the MPEG Layer and
- * whether the stream is mono or not. */
- if (fread(buf, 1, 4, file) != 4) goto rg_fail;
-
- /* should start with 0xff 0xf? (synch) */
- if (((buf[0] & 0xff) != 0xff)
- || ((buf[1] & 0xf0) != 0xf0)) goto rg_fail;
-
- /* determine the length of the sideinfo */
- if (buf[1] & 0x08) {
- sideinfo = ((buf[3] & 0xc0) == 0xc0) ?
- SIDEINFO_MPEG1_MONO : SIDEINFO_MPEG1_MULTI;
- } else {
- sideinfo = ((buf[3] & 0xc0) == 0xc0) ?
- SIDEINFO_MPEG2_MONO : SIDEINFO_MPEG2_MULTI;
- }
-
- if (fseek(file, sideinfo, SEEK_CUR) ||
- (fread(&buf[0], 1, 4, file) != 4))
- goto rg_fail;
-
- /* Is this really a Xing or Info Header?
- * FIXME: Apparently (according to madplay sources) there is a different
- * possible location for the Xing header ("due to an unfortunate
- * historical event"). I do not thing we need to care though since
- * RaplayGain information is only conatined in recent files. */
- if (strncmp(buf, "Xing", 4) && strncmp(buf, "Info", 4))
- goto rg_fail;
-
- /* Check for LAME Tag */
- if (fseek(file, LAME_OFFSET, SEEK_CUR) ||
- (fread(&buf[0], 1, 4, file) != 4))
- goto rg_fail;
- if (strncmp(buf, "LAME", 4))
- goto rg_fail;
-
- /* Check LAME Version */
- if (fread(version, 1, 5, file) != 5)
- goto rg_fail;
-
- /* Skip really old versions altogether. I am not sure when radio_gain
- * information was introduced. 3.89 does not seem to supprt it though.
- * */
- if (lame_vcmp(version, "3.90") < 0) {
+ if (lame_vcmp(lt.version_string, "3.90") < 0) {
/* fprintf(stderr, "Old lame version (%c%c%c%c%c). Not used.\n",
version[0], version[1], version[2], version[3], version[4]); */
goto rg_fail;
}
- if (fseek(file, 0x2, SEEK_CUR) || (fread(buf, 1, 4, file) != 4))
- goto rg_fail;
-
- /* get the peak signal. */
- ps = parse_lame_uint32(buf);
-
/* Don't know when fixed-point PeakSingleAmplitude
* was introduced exactly. 3.94b will be used for now.) */
- if ((lame_vcmp(version, "3.94b") >= 0)) {
- if ((!gd->peak_signal_set) && ps) {
- gd->peak_signal = ps;
+ if ((lame_vcmp(lt.version_string, "3.94b") >= 0)) {
+ if ((!gd->peak_signal_set) && lt.peak_signal_amplitude) {
+ gd->peak_signal = lt.peak_signal_amplitude;
gd->peak_signal_set = TRUE;
/* printf("peak_signal (lame): %f\n", (double)
gd->peak_signal / 0x800000);*/
}
} else {
- float f = *((float *) (void *) (&ps)) * 0x800000;
+ float f = *((float *) (void *) (<.peak_signal_amplitude)) * 0x800000;
gd->peak_signal = (guint32) f;
/* I would like to see an example of that. */
/* printf("peak_signal (lame floating point): %f. PLEASE report.\n",
@@ -1930,34 +1957,27 @@
* Versions prior to 3.95.1 used a reference volume of 83dB.
* (As compared to the currently used 89dB.)
*/
- if ((lame_vcmp(version, "3.95.") < 0)) {
+ if ((lame_vcmp(lt.version_string, "3.95.") < 0)) {
gain_adjust = 60;
/* fprintf(stderr, "Old lame version (%c%c%c%c%c). Adjusting gain.\n",
version[0], version[1], version[2], version[3], version[4]); */
}
- if (fread(&buf[0], 1, 2, file) != 2)
- goto rg_fail;
-
+ unsigned char ubuf[2];
/* radio gain */
- read_lame_replaygain (buf, gd, gain_adjust);
+ memcpy(ubuf,<.radio_replay_gain,2);
+ read_lame_replaygain (ubuf, gd, gain_adjust);
- if (fread(&buf[0], 1, 2, file) != 2)
- goto rg_fail;
-
/* audiophile gain */
- read_lame_replaygain (buf, gd, gain_adjust);
+ memcpy(ubuf,<.audiophile_replay_gain,2);
+ read_lame_replaygain (ubuf, gd, gain_adjust);
- fclose(file);
return TRUE;
rg_fail:
- if (file)
- fclose(file);
return FALSE;
}
-
/*
* mp3_get_track_ape_replaygain - read the specified file and scan for Ape Tag
* ReplayGain information.
@@ -2180,8 +2200,13 @@
+/* ----------------------------------------------------------------------
-/* mp3 slot size in bytes */
+ From here starts original gtkpod code
+
+---------------------------------------------------------------------- */
+
+/* mpeg audio slot size in bytes */
int slotsize[3] = {4,1,1}; /* layer 1, layer 2, layer 3 */
int samplesperframe[2][3] = {
@@ -2196,48 +2221,42 @@
/*
- * mp3_get_track_lame_gapless - read the specified file and scan for LAME Tag
- * gapless information.
+ * mp3_read_lame_tag - read the data from the lame tag (if it exists)
*
- * @path: localtion of the file
- * @track: structure holding track information
- *
- * TODO: Split off non-LAME stuff (samplecount, gapless_data) to a separate function since it's generic
+ * @path: location of the file
+ * @lt: pointer to structure to be filled
*/
-gboolean mp3_get_track_lame_gapless (gchar *path, GaplessData *gd)
+gboolean mp3_read_lame_tag (gchar *path, LameTag *lt)
{
- FILE *file = NULL;
- char buf[4], version[5];
- unsigned char ubuf[4];
+ unsigned char ubuf[LAME_TAG_SIZE];
int sideinfo;
- int i;
- g_return_val_if_fail (gd, FALSE);
+ unsigned char full_info_tag[INFO_TAG_CRC_SIZE];
- if (!path)
- goto gp_fail;
+ g_return_val_if_fail (path, FALSE);
- file = fopen (path, "rb");
-
+ /* Attempt to open the file */
+ FILE *file = fopen (path, "r");
if (!file)
- goto gp_fail;
+ goto lt_fail;
- /* use get_first_header() to seek to the first mp3 header */
MP3Info *mp3i = NULL;
mp3i = g_malloc0 (sizeof (MP3Info));
mp3i->filename = path;
mp3i->file = file;
get_mp3_info (mp3i);
+
+ /* use get_first_header() to seek to the first mp3 header */
get_first_header (mp3i, 0);
- int xing_header_offset = ftell (file);
+ if (fread (full_info_tag, 1, INFO_TAG_CRC_SIZE, mp3i->file) != INFO_TAG_CRC_SIZE)
+ goto lt_fail;
+ fseek(mp3i->file, -INFO_TAG_CRC_SIZE, SEEK_CUR);
MP3Header h;
- if (!get_header (file, &h))
- goto gp_fail;
+ if (!get_header (mp3i->file, &h))
+ goto lt_fail;
- int mysamplesperframe = samplesperframe[h.version & 1][3 - h.layer];
-
/* Determine offset of Xing header based on sideinfo size */
if (h.version & 0x1)
{
@@ -2250,21 +2269,21 @@
SIDEINFO_MPEG2_MONO : SIDEINFO_MPEG2_MULTI;
}
- if (fseek (file, sideinfo, SEEK_CUR) ||
- (fread (&buf[0], 1, 4, file) != 4))
- goto gp_fail;
+ if (fseek (mp3i->file, sideinfo, SEEK_CUR) ||
+ (fread (&ubuf[0], 1, 4, mp3i->file) != 4))
+ goto lt_fail;
/* Is this really a Xing or Info Header?
* FIXME: Apparently (according to madplay sources) there is a different
* possible location for the Xing header ("due to an unfortunate
* historical event"). I do not thing we need to care though since
* ReplayGain information is only contained in recent files. */
- if (strncmp (buf, "Xing", 4) && strncmp (buf, "Info", 4))
- goto gp_fail;
+ if (strncmp (ubuf, "Xing", 4) && strncmp (ubuf, "Info", 4))
+ goto lt_fail;
/* Determine the offset of the LAME tag based on contents of the Xing header */
int flags;
- fread (&flags, 4, 1, file);
+ fread (&flags, 4, 1, mp3i->file);
int toskip = 0;
if (flags | 0x1)
{ /* frames field is set */
@@ -2284,38 +2303,90 @@
}
/* Check for LAME Tag */
- if (fseek (file, toskip, SEEK_CUR) || (fread (&buf[0], 1, 4, file) != 4))
- goto gp_fail;
- if (strncmp (buf, "LAME", 4))
- goto gp_fail;
+ if (fseek (mp3i->file, toskip, SEEK_CUR) || (fread (ubuf, 1, LAME_TAG_SIZE, mp3i->file) != LAME_TAG_SIZE))
+ goto lt_fail;
+ if (strncmp (ubuf, "LAME", 4))
+ goto lt_fail;
- /* Check LAME Version */
- if (fread (version, 1, 5, file) != 5)
- goto gp_fail;
+ strncpy(lt->encoder, &ubuf[0x0], 4);
- /* XXX skip old LAME versions, or just assume that pre/postgap
- * turn out zeros anyway, or check the CRC to vaidate the tag? */
+ strncpy(lt->version_string, &ubuf[0x4], 5);
- gboolean cbr = FALSE;
- if (fread (ubuf, 1, 1, file) != 1)
- goto gp_fail;
+ lt->info_tag_revision = (ubuf[0x9] >> 4);
+ lt->vbr_method = (ubuf[0x9] & 0xf);
+ lt->lowpass = ubuf[0xa];
- if ((ubuf[0] & 0xf) == 0x1)
- cbr = TRUE;
+ memcpy(<->peak_signal_amplitude,&ubuf[0xb],4);
+ memcpy(<->radio_replay_gain,&ubuf[0xf],2);
+ memcpy(<->audiophile_replay_gain,&ubuf[0x11],2);
- if (fseek (file, 0xB, SEEK_CUR) || (fread (ubuf, 1, 4, file) != 4))
- goto gp_fail;
+ lt->encoding_flags = ubuf[0x13] >> 4;
+ lt->ath_type = ubuf[0x13] & 0xf;
- /* set pregap and postgap directly from LAME header */
- gd->pregap = (ubuf[0] << 4) + (ubuf[1] >> 4);
- gd->postgap = ((ubuf[1] & 0xf) << 8) + ubuf[2];
+ lt->bitrate = ubuf[0x14];
- /* jump the end of the frame with the xing header */
- if (fseek (file, xing_header_offset + frame_length (&h), SEEK_SET))
+ lt->delay = (ubuf[0x15] << 4) + (ubuf[0x16] >> 4);
+ lt->padding = ((ubuf[0x16] & 0xf) << 8) + ubuf[0x17];
+
+ lt->noise_shaping = ubuf[0x18] & 0x3;
+ lt->stereo_mode = (ubuf[0x18] >> 2) & 0x7;
+ lt->unwise_settings = (ubuf[0x18] >> 5) & 0x1;
+ lt->source_sample_frequency = (ubuf[0x18] >> 6) & 0x3;
+
+ lt->mp3_gain = ubuf[0x19];
+
+ lt->surround_info = (ubuf[0x1a] >> 3) & 0x7;
+ lt->preset = ((ubuf[0x1a] & 0x7) << 8) + ubuf[0x1b];
+
+ lt->music_length = parse_lame_uint32(&ubuf[0x1c]);
+
+ lt->music_crc = parse_lame_uint16(&ubuf[0x20]);
+ lt->info_tag_crc = parse_lame_uint16(&ubuf[0x22]);
+
+ lt->calculated_info_tag_crc = crc_compute(full_info_tag, INFO_TAG_CRC_SIZE, 0x0000);
+
+ fclose(file);
+ return (lt->calculated_info_tag_crc == lt->info_tag_crc);
+
+ lt_fail:
+ if (file)
+ fclose(file);
+ return FALSE;
+
+}
+
+
+/*
+ * mp3_get_track_gapless - read the specified file and calculate gapless
+ * information: totalsamples and gapless_data
+ *
+ * @mp3i: MP3Info of the file; should already have run get_mp3_info() on it
+ * @gd: structure holding gapless information; should have pregap and
+ * postgap already filled
+ */
+
+gboolean mp3_get_track_gapless (MP3Info *mp3i, GaplessData *gd)
+{
+ int i;
+
+ g_return_val_if_fail (mp3i, FALSE);
+ g_return_val_if_fail (gd, FALSE);
+
+ /* use get_first_header() to seek to the first mp3 header */
+ get_first_header (mp3i, 0);
+
+ int xing_header_offset = ftell (mp3i->file);
+
+ get_header(mp3i->file, &(mp3i->header));
+
+ int mysamplesperframe = samplesperframe[mp3i->header.version & 1][3 - mp3i->header.layer];
+
+ /* jump to the end of the frame with the xing header */
+ if (fseek (mp3i->file, xing_header_offset + frame_length (&(mp3i->header)), SEEK_SET))
goto gp_fail;
/* counts bytes from the start of the 1st sync frame */
- int totaldatasize = frame_length (&h);
+ int totaldatasize = frame_length (&(mp3i->header));
/* keeps track of the last 8 frame sizes */
int lastframes[8];
@@ -2325,19 +2396,14 @@
/* quickly parse the file, reading only frame headers */
int l = 0;
- while ((l = get_header (file, &h)) != 0)
+ while ((l = get_header (mp3i->file, &(mp3i->header))) != 0)
{
- for (i = 7; i > 0; i--)
- {
- lastframes[i] = lastframes[i - 1];
- }
- lastframes[0] = l;
+ lastframes[totalframes%8] = l;
totaldatasize += l;
totalframes++;
- if (fseek (file, l - FRAME_HEADER_SIZE, SEEK_CUR))
+ if (fseek (mp3i->file, l - FRAME_HEADER_SIZE, SEEK_CUR))
goto gp_fail;
-
}
int finaleight = 0;
@@ -2346,7 +2412,12 @@
finaleight += lastframes[i];
}
- if (cbr)
+ /* For some reason, iTunes appears to add an extra frames worth of
+ * samples to the samplecount for CBR files. CBR files don't currently
+ * (2 Jul 07) play gaplessly whether uploaded from iTunes or gtkpod,
+ * even with apparently correct values, but we will attempt to emulate
+ * iTunes' behavior */
+ if (mp3i->vbr == 0) // CBR
totalframes++;
/* all but last eight frames */
@@ -2358,14 +2429,11 @@
gp_fail:
- if (file)
- fclose (file);
return FALSE;
}
-
/**
* mp3_read_gapless:
*
@@ -2382,8 +2450,11 @@
* set. etrack->tchanged is set to TRUE if data has been changed,
* FALSE otherwise.
*/
-gboolean mp3_read_gapless (char *path, Track *track)
-{
+
+gboolean mp3_read_gapless (gchar *path, Track *track) {
+ MP3Info *mp3i=NULL;
+ FILE *file;
+
GaplessData gd;
ExtraTrackData *etr;
@@ -2393,81 +2464,70 @@
memset (&gd, 0, sizeof (GaplessData));
- gd.pregap = 0;
- gd.samplecount = 0;
- gd.postgap = 0;
- gd.gapless_data = 0;
- mp3_get_track_lame_gapless (path, &gd);
+ g_return_val_if_fail (path, FALSE);
- etr->tchanged = FALSE;
+ /* Attempt to open the file */
+ file = fopen (path, "r");
+ if (file)
+ {
+ mp3i = g_malloc0 (sizeof (MP3Info));
+ mp3i->filename = path;
+ mp3i->file = file;
+ get_mp3_info (mp3i);
- if ((gd.pregap) && (gd.samplecount) && (gd.postgap) && (gd.gapless_data))
- {
- if ((track->pregap != gd.pregap) ||
- (track->samplecount != gd.samplecount) ||
- (track->postgap != gd.postgap) ||
- (track->gapless_data != gd.gapless_data) ||
- (track->gapless_track_flag == FALSE))
+ /* Try the LAME tag for pregap and postgap */
+ LameTag lt;
+ if (mp3_read_lame_tag (path, <)) {
+ gd.pregap = lt.delay;
+ gd.postgap = lt.padding;
+ } else {
+ /* insert non-LAME methods of finding pregap and postgap */
+ fclose(file);
+ return FALSE;
+ }
+
+ mp3_get_track_gapless (mp3i, &gd);
+
+ etr->tchanged = FALSE;
+
+ if ((gd.pregap) && (gd.samplecount) && (gd.postgap) && (gd.gapless_data))
{
- etr->tchanged = TRUE;
- track->pregap = gd.pregap;
- track->samplecount = gd.samplecount;
- track->postgap = gd.postgap;
- track->gapless_data = gd.gapless_data;
- track->gapless_track_flag = TRUE;
+ if ((track->pregap != lt.delay) ||
+ (track->samplecount != gd.samplecount) ||
+ (track->postgap != lt.padding) ||
+ (track->gapless_data != gd.gapless_data) ||
+ (track->gapless_track_flag == FALSE))
+ {
+ etr->tchanged = TRUE;
+ track->pregap = lt.delay;
+ track->samplecount = gd.samplecount;
+ track->postgap = lt.padding;
+ track->gapless_data = gd.gapless_data;
+ track->gapless_track_flag = TRUE;
+ }
}
+ fclose(file);
+ return TRUE;
}
return FALSE;
}
-
-/* ----------------------------------------------------------------------
-
- From here starts original gtkpod code
-
----------------------------------------------------------------------- */
-
-/* Return a Track structure with all information read from the mp3
- file filled in */
-Track *mp3_get_file_info (gchar *name)
+/* Read ID3 tags of filename @name into track structure @track */
+/* Return value: TRUE if tags could be read, FALSE if an error
+ occured */
+gboolean id3_read_tags (const gchar *name, Track *track)
{
- Track *track = NULL;
File_Tag filetag;
- MP3Info *mp3i=NULL;
- FILE *file;
- guchar *image_data = NULL;
- gsize image_data_len = 0;
- g_return_val_if_fail (name, NULL);
+ g_return_val_if_fail (name && track, FALSE);
- /* Attempt to open the file */
- file = fopen (name, "r");
- if (file)
+ if (id3_tag_read (name, &filetag))
{
- mp3i = g_malloc0 (sizeof (MP3Info));
- mp3i->filename = name;
- mp3i->file = file;
- get_mp3_info (mp3i);
- mp3i->file = NULL;
- fclose (file);
- }
- else
- {
- gchar *fbuf = charset_to_utf8 (name);
- gtkpod_warning(_("ERROR while opening file: '%s' (%s).\n"),
- fbuf, g_strerror(errno));
- g_free (fbuf);
- return NULL;
- }
+ guchar *image_data = NULL;
+ gsize image_data_len = 0;
- track = gp_track_new ();
- track->filetype = g_strdup ("MPEG audio file");
-
- if (prefs_get_int("readtags") && (id3_tag_read (name, &filetag) == TRUE))
- {
-
if (filetag.album)
{
track->album = filetag.album;
@@ -2622,33 +2682,72 @@
{
track->lyrics_flag = 0x00;
}
- }
- if (prefs_get_int("coverart_apic") &&
- (id3_apic_read (name, &image_data, &image_data_len) == TRUE))
- {
- if (image_data)
+ if (prefs_get_int("coverart_apic") &&
+ (id3_apic_read (name, &image_data, &image_data_len) == TRUE))
{
- gp_track_set_thumbnails_from_data (track,
- image_data,
- image_data_len);
- g_free (image_data);
+ if (image_data)
+ {
+ gp_track_set_thumbnails_from_data (track,
+ image_data,
+ image_data_len);
+ g_free (image_data);
+ }
}
+ return TRUE;
}
+ return FALSE;
+}
+
+/* ----------------------------------------------------------------------
+
+ From here starts original gtkpod code
+
+---------------------------------------------------------------------- */
+
+/* Return a Track structure with all information read from the mp3
+ file filled in */
+Track *mp3_get_file_info (gchar *name)
+{
+ Track *track = NULL;
+ MP3Info *mp3i=NULL;
+ FILE *file;
+
+ g_return_val_if_fail (name, NULL);
+
+ /* Attempt to open the file */
+ file = fopen (name, "r");
+ if (file)
+ {
+ mp3i = g_malloc0 (sizeof (MP3Info));
+ mp3i->filename = name;
+ mp3i->file = file;
+ get_mp3_info (mp3i);
+ mp3i->file = NULL;
+ fclose (file);
+ }
+ else
+ {
+ gchar *fbuf = charset_to_utf8 (name);
+ gtkpod_warning(_("ERROR while opening file: '%s' (%s).\n"),
+ fbuf, g_strerror(errno));
+ g_free (fbuf);
+ return NULL;
+ }
+
+ track = gp_track_new ();
+ track->filetype = g_strdup ("MPEG audio file");
+
+ if (prefs_get_int("readtags"))
+ {
+ id3_read_tags (name, track);
+ }
+
mp3_read_soundcheck (name, track);
mp3_read_gapless (name, track);
-#if LOCALDEBUG
- printf("%s\n", name);
- printf("\tpregap: %i\n", track->pregap);
- printf("\tpostgap: %i\n", track->postgap);
- printf("\tsamplecount: %li\n", track->samplecount);
- printf("\tgaplessdata: %i\n", track->gapless_data);
-#endif
-
-
/* Get additional info (play time and bitrate */
if (mp3i)
{
Property changes on: gtkpod/branches/etch-bpo/src/mp3file.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/mp3file.h
===================================================================
--- gtkpod/branches/etch-bpo/src/mp3file.h 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/mp3file.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-11 13:57:01 jcs>
+/* Time-stamp: <2007-07-14 15:55:29 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: mp3file.h 1591 2007-06-26 03:33:25Z tmzullinger $
+| $Id: mp3file.h 1646 2007-07-14 06:58:44Z jcsjcs $
*/
#ifndef MP3FILEH_INCLUDED
@@ -37,4 +37,5 @@
gboolean mp3_read_soundcheck (gchar *path, Track *track);
gboolean mp3_read_gapless (gchar *path, Track *track);
+gboolean id3_read_tags (const gchar *name, Track *track);
#endif
Property changes on: gtkpod/branches/etch-bpo/src/mp3file.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/mp4file.c
===================================================================
--- gtkpod/branches/etch-bpo/src/mp4file.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/mp4file.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: mp4file.c 1575 2007-06-22 17:49:43Z jcsjcs $
+| $Id: mp4file.c 1740 2007-10-27 02:48:08Z jcsjcs $
*/
#ifdef HAVE_CONFIG_H
@@ -139,6 +139,20 @@
#include <string.h>
#include "mp4.h"
+#ifndef FREEFORM_ACCEPTS_EXTRA_ARG
+/* Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataFreeForm. For C++ sources it defaults
+ to 0, but in C we have to specify it on our own.
+*/
+#define MP4GetMetadataFreeForm(mp4File, name, pValue, pValueSize, owner) MP4GetMetadataFreeForm(mp4File, name, pValue, pValueSize)
+#endif
+
+#ifndef COVERART_ACCEPTS_EXTRA_ARG
+/* Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataCoverart. For C++ sources it defaults
+ to NULL, but in C we have to specify it on our own.
+*/
+#define MP4GetMetadataCoverArt(hFile, coverArt, size, index) MP4GetMetadataCoverArt(hFile, coverArt, size)
+#endif
+
static gboolean mp4_scan_soundcheck (MP4FileHandle mp4File, Track *track)
{
gboolean success = FALSE;
@@ -149,7 +163,7 @@
g_return_val_if_fail (mp4File != MP4_INVALID_FILE_HANDLE, FALSE);
if (MP4GetMetadataFreeForm(mp4File, "iTunNORM",
- &ppValue, &pValueSize))
+ &ppValue, &pValueSize, NULL))
{
gchar *str;
guint sc1=0, sc2=0;
@@ -171,7 +185,7 @@
}
if (MP4GetMetadataFreeForm(mp4File, "replaygain_track_gain",
- &ppValue, &pValueSize))
+ &ppValue, &pValueSize, NULL))
{
gchar *str;
gdouble rg;
@@ -367,7 +381,7 @@
u_int8_t *image_data;
u_int32_t image_data_len;
if (MP4GetMetadataCoverArt (mp4File,
- &image_data, &image_data_len))
+ &image_data, &image_data_len, 0))
{
if (image_data)
{
@@ -452,7 +466,7 @@
MP4GetMetadataAlbum (mp4File, &m_album);
MP4GetMetadataGenre (mp4File, &m_genre);*/
MP4GetMetadataTool (mp4File, &m_tool);
- MP4GetMetadataCoverArt (mp4File, &m_covert, &m_size);
+ MP4GetMetadataCoverArt (mp4File, &m_covert, &m_size, 0);
MP4MetadataDelete (mp4File);
#endif
value = charset_from_utf8 (track->title);
Property changes on: gtkpod/branches/etch-bpo/src/mp4file.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/mp4file.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/prefs.c
===================================================================
--- gtkpod/branches/etch-bpo/src/prefs.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/prefs.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: prefs.c 1597 2007-06-26 14:35:18Z dforsi $
+| $Id: prefs.c 1776 2007-11-12 22:38:00Z phantom_sf $
*/
/* -------------------------------------------------------------------
@@ -173,6 +173,7 @@
prefs_set_int("show_duplicates", TRUE);
prefs_set_int("show_non_updated", TRUE);
prefs_set_int("show_updated", TRUE);
+ prefs_set_int("photo_library_confirm_delete", TRUE);
prefs_set_int("mserv_report_probs", TRUE);
prefs_set_int("delete_ipod", TRUE);
prefs_set_int("delete_file", TRUE);
@@ -1192,7 +1193,49 @@
/* For versions < 0.91, remove all itdb keys */
if (version < 0.91)
prefs_flush_subkey("itdb_");
-
+
+ /* rename convert scripts */
+ if (version <= 0.99001)
+ {
+
+ const gchar **keyp;
+ const gchar *keys[] =
+ {"path_conv_m4a", "path_conv_wav", "path_conv_mp3",
+ "path_conv_ogg", "path_conv_flac", NULL};
+
+ for (keyp=keys; *keyp; ++keyp)
+ {
+ buf = prefs_get_string (*keyp);
+ if (buf)
+ {
+ const gchar *needles[] =
+ { "convert-flac2mp3.sh", "convert-m4a2mp3.sh",
+ "convert-ogg2mp3.sh", "convert-wav2mp3.sh",
+ "convert-flac2m4a.sh", "convert-m4a2m4a.sh",
+ "convert-ogg2m4a.sh", "convert-wav2m4a.sh", NULL };
+ const gchar *replacements[] =
+ { "convert-2mp3.sh ", "convert-2mp3.sh ",
+ "convert-2mp3.sh ", "convert-2mp3.sh " ,
+ "convert-2m4a.sh ", "convert-2m4a.sh ",
+ "convert-2m4a.sh ", "convert-2m4a.sh " };
+ const gchar **needlep;
+ const gchar **replp;
+ replp = replacements;
+ for (needlep=needles; *needlep; ++needlep, ++replp)
+ {
+ gchar *bufp = strstr (buf, *needlep);
+ if (bufp)
+ {
+ g_memmove (bufp, *replp, strlen (*replp));
+ prefs_set_string (*keyp, buf);
+ break;
+ }
+ }
+ g_free (buf);
+ }
+ }
+ }
+
prefs_set_string ("version", VERSION);
}
Property changes on: gtkpod/branches/etch-bpo/src/prefs.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/prefs.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/src/prefs_window.c
===================================================================
--- gtkpod/branches/etch-bpo/src/prefs_window.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/prefs_window.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: prefs_window.c 1594 2007-06-26 04:02:23Z tmzullinger $
+| $Id: prefs_window.c 1776 2007-11-12 22:38:00Z phantom_sf $
*/
#include <stdio.h>
@@ -59,7 +59,6 @@
static void prefs_window_set_st_autoselect (guint32 inst, gboolean autoselect);
static void prefs_window_set_autosettags (gint category, gboolean autoset);
-static void prefs_window_set_col_visible (gint column, gboolean visible);
static void prefs_window_set_sort_tab_num (gint num);
/* Some declarations */
@@ -177,15 +176,6 @@
}
-static void on_cfg_col_visible_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- prefs_window_set_col_visible (
- GPOINTER_TO_UINT(user_data),
- gtk_toggle_button_get_active(togglebutton));
-}
-
-
/* one of the "..." buttons has been pressed -> open a file chooser
dialog and let the user select a file or directory */
static void on_path_button_pressed (GtkButton *button, gpointer user_data)
@@ -306,100 +296,256 @@
}
}
-static gint setup_visible_cols_buttons_sort (gconstpointer a, gconstpointer b)
+enum {
+ TRACK_COLUMNS_TEXT,
+ TRACK_COLUMNS_INT,
+ TRACK_N_COLUMNS
+};
+
+typedef enum {
+ HIDE,
+ SHOW
+} TrackColumnsType;
+
+
+static gint visible_cols_sort (GtkTreeModel *model,
+ GtkTreeIter *a,
+ GtkTreeIter *b,
+ gpointer user_data)
{
- const gint *aa = a;
- const gint *bb = b;
+ gchar *str1, *str2;
+ gint result;
- g_return_val_if_fail (a&&b, 0);
+ gtk_tree_model_get (model, a, TRACK_COLUMNS_TEXT, &str1, -1);
+ gtk_tree_model_get (model, b, TRACK_COLUMNS_TEXT, &str2, -1);
- return g_utf8_collate (gettext (get_tm_string (*aa)),
- gettext (get_tm_string (*bb)));
+ result = g_utf8_collate (str1, str2);
+
+ g_free (str1);
+ g_free (str2);
+
+ return result;
}
-/* Creates the toggle buttons to select the visible columns */
-static void setup_visible_cols_buttons ( GtkTooltips *tt)
+
+static GtkWidget *visible_cols_get_treeview (TrackColumnsType type)
{
- GArray *array;
- GtkWidget *hbox;
- GtkWidget *table;
- gint i, rows, columns, r, c;
+ GtkWidget *w=NULL;
- /* Sort the available colums alphabetically */
- array = g_array_new (FALSE, FALSE, sizeof (gint));
- for (i=0; i<TM_NUM_COLUMNS; ++i)
+ switch (type)
{
- g_array_append_val (array, i);
+ case HIDE:
+ w = gtkpod_xml_get_widget (prefs_window_xml, "track_cols_hide_tv");
+ break;
+ case SHOW:
+ w = gtkpod_xml_get_widget (prefs_window_xml, "track_cols_show_tv");
+ break;
+ default:
+ g_return_val_if_reached (NULL);
}
- g_array_sort (array, setup_visible_cols_buttons_sort);
-#if 0
+ return w;
+}
+
+static GtkWidget *visible_cols_get_treeview_other (TrackColumnsType type)
+{
+ GtkWidget *w=NULL;
+
+ switch (type)
+ {
+ case SHOW:
+ w = gtkpod_xml_get_widget (prefs_window_xml, "track_cols_hide_tv");
+ break;
+ case HIDE:
+ w = gtkpod_xml_get_widget (prefs_window_xml, "track_cols_show_tv");
+ break;
+ default:
+ g_return_val_if_reached (NULL);
+ }
+
+ return w;
+}
+
+
+static void setup_visible_cols_liststore (TrackColumnsType type)
+{
+ GtkTreeSelection *selection;
+ GtkWidget *treeview;
+ GtkListStore *store;
+ GtkTreeIter iter;
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
+ gint i;
+
+ treeview = visible_cols_get_treeview (type);
+
+ store = gtk_list_store_new (TRACK_N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
+ column = gtk_tree_view_column_new ();
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (column, renderer, TRUE);
+
+ gtk_tree_view_column_set_attributes (column, renderer,
+ "text", TRACK_COLUMNS_TEXT, NULL);
+
+ gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (treeview),
+ (GTK_TREE_MODEL (store)));
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+
+ g_object_unref (G_OBJECT (store));
+
for (i=0; i<TM_NUM_COLUMNS; ++i)
{
- printf ("%s\n", gettext (get_tm_string (g_array_index (array, gint, i))));
+ gint visible;
+ visible = prefs_get_int_index("col_visible", i);
+ if (((type == HIDE) && visible) || ((type == SHOW) && !visible))
+ continue;
+ gtk_list_store_append (store, &iter);
+ gtk_list_store_set(store, &iter,
+ TRACK_COLUMNS_TEXT, gettext (get_tm_string (i)),
+ TRACK_COLUMNS_INT, i, -1);
}
-#endif
+ /* sort model alphabetically */
+ gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
+ visible_cols_sort,
+ NULL,
+ NULL);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+ GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+ GTK_SORT_ASCENDING);
+}
- hbox = gtkpod_xml_get_widget (prefs_window_xml, "visible_cols_hbox");
- /* how big must the table be to keep all column labels? */
- columns = 5;
- rows = (TM_NUM_COLUMNS + (columns - 1)) / columns;
- table = gtk_table_new (rows, columns, TRUE);
+static void visible_cols_move (GtkButton *button, gpointer data)
+{
+ GtkTreeSelection *selection_from, *selection_to;
+ gchar *text;
+ gint index;
+ TrackColumnsType type;
+ GtkWidget *treeview_from, *treeview_to;
+ GtkTreeModel *model_from, *model_to;
+ GList *gl, *selected_paths, *selected_refs=NULL;
- for (r=0; r*columns < TM_NUM_COLUMNS; ++r)
+ type = GPOINTER_TO_INT (data);
+
+ treeview_from = visible_cols_get_treeview_other (type);
+ model_from = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview_from));
+ selection_from = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview_from));
+
+ treeview_to = visible_cols_get_treeview (type);
+ model_to = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview_to));
+ selection_to = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview_to));
+
+ /* unselect the "to" selection */
+ gtk_tree_selection_unselect_all (selection_to);
+
+ /* Get a list of paths */
+ selected_paths = gtk_tree_selection_get_selected_rows (selection_from,
+ &model_from);
+
+ /* Since we are modifying the model as we go along, we cannot use
+ paths -> convert the paths into references */
+ for (gl=selected_paths; gl; gl=gl->next)
{
- for (c=0; c<columns; ++c)
+ selected_refs = g_list_append (selected_refs,
+ gtk_tree_row_reference_new (model_from,
+ gl->data));
+ gtk_tree_path_free (gl->data);
+ }
+ g_list_free (selected_paths);
+
+ for (gl=selected_refs; gl; gl=gl->next)
+ {
+ GtkTreeIter iter;
+ GtkTreePath *path_from = gtk_tree_row_reference_get_path (gl->data);
+ if (gtk_tree_model_get_iter (model_from, &iter, path_from))
{
- i = r*columns+c;
- if (i < TM_NUM_COLUMNS)
- {
- GtkWidget *button;
- gint j;
- j = g_array_index (array, gint, i);
- /* Create button */
- button = gtk_check_button_new_with_label (
- gettext (get_tm_string (j)));
- /* set active/inactive */
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
- prefs_get_int_index("col_visible", j));
- /* set tooltip if available */
- if (get_tm_tooltip (j))
- {
- gtk_tooltips_set_tip (tt, button,
- gettext (get_tm_tooltip (j)),
- NULL);
- }
- /* connect the signal handler */
- g_signal_connect ((gpointer)button,
- "toggled",
- G_CALLBACK (on_cfg_col_visible_toggled),
- GUINT_TO_POINTER(j));
- /* attach button to table */
- gtk_table_attach (GTK_TABLE (table),
- button,
- c, c+1,
- r, r+1,
- GTK_FILL, GTK_SHRINK,
- 0, 0);
- /* show the button */
- gtk_widget_show (button);
- }
+ GtkTreePath *path_to;
+ gtk_tree_model_get (model_from, &iter,
+ TRACK_COLUMNS_TEXT, &text,
+ TRACK_COLUMNS_INT, &index, -1);
+ gtk_list_store_remove (GTK_LIST_STORE (model_from), &iter);
+ gtk_list_store_append (GTK_LIST_STORE (model_to), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model_to), &iter,
+ TRACK_COLUMNS_TEXT, text, -1);
+ /* select all newly moved items */
+ gtk_tree_selection_select_iter (selection_to, &iter);
+ /* make newly moved item visible */
+ path_to = gtk_tree_model_get_path (model_to, &iter);
+ gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (treeview_to),
+ path_to, NULL,
+ FALSE, 0, 0);
+ gtk_tree_path_free (path_to);
+ temp_prefs_set_int_index(temp_prefs, "col_visible", index, type);
}
+ gtk_tree_path_free (path_from);
+ gtk_tree_row_reference_free (gl->data);
}
- /* Set table spacings */
- gtk_table_set_row_spacings (GTK_TABLE (table), 4);
- gtk_table_set_col_spacings (GTK_TABLE (table), 4);
- /* Make table visible */
- gtk_widget_show (table);
- /* pack the table into the hbox */
- gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
+ g_list_free (selected_refs);
+}
- /* free memory */
- g_array_free (array, TRUE);
+
+static gboolean visible_cols_double_clicked (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ TrackColumnsType type;
+
+ type = GPOINTER_TO_INT (user_data);
+
+ switch (event->type)
+ {
+ case GDK_2BUTTON_PRESS:
+ /* pretend the "show/hide" button was pressed */
+ visible_cols_move (NULL, user_data);
+ /* don't propagate event */
+ return TRUE;
+ default:
+ /* propagate event */
+ return FALSE;
+ }
}
+/* Note that the tooltips are not currently used. Gtk+ >= 2.11.6 has a new
+ * tooltip API which allows tooltips in treeview cells. Prior to that, various
+ * hacks are required. See the patch in http://bugzilla.gnome.org/130983 for
+ * one possible method. -- tmz */
+static void setup_visible_cols (GtkTooltips *tt)
+{
+ GtkWidget *hide_button;
+ GtkWidget *show_button;
+
+ setup_visible_cols_liststore (HIDE);
+ setup_visible_cols_liststore (SHOW);
+
+ hide_button = gtkpod_xml_get_widget (prefs_window_xml,
+ "track_cols_hide_button");
+ show_button = gtkpod_xml_get_widget (prefs_window_xml,
+ "track_cols_show_button");
+
+ /* connect signals */
+ g_signal_connect (hide_button, "clicked",
+ G_CALLBACK (visible_cols_move), GINT_TO_POINTER(HIDE));
+ g_signal_connect (show_button, "clicked",
+ G_CALLBACK (visible_cols_move), GINT_TO_POINTER(SHOW));
+
+
+ g_signal_connect (visible_cols_get_treeview (HIDE), "button-press-event",
+ G_CALLBACK (visible_cols_double_clicked),
+ GINT_TO_POINTER (SHOW));
+ g_signal_connect (visible_cols_get_treeview (SHOW), "button-press-event",
+ G_CALLBACK (visible_cols_double_clicked),
+ GINT_TO_POINTER (HIDE));
+
+}
+
+
/**
* create_gtk_prefs_window
* Create, Initialize, and Show the preferences window
@@ -611,6 +757,11 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_track_database_deletion");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_int("delete_database"));
+
+ w = gtkpod_xml_get_widget (prefs_window_xml, "photo_library_confirm_delete_toggle");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
+ prefs_get_int("photo_library_confirm_delete"));
+
#if 0
/* last.fm -- disabled, we'll hide the prefs window */
@@ -741,7 +892,7 @@
}
gtk_widget_set_sensitive (w, prefs_get_int("coverart_file"));
- setup_visible_cols_buttons (tt);
+ setup_visible_cols (tt);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_extended");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -1261,6 +1412,13 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), active);
}
+void
+on_photo_library_confirm_delete_toggled (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ temp_prefs_set_int(temp_prefs, "photo_library_confirm_delete",
+ gtk_toggle_button_get_active(togglebutton));
+}
void
on_charset_combo_entry_changed (GtkEditable *editable,
@@ -1368,12 +1526,6 @@
gtk_editable_get_chars (editable,0, -1));
}
-void prefs_window_set_col_visible (gint column, gboolean visible)
-{
- if (column < TM_NUM_COLUMNS)
- temp_prefs_set_int_index(temp_prefs, "col_visible", column, visible);
-}
-
void
on_cfg_show_duplicates_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
Property changes on: gtkpod/branches/etch-bpo/src/prefs_window.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/prefs_window.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Copied: gtkpod/branches/etch-bpo/src/stock_icons.c (from rev 305, gtkpod/tags/0.99.12-1/src/stock_icons.c)
===================================================================
--- gtkpod/branches/etch-bpo/src/stock_icons.c (rev 0)
+++ gtkpod/branches/etch-bpo/src/stock_icons.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,144 @@
+/*
+ |Copyright (C) 2007 P.G. Richardson <phantom_sf at users.sourceforge.net>
+ |Part of the gtkpod project.
+ |
+ |URL: http://www.gtkpod.org/
+ |URL: http://gtkpod.sourceforge.net/
+ |
+ |This program is free software; you can redistribute it and/or modify
+ |it under the terms of the GNU General Public License as published by
+ |the Free Software Foundation; either version 2 of the License, or
+ |(at your option) any later version.
+ |
+ |This program is distributed in the hope that it will be useful,
+ |but WITHOUT ANY WARRANTY; without even the implied warranty of
+ |MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ |GNU General Public License for more details.
+ |
+ |You should have received a copy of the GNU General Public License
+ |along with this program; if not, write to the Free Software
+ |Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ |
+ |iTunes and iPod are trademarks of Apple
+ |
+ |This product is not supported/written/published by Apple!
+ |
+ */
+
+#include "stock_icons.h"
+
+static void register_stock_icon (gchar *path, const gchar *stockid);
+
+/**
+ * stockid_init
+ *
+ * Initialises paths used for gtkpod specific icons.
+ * This needs to be loaded early as it uses the path
+ * of the binary to determine where to load the file from, in the
+ * same way as main() determines where to load the glade file
+ * from.
+ *
+ * @progpath: path of the gtkpod binary being loaded.
+ *
+ */
+void stockid_init (gchar *progpath)
+{
+ gchar *progname;
+
+ progname = g_find_program_in_path (progpath);
+
+ if (progname)
+ {
+ static const gchar *SEPsrcSEPgtkpod = G_DIR_SEPARATOR_S "src" G_DIR_SEPARATOR_S "gtkpod";
+
+ if (!g_path_is_absolute (progname))
+ {
+ gchar *cur_dir = g_get_current_dir ();
+ gchar *prog_absolute;
+
+ if (g_str_has_prefix (progname, "." G_DIR_SEPARATOR_S))
+ prog_absolute = g_build_filename (cur_dir, progname+2, NULL);
+ else
+ prog_absolute = g_build_filename (cur_dir, progname, NULL);
+
+ g_free (progname);
+ g_free (cur_dir);
+ progname = prog_absolute;
+ }
+
+ if (g_str_has_suffix (progname, SEPsrcSEPgtkpod))
+ {
+ gchar *suffix = g_strrstr (progname, SEPsrcSEPgtkpod);
+
+ if (suffix)
+ {
+ *suffix = 0;
+ GPHOTO_PLAYLIST_ICON_PATH = g_build_filename (progname, "data", "gphoto_playlist_icon-48.png", NULL);
+ TUNE_PLAYLIST_ICON_PATH = g_build_filename (progname, "data", "tunes_playlist_icon-48.png", NULL);
+ }
+ }
+
+ g_free (progname);
+
+ /* Photo playlist icon */
+ if (GPHOTO_PLAYLIST_ICON_PATH && !g_file_test (GPHOTO_PLAYLIST_ICON_PATH, G_FILE_TEST_EXISTS))
+ {
+ g_free (GPHOTO_PLAYLIST_ICON_PATH);
+ GPHOTO_PLAYLIST_ICON_PATH = NULL;
+ }
+
+ if (!GPHOTO_PLAYLIST_ICON_PATH)
+ {
+ GPHOTO_PLAYLIST_ICON_PATH = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "gphoto_playlist_icon-48.png", NULL);
+ }
+
+ /* Normal Playlist icon */
+ if (TUNE_PLAYLIST_ICON_PATH && !g_file_test (TUNE_PLAYLIST_ICON_PATH, G_FILE_TEST_EXISTS))
+ {
+ g_free (TUNE_PLAYLIST_ICON_PATH);
+ TUNE_PLAYLIST_ICON_PATH = NULL;
+ }
+
+ if (!TUNE_PLAYLIST_ICON_PATH)
+ {
+ TUNE_PLAYLIST_ICON_PATH = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "tunes_playlist_icon-48.png", NULL);
+ }
+
+ register_stock_icon (GPHOTO_PLAYLIST_ICON_PATH, GPHOTO_PLAYLIST_ICON_STOCK_ID);
+ register_stock_icon (TUNE_PLAYLIST_ICON_PATH, TUNES_PLAYLIST_ICON_STOCK_ID);
+ }
+}
+
+/**
+ * register_stock_icons
+ *
+ * Add pixbuf images to the default icon factory for use
+ * as stock items should they be required.
+ *
+ */
+static void register_stock_icon (gchar *path, const gchar *stockid)
+{
+ GError *error = NULL;
+ GdkPixbuf *image;
+
+ g_return_if_fail (path);
+
+ image = gdk_pixbuf_new_from_file (path, &error);
+
+ if(error != NULL)
+ {
+ printf("Error occurred loading photo icon - \nCode: %d\nMessage: %s\n", error->code, error->message);
+ g_error_free (error);
+ g_return_if_fail (image);
+ }
+
+ GtkIconSet *pl_iconset = gtk_icon_set_new_from_pixbuf (image);
+ GtkIconFactory *factory = gtk_icon_factory_new ();
+ gtk_icon_factory_add (
+ factory,
+ stockid,
+ pl_iconset);
+ gtk_icon_factory_add_default (factory);
+
+ gdk_pixbuf_unref (image);
+}
Copied: gtkpod/branches/etch-bpo/src/stock_icons.h (from rev 305, gtkpod/tags/0.99.12-1/src/stock_icons.h)
===================================================================
--- gtkpod/branches/etch-bpo/src/stock_icons.h (rev 0)
+++ gtkpod/branches/etch-bpo/src/stock_icons.h 2008-04-17 18:50:56 UTC (rev 306)
@@ -0,0 +1,47 @@
+/*
+| Copyright (C) 2007 P.G. Richardson <phantom_sf at users.sourceforge.net>
+| Part of the gtkpod project.
+|
+| URL: http://www.gtkpod.org/
+| URL: http://gtkpod.sourceforge.net/
+|
+| This program is free software; you can redistribute it and/or modify
+| it under the terms of the GNU General Public License as published by
+| the Free Software Foundation; either version 2 of the License, or
+| (at your option) any later version.
+|
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; if not, write to the Free Software
+| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+|
+| iTunes and iPod are trademarks of Apple
+|
+| This product is not supported/written/published by Apple!
+|
+*/
+
+#ifndef STOCK_ICONS_H_
+#define STOCK_ICONS_H_
+
+#ifdef HAVE_CONFIG_H
+ #include <config.h>
+#endif
+
+#include <gtk/gtk.h>
+
+/* Stock IDs */
+#define GPHOTO_PLAYLIST_ICON_STOCK_ID "gtkpod-gphoto-playlist-icon"
+#define TUNES_PLAYLIST_ICON_STOCK_ID "gtkpod-tunes-playlist-icon"
+
+/* Icon File Paths */
+gchar *GPHOTO_PLAYLIST_ICON_PATH;
+gchar *TUNE_PLAYLIST_ICON_PATH;
+
+void stockid_init (gchar *progpath);
+
+#endif /*STOCK_ICONS_H_*/
Modified: gtkpod/branches/etch-bpo/src/tools.c
===================================================================
--- gtkpod/branches/etch-bpo/src/tools.c 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/src/tools.c 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,6 +1,5 @@
-/* Time-stamp: <2007-05-09 22:23:27 jcs>
-|
-| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
+/*
+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
|
| URL: http://www.gtkpod.org/
@@ -24,7 +23,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: tools.c 1596 2007-06-26 14:33:01Z dforsi $
+| $Id: tools.c 1684 2007-08-18 06:38:49Z jcsjcs $
*/
#ifdef HAVE_CONFIG_H
@@ -669,6 +668,7 @@
case 0: /*child*/
close(fdpipe[READ]);
dup2(fdpipe[WRITE],fileno(stdout));
+ dup2(fdpipe[WRITE],fileno(stderr));
close(fdpipe[WRITE]);
execv(script_path, argv);
break;
Property changes on: gtkpod/branches/etch-bpo/src/tools.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/tools.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/wavfile.c
___________________________________________________________________
Name: svn:mime-type
- text/x-csrc
Name: svn:eol-style
- native
Property changes on: gtkpod/branches/etch-bpo/src/wavfile.h
___________________________________________________________________
Name: svn:mime-type
- text/x-chdr
Name: svn:eol-style
- native
Modified: gtkpod/branches/etch-bpo/ylwrap
===================================================================
--- gtkpod/branches/etch-bpo/ylwrap 2008-04-17 18:26:25 UTC (rev 305)
+++ gtkpod/branches/etch-bpo/ylwrap 2008-04-17 18:50:56 UTC (rev 306)
@@ -1,9 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003 Free Software
-# Foundation, Inc.
-#
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -18,30 +20,60 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Usage:
-# ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-# * INPUT is the input file
-# * OUTPUT is file PROG generates
-# * DESIRED is file we actually want
-# * PROGRAM is program to run
-# * ARGS are passed to PROG
-# Any number of OUTPUT,DESIRED pairs may be used.
+# This file is maintained in Automake, please report
+# bugs to <bug-automake at gnu.org> or send patches to
+# <automake-patches at gnu.org>.
+case "$1" in
+ '')
+ echo "$0: No files given. Try \`$0 --help' for more information." 1>&2
+ exit 1
+ ;;
+ --basedir)
+ basedir=$2
+ shift 2
+ ;;
+ -h|--h*)
+ cat <<\EOF
+Usage: ylwrap [--help|--version] INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
+
+Wrapper for lex/yacc invocations, renaming files as desired.
+
+ INPUT is the input file
+ OUTPUT is one file PROG generates
+ DESIRED is the file we actually want instead of OUTPUT
+ PROGRAM is program to run
+ ARGS are passed to PROG
+
+Any number of OUTPUT,DESIRED pairs may be used.
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v|--v*)
+ echo "ylwrap $scriptversion"
+ exit $?
+ ;;
+esac
+
+
# The input.
input="$1"
shift
case "$input" in
- [\\/]* | ?:[\\/]*)
+ [\\/]* | ?:[\\/]*)
# Absolute path; do nothing.
;;
- *)
+ *)
# Relative path. Make it absolute.
input="`pwd`/$input"
;;
@@ -49,12 +81,12 @@
pairlist=
while test "$#" -ne 0; do
- if test "$1" = "--"; then
- shift
- break
- fi
- pairlist="$pairlist $1"
- shift
+ if test "$1" = "--"; then
+ shift
+ break
+ fi
+ pairlist="$pairlist $1"
+ shift
done
# The program to run.
@@ -62,8 +94,8 @@
shift
# Make any relative path in $prog absolute.
case "$prog" in
- [\\/]* | ?:[\\/]*) ;;
- *[\\/]*) prog="`pwd`/$prog" ;;
+ [\\/]* | ?:[\\/]*) ;;
+ *[\\/]*) prog="`pwd`/$prog" ;;
esac
# FIXME: add hostname here for parallel makes that run commands on
@@ -75,86 +107,117 @@
cd $dirname
case $# in
- 0) $prog "$input" ;;
- *) $prog "$@" "$input" ;;
+ 0) $prog "$input" ;;
+ *) $prog "$@" "$input" ;;
esac
-status=$?
+ret=$?
-if test $status -eq 0; then
- set X $pairlist
- shift
- first=yes
- # Since DOS filename conventions don't allow two dots,
- # the DOS version of Bison writes out y_tab.c instead of y.tab.c
- # and y_tab.h instead of y.tab.h. Test to see if this is the case.
- y_tab_nodot="no"
- if test -f y_tab.c || test -f y_tab.h; then
- y_tab_nodot="yes"
- fi
+if test $ret -eq 0; then
+ set X $pairlist
+ shift
+ first=yes
+ # Since DOS filename conventions don't allow two dots,
+ # the DOS version of Bison writes out y_tab.c instead of y.tab.c
+ # and y_tab.h instead of y.tab.h. Test to see if this is the case.
+ y_tab_nodot="no"
+ if test -f y_tab.c || test -f y_tab.h; then
+ y_tab_nodot="yes"
+ fi
- # The directory holding the input.
- input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
- # Quote $INPUT_DIR so we can use it in a regexp.
- # FIXME: really we should care about more than `.' and `\'.
- input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
+ # The directory holding the input.
+ input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
+ # Quote $INPUT_DIR so we can use it in a regexp.
+ # FIXME: really we should care about more than `.' and `\'.
+ input_rx=`echo "$input_dir" | sed 's,\\\\,\\\\\\\\,g;s,\\.,\\\\.,g'`
- while test "$#" -ne 0; do
- from="$1"
- # Handle y_tab.c and y_tab.h output by DOS
- if test $y_tab_nodot = "yes"; then
- if test $from = "y.tab.c"; then
- from="y_tab.c"
- else
- if test $from = "y.tab.h"; then
- from="y_tab.h"
- fi
- fi
+ while test "$#" -ne 0; do
+ from="$1"
+ # Handle y_tab.c and y_tab.h output by DOS
+ if test $y_tab_nodot = "yes"; then
+ if test $from = "y.tab.c"; then
+ from="y_tab.c"
+ else
+ if test $from = "y.tab.h"; then
+ from="y_tab.h"
+ fi
fi
- if test -f "$from"; then
- # If $2 is an absolute path name, then just use that,
- # otherwise prepend `../'.
- case "$2" in
- [\\/]* | ?:[\\/]*) target="$2";;
- *) target="../$2";;
- esac
+ fi
+ if test -f "$from"; then
+ # If $2 is an absolute path name, then just use that,
+ # otherwise prepend `../'.
+ case "$2" in
+ [\\/]* | ?:[\\/]*) target="$2";;
+ *) target="../$2";;
+ esac
- # Edit out `#line' or `#' directives.
- #
- # We don't want the resulting debug information to point at
- # an absolute srcdir; it is better for it to just mention the
- # .y file with no path.
- #
- # We want to use the real output file name, not yy.lex.c for
- # instance.
- #
- # We want the include guards to be adjusted too.
- FROM=`echo "$from" | sed \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
- -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
- TARGET=`echo "$2" | sed \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
- -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
- sed "/^#/{s,$input_rx,,;s,$from,$2,;s,$FROM,$TO,;}" "$from" >"$target" ||
- status=$?
- else
- # A missing file is only an error for the first file. This
- # is a blatant hack to let us support using "yacc -d". If -d
- # is not specified, we don't want an error when the header
- # file is "missing".
- if test $first = yes; then
- status=1
- fi
+ # We do not want to overwrite a header file if it hasn't
+ # changed. This avoid useless recompilations. However the
+ # parser itself (the first file) should always be updated,
+ # because it is the destination of the .y.c rule in the
+ # Makefile. Divert the output of all other files to a temporary
+ # file so we can compare them to existing versions.
+ if test $first = no; then
+ realtarget="$target"
+ target="tmp-`echo $target | sed s/.*[\\/]//g`"
fi
- shift
- shift
- first=no
- done
+ # Edit out `#line' or `#' directives.
+ #
+ # We don't want the resulting debug information to point at
+ # an absolute srcdir; it is better for it to just mention the
+ # .y file with no path.
+ #
+ # We want to use the real output file name, not yy.lex.c for
+ # instance.
+ #
+ # We want the include guards to be adjusted too.
+ FROM=`echo "$from" | sed \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+ TARGET=`echo "$2" | sed \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\
+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
+ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+ # Check whether header files must be updated.
+ if test $first = no; then
+ if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+ echo "$2" is unchanged
+ rm -f "$target"
+ else
+ echo updating "$2"
+ mv -f "$target" "$realtarget"
+ fi
+ fi
+ else
+ # A missing file is only an error for the first file. This
+ # is a blatant hack to let us support using "yacc -d". If -d
+ # is not specified, we don't want an error when the header
+ # file is "missing".
+ if test $first = yes; then
+ ret=1
+ fi
+ fi
+ shift
+ shift
+ first=no
+ done
else
- status=$?
+ ret=$?
fi
# Remove the directory.
cd ..
rm -rf $dirname
-exit $status
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
Property changes on: gtkpod/branches/etch-bpo/ylwrap
___________________________________________________________________
Name: svn:eol-style
- native
More information about the Pkg-gtkpod-devel
mailing list