[Pkg-gtkpod-devel] r361 - in gtkpod/branches/upstream/current: . data data/icons data/icons/16x16 data/icons/22x22 data/icons/24x24 data/icons/32x32 data/icons/48x48 data/icons/64x64 data/icons/hicolor data/icons/hicolor/16x16 data/icons/hicolor/16x16/places data/icons/hicolor/16x16/status data/icons/hicolor/22x22 data/icons/hicolor/22x22/places data/icons/hicolor/24x24 data/icons/hicolor/24x24/places data/icons/hicolor/32x32 data/icons/hicolor/32x32/places data/icons/hicolor/48x48 data/icons/hicolor/48x48/places data/icons/hicolor/scalable data/icons/hicolor/scalable/places data/icons/scalable data/man doc doc/figures po scripts src

djpig at alioth.debian.org djpig at alioth.debian.org
Sat Jan 24 20:05:47 UTC 2009


Author: djpig
Date: 2009-01-24 20:05:38 +0000 (Sat, 24 Jan 2009)
New Revision: 361

Added:
   gtkpod/branches/upstream/current/data/icons/16x16/
   gtkpod/branches/upstream/current/data/icons/16x16/Makefile.am
   gtkpod/branches/upstream/current/data/icons/16x16/Makefile.in
   gtkpod/branches/upstream/current/data/icons/16x16/gtkpod.png
   gtkpod/branches/upstream/current/data/icons/22x22/
   gtkpod/branches/upstream/current/data/icons/22x22/Makefile.am
   gtkpod/branches/upstream/current/data/icons/22x22/Makefile.in
   gtkpod/branches/upstream/current/data/icons/22x22/gtkpod.png
   gtkpod/branches/upstream/current/data/icons/24x24/
   gtkpod/branches/upstream/current/data/icons/24x24/Makefile.am
   gtkpod/branches/upstream/current/data/icons/24x24/Makefile.in
   gtkpod/branches/upstream/current/data/icons/24x24/gtkpod.png
   gtkpod/branches/upstream/current/data/icons/hicolor/
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/playlist-photo.png
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/playlist.png
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-none.png
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-set.png
   gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-unset.png
   gtkpod/branches/upstream/current/data/icons/hicolor/22x22/
   gtkpod/branches/upstream/current/data/icons/hicolor/22x22/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/22x22/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/
   gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/playlist-photo.png
   gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/playlist.png
   gtkpod/branches/upstream/current/data/icons/hicolor/24x24/
   gtkpod/branches/upstream/current/data/icons/hicolor/24x24/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/24x24/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/
   gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/playlist-photo.png
   gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/playlist.png
   gtkpod/branches/upstream/current/data/icons/hicolor/32x32/
   gtkpod/branches/upstream/current/data/icons/hicolor/32x32/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/32x32/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/
   gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/playlist-photo.png
   gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/playlist.png
   gtkpod/branches/upstream/current/data/icons/hicolor/48x48/
   gtkpod/branches/upstream/current/data/icons/hicolor/48x48/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/48x48/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/
   gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/playlist-photo.png
   gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/playlist.png
   gtkpod/branches/upstream/current/data/icons/hicolor/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/scalable/
   gtkpod/branches/upstream/current/data/icons/hicolor/scalable/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/scalable/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/
   gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/Makefile.am
   gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/Makefile.in
   gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/playlist-photo.svg
   gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/playlist.svg
   gtkpod/branches/upstream/current/data/icons/scalable/
   gtkpod/branches/upstream/current/data/icons/scalable/Makefile.am
   gtkpod/branches/upstream/current/data/icons/scalable/Makefile.in
   gtkpod/branches/upstream/current/data/icons/scalable/gtkpod.svg
   gtkpod/branches/upstream/current/data/man/
   gtkpod/branches/upstream/current/data/man/Makefile.am
   gtkpod/branches/upstream/current/data/man/Makefile.in
   gtkpod/branches/upstream/current/data/man/gtkpod.1
   gtkpod/branches/upstream/current/data/man/gtkpod.1.in
   gtkpod/branches/upstream/current/data/photo-toolbar-album.png
   gtkpod/branches/upstream/current/data/photo-toolbar-photos.png
   gtkpod/branches/upstream/current/doc/
   gtkpod/branches/upstream/current/doc/Makefile.am
   gtkpod/branches/upstream/current/doc/Makefile.in
   gtkpod/branches/upstream/current/doc/adding-cover-art-from-a-browser.html
   gtkpod/branches/upstream/current/doc/adding-files-and-folders.html
   gtkpod/branches/upstream/current/doc/advanced-features.html
   gtkpod/branches/upstream/current/doc/copying-content-to-the-ipod.html
   gtkpod/branches/upstream/current/doc/cover-art.html
   gtkpod/branches/upstream/current/doc/exporting-files-from-the-ipod.html
   gtkpod/branches/upstream/current/doc/figures/
   gtkpod/branches/upstream/current/doc/figures/Makefile.am
   gtkpod/branches/upstream/current/doc/figures/Makefile.in
   gtkpod/branches/upstream/current/doc/figures/add-folders.png
   gtkpod/branches/upstream/current/doc/figures/cover-fullsize.png
   gtkpod/branches/upstream/current/doc/figures/cover-popupmenu.png
   gtkpod/branches/upstream/current/doc/figures/cover-setfromfile.png
   gtkpod/branches/upstream/current/doc/figures/coverart.png
   gtkpod/branches/upstream/current/doc/figures/edit-track-details.png
   gtkpod/branches/upstream/current/doc/figures/gtkpod.png
   gtkpod/branches/upstream/current/doc/getting-started.html
   gtkpod/branches/upstream/current/doc/gtkpod-info.html
   gtkpod/branches/upstream/current/doc/gtkpod.html
   gtkpod/branches/upstream/current/doc/gtkpod.xml
   gtkpod/branches/upstream/current/doc/hooking-up-the-ipod.html
   gtkpod/branches/upstream/current/doc/ipod-and-content.html
   gtkpod/branches/upstream/current/doc/ipod-file-recovery.html
   gtkpod/branches/upstream/current/doc/layout-of-gtkpod.html
   gtkpod/branches/upstream/current/doc/managing-playlists.html
   gtkpod/branches/upstream/current/doc/playcounts-and-ratings.html
   gtkpod/branches/upstream/current/doc/playlists-podcasts-and-photos.html
   gtkpod/branches/upstream/current/doc/setting-ipod-properties.html
   gtkpod/branches/upstream/current/doc/the-sysinfo-file.html
   gtkpod/branches/upstream/current/doc/troubleshooting-faq.html
   gtkpod/branches/upstream/current/doc/view-and-edit-track-details.html
   gtkpod/branches/upstream/current/po/zh_CN.po
   gtkpod/branches/upstream/current/src/help.c
   gtkpod/branches/upstream/current/src/help.h
   gtkpod/branches/upstream/current/src/infodlg.c
   gtkpod/branches/upstream/current/src/infodlg.h
   gtkpod/branches/upstream/current/src/prefsdlg.c
   gtkpod/branches/upstream/current/src/rb_cell_renderer_rating.c
   gtkpod/branches/upstream/current/src/rb_cell_renderer_rating.h
   gtkpod/branches/upstream/current/src/rb_rating_helper.c
   gtkpod/branches/upstream/current/src/rb_rating_helper.h
   gtkpod/branches/upstream/current/src/sort_window.c
   gtkpod/branches/upstream/current/src/sort_window.h
Removed:
   gtkpod/branches/upstream/current/data/cdshine.png
   gtkpod/branches/upstream/current/data/cdshine_main.png
   gtkpod/branches/upstream/current/data/gphoto_album_menuitem-32.png
   gtkpod/branches/upstream/current/data/gphoto_album_menuitem-48.png
   gtkpod/branches/upstream/current/data/gphoto_images_menuitem-32.png
   gtkpod/branches/upstream/current/data/gphoto_images_menuitem-48.png
   gtkpod/branches/upstream/current/data/gphoto_playlist_icon-48.png
   gtkpod/branches/upstream/current/data/gphoto_tools_menuitem-32.png
   gtkpod/branches/upstream/current/data/gphoto_tools_menuitem-48.png
   gtkpod/branches/upstream/current/data/gtkpod-new-playlist.png
   gtkpod/branches/upstream/current/data/gtkpod-sync.png
   gtkpod/branches/upstream/current/data/tunes_playlist_icon-48.png
   gtkpod/branches/upstream/current/src/prefs_window.c
   gtkpod/branches/upstream/current/src/prefs_window.h
Modified:
   gtkpod/branches/upstream/current/AUTHORS
   gtkpod/branches/upstream/current/ChangeLog
   gtkpod/branches/upstream/current/INSTALL
   gtkpod/branches/upstream/current/Makefile.am
   gtkpod/branches/upstream/current/Makefile.in
   gtkpod/branches/upstream/current/NEWS
   gtkpod/branches/upstream/current/aclocal.m4
   gtkpod/branches/upstream/current/config.guess
   gtkpod/branches/upstream/current/config.h.in
   gtkpod/branches/upstream/current/config.sub
   gtkpod/branches/upstream/current/configure
   gtkpod/branches/upstream/current/configure.in
   gtkpod/branches/upstream/current/data/Makefile.am
   gtkpod/branches/upstream/current/data/Makefile.in
   gtkpod/branches/upstream/current/data/default-cover.png
   gtkpod/branches/upstream/current/data/gtkpod-icon-32-2.png
   gtkpod/branches/upstream/current/data/gtkpod-icon-32.png
   gtkpod/branches/upstream/current/data/gtkpod-icon-48.png
   gtkpod/branches/upstream/current/data/gtkpod-logo.png
   gtkpod/branches/upstream/current/data/gtkpod.desktop.in
   gtkpod/branches/upstream/current/data/gtkpod.glade
   gtkpod/branches/upstream/current/data/icons/32x32/Makefile.in
   gtkpod/branches/upstream/current/data/icons/32x32/gtkpod.png
   gtkpod/branches/upstream/current/data/icons/48x48/Makefile.in
   gtkpod/branches/upstream/current/data/icons/48x48/gtkpod.png
   gtkpod/branches/upstream/current/data/icons/64x64/Makefile.in
   gtkpod/branches/upstream/current/data/icons/64x64/gtkpod.png
   gtkpod/branches/upstream/current/data/icons/Makefile.am
   gtkpod/branches/upstream/current/data/icons/Makefile.in
   gtkpod/branches/upstream/current/depcomp
   gtkpod/branches/upstream/current/install-sh
   gtkpod/branches/upstream/current/intltool-extract.in
   gtkpod/branches/upstream/current/intltool-merge.in
   gtkpod/branches/upstream/current/intltool-update.in
   gtkpod/branches/upstream/current/po/Makefile.in.in
   gtkpod/branches/upstream/current/po/POTFILES.in
   gtkpod/branches/upstream/current/po/de.po
   gtkpod/branches/upstream/current/po/es.po
   gtkpod/branches/upstream/current/po/fr.po
   gtkpod/branches/upstream/current/po/he.po
   gtkpod/branches/upstream/current/po/it.po
   gtkpod/branches/upstream/current/po/ja.po
   gtkpod/branches/upstream/current/po/ro.po
   gtkpod/branches/upstream/current/po/ru.po
   gtkpod/branches/upstream/current/po/sv.po
   gtkpod/branches/upstream/current/scripts/Makefile.in
   gtkpod/branches/upstream/current/scripts/sync-evolution.sh
   gtkpod/branches/upstream/current/scripts/sync-ldif.sh
   gtkpod/branches/upstream/current/scripts/sync-thunderbird-nano.sh
   gtkpod/branches/upstream/current/scripts/sync-tomboy.sh
   gtkpod/branches/upstream/current/src/Makefile.am
   gtkpod/branches/upstream/current/src/Makefile.in
   gtkpod/branches/upstream/current/src/charset.c
   gtkpod/branches/upstream/current/src/charset.h
   gtkpod/branches/upstream/current/src/clientserver.c
   gtkpod/branches/upstream/current/src/confirmation.c
   gtkpod/branches/upstream/current/src/confirmation.h
   gtkpod/branches/upstream/current/src/context_menus.c
   gtkpod/branches/upstream/current/src/date_parser.c
   gtkpod/branches/upstream/current/src/date_parser2.c
   gtkpod/branches/upstream/current/src/details.c
   gtkpod/branches/upstream/current/src/details.h
   gtkpod/branches/upstream/current/src/display.c
   gtkpod/branches/upstream/current/src/display.h
   gtkpod/branches/upstream/current/src/display_coverart.c
   gtkpod/branches/upstream/current/src/display_coverart.h
   gtkpod/branches/upstream/current/src/display_itdb.c
   gtkpod/branches/upstream/current/src/display_itdb.h
   gtkpod/branches/upstream/current/src/display_photo.c
   gtkpod/branches/upstream/current/src/display_photo.h
   gtkpod/branches/upstream/current/src/display_playlists.c
   gtkpod/branches/upstream/current/src/display_sorttabs.c
   gtkpod/branches/upstream/current/src/display_spl.c
   gtkpod/branches/upstream/current/src/display_tracks.c
   gtkpod/branches/upstream/current/src/fetchcover.c
   gtkpod/branches/upstream/current/src/fetchcover.h
   gtkpod/branches/upstream/current/src/file.c
   gtkpod/branches/upstream/current/src/file.h
   gtkpod/branches/upstream/current/src/file_convert.c
   gtkpod/branches/upstream/current/src/file_export.c
   gtkpod/branches/upstream/current/src/file_itunesdb.c
   gtkpod/branches/upstream/current/src/fileselection.c
   gtkpod/branches/upstream/current/src/fileselection.h
   gtkpod/branches/upstream/current/src/flacfile.c
   gtkpod/branches/upstream/current/src/info.c
   gtkpod/branches/upstream/current/src/info.h
   gtkpod/branches/upstream/current/src/ipod_init.c
   gtkpod/branches/upstream/current/src/misc.c
   gtkpod/branches/upstream/current/src/misc.h
   gtkpod/branches/upstream/current/src/misc_confirm.c
   gtkpod/branches/upstream/current/src/misc_conversion.c
   gtkpod/branches/upstream/current/src/misc_input.c
   gtkpod/branches/upstream/current/src/misc_playlist.c
   gtkpod/branches/upstream/current/src/misc_track.c
   gtkpod/branches/upstream/current/src/mp3file.c
   gtkpod/branches/upstream/current/src/mp3file.h
   gtkpod/branches/upstream/current/src/mp4file.c
   gtkpod/branches/upstream/current/src/prefs.c
   gtkpod/branches/upstream/current/src/prefs.h
   gtkpod/branches/upstream/current/src/repository.c
   gtkpod/branches/upstream/current/src/stock_icons.c
   gtkpod/branches/upstream/current/src/stock_icons.h
   gtkpod/branches/upstream/current/src/syncdir.c
   gtkpod/branches/upstream/current/src/tools.c
   gtkpod/branches/upstream/current/ylwrap
Log:
[svn-upgrade] Integrating new upstream version, gtkpod (0.99.14)

Modified: gtkpod/branches/upstream/current/AUTHORS
===================================================================
--- gtkpod/branches/upstream/current/AUTHORS	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/AUTHORS	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,3 +1,16 @@
 Jorg Schuler <jcsjcs at users.sourceforge.net>
 Corey Donohoe <atmos at atmos.org>
 Adrian Ulrich <pab at blinkenlights.ch>
+
+The gtkpod icon is based on the gnome-icon-theme-extras project and licensed
+under the GPL v2. Originally created by Ryan Collier, modified by
+Rodney Dawes  <dobey.pwns at gmail.com>. ("multimedia-player-apple-ipod-video-white")
+
+This project uses icons from the Rhythmbox (http://rhythmbox.org) project,
+licensed under the GPL v2 or later:
+* data/tunes_playlist_icon-48.png
+
+This project uses icons from the F-Spot (http://f-spot.org) project,
+licensed under the GPL v2 or later:
+* data/photo-toolbar-album.png
+* data/photo-toolbar-photos.png

Modified: gtkpod/branches/upstream/current/ChangeLog
===================================================================
--- gtkpod/branches/upstream/current/ChangeLog	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/ChangeLog	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,1000 +1,5683 @@
-gtkpod V0.99.12
+2009-01-18  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-       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.
+	* configure.in: Bump version for 0.99.14 release
+
+	* NEWS: Update for 0.99.14 release
+
+	* src/file_itunesdb.c: Quiet iTunesDB.ext warning
+
+2008-01-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_convert.c (conversion_log_set_status): don't change tab
+	  label text in conversion log window unless actually
+	  necessary. Fixes the "disappearing tooltips" problem (tracker
+	  #1906016).
+
+2008-01-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/rb_rating_helper.c: display a warning if one of the star
+	  icons cannot be loaded.
+
+2008-01-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_tracks.c: let gtkpod remember column sizes again.
+
+	* src/prefs.c: enable horizontal scrollbar in the track view by
+	  default.
+
+2009-01-14  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* po/zh_CN.po: Update simple Chinese translation (Tan Zhixin)
+
+2008-01-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/ro.po: updated Romanian translation. Thanks to Alex
+          Eftimie.
+
+2008-01-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_export.c: add export template for mp4 files.
+
+	  src/prefs.c: remove references to export_template which
+	  wasn't used. Thanks to Todd to point out both.
+
+	* src/confirmation.c
+	  src/misc_confirm.c: cleanup indentation
+
+2008-01-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* data/gtkpod.glade: add property "translatble=yes" to the check
+	  button "generate_video_thumbnails". Thanks to Eric.
+	  
+2008-01-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* configure.in
+	  src/mp4file.c: Adding support for MP4V2 2.0_20081129 without
+	  losing support for older versions of MP4V2 from the mpeg4ip
+	  line. Thanks to William Hardeman.
+
+2008-01-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c: correct programming error when determining offset
+	  of the LAME tag. Thanks to <Anonymous> for submitting tracker
+	  #2490479.
+
+2009-01-04  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* configure.in,	data/man/gtkpod.1 -> data/man/gtkpod.1.in:
+	Update man page and generate it to set the version properly.
+
+	* po/zh_CN.po: Add simple Chinese translation (Tan Zhixin)
+
+2008-12-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file.c
+	  src/help.c
+	  data/gtkpod.glade: string corrections -- thanks to Daniele Forsi.
+
+2008-12-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/es.po: Spanish translation updated -- thanks to Alejandro
+	  Lamas Daviña
+
+2008-12-17  Daniele Forsi <dforsi at users.sourceforge.net>
+
+        * po/it.po: Italian translation updated
+
+2008-12-16  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* src/misc_confirm.c: Fix typo in ok_to_close_gtkpod dialog
+
+2008-12-15  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* data/man/gtkpod.1
+	  src/prefs.c: Remove -a/--auto from usage output and manpage
+	  These options were removed long ago in svn rev 1070.  Thanks
+	  to Frank Lichtenheld (in Debian bug #466127).
+
+2008-12-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/he.po: Hebrew translation updated -- thanks to Assaf Gillat
+
+2008-12-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/sv.po: Swedish translation updated -- thanks to Stefan
+	  Asserhäll
+
+2008-12-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/*: updated po files.
+
+2008-12-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* data/gtkpod.glade
+	  src/display.c: Add an item to the View menu to show/hide the
+	  filter bar (AKA: search bar)
+
+	* src/display_tracks:
+	  Fix a number of bugs relating to the filter bar. Thanks to
+	  Andrea for the pointer.
+
+	  Remove filter text when switching from one playlist to another:
+	  leaving the filter in place immensely increases the time for display.
+
+2008-11-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_tracks.c
+	  src/misc_track.c: use a toggle box to show the state of the
+	  lyrics flag instead of 0/1.
+
+	* src/display_tracks.c
+	  src/misc_track.c
+	  src/file.c
+	  src/file.h
+	  src/details.c
+	  src/details.h: clicking on the lyrics toggle box brings up the
+	  edit lyrics dialog.
+
+	  !!! There are two possible sources for segfaults in
+	  details.c/details_button_apply_clicked:
+
+	  - track_copy_artwork() writes the lyrics tag to the file and
+	    checks for duplicates. This might destroy the list we are just
+	    iterating over.
+
+	  - write_tags_to_file() writes tags to the file and checks for
+	    duplicates. This might destroy the list we are just iterating
+	    over.
+
+	  I don't have a simple solution right now.
+
+2008-11-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+        * src/display.h
+	  src/file_itunesdb.c
+	  src/misc_conversion.c
+	  src/display_itdb.c
+	  src/display_tracks.c
+	  src/display_itdb.h
+	  src/misc_track.c
+	  src/mp3file.c
+	  src/mp3file.h
+	  src/file.c
+	  src/file.h
+	  src/details.c
+	  data/gtkpod.glade:
+
+	  Implemented Dudy Kohen's patch to read/write/edit lyrics data
+	  of MP3 files. Added a separate lyrics tab in the "Edit Details"
+	  window.
+
+	  MP4 lyrics not yet supported -- patches welcome.
+
+2008-11-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* data/gtkpod.glade: write-out with glade V3.4.5
+
+2008-10-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_export.c
+	  data/gtkpod.glade: fix bug that prevented "export to file
+	  system" mode from working. (glade-3 renamed yet another widget)
+
+2008-10-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+	* src/prefs.c
+	  src/prefsdlg.c
+	  src/file_convert.c
+	  data/gtkpod.glade: straighten out bug that allowed to unselect
+	  conversion and as a side effect switched off copying of the
+	  music files to the iPod.
+
+2008-10-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefsdlg.c
+	  data/gtkpod.glade: option for mass-editing of tags was only
+	  available if "writing tags to disk" was selected.
+
+2008-10-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/repository.c
+	  data/gtkpod.glade: glade3 must have decided to rename a number
+	  of widget names. This patch fixes this issue for the
+	  Repositories Prefs and Create New Repository windows.
+
+2008-09-30  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* src/mp4file.c (mp4_get_file_info): Set track->lyrics_flag
+	  for mp4 files
+
+2008-09-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/ipod_init.c
+	  data/gtkpod.glade: glade3 must have decided to rename a number
+	  of widget names. More of these patches to come. Initializing a
+	  new iPod should work fine again.
+
+2008-09-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* INSTALL: removed git-svn from the list of required packages
+
+2008-09-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* INSTALL: added instructions on how to compile libgopd and gtkpod on a
+          fairly virgin Ubuntu Hardy (8.04) installation. 
+
+2008-09-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c (id3_set_string): don't write genre IDs instead of
+	  genre string. The use of ID numbers seems antiquated.
+
+2008-09-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c (id3_tag_read): (partially) implement genre IDs in
+	  parenthesis according to
+	  http://www.id3.org/id3v2.3.0#head-42b02d20fb8bf48e38ec5415e34909945dd849dc
+	  Ignore genre IDs in parenthesis if a "refinement" is
+	  given. Otherwise use the first ID found as genre. Fixes tracker
+	  item 2113461.
+
+2008-09-18 Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* configure.in: Use AC_SEARCH_LIBS to check for
+	  MP4SetMetadataAlbumArtist in libmp4v2.
+	  Reword several libmp4v2 macro definition descriptions.
+	  Minor whitespace cleanups.
+
+2008-09-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* configure.in
+	  src/mp4file.c: Check whether MP4 AlbumArtist functions are
+	  available (fixes compilation error with older versions of
+	  libmp4v2).
+
+	* README: added download link for V1.6 of libmp4v2
+
+	* src/mp3file.c: Add saving of AlbumArtist field. Thanks to Dudy
+	  Kohen for the patch.
+
+2008-08-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c: Handle Artist and AlbumArtist fields differently:
+	  For Artist: try the Artist tag and fall back to the Album Artist
+	  tag if the former does not exist.
+	  For Album Artist: set to the contents of the Album Artist tag,
+	  but only if the Artist tag does exist.
+	  Thanks to Dudy Kohen for the patch.
+
+	* src/mp4file.c: do the same for mp4 files (the Album Artist tag
+	  was not supported before).
+
+2008-08-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_itunesdb.c (read_extended_info): fixed valgrind
+	  warning. Thanks to Andrea.
+
+	* src/repository.c (sync_playlist_mode_automatic_toggled): fixed
+	  memory leak. Thanks to Andrea.
+
+	  (repwin_free): fixed memory leak. Thanks to Andrea.
+
+	* src/mp3file.c (mp3_read_lame_tag, mp3_get_track_gapless,
+	  mp3_get_track_lame_replaygain, set_uncommon_tag): fixed possible
+	  compiler warnings.
+
+	  (mp3_read_lame_tag, mp3_read_gapless): fixed memory
+	  leaks. Thanks to Andrea.
+
+	* src/mp3file.[ch]: Added "const" qualifier to filename arguments.
+
+	* src/file.c (add_coverart): fixed memory leak. Thanks to Andrea.
+
+	* src/details.c (details_get_item): fixed memory leak. Thanks to
+	  Andrea.
+
+	* src/prefs.c (get_list_from_buffer): fixed memory leaks.
+
+	* src/prefsdlg.c (on_unsetdeps_checkbox_toggled): fixed memory
+	  leak.
+
+	* src/prefsdlg.c (on_commands_clicked, on_cmd_aacgain_file_set):
+	  variable for aacgain was defined as "aacgain_path" instead of
+	  "path_aacgain".
+
+	* src/prefsdlg.c
+	  data/gtkpod.glade:
+	  Fix usability problems in prefs dialog (Music->Commands).
+
+	* src/file_convert.c
+	  data/gtkpod.glade:
+	  The widget name "conversion_log" was used twice, but for some
+	  reason this didn't cause problems until glade-3 re-wrote the
+	  file. Fixed by using different name for the menu item.
+
+2008-08-16 Paul Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/display.c: memory leak fix in display_image_dialog. Thanks to
+	  Tomas Carnecky for the patch.  
+
+2008-08-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/sort_window.c: fix bug that selected sort column (for track
+	  view) was displayed incorrectly. Make handling of "no sorting"
+	  more intuitive.
+
+	* data/gtkpod.glade: small bugfix (radio button group for track
+	  display sort order was not set up correctly)
+
+2008-08-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_itdb.c (gp_replace_itdb): fix memory leak. Thanks to
+	  Andrea.
+
+	* src/display_playlists.c (pm_button_press): block widgets during
+	  eject. Thanks to Andrea for spotting this potential crash site.
+
+2008-08-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_itunesdb.c (gp_import_itdb): fix memory leak. Thanks to
+	  Andrea.
+
+	* src/prefs.c (prefs_get_cfgdir): fix possible memory leak. Thanks
+	  to Andrea.
+
+	* src/prefs.c (temp_prefs_load): fix memory leaks. Thanks to
+	  Andrea.
+
+	* src/misc.c (load_ipod_index_prefs): fix memory leaks. Thanks to
+	  Andrea.
+
+	* src/display_itdb.c (gp_itdb_extra_destroy): fix memory
+	  leaks. Thanks to Andrea.
+
+	* src/stock_icons.c (register_stock_icon): fix memory leak. Thanks
+	  to Andrea.
+
+	* src/display_photo.c (gphoto_album_selection_changed): fix memory
+	  leak. Thanks to Andrea.
+
+	* src/display_itdb.c (gp_track_extra_destroy): fix memory leaks.
+
+2008-07-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc_confirm (on_gtkpod_delete_event): return TRUE to
+	  prevent other handlers from being called. (Tons of error
+	  messages otherwise.)
+
+2008-07-20 Paul Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/display_photo.c:
+	Patch to stop photo action signals being added to actions
+	multiple times. Thanks to Andrea.
+
+2008-07-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/fileselection.c
+	  src/fileselection.h: restructure code. Thanks to Andrea.
+
+2008-07-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_itunesdb.c (data_changed): don't mark non-imported
+          iPods as changed. Thanks to Andrea.
+
+2008-07-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/confirmation.c (gtkpod_confirmation): initialize
+          <scrolled> variable. Thanks to Andrea.
+
+2008-07-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_playlists.c (pm_add_child): when adding
+          playlists to the end, don't add behind the Photo item.
+
+2008-07-18 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/file.c (get_track_info_from_file): 
+	Relating to previous change. Rather than comment out, have reversed
+	logic as per Michael Tiffany's patch (15/07/2008)
+
+2008-07-18 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/file.c (get_track_info_from_file): 
+	Commented out test itdb_track_has_thumbnails test on line 1418
+	as this stops coverart being added to new tracks as they are being
+	imported from directory.
+
+2008-07-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_playlists.c (pm_get_iter_for_playlist): remove
+          assertion (pl!=NULL) that is no longer valid with the
+          introduction of the "Photo" entity. Should take care of the
+          segfaults when removing a playlist listed after the Photo
+          entity.
+
+2008-07-14  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* scripts/sync-evolution.sh
+	  scripts/sync-ldif.sh: Use /bin/bash as the interpreter, as
+	  these scripts use bash-specific syntax
+
+	* scripts/sync-thunderbird-nano.sh: Remove a few bashisms
+
+	  Thanks to Frank Lichtenheld (fixes Debian bug #489605)
+
+2008-07-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/syncdir.c: hash filenames of tracks to reduce overhead
+          when syncing parts of large repositories. Thanks to Clarke
+          Brunsdon for the initial patch.
+
+	* src/file.c: also update mtime of updated tracks.
+
+
+2008-07-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_coverart.c:
+
+	  Normalized indentation (original editor was mis-configured).
+
+
+2008-07-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc_conversion.c (ST_to_T)
+	  src/display_sorttabs.c (st_set_string_compare_func):
+
+	  be more restrictive concerning ST_CAT_SPECIAL (assertion)
+
+	  src/display_coverart: white space
+
+	  src/file.c: added comments
+
+
+2008-07-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file.c: allow absolute paths in coverart
+          template. Thanks to J.D. Laub for the patch.
+
+
+2008-07-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_itdb.c
+	  src/display_playlists.c: some work on white space.
+
+
+2008-07-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	  src/display.h
+	  src/file_itunesdb.c
+	  src/repository.c
+	  src/display_itdb.c
+	  src/display_playlists.c
+	  src/context_menus.c
+	  src/display_photo.c
+	  src/display_photo.h: get rid of Photo "Playlist" and create a
+	  "Photo" object in the Playlist view. This also solves a problem
+	  with the population of smart playlists.
+
+2008-06-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_photo.c: fix possible memory leak. Thanks to Mike
+	  Heffner.
+
+	* src/display.c
+	  src/display_photo.c
+	  src/details.c
+	  src/fetchcover.c: replace deprecated gdk_pixbuf_unref() with
+	  g_object_unref().
+
+2008-06-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_itunesdb.c
+	  src/display_photo.c
+	  src/display_photo.h: don't display error message about
+	  non-available photodb if iPod does not support photos.
+
+2008-05-31  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* po/POTFILES.in: update file list to keep distcheck happy
+
+	* data/icons/hicolor/16x16/places/Makefile.am
+	  data/icons/hicolor/16x16/status/Makefile.am
+	  data/icons/hicolor/22x22/places/Makefile.am
+	  data/icons/hicolor/24x24/places/Makefile.am
+	  data/icons/hicolor/32x32/places/Makefile.am
+	  data/icons/hicolor/48x48/places/Makefile.am
+	  data/icons/hicolor/scalable/places/Makefile.am
+	  data/man/Makefile.am
+	  doc/Makefile.am: minor distcheck fixes
+
+2008-05-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/details.c (details_update_thumbnail): fix bug that prevented
+	  displaying thumbnails in the edit details window that were saved
+	  on the iPod.
+
+2008-05-31 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* context_menus.c
+  
+	  Added coverart update call to eject ipod action.
+    
+	* display_coverart.c
+	* display_covarart.h
+  
+	  Tidied up function doc comments.
+	  Ensured when no playlist is selected, coverart_display_update 
+	  clears the artwork display.
+
+2008-05-30  Christophe Fergeau  <teuf at gnome.org>
+
+	* src/details.c:
+	* src/display_coverart.c:
+	* src/display_itdb.c:
+	* src/display_photo.c:
+	* src/file.c:
+	* src/file_itunesdb.c:
+	* src/misc_track.c: adjust to libgpod API changes (use
+	itdb_track_has_thumbnail and itdb_track_get_thumbnail instead of using
+	deprecated API and struct members)
+
+2008-05-29 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/fetchcover.c
+
+	  Fix for incorrect creation of jpg filenames
+    
+2008-05-29 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/display_photo.c
+
+	  Fix for pixbufs not being unreference in display_photo.c
+    
+2008-05-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file.c (video_thumbnail_setup_cache): fixed compiler warning
+	  and possible memory leak.
+
+	* src/file.c (create_video_thumbnail): fixed possible memory leak.
+
+2008-05-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/confirmation.c (gtkpod_confirmation): switch wrapping on for
+	  displayed text.
+
+2008-05-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c (mp3_read_gapless):
+	  - added assertion for track->userdata
+	  - remove gapless data if file does not contain gapless data.
+
+	* src/file_convert.c: read gapless data after conversion to MP3
+	  files.
+	
+2008-05-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc_playlist.c: don't allow adding of playlists if iPod is
+	  not loaded. Thanks to Andrea.
+
+	* src/fileselection.c: use gtkpod_warning_simple() instead of
+	  error_dialog() -- reducing code. Thanks to Andrea.
+
+2008-05-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* data/gtkpod.glade: added lost handler to "create new
+	playlist". Thanks to Andrea.
+
+2008-05-01  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* INSTALL
+	  configure.in:
+	  Require libgpod >= 0.6.1
+
+2008-04-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_convert (conversion_convert_track): redirect stdout
+          of conversion script to /dev/NULL.
+
+	* data/gtkpod.glade (prefs_dialog): get rid of "Only
+          'activatable' widgets can be packed into the action area of
+          a GtkDialog" warning. Changes layouts of buttons at the
+          bottom of the window slightly ("Revert" is now centered
+          instead of being grouped on the right together with the
+          "Close" button).
+
+	* src/flacfile.c (flac_get_file_info): patch by Peter Pletcher
+          supporting the DATE field (alternative source for YEAR),
+          extended track and disc numbers ("n/m" format), as well as
+          correction of an obvious type (CNDR -> CDNR). Thanks!
+
+2008-04-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/fileselection.c: add multiple directories patch by Alex
+          Pounds. Fixes bug that limited adding of directories to one
+          at a time.
+
+2008-04-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_photo.c (gphoto_is_photo_playlist,
+          gphoto_ipod_supports_photos, gphoto_display_photo_window,
+          debug_list_photos): prevent segfault if called with NULL
+          argument.
+
+	  (gphoto_add_image_to_database,
+	  gphoto_add_image_to_iconview): sanity checks
+
+	* context_menus.c (pm_context_menu_init): check for selected
+          playlist before making further checks. Thanks to Alex
+          Pounds.
+
+	* po/de.po: updated German translation. Thanks to Kai-Ove
+          Pietsch.
+
+2008-04-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/sync-tomboy.sh
+	  (Olivier Crete <tester at tester dot ca>):
+	  Strip all tomboy tags with the power of sed
+
+2008-04-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_convert.c (transfer_transfer_track): removed
+          unnecessary g_mutex_unlock(). Thanks to Klaus Heinz.
+
+2008-03-29  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* configure.in: Remove unused references to libgnomecanvas
+
+	* configure.in: Handle the case where LEX is a path, from
+	  NetBSD via Klaus Heinz (fixes SF tracker #1920207)
+
+2008-03-17 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/display_photo.c
+	* src/misc_input.c
+
+	  Fix for segfault in get_user_string function.
+
+2007-12-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp4file.c
+	* src/file.c: applied chapterdata patch by Michael Tiffany
+
+2008-01-13 Matvey Kozhev <sikon at users.sourceforge.net>
+
+	* data/gtkpod.glade:
+        * src/prefs.c:
+        * src/prefsdlg.c:
+        * src/file.c:
+  
+	  Support for video thumbnail generation via
+	  totem-video-thumbnailer (patch by M. Sean Finney
+	  <seanius at seanius.net>).
+
+2008-01-06 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * data/gtkpod.glade:
+  * src/display.h:
+  * src/display_tracks.c:
+  * src/display_sorttabs.c:
+  * src/prefsdlg.c:
+  
+    Made the "Filter tab position" and "Horizontal scrollbar" preferences
+    instant-apply.
+    
+  * data/gtkpod.glade:
+  
+    The "New Playlist" button is now dropdown.
+    
+  * configure.in:
+  * data/gtkpod-logo.png:
+  * data/gtkpod-icon-32.png:
+  * data/gtkpod-icon-32-2.png:
+  * data/gtkpod-icon-48.png:
+  * data/icons/16x16:
+  * data/icons/22x22:
+  * data/icons/24x24:
+  * data/icons/32x32:
+  * data/icons/scalable:
+  
+    More manually tweaked icons, plus the SVG original.
+
+2008-01-06 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+  * data/gtkpod.glade
+    src/display_tracks.c
+    src/display.c
+    src/display.h
+    
+    Added a down arrow to end of search bar to hide if not wanted.
+    On hide, an up arrow is displayed in the bottom right corner
+    of the window.
+    Preference stored to preserve decision between loadings.
+
+2008-01-05  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* doc
+	  doc/figures
+	  data/icons/hicolor/16x16/status
+	  data/man:
+	  ignore generated Makefiles
+
+2008-01-05 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * data/gtkpod.glade:
+  * src/display_tracks.c:
+  
+    Killed the horizontal scrollbar for good. The space is now first
+	allocated to "non-text" columns (like playcount and rating) and
+	then equally distributed between "text" columns. It isn't possible
+	to exceed the width of the track list.
+	
+  * src/prefs.c:
+  
+    Default columns set to title, artist, album, duration and rating.
+	
+  * src/rb_cell_renderer_rating.c:
+  * src/rb_cell_renderer_rating.h:
+  * src/rb_rating_helper.c:
+  * src/rb_rating_helper.h:
+  
+    Rating cell renderer implementation from Rhythmbox.
+
+  * data/icons/hicolor/16x16/status/*:
+  
+    Rating star icons from Rhythmbox.
+	
+  * src/display_tracks.c:
+  
+    Graphical rating column.
+	
+  * data/gtkpod.glade:
+  * src/display_sorttabs.c:
+  
+    Moved filter tabs to the bottom.
+	
+  * src/display_itdb.c:
+  
+    Name the default local repository "Music Library" instead of "Local".
+	
+  * src/display_playlists.c:
+  * src/display.h:
+  * src/display_itdb.c:
+  
+    Expand the playlist tree on startup.
+
+2008-01-04 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * data/gtkpod.glade:
+  * src/confirmation.c:
+  * src/display_playlists.c:
+
+    A bit more UI polish in the main window. Sane defaults for pane sizes.
+	
+  * src/misc_confirm.c:
+  
+    Made the quit confirmation use three buttons (Quit without saving,
+	Cancel, Save), per HIG.
+  
+2008-01-03  Todd Zullinger  <tmzullinger at users.sourceforge.net>
+
+	* data/icons/hicolor/*:
+	  ignore generated Makefiles
+
+2008-01-03 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * data/gtkpod.glade:
+  
+    Killed prefs_window.
+	
+  * src/prefs_window.c -> src/sort_window.c:
+  * src/prefs_window.h -> src/sort_window.h:
+  
+    Removed all prefs_window code.
+	Renamed.
+
+  * src/display_sorttabs.c:
+  * data/gtkpod.glade:
+
+    Retouched Calendar dialog, migrated from GtkCombo to GtkComboBox.
+
+  * src/file_itunesdb.c:
+  
+    write_extended_info is now ignored (always true).
+
+  * src/display_playlists.c:
+  
+    mpl_autoselect is now ignored (always false).
+	Use larger icons in the playlist tree view.
+
+  * src/display_tracks.c:
+  
+    multi_edit_title is now ignored (always true).
+	Find-as-you-type search implemented using GtkTreeModelFilter.
+	(Remember to use get_model instead of gtk_tree_view_get_model)
+	
+  * src/prefsdlg.c:
+  * data/gtkpod.glade:
+  
+    Added "Display tooltips" preference.
+	
+  * data/Makefile.am:
+  * data/*.png:
+  * data/icons/hicolor/*:
+  
+    Icon refresh. Removed unused icons.
+	
+  * src/stock_icons.c:
+  * src/stock_icons.h:
+  
+    Use GtkIconTheme for stock icon handling.
+	
+  * src/misc.c:
+  * src/misc.h:
+  
+    Added utf8_strcasestr (a copied g_utf8_strcasestr from GtkSourceView).
+	
+  * src/help.c:
+  
+    Translation string optimization, as suggested by Daniele Forsi and
+	Bastien Nocera <hadess at hadess.net>.
+
+2008-01-02 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * src/prefs.c:
+  * src/prefs.h:
+  
+    Added function temp_prefs_copy_prefs to create copies of the current prefs
+	(for Revert buttons).
+	
+  * src/prefsdlg.c:
+  * data/gtkpod.glade:
+  
+    Added Revert button.
+	Fixed: 'subwindows can be hidden by main window' (except for the sort
+	window, this is intended behavior and not a bug)
+	Fixed: 'assertion failed when clicking "remove" buttons'
+	Fixed: 'assertion `g_path_is_absolute (filename)' failed'
+	Fixed: 'signal `file_set' is invalid for instance `0x85d1160''
+	Fixed: 'g_object_unref: assertion `G_IS_OBJECT (object)' failed'
+	
+  * src/fileselection.c:
+  
+    Use the stock GTK directory selection dialog. Code cleanup.
+	
+  * src/confirmation.c:
+  * data/gtkpod.glade:
+  
+    Redesigned confirmation window to use GtkTreeView, as well as for
+	HIG compliance.
+	
+  * src/charset.c:
+  
+    Fixed: 'Invalid column number -1077094488 added to iter'
+	(thanks to Daniele Forsi <dforsi at gmail.com>)
+	Fixed: 'g_object_unref: assertion `G_IS_OBJECT (object)' failed'
+
+2008-01-01 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * src/misc_input.c:
+  * src/misc.h:
+  * src/misc_playlist.c:
+  * src/display_photo.c:
+  * data/gtkpod.glade:
+  
+    Refactored get_user_string (input box) to use glade, as well
+	as for HIG compliance.
+	
+  * configure.in:
+  * src/help.c:
+  
+    Display libgpod version in the about dialog.
+	
+  * data/icons/Makefile.am:
+  
+    Removed data/icons/gtkpod.xpm.
+	
+  * src/misc.h:
+  * src/misc_confirm.c:
+  
+    Simpler warning functions for cases when a single dialog box is enough
+	(gtkpod_warning_simple, a drop-in replacement for gtkpod-warning, and
+	gtkpod_warning_hig).
+	
+  * src/info.c:
+  * src/info.h:
+  * data/gtkpod.glade:
+  
+	Removed the old info window. (There is still some now-unused code left.)
+	Exported some info gathering functions for infodlg.c.
+	
+  * src/infodlg.c:
+  * src/infodlg.h:
+  * src/display.c:
+  * src/tools.c:
+  
+    Use the new info dialog.
+
+2007-12-31 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * data/icons/*/gtkpod.png:
+  * data/icons/gtkpod.xpm:
+  * data/gtkpod-*.png:
+  
+    New Tango-style application icon.
+	
+  * src/info.c:
+  * src/info.h:
+  
+    Support for hooks in info_update_*. Will be needed by the new info_dialog.
+	
+  * src/repository.c:
+  * data/gtkpod.glade:
+  
+    Redesigned the repository manager dialog.
+	The behavior of the Delete button is now much more intuitive
+	(thanks to godog for pointing this out).
+
+  * src/prefs_window.c:
+  
+    Hopefully fixed the Dreaded Sort Window Crash once and for all.
+	(Although it would still be better if all developers migrated to glade 3 ;))
+
+2007-12-31 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+  * src/display_coverart.h
+  * src/display_coverart.c
+  
+  Visible scaled images are cached to improve performance. Only when
+  they are no longer visible is the scaled version unreferenced. If the
+  scaled version does not exist then a new scaled version is created as
+  usual. Thus, when moving along the collection, only 1 image should
+  be scaled when the drawing occurs rather than 9.
+
+2007-12-31 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * src/prefs.c:
+  * src/prefs_window.c:
+  * src/prefsdlg.c:
+  * src/display_coverart.h:
+  
+    Renamed "colour" to "color". Added text color preference.
+
+  * src/display_coverart.c:
+  
+    Fixed regression with CJK text rendering by using Pango to render.
+	Performance improvement.
+	
+2007-12-30 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+  * data/cdshine.png
+  * data/Makefile.am
+  
+  png file removed as highlight now done programmatically with cairo.
+  
+  * data/gtkpod.glade
+  
+  GtkDrawingArea added to coverart preview dialog for use with cairo.
+  
+  * src/display_coverart.c
+  * src/display_coverart.h
+  
+  Refactored functions to use cairo for rendering coverart images
+  rather than libgnomecanvas.
+  
+  * src/display_playlists.c
+  * src/display_sorttabs.c
+  * src/prefsdlg.c
+  
+  References to some coverart functions updated.
+  
+  * src/display.c
+  
+  Generic function for display preview dialog refactored to use cairo
+  rather than libgnomecanvas.
+  
+  * src/fetchcover.h
+  * configure.in
+  * INSTALL
+
+  References to libgnomecanvas removed.  
+  
+2007-12-30 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * data/man:
+  
+    Added manpage from Debian.
+
+  * data/icons/gtkpod.xpm:
+  * data/gtkpod.desktop.in:
+  
+    Added XPM icon from Debian (goes to /usr/share/pixmaps).
+	
+  * data/gtkpod.glade:
+  
+    Small fixes to the info window.
+	
+  * src/prefs.c:
+  * src/prefs.h:
+  * src/file_convert.c:
+  
+    Added new settings:
+    - conversion_enable: skip any conversion if this is false (default: true)
+	- conversion_target_format: format to convert to (default: MP3; only used in prefsdlg.c)
+  
+  * src/prefsdlg.c:
+  
+    Conversion preferences.
+	Fixed a bug that prevented the dialog from being shown again if closed
+	using the X button.
+	
+  * src/infodlg.c:
+  
+    New info window mockup ("Experimental" button in existing info window).
+
+2007-12-30 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+  * data/gtkpod.glade
+  
+  Added the photo window toolbar back in. Seems it may have been lost by
+  accident and it is required for some functions for the moment.
+
+2007-12-29 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * data/gtkpod.glade:
+  * src/prefsdlg.c:
+  
+    Filename parse preferences
+    Cover art search preferences
+	File mask exclusion preferences
+	mserv preferences
+	Commands preferences
+	
+  * data/default-cover.png:
+  
+    Less fugly and 1996-style picture
+	
+  * src/display_coverart.c:
+  
+    Set resize algorithm to GDK_INTERP_BILINEAR - yields nicer-looking images
+	
+  * src/charset.c:
+  
+    Added missing call to g_free
+	
+  * src/display_spl.c:
+  
+    Initial HIGification of the smart playlist dialog.
+
+2007-12-28 Matvey Kozhev <sikon at users.sourceforge.net>
+
+  * data/gtkpod.glade:
+  
+    Fixed sort window crash related to absence of tooltips. Marked
+	"Dummy - do not delete"	as not translatable.
+	
+  * src/charset.c:
+  * src/charset.h:
+  
+    Implemented charset_init_combo_box as a drop-in replacement
+	for charset_init_combo
+	
+  * src/prefsdlg.c:
+  
+    Encoding dialog
+
+2007-12-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+  * src/prefs_window.c
+  
+    Fixed potential memory leak in on_coverart_display_bg_color_set
+    
+  * data/gtkpod.glade
+  * src/prefsdlg.c
+  
+    Support for change background colour added to new prefs dialog
+
+2007-12-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+  * data/cdshine.png
+  * data/cdshine_main.png
+  * data/Makefile.am
+  
+    Removed reflection shadowing as this is done programmatically.
+    No higlighting required on main image to png removed entirely.
+    
+  * gtkpod.glade
+  
+    Added colour selection button for CoverArt Display background colour.
+    
+  * src/display_coverart.c
+  * src/display_coverart.h
+  * prefs_window.c
+  * prefs.c
+  
+    When a repository contains no tracks, the CoverArt Display background
+    returns to a default colour of white.
+    The default colour of a "live" CoverArt Display is black but can now be
+    changed with a preference option available from the preferences window.
+    To be added to the new preference dialog shortly.
+    To achieve this and keeps a proper reflection, the reflection shadow is
+    added programmatically using a gdkpixbuf created from data.
       
-       UPDATE: Better icon theme specification compliance.
+2007-12-27 Matvey Kozhev <sikon at users.sourceforge.net>
 
-       BUGFIX: Fixes to tomboy script. Thanks to Javier Kohen.
+	* INSTALL:
+	* configure.in:
+	  Updated dependency versions (GTK 2.8, indirectly glib 2.8 for libgpod).
+	  
+	* src/misc.h:
+	* src/display.c:
+	* src/misc_confirm.c:
+	* src/file_itunesdb.c:
+	* src/ipod_init.c:
+	* src/repository.c:
+	* src/file_export.c:
+	* src/display_spl.c:
+	* src/info.c:
+	* src/tools.c:
+	* src/prefs_window.c:
+	* src/prefsdlg.c:
+	* src/display_coverart.c:
+	* src/misc_playlist.c:
+	* src/file_convert.c:
+	* src/fileselection.c:
+	* src/confirmation.c:
+	* src/display_photo.c:
+	* src/details.c:
+	* src/display_sorttabs.c:
+	* src/help.c:
+	* src/misc.c:
+	  Patch for cygwin build, by Éric Lassauge:
+	  - Added new wrapper function, gtkpod_xml_new, for glade_xml_new.
+	  - Added G_MODULE_EXPORT calls to all glade callbacks.
+	  - Renamed struct member "stderr" in display_photo.c.
 
-       BUGFIX: Issues with display of track length. Inconsistent units used
-       in conjunction with libgpod (Jorg).
+2007-12-26 Matvey Kozhev <sikon at users.sourceforge.net>
 
-       UPDATE: Cover art preview window either displays an album cover
-       to its full size or to a size consistent with the user's desktop.       
+	* src/prefsdlg.c:
+	* data/gtkpod.glade:
+	  New preferences dialog mostly working, except for "advanced" buttons
+	  and format conversion settings (greyed out).
 
-       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).
+2007-12-23  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-       BUGFIX: Issues on detecting changed local / podcast database. Thanks to
-       Mario Rossi.
+	* configure.in: bump gtk+ requirement to 2.8.0 or newer
+	
+2007-12-21 Matvey Kozhev <sikon at users.sourceforge.net>
+	* src/confirmation.c:
+	  Remove GTK_DIALOG_NO_SEPARATOR from the GtkMessageDialog.
+	  
+	* data/gtkpod.glade:
+	* src/prefs_window.c:
+	  Migrate to GtkComboBox for sort_combo (fixes crash regression).
+	  
+	* src/misc_conversion.c:
+	* src/display_sorttabs.c:
+	  Applied patch to fix crash (ST_CAT_SPECIAL) in misc_conversion.c,
+	  by Andrea <mariofutire at googlemail.com>
+	  [misc_conversion.c: line 300 (ST_to_T): should not be reached]
+	  
+	* data/gtkpod.glade:
+	* src/prefsdlg.c:
+	  Fully implemented the first tab (Display).
 
-       BUGFIX: Issues addressed on Details Window.
+2007-12-20 Daniele Forsi <dforsi at users.sourceforge.net>
+	* display.c: add NULL terminator to the argument list for a call
+	  to gnome_canvas_item_set()
 
-       BUGFIX: Crash avoided when auto-detecting an iTunes database that 
-       cannot be read.
+2007-12-20 Matvey Kozhev <sikon at users.sourceforge.net>
 
-       UPDATE: Display of error output of scripts (Jorg).
+    * data/gtkpod.glade:
+    * src/prefsdlg.c:
+    * src/Makefile.am:
+      Mockup of the new preferences dialog, available in
+      Edit -> Preferences (Experimental).
+      
+    * src/display_itdb.c:
+      gtkpod.track_add_extra.typo.awn.1.patch by Andrew W. Nosenko
+      <andrew.w.nosenko at gmail.com>:
+      
+      Fix typo, avoid re-creating ExtraTrackData if it already exists
+      as consequence.
+      
+    * src/charset.c:
+    * src/clientserver.c:
+    * src/prefs_window.c:
+    * src/prefs_window.h:
+      gtkpod.gcc-warn.awn.1.patch_[zeT1qb].gcc-warn.awn.1.patch
+      by Andrew W. Nosenko:
+      
+      Eliminate some GCC warnings.
+      
+    * doc/*:
+    * doc/figures/*:
+      Completed import of documentation from the wiki.
 
-       IMPROVEMENT: Configuring and Compilation support (Todd).
+2007-12-19 Matvey Kozhev <sikon at users.sourceforge.net>
 
-       UPDATE: New scripts for flac, ogg, mp3, m4a, wav conversion to mp3 and
-       m4a. Thanks to Peter van de Does.  
+	* COPYING-DOCS:
+	  Text of the GFDL 1.2. Documentation should be under the GFDL to
+	  ensure that it remains license-compatible with the wiki.
+	
+	* doc/gtkpod.xml:
+	  Initial, very incomplete documentation import from the wiki.
+	  
+	  Do not modify the HTML files directly. They are generated from
+	  the DocBook XML file. Use "make update-docs" to regenerate them.
+	
+	* Makefile.am:
+	* doc/Makefile.am:
+	  Added the update-docs rule to generate HTML documentation from XML.
+	  
+	* src/misc.c:
+	* src/misc.h:
+	  Moved open_about_window to help.c.
+	  
+	* src/help.c:
+	* src/help.h:
+	* src/gtkpod.glade:
+	  Support for help contents, online help, and report bug menus.
+	  
+	  To use context-sensitive help, call gtkpod_open_help_context
+	  (in help.h) using the ID of the chapter or sect1 in the DocBook/XML
+	  file as the context. It will first try to open the XML file in yelp
+	  (the GNOME help viewer), and if that fails, will open the
+	  corresponding HTML file in the browser.
+	  
+	* src/misc_confirm.c:
+	* src/file_itunesdb.c:
+	* src/misc_playlist.c:
+	* src/fetchcover.c:
+	  More message box HIGification.
 
-       BUGFIX: Model number identified and written to ipod upon loading to ensure
-       libgpod can read the ipod's artwork.
+2007-12-18 Matvey Kozhev <sikon at users.sourceforge.net>
 
-       UPDATE: Updates and bug fixes to gapless playback. Thanks to
-       Michael Tiffany.
+	* src/confirmation.c:
+	* src/confirmation.h:
+	  Added the gtkpod_confirmation_hig and gtkpod_confirmation_simple
+	  functions for HIG-compliant confirmation messages.
+	  
+    * src/file_itunesdb.c:
+      Migrated the "directory structure" dialog to the HIG functions.
 
-       BUGFIX: When Cover Art Display is widened, covers space out rather
-       than stretch.       
+2007-12-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-       BUGFIX: Fixed memory leaks in CoverArt Display and Details window.
-       Thanks to Daniele Forsi.
+	* configure.in:
+	  bump version for future development (0.99.13SVN)
 
-       UPDATE: French translation. Thanks to Éric Lassauge.
-     
-       UPDATE: Italian translation. Thanks to Daniele Forsi.
+2007-12-17  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-       UPDATE: Hebrew translation. Thanks to Assaf Gillat.
+	* configure.in:
+	  bump version for 0.99.12 release
 
-       UPDATE: Swedish translation. Thanks to Stefan Asserhäll.
+2007-12-17  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-       NEW FEATURE: Added Romanian translation support. Thanks to 
-       Alex Eftimie.
+	* po/he.po:
+	  update Hebrew translation (Assaf Gillat)
 
-       NEW FEATURE: Added Russian translation support. Thanks to
-       Matvey Kozhev.
+	* po/ro.po:
+	  update Romanian translation (Alex Eftimie)
 
-gtkpod V0.99.10
+	* po/sv.po:
+	  update Swedish translation (Stefan Asserhäll)
 
-       NEW FEATURE: on-the-fly conversion of WAV, FLAC and OGG (as well
-       as MP3 and M4A). Thanks to Marc d[readlock], Simon Naunton and
-       Peter Edwards! Multi-threaded background conversion was added by
-       Jorg Schuler.
+2007-12-16 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-       NEW FEATURE: editing of TV show metadata and track media
-       type. Thanks to Mario Rossi.
+	* configure.in: added Russian translation.
 
-       NEW FEATURE: Display of Album Art. Thanks to P.G. Richardson.
+2007-12-16 Matvey Kozhev <sikon at users.sourceforge.net>
 
-       NEW FEATURE: Download of Album Art from the net. Thanks to
-       P.G. Richardson.
+        * po/ru.po
+          Added Russian translation.
 
-       NEW FEATURE: copy playlists and tracks from within the context
-       menu without DND can simplify life with many playlists. Thanks
-       to Andrzej Palejko for his patch.
+2007-12-13 Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-       NEW FEATURE: preliminary support for calculating gapless
-       playback information (lame encoded mp3 files only).  Thanks to
-       Michael Tiffany.
+	* po/*.po
+	  po/gtkpod.pot:
+	  update translation templates
 
-       UPDATE: Smart playlists now support the following new fields:
-       album artist, tv show, last skipped, season number, skipcount
-       and video kind.
+2007-12-13 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       IMPROVEMENT: Clicking on an item with the right mouse button
-       will select and open the context menu, which is the intended
-       behavior. As a consequence, the interface will remain blocked
-       while the selection is being updated and displayed.
+	* stock_icons.c
+  
+          Squashed some compiler warnings.
+    
+2007-12-13 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       BUGFIX: dragging tracks between two iPods would sometimes not
-       actually copy the file.
+	* src/context_menus.c
+	  src/display_photo.h
+	  src/display_photo.c
+    
+	  Bug fixes made to photo window. Remove photo action disabled
+	  on thumbnail view context menu when no thumbs selected. The
+	  Remove album action was not removing an album unless the
+	  album contained photos. Thanks to Alex Eftimie for raising
+	  the bugs.
 
-       UPDATED: Italian translation (thanks to Daniele Forsi)
+2007-12-13 Daniele Forsi <dforsi at users.sourceforge.net>
+        * src/file.c: add variable for existing %s directive
 
-       PACKAGING: Install a .desktop file and icons according to the
-       freedesktop.org specification.
+	* src/file_export.c
+	  src/file_itunesdb.c: make strings identical to existing ones
 
-gtkpod V0.99.8
+	* src/display.c
+	  data/gtkpod.glade: a string marked translatable in glade must
+	  be translated in code instead
 
-       NEW FEATURE: Support of several iPods (currently you need to
-       edit the itdb_* entries in ~/.gtkpod/prefs to add
-       repositories). Each iPod can be loaded/ejected
-       individually. Scripts are called before loading (gtkpod.load)
-       and after saving (gtkpod.eject) with the mountpoint as the
-       first argument. If you need to mount the iPod manually, put the
-       mount command in gtkpod.load.
+2007-12-12 Daniele Forsi <dforsi at users.sourceforge.net>
+	* src/misc_confirm.c
+	  src/display_photo.c
+	  src/fetchcover.c
+	  src/misc.c
+	  data/gtkpod.glade: fix typos
 
-       NEW FEATURE: Support for mobile phones supporting iTunes (see
-       Changelog_detailed for details)
+	* src/misc.c: update list of translators
 
-       NEW FEATURE: Lyrics are displayed on the iPod when available.
+2007-12-12  Todd Zullinger <tmzullinger at users.sourceforge.net>
 
-       NEW FEATURE: Preliminary (no meta data) support of h.264 video
-       format via the libmp4v2 interface. Thanks to Peter Lieverdink.
+	* po/POTFILES.in:
+	  tell gettext/intltool to treat translation strings as utf-8
 
-       NEW FEATURE: Script to sync notes from Tomboy to the
-       iPod. Thanks to Tejas Dinkar.
+2007-12-12 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-       NEW FEATURE: Support of iTunes iTunNORM tag for volume
-       normalisation of mp4 tracks.
+	* src/display_tracks.c (tm_create_treeview)
+	  src/display.c (display_create):
+	  moved initialisation of track view sorting to after the
+	  entire display is set up to avoid assertion errors.
 
-       NEW FEATURE: Support of aacgain's replay gain tag for volume
-       normalisation of mp4 tracks (takes precedence over the iTunNORM
-       tag, see http://altosdesign.com/aacgain/)
+	* data/gtkpod.glade
+	  data/gtkpod-add-dirs.png (modified)
+	  data/gtkpod-logo.png (modified)
+	  data/menus-toolbars.diff (modified)
+	  data/gtkpod-add-files.png (modified)
+	  data/gtkpod-read-16.png (new)
+	  data/gtkpod-add-playlists.png (modified)
+	  data/gtkpod-read.png (modified)
+	  Usability patch by Sikon
 
-       NEW FEATURE: Support for start time, stop time, skip when
-       shuffling and remember playback position.
+	* data/Makefile.am: added gtkpod-read-16.png
 
-       IMPROVEMENT: Support for coverart has been improved. You may
-       have to select your iPod model from a list of available models
-       if your iPod cannot be identified automatically, as is the case
-       for iTunes mobile phones or the new 6th generation iPod Nanos.
-       Coverart embedded in the music file (APIC tag) can now also
-       read. Support to read the coverart from specified files is
-       still available though. Please note that at present APIC
-       support only works when adding tracks directly to the iPod. It
-       does not work when you add tracks to a LOCAL repository first
-       and use Drag and Drop to move the track to your iPod.
+	* scripts/Makefile.am: sorted files alphabetically for ease of
+	  checking.
 
-       IMPROVEMENT: Podcasts are marked as unplayed (on the iPod, with
-       a bullet in front of the title) when newly added to the podcast
-       list, and unmarked once they have been played once on the iPod.
+	* po/*.po
+	  po/gtkpod.pot: run 'make update-po'
 
-       IMPROVEMENT: Support to sync thunderbird's address book to an
-       iPod Nano with old firmware that would otherwise only display
-       the first address. This script may be useful to other users as
-       well as it writes out one vcf file per contact instead of just
-       one big file containing all contacts. Thanks to Paul Oremland.
+	* src/display.c (display_adjust_menus)
+	  Disable 'Edit Smart Playlist' menu when no playlist is
+	  displayed. Thanks to Daniele Forsi.
 
-       IMPROVEMENT: Handle multiple calendar and task files in
-       sync-evocalendar script. Thanks to Michele C. Soccio
+2007-12-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-       NEW: Spanish translation. Thanks to Alejandro Lamas.
+	* src/mp3file.c(get_mp3_info): fix integer overlow in
+          calculation of track length of very long tracks. Thanks to
+          Dylan Hall.
 
-       BUGFIX: Pressing 'OK' when syncing directories several times
-       could crash gtkpod. Thanks to dforsi.
+	* src/file_convert.c(conversion_scheduler_unlocked,
+          transfer_get_failed_tracks): attempt to fix the problem of
+          non-transfered tracks. Unable to reproduce the problem
+          myself so I have no way to say whether this is a fix or not.
 
-       BUGFIX: Exporting tracks did not work if the template
-       extensions (.mp3...) did not match case-sensitively, possibly
-       leading to non-exported tracks. Thanks to Mattias Wadman.
+	* src/misc.h
+	  src/misc.c: use standard gtk_about_dialog(). Thanks to Sikon.
 
-       BUGFIX: When updating tracks, the filename of the music file
-       and the filename of the thumbnail could be messed up. Fixed.
+2007-12-11  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-       BUGFIX: The Edit Detail dialog did not handle the 'Year' field
-       correctly.
+	* data/gtkpod.glade:
+	  map ctrl-s to "Save Changes" instead of "Sorting Options"
 
-       BUGFIX: When updating tracks, files were not copied to the iPod
-       even if the file was changed.
+	* po/POTFILES.in
+	  po/POTFILES.skip:
+	  add some missing files
 
-       BUGFIX: Removing playlists could crash gtkpod.
+	* po/es.po
+	  po/fr.po
+	  po/de.po
+	  po/sv.po
+	  po/ja.po
+	  po/gtkpod.pot
+	  po/he.po
+	  po/it.po
+	  po/ro.po:
+	  update translation templates
 
-       WORKAROUND: Disable sorting of playlist view as this crashed
-       gtkpod.
+2007-12-09 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-gtkpod V0.99.4
+  * Added updates since July to ChangeLog. 
 
-       BUGFIX: Options for exporting playlist files could not be
-       changed.
+2007-12-09 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       BUGFIX: Fixed segfault when updating tracks or directories with
-       artowrk present.
+  * src/display_photos.c:
+  
+  When adding multiple images to photo collection, they are now
+  added in alphabetical order by filename. Thansk to Andrew W.
+  Nosenko for the patch.
+  
+  Improved doc comments around photo functions.
 
-       BUGFIX: Browse button for "Sync Notes Script" opened a
-       directory browser instead of a file browser.
+2007-12-06  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-       BUGFIX: Writing ID3v2.4 tags in UTF8 did not always
-       work. Thanks to 't0c' for the patch.
+    * data/gtkpod.desktop.in:
+      better Icon Theme Specification compliance
 
-       BUGFIX: Context Menus for removing playlists from the iPod were
-       not displayed. Thanks to 'rob/biffhero' for pointing this out.
+2007-11-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-gtkpod V0.99.2
-       BUGFIX: Fix segfault when applying preferences.
+  * configure.in: raised required libgpod version to 0.6.0
 
-       BUGFIX: Don't require libcurl (not actively used).
+2007-11-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-       UPDATE: Swedish translation catalog
+  * scripts/sync-tomboy.sh:
 
-       IMPROVEMENT: Allow export of multiple thunderbird address
-       books (by naming the output filename).
+    Fixes by Javier Kohen: "First, it escapes the mount point to allow
+    white space in it. Second, it removes tags from the whole note
+    contents so that links in the title don't end up in the file
+    name. Last, but not least, colons are converted to hyphens, since
+    the former are not valid characters in the FAT family of file
+    systems, which the iPod uses."
 
-gtkpod V0.99.0
-       NEW: type-ahead search functionality. Thanks to Nick Piper,
-       http://www.nickpiper.co.uk/ -- please note that the list view
-       you want to search in needs to have keyboard focus. Selection
-       of the search column is done by clicking anywhere inside the
-       column.
+2007-11-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-       NEW: Handle Compilations decently. The compilation mp3 tag is
-       read and written, and compilation artists can be grouped into
-       "Compilations" in the Artist filter tab. Thanks to Iain Benson!
+  * src/display_spl.c:
+    Renamed "Time" to "Track length" for better understanding.
+    Fixed track length display (unit was seconds but msecs had to be
+    entered. Furthermore, due to a bug in libgpod offline playlist
+    generation assumed the track length was given in seconds whereas
+    the live-update on the iPod assumed it was given in msecs. You
+    need at least libgpod SVN version 1797 for this to work
+    consistently. libgpod 0.6.0 does not contain the fix.
 
-       NEW: Window for edit of track details, including functionality
-       to set thumbnails. The thumbnails are not stored as tags in the
-       file as iTunes does it. Instead, the original filename is
-       stored.
+    src/display_photo.c:
+    Squashed warning about pointer to integer conversion.
 
-       NEW: Display and setting/removing of thumbnail images. Choose
-       "Show Details" from the context menu (right mouse-button). New
-       thumbnails are displayed by the iPod but get wiped by iTunes,
-       however.
+2007-11-14 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       NEW: Automatic adding of thumbnail images when adding new
-       tracks or updating existing ones. See the option on the 'Track
-       Info' page of the preferences dialog for settings about which
-       filename will be used. Any filename is possible, even filenames
-       constructed from the album or artist name.
+  * src/display_photos.c
+  
+  Fix for cancel button when removing a photo album.
+  Photo image removal action display a proper question dialog
+  as to whether the photo should be deleted from the database
+  as well as removing the photo from the selected album.
+  
+2007-11-14 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       NEW: very basic iPod video support (you can add Videos but no
-       metadata is filled in). Thanks to Uwe Herman for the input.
+  * data/stock_icons.c: corrected new name of photo icon
 
-       NEW: script to sync contacts from a Palm (via jppy
-       http://wiki.zanu.org.uk/jppy). Thanks to Nick Piper,
-       http://www.nickpiper.co.uk/)
+2007-11-13 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       NEW: basic podcast support (use e.g. bashpodder or gpodder to
-       download podcasts, then add them directly into the podcast
-       playlist on the iPod).
+  * data/tunes_playlist_icon-48.png: new icon for consideration
+  
+2007-11-12 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       NEW: transition to libgpod to read/write iTunesDB. See
-       www.gtkpod.org/libgpod.html for details.
+  * data/gtkpod.glade
+  * src/prefs.c
+  * src/prefs_window.c
+  
+  Preference added for controlling display of delete confirmation
+  dialog in display_photo window for removal of a photo album.
+  
+  * src/display_photo.c
+  * src/diaplay_photo.h
+  
+  Rename action added for renaming a photo album.
+  Dialog altered in remove album function so that on clicking
+  "Yes Do Not Display Again", the preference is set to stop the
+  dialog displaying again.
+  
+  * src/context_menus.c
+  
+  Popup menuitem for photo album rename action.
 
-       IMPROVEMENT: added comment, category, description, podcast url,
-       podcast rss, subtitle fields and release date to displayable
-       fields.
+  * data/gphoto_playlist_icon-48.png
+  * data/tunes_playlist_icon-48.png
+  * data/Makefile.am
+  * src/stock_icons.c
+  * src/stock_icons.h
+  * src/Makefile.am
+  * src/misc.c
+  
+  Stock icons created from image files for use as playlist icons.
+  stockid_init() is called from misc.c upon loading of application.
+  This finds the correct paths of the specified icon images and loads
+  pixbufs of them. These are then added to the default stock factory.
+  Stock ids of these images can then be used throughout the application.
+  
+  * src/display_playlists.c
+  
+  Uses the new stock ids for the playlist icons.
 
-       IMPROVEMENT: Support playcounts on iPod Shuffle as well
+2007-11-07 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       IMPROVEMENT: Remember size of 'Edit Smart Playlist' dialog and
-       use scrolled window for the rules display.
+  * data/gphoto*.png
+  * data/Makefile.am
+  
+  New icons for menu items in photo window.
+  
+  * data/gtkpod.glade
+  
+  Components of photo window changed around to make more sense from
+  a user perspective.
+  
+  * src/display.c
+  * src/display.h
+  
+  Generic display_image_dialog function added for displaying a bare
+  transient dialog with only the required pixbuf image in it. Used
+  for coverart display and photo window.
+  
+  * src/display_photo.c
+  
+  View full size action added to menus.
+  Rename selected album added to menus.
+    
+2007-11-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-       IMPROVEMENT: Update smart playlists automatically (on
-       load/display/save) if 'live updating' is set.
+  * src/display_playlists.c (pm_set_renderer_pix): display a different
+    icon for the photo playlist. Customized icons welcome for both
+    standard playlists and the photo "playlist".
 
-       IMPROVEMENT: Support for more mp3 file tags: Compilation
-       (TCMP), Podcast URL/Title (TID), Podcast Description (TDS),
-       Podcast Subtitle (TT3), Podcast RSS (WFD), Podcast Release Date
-       (TDR). Mostly reading only because of limited support on
-       id3tag's side.
+2007-11-04 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       UPDATED: Italian translation (thanks to Edward Matteucci)
+  * src/display_photos.c
+  
+  New ipods do not necessarily have ITDB_THUMB_PHOTO_LARGE or any
+  other photo format so cannot assume these in display of thumbs in
+  iconview or preview components.
+  
+  Fix is to find the first existing smalled thumb in the case of the
+  iconview and biggest in the case of preview and scale the pixbufs
+  to uniform sizes.
+  
+  Also, fix to clear the preview when a data change like remove occurs.
 
-       BUGFIX: 'Check iPod's files' could crash under certain
-       circumstances (thanks to David Mansfield for the patch).
+2007-11-04 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       BUGFIX: Lame's Replay Gain was read incorrectly for certain
-       values. Thanks to Chris Brotherton for tracking this down.
+  * src/fetchcover.c
+  
+  Opened up filename handling functions to rest of gtkpod.
+  Reduced number of functions hidden if curl is not available.
+  Fetch_Cover object used as vehicle for handling the filename
+  even if image is not being downloaded.
+  
+  * src/fetchcover.h: parent_window added to Fetch_Cover object.
+  
+  * src/display.h
+  
+  Support for IMAGE_JPEG target type.
+  
+  * src/details.c
+  * src/display_coverart.c
+  
+  Support for image/jpeg target in drag and drop operations on
+  cover art. This target is provided by konqueror (not by firefox
+  at the moment but supposedly at some point) and carries the
+  displayed jpeg image as its data so redownloading is not required.
+  
+  Downloading option used as fallback if this target is not provided.
+  
+2007-11-03 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       BUGFIX: Prevent that all rules in a smart playlist get deleted,
-       which would mess up the iTunesDB.
+  * src/display_coverart.c
+  
+  Fixed bug in display coverart. Irregular sized album images were
+  being scaled to the default sizes. 
+  
+2007-11-01 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       BUGFIX: Choosing 'Delete' from the menu (not context menu) now
-       works again.
+  * README
+  
+  Updated README with some instructions on using the photo window.
 
-gtkpod V0.95.CVS
-       NEW: script to sync addressbooks in ldif format provided by
-       Sebastien BERIDOT.
+2007-11-01 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       NEW: script to sync kNotes (KDE note program) provided by
-       Sebastian Scherer.
+  * src/display_photo.c
+  * src/display_photo.h
+  
+  Photo support added to gtkpod.
+  
+  * data/gtkpod.glade: photo window gui components added.
+  
+  * src/context_menus.c
+  * src/context_menus.h
+  
+  Disable right-click menu if Photo "playlist" is selected.
+  Add context menus to album and icon views in Photo window.
+  
+  * src/display_itdb.h
+  
+  Photo database and photodb data changed flag added to Extra iTunes
+  db data structure
+  
+  * src/display_playlists.c
+  
+  Photo playlist added to playlist tree if ipod has a photo db or
+  a new one is created photos are supported.
+  
+  * src/display_private.h
+  * src/display_sorttabs.c
+  
+  Getter and Setter added for control of the selected sorttabs. Allows
+  sorttabs to be returned to their status prior to the photo window
+  being opened.
+  
+  * src/file_itunesdb.c: support for loading of ipod photo database.
+  * src/itdb.h: typedefs for photo database.
+  * src/Makefile.am: compile photo source files.
+  
+  * src/misc.c
+  * src/misc.h
+  
+  Parse artwork from string function. Used in photo DnD operations. 
+  
+  * fetchcover.c: removal of fetchcover_cleanup as no longer needed.
+  
+2007-10-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-       CHANGE: MP3 tags: use 'Band/Orchestra/Accompaniment' (TPE2) as
-       artist if it exists. Otherwise use 'Lead artist/Lead
-       performer/Soloist/Performing group' (TPE1) as before. Let me
-       know if this causes problems for you.
+  * src/fetchcover.c (fetchcover_cleanup): function only used if curl
+    is available -- avoid compilation warning.
 
-       UPDATED Hebrew translation (thanks to Assaf Gillat)
+  * configure.in
+    src/mp4file.c: recognize if additional argument is needed for
+    MP4GetMetadataFreeForm() and MP4GetMetadataCoverArt(). Thanks to
+    Felix Homann.
 
-       SAFETY: call sync() and flush all buffers to the iPod after
-       writing the iTunesDB -- should minimise filesystem errors
-       caused by people disconnecting the iPod without unmounting.
+2007-10-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       BUGFIX: Copying playlists by drag and drop could confuse smart
-       playlists referencing these playlists. Fixed.
+  * src/display_coverart.c
+  * data/gtkpod.glade
 
-       After copying playlists by drag and drop, smart playlists
-       refering to these playlists could become confused.
+  Improved the preview fullsize artwork dialog. Now scales the
+  image to respect the size of the desktop, while displaying
+  the true resolution in a label below it. Preview dialog now
+  constructed in glade file rather than from scratch.
 
-gtkpod V0.94.0
-       NEW FEATURE: stable sorting of track view. This allows you, for
-       example, to first sort by title, then by artist. The list will
-       then be sorted by artist, but all titles of each artist remain
-       sorted as well (before the tiles were random).
-       Arbitrary depth and order of stable sorting is possible by
-       clicking the sort columns in the desired order.
+2007-10-21 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-       NEW FEATURE: define your own ignore list of words that should
-       be ignored during sorting (sort options: ctrl-s).
+  * src/fetchcover.c
+  * src/fetchcover.h
 
-       IMPROVEMENT: improved handling of dangling files (files that
-       are referenced in the iTunesDB but are not present on the
-       iPod).
+  Changed purpose of fetchcover. It no longer displays a
+  dialog window for dealing with covers. Instead it
+  provides the internal curl retrieve functions only.
 
-       IMPROVEMENT: use 'eject' instead of 'umount'. Also fixes the
-       bug that 'could not unmount' was always displayed, even if the
-       umount was successful (thanks to Andreas Hauber).
+  * src/context_menus.c
 
-       BUGFIX: Some iTunesDB files written by iTunes could not be read
-       because of an error in the parse code (gtkpod would attempt to
-       read beyond the end of the file).
+  Removed fetchcover context menu entries as no longer
+  required.
 
-       BUGFIX: Fixed compatibility issue with new firmware 3.1 and
-       iTunes 4.9 (only 256 tracks were shown on the iPod, iTunes
-       removed the majority of the tracks from the iPod). Podcasts are
-       still not supported, however, and will be lost when handled by
-       gtkpod.
+  * src/details.c
 
-       BUGFIX: Fixed On-The-Go playlist handling (thanks to "Todd").
+  Added drag and drop receive function to thumbnail cover
+  image. Drag a jpg file displayed in firefox or konqueror
+  onto the cover artwork thumbnail in the Edit Details
+  window to download it and set it as the track's artwork.
 
-       UPDATE: Hebrew translation catalog. Thanks to Assaf Gillat!
+  * src/display_coverart.c
+  * src/display_coverart.h
 
-gtkpod V0.93.1
-       BUGFIX: When changing the mountpoint, the change was not
-       written to the preferences file correctly.
+  Added drag and drop receive function to main image on
+  coverart display. Drag a jpg file displayed in firefox or
+  konqueror onto the main image to set it as the coverart
+  for the album's tracks.
+  
+  * data/gtkpod.glade
 
-       BUGFIX: 'Copy from iPod' just failed in offline mode instead of
-       giving meaningful error messages -> fixed.
+  Removed fetchcover dialog from the glade file.
 
-       IMPROVEMENT: 'Copy from iPod' is now 'Export from Database' and
-       allows to export from the local database as well. This is
-       useful if you want to rename files in a consistant manner.
+  * README
 
-gtkpod V0.93
-	Complete rewrite of reading/writing the iTunesDB. The code for
-	reading and writing the iTunesDB (and other iPod/Shuffle
-	files) is completely self-contained (itdb*.[ch]) and can
-	easily be used in other projects.
+  Updated drag and drop section to include information about
+  dnd'ing jpgs onto coverart display and Edit Details dialog.
+  
+2007-10-07 Michael Tiffany <tiffman at users.sourceforge.net>
 
-	NEW FEATURE: Support of 'local database' containing tracks on
-	local harddisk. The contents of the local hard disk can be
-	browsed in the known gtkpod-fashion: by artist or genre or
-	album etc. Tracks and entire playlists can be dragged over to
-	the iPod or Shuffle database. By using smart playlists with
-	defined size in MBytes, the Shuffle can be filled effectively.
+	* src/display_itdb.c: patch to set "changed" and "imported" to
+	  TRUE for non-ipod (local and podcast) databases
+	  Thanks to Mario Rossi.
 
-	Drag and drop also works in the opposite direction: drag
-	tracks or entire playlists from the iPod/Shuffle database into
-	your local database. If necessary, the tracks are copied to
-	your harddisk automatically.
+2007-10-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	NEW FEATURE: sync-abook.sh and sync-webcalendar.sh scripts
-	provided by Daniel Kercher.
+	* src/details.c
+	  data/gtkpod.glade: fixed issues with details window:
+	  1) window is shown before resize, which gives an annoying
+             flickering
+	  2) if Misc is the selected panel, the it is not restored
+             next time
+	  Thanks to Mario Rossi.
 
-	NEW FEATURE: sync-thunderbird.sh script	provided by Clinton
-	Gormley.
+	* scripts/convert-2mp3.sh: fix handling of genre option
 
-	IMPROVEMENT: support MP3 disc numbers (thanks to Leigh Dyer)
+2007-09-30  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-	IMPROVEMENT: Use of GTK filechoosers instead of fileselectors
-	(thanks to James Ligget)
+	* configure.in
+	  src/Makefile.am:
+	  add --with/--without options to configure for curl, flac,
+	  libmp4v2, and ogg vorbis dependencies.
 
-	IMPROVEMENT: sync-notes.sh now also works on directories (thanks
-	to Thomas Perl)
+	  separate pkg-config calls so that the configure output is
+	  more informative when one of the required deps is missing.
 
-	UPDATE: use 'iconv' instead of 'recode' in the provided export
-	scripts. Thanks to Alexey Dokuchaev.
+	  minor cosmetic cleanups.
 
-	UPDATE: All translation catlogs updated (French, German,
-	Italian, Japanese and Swedish)
+	* src/fetchcover.h:
+	  remove duplicate comment tag (silences a compiler warning)
 
-	BUGFIX: display and reading of compilation flag fixed (thanks
-	to Julien Oster for the patch)
+2007-09-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	BUGFIX: don't hang when parsing playlist files with empty
-	lines (thanks to Mattias Wadman)
+	* src/file_itunesdb.c (gp_load_ipod): make sure the ipod model
+	  number is known and written to the iPod before loading the
+	  iTunesDB. If the model number is not known at the time of
+	  loading the iTunesDB, libgpod will not read the ArtworkDB,
+	  thereby losing all artwork.
 
-	BUGFIX: When exporting from the iPod: if the original filename
-        of a track was available, the track was not copied from the
-        iPod but from the original location on the user's
-        harddisk. Had the original file been removed or the export was
-        done on another computer (where the original file was not
-        present), the export failed.
+	* scripts/ removed previous
+	  convert-{flac|ogg|mp3|m4a|wav}2{mp3|m4a} scripts and
+	  replaced with convert-2{mp3|m4a} drafted by Peter van der
+	  Does. These scripts share gtkpod-convert-common.sh.
 
-gtkpod V0.88.2
-	IMPROVEMENT: Added '%p' (current playlist) identifier when
-	exporting tracks.
+	  scripts/Makefile.am: added/removed the files mentioned above.
 
-	BUGFIX: DND in playlist view did not work.
+	* src/prefs.c: automatically replace prefs settings to use the
+          new generic conversion scripts.
 
-	BUGFIX: scripts sync_evolution, sync_evocalendar and sync_notes
-	were not included in standard distribution.
+2007-09-02  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-gtkpod V0.88.1
-	BUGFIX: Should now work with the shuffle -- forgot to change a
-	version number in the iTunesDB file :-(
+	* scripts/convert-m4a2mp3.sh: fixed a typo, spotted by Peter
+	  van der Does.
 
-gtkpod V0.88
-	NEW FEATURE: Support for iPod Shuffle. Thanks to Steve Wahl.
+2007-08-26 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	BUGFIX: In smartlists star rating better supported. One star is
-	"1" and not "20".
+	* src/fetchcover.c
+	* src/fetchcover.h
+	* src/display_coverart.c
+	* src/details.c
+	* src/context_menus.c
+	* gtkpod.glade
+  
+	Commented out fetchcover due to licensing problems. Wiil re-enable
+	once a new approach has been fully considered.
 
-gtkpod V0.87
-	NEW FEATURE: Support for smart playlists.
+2007-08-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	NEW FEATURE: Added scripts sync_evolution, sync_evocalendar and
-	sync_notes to synchronise Contacts, Calendar and Tasks from
-	Evolution and to synchronise Notes with anything in the folder
-	~/ipod_notes.
+	* src/misc_track.c (gp_track_by_filename): stop iteration when
+          result is found. Thanks to Clarke Brunsdon for bringing this
+          to my attention.
 
-        BUGFIX: drag and drop was only implemented for mp3 files, not
-        for m4a, m4p, m4b, and wav files (thanks to Chris Micacchi for
-        pointing it out and supplying a first fix).
+2007-08-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	BUGFIX: Category playlists "for each year" did not work.
+	* src/autodetection.c (ad_timeout_cb): avoid crash when
+          iTunesDB could not be read successfully.
 
-	BUGFIX: Invalid charset conversion could hang gtkpod.
+	* src/file_itunesdb.c (set_progressbar): only update window if
+          a change occured.
 
-	IMPROVEMENT: Support for iTunes' "checked", filedescriptor (kind),
-	and grouping fields.
+	* src/tools.c (tools_sync_script): make sure the stderr of
+          scripts is displayed as well.
 
-	IMPROVEMENT: When sorting ignore 'the' and similar at the
-	beginning of the title (thanks to Chris Micacchi)
+2007-08-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	IMPROVEMENT: Use statvfs() instead of a call to the external
-	command "df" to determine the free space on the iPod (thanks
-	to Steve Jay)
+	* src/file_convert.c (conversion_log_append): don't append
+	  character by character as this takes up too much CPU
+	  time. Thanks to Javier Kohen for the patch.
 
-	IMPROVEMENT: The fields "time_modified/played/created" can now
-	be edited from within the track view.
+2007-08-08  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-	IMPROVEMENT: Creation of playlists for each rating
-	(Unrated, and Rated 1..5).
+	* data/gtkpod.glade
+	  src/prefs_window.c
+	  TODOandBUGS:
+	  Convert the Track Attributes preference from a series of
+	  checkboxes to an Available and Displayed list.  Jorg did a
+	  bit of cleanup and added many nice features.
 
-	UPDATE: Swedish translation catalog
+2007-08-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	UPDATE: Italian translation catalog
+	* flacfile.c: include "mp3file.h" to avoid compile time
+          warning.
 
-gtkpod V0.85.0
-	BUGFIX: when clicking onto the column header of the track
-	treeview three times and moving sidewards with the mouse at
-	the same time, gtkpod crashed. Crashing was due to a bad
-	workaround of a bug in the GTK+-library. Removed workaround
-	and instead submitted a bug report against GTK+. The bug has
-	been fixed in version 2.5.4 of the GTK+ library.
+2007-08-03 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	BUGFIX: When using "block display during updates" the display
-	was still updated during import. Fixed.
+	* src/display_coverart.h: added DEFAULT_IMG_SIZE
 
-	BUGFIX: The menu item "Check iPod's Files" was not reliably
-	activated. It's now always selectable when not in offline
-	mode.
+	* src/display_coverart.c: improvements to image dimension
+	  setting algorithms for both x and y. Using
+	  ITDB_THUMB_COVER_LARGE for the preferred image means the
+	  coverart can be too big in the coverart display
+	  window. Thus, introduces a default maximum and algorithm to
+	  set it.
 
-	BUGFIX: when writing tags to file the track tag was
-	deleted.
+2007-08-02  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-	BUGFIX: special sorttab: sorting according to "time modified"
-	and "time created" did not work.
+	* data/gtkpod.glade:
+	  add fetchcover_dialog_test
 
-	BUGFIX: handling of orphaned tracks that had been added to the
-	ipod again are now handled correctly.
+2007-07-31  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
-	BUGFIX: fixed case-sensitivity issue while handling orphaned
-	tracks.
+	* INSTALL:
+	  update the dependency list
 
-	BUGFIX: fixed bug that caused gtkpod to hang when activating
-	duplicate detection without having the list of duplicates
-	displayed (must have been around ever since duplicate
-	detection was introduced...)
+2007-07-30 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	BUGFIX: gain tags written by mp3gain were never read
-	correctly. Normalization using mp3gain was therefore
-	impossible. Didn't anyone ever use that feature?!
+	* src/fetchcover.c: improved return status of
+	  net_retrieve_image function so that if one image fails to be
+	  retrieved then the dialog does not have to be cancelled.
 
-	BUGFIX: when copying track to the iPod, the free space
-	indication became bigger and bigger during the process.
+2007-07-26 Michael Tiffany <tiffman at users.sourceforge.net>
 
-	BUGFIX: Ascending and descending were interchanged in the sort
-	window.
+	* merge gapless_playback_branch back to HEAD.
 
-	NEW FEATURE: Implemented Michael Rolig's patch/idea to access
-	mserv data for the rating. Still needs testing as I don't use
-	mserv.
+2007-07-23 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	NEW FEATURE: added "randomize current playlist" (only the menu
-	entry without actual code was present so far).
+	* src/details.c: set tartwork_changed flag to TRUE rather than
+	  relying on using force_update_cover function. Former picked
+	  up by pm_track_changed()
 
-	NEW FEATURE: support for On-The-Go Playlists. They will show
-	up as "OTG Playlist 1" etc.
+	* src/display_coverart.c: coverart_track_change responds to
+	  track changes and redisplays covers if tartwork_changed flag
+	  has been set.
+	
+	* src/display_playlists.c: KEY_DISPLAY_COVERART pref test removed from
+	  pm_track_changed and placed inside coverart_track_changed instead.
+	  
+	* file.c: update_track_from_file function updates calls for
+	  redisplay of the coverart regardless of any file data
+	  changes to ensure that any coverart changes do not go
+	  unnoticed.
 
-	NEW FEATURE: export of PLS or M3U file including meta data.
+2007-07-15 Michael Tiffany <tiffman at users.sourceforge.net>
+
+	* src/mp3file.c: fixed memory leak: wasn't closing files in
+	  mp3_read_lame_tag.
+
+2007-07-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_tracks.c (tm_set_search_column,
+          tm_search_equal_func): add newly added fields (bugfix).
+
+	* src/display_tracks.c (tm_cell_toggled): removed "default"
+          case to make sure newly added fields are not forgotten.
+
+	* src/mp3file.[ch]: moved reading of default tags to
+          id3_read_tags()
+
+	* src/flacfile.c: fallback on ID3 tags if no vorbis comments
+          are available.
+
+2007-07-13 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+  	* src/display_coverart.c
+	    src/display_coverart.h
+	    src/fetchcover.c
+	  Added parameter to coverart_get_track_thumb so that the default
+	  cover image can be provided with a default size if required.
+
+2007-07-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_tracks.c (tm_cell_edited, tm_cell_compare): add
+          newly added fields (bugfix, thanks to Michael Tiffany)
+
+2007-07-12 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* configure.in
+	  po/ro.po: added Romanian translation, thanks to Alex Eftimie.
+
+2007-07-11  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* scripts/sync-evolution.sh:
+	  try harder to find evolution-addressbook-export (thanks to
+	  Götz Waschk)
+
+2007-07-08  Michael Tiffany <tiffman at users.sourceforge.net>
+
+	* src/mp3file.c: modified mp3_read_lame_tag() to check the info tag
+	  crc and return the result of the check.  Changed the replaygain and
+	  gapless functions to check the return value and only use tag data if
+	  the crc matched.
+
+2007-07-06  Michael Tiffany <tiffman at users.sourceforge.net>
+
+	* src/display.h
+	  src/misc_conversion.c
+	  src/misc_track.c
+	  src/file.c
+	  src/details.c
+	  data/gtkpod.glade:
+	  added a read-only checkbox to the Misc tab in the Details window to
+	  show the state of the gapless track flag.
+
+2007-07-05  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* src/autodection.c:
+	  add missing string replacement
+
+2007-07-04 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/details.c: tartwork_changed flag defined when a new
+          artwork file is selected from the filesystem.
+    
+	* src/fetchcover.c: tartwork_changed flag added for all
+	  occurrences of artwork being changed.
+    
+        * src/display_coverart.c: reworking of the code to fix the
+	  sizes of the covers according to the ipod thumbnail size.
+	  When the pane is expanded, the coverart display's spacing is
+	  widened rather than the individual covers being stretched.
+	  Instead of the highlights, reflections and covers images
+	  being redrawn as black when null, the containing items are
+	  hidden. They are redisplayed when a new cover image is
+	  required.
+
+2007-07-04  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* configure.ac
+	  src/Makefile.am:
+	  fix compile with --as-needed (thanks to Santiago M. Mola)
+
+	* po/fr.po:
+	  updated French translation (thanks to Eric Lassauge)
+
+2007-07-02  Michael Tiffany <tiffman at users.sourceforge.net>
+
+	* src/mp3file.c: created struct to store the lame tag, and a function to
+	  parse it.  Changed the replaygain and gapless functions to use this to
+	  get any necessary lame data.  Added an info tag CRC function from the
+	  libmad code (GPL) to check the validity of the lame tag.
+
+2007-06-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/details.c (details_setup_widget): fixed memory leak
+	  (thanks to Daniele).
+
+	* src/display_coverart.c (coverart_set_images): fixed memory
+          leak (thanks to Daniele).
+
+	* src/Makefile.am: remove EJECT_BIN line as it is no longer
+	  used (thanks to Gabriel C).
+
+2007-06-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* data/gtkpod.glade:
+	  Changed fetchcover dialog's buttons to display icons only.
+		
+	* src/fetchcover.c:
+	  Added in gettext macros for status messages.  Disabled next
+	  button if net_retrieve fails to get any images from the
+	  downloaded xml file (Thanks Daniele).
+
+2007-06-27  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* po/es.po
+	  po/fr.po
+	  po/de.po
+	  po/sv.po
+	  po/ja.po
+	  po/gtkpod.pot
+	  po/he.po
+	  po/it.po
+	  po/POTFILES.in:
+	  add src/autodetection.c to POTFILES.in and update po files
+
+	* configure.in:
+	  bump version for 0.99.11SVN new development
+
+	* ChangeLog:
+	  bump version to 0.99.10
+	  note Michael's work on gapless playback
+
+	* configure.in:
+	  bump version for 0.99.10 release
+	  look for MP4GetMetadataGrouping in libmp4v2 check
+
+	* src/fetchcover.c
+	  src/fetchcover.h:
+	  give credit where credit is due
+	  add Id keyword (Daniele)
+
+	* src/display_coverart.c
+	  src/display_coverart.h
+	  src/flacfile.c:
+	  add/update copyright headers (Daniele)
+
+2007-06-26  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* COPYING:
+	  update license text from http://www.gnu.org/licenses/gpl.txt
+
+2007-06-26 Daniele Forsi <dforsi at users.sourceforge.net>
+
+	* src/fetchcover.c
+	  src/file.c
+	  src/misc_playlist.c: change some strings to match existing ones
+	  (this will hopefully help translators a little bit) 
+
+	* src/details.c
+	  src/details.h
+	  src/display_coverart.c
+	  src/display_itdb.c
+	  src/display_playlists.c
+	  src/display_sorttabs.c
+	  src/fetchcover.c
+	  src/file.c
+	  src/prefs.c
+	  src/prefs.h
+	  src/tools.c: fix typos in comments
+
+	* po/it.po: updated Italian translation
+
+2007-06-25  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* src/file.c
+	  src/misc_track.c
+	  src/mp3file.c
+	  src/mp3file.h:
+	  preliminary support for parsing gapless playback data from
+	  mp3 files.  Thanks to Michael Tiffany.
+
+	* po/es.po
+	  po/he.po:
+	  remove generic copyright header.
+
+2007-06-25 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/display_itdb.h: added tartwork_changed flag to
+          ExtraTrackData
 	
-	NEW FEATURE: registering playcounts when tracks are played on
-	the local machine is now possible (actually it was already
-	possible in V0.80, but now the README explains how to do it).
+	* src/details.c: initialise tartwork_changed flag to
+	  FALSE. Use this flag in details_copy_artwork as additional
+	  check if artwork has changed. Removal of all tilda related
+	  cruff.
+		
+	* src/fetchcover.c: removal of tilda related cruff with use of
+	  the tartwork_changed flag from ExtraTrackData. Set Prev
+	  Button initially to hidden until images from the net are
+	  retrieved.
 
-	NEW FEATURE: Swedish translation provided by Stefan Asserhäll.
+2007-06-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	IMPROVEMENT: Speeded up writing of iTunesDB. For me it is now
-	between 1 and 15 seconds instead of between 20 and 40 seconds
-	before (for security I'm using the iPod as a non-buffered
-	device). A back-upped version of the iTunesDB is now always
-	written to ~/.gtkpod.
+	* src/display_playlists.c (pm_drag_motion): don't allow drops
+          into non-loaded repositories. (pm_create_treeview): don't
+          use GTK_DEFAULT_MOTION as this gives optical feedback that
+          drops into the column header is allowed, even though it is
+          not.
 
-	IMPROVEMENT: Speeded up display of sorted views. Thanks to
-	Stefan Asserhäll for the idea and valuable input.
+	* src/display_sorttabs.c (st_create_listview): renamed to
+          st_create_treeview(), simplified and merged with parts of
+          st_create_page which did part of creating the treeview. This
+          is the point when I realize that DND into the sort tabs is
+          not supported and I don't have to do anything. Code is
+          easier to read and understand now.
 
-	IMPROVEMENT: Moved some options from the preferences dialog to
-	the file chooser dialog where you need them. gtkpod now
-	requires GTK2.4 to compile.
+	* src/display_tracks.c (tm_drag_motion): don't allow drops
+          into non-loaded repositories.
 
-	IMPROVEMENT: Added "Time Created" support to special sorttab,
-	track display and iTunesDB. (Before only "modified" and
-	"played" were supported.)
+2007-06-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	IMPROVEMENT: All information stored in the iTunesDB about
-	tracks is read and written, even if the information itself is
-	not used by gtkpod itself.
+	* src/misc_input.c: removed calls to dirbrowser_block() and
+	  dirbrowser_release() (obsolete because dirbrowser became
+	  modal)
 
-	IMPROVEMENT: Added new track information fields: iPod_Path,
-	creation time, soundcheck, samplerate, "BPM"
+	* src/fileselection.c
+	  src/fileselection.h
+          data/gtkpod.glade: (adding of tracks, directories and
+	  playlist files): do not allow adding of tracks if no
+	  playlist is selected or if the iPod is not loaded into the
+	  selected repository. Better names for file chooser
+	  directories, dirbrowser modal, separate functions for glade
+	  callback.
 
-	IMPROVEMENT: Volume normalizing: when importing mp3 the replay
-	gain is read and the soundcheck field set accordingly. Use
-	the "soundcheck" feature of the iPod to have the volume
-	normalized during playback.
-	If no replay gain tag is set, use the "Normalize" as usual to
-	have mp3gain write a replay gain tag.
+	* src/file.c (copy_new_info): removed unused variables.
 
-	IMPROVEMENT: The extended information database now also
-	contains the iPod filename. This allows to find a certain
-	track even on systems not running gtkpod/gnupod/iTunes etc.
+2007-06-23  Todd Zullinger <tmzullinger at users.sourceforge.net>
 
-	IMPROVEMENT: Some fixes for compilation under solaris. This
-	also led to the introduction of the environment variable
-	"GTKPOD_DF_COMMAND" that can be used to customize the df
-	command called to probe the free space of the iPod.
+	* configure.in:
+	  require libgpod >= 0.5.2
 
-gtkpod V0.80-2
-	BUGFIX: gtkpod would crash right after startup if the info
-	window was open when stopping gtkpod the previous time.
+2007-06-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	BUGFIX: Fixed free space display: the digits were right, the
-	unit was wrong (B instead of kB, kB instead of MB, MB instead
-	of GB...).
+	* src/file_convert.c: fixed typo (thanks to Daniele Forsi).
 
-	PATCH: gtkpod will compile with GTK V2.0 (V0.80 needed GTK
-	V2.4)
+	* src/misc_conversion.c: corrected tooltip for BPM (thanks to
+	  Daniele Forsi).
 
-	PATCH: gtkpod should compile under Fedora without patch
+	* src/display_coverart.c (coverart_get_track_thumb): retrieve
+	  thumbnail through libgpod and not from thumbnail filenames
+	  because these are not always set.
 
-	PATCH: reverted to old-style check of id3tag-lib as id3tag.pc
-	is not included with the id3tag distribution by default
+	* src/details.c (details_button_apply_clicked): write tags
+          back to file if option is selected. Change modification time
+          of changed tracks.
+
+	* src/file.c (copy_new_info): further simplification by using
+	  track_copy_item() instead of duplicating code.
+
+2007-06-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c:
+	  added reading/writing of tags for sort artist, sort album,
+	  sort title, sort albumartist and sort composer.
+
+	* src/mp4file.c:
+
+	  Added reading/writing of the grouping tag, whatever that
+	  is.
+
+	  The sort tags are written by iTunes as fields of the
+	  iTunes_CDDB_IDs tag which I don't seem to be able to access
+	  (only the first field seems available without hacking). For
+	  reference: the field names are soar (artist), sonm (title),
+	  soal (album), soaa (album artist), soco (composer) and sosn
+	  (show).
+
+	  Added reading of coverart tag. Displayed by the iPod but not
+	  by the coverart display. Properly displayed in the details
+	  window.
+
+	* src/file.c (copy_new_info): use switch() to avoid missing
+          copying new items (like the sort keys).
+
+2007-06-22  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* src/fetchcover.c:
+	  disable debug output for release
+
+	* po/de.po:
+	  remove duplicate header comments
+
+2007-06-21  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* data/gtkpod.glade:
+	  add/update keyboard mnemonics in the Details and Download
+	  Cover windows to avoid missing/duplicated mnemonics
+
+2007-06-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_convert.c (transfer_transfer_track): add newline to
+          libgpod error messages. Thanks to Daniele Forsi.
+
+	* src/display.h
+	  src/misc_conversion.c
+	  src/display_itdb.c
+	  src/display_tracks.c
+	  src/misc_track.c
+	  src/details.c
+	  data/gtkpod.glade:
+	  added support for new text fields supported by libgpod
+	  0.5.0: album artist, sort artist, sort title, sort album,
+	  sort albumartist, sort_composer, sort_tvshow.
+
+2007-06-20 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* details.c - details_copy_artwork
+	  Reintroduced if clause on whether to copy the artwork. If
+	  image file has been set by fetchcover then a tilde is appended
+	  to the filename. This method removes the tilde, renames the
+	  file and copies the artwork with the proper filename.
+	  
+	* fetchcover.c
+	  Introduced flag USE_TILDA that is true when Details window calls
+	  fetchcover and false for when display coverart calls it. Tilda
+	  symbol added to end of filename if USE_TILDA set to true.
+	  Added references to dialog parents to properly control which
+	  windows can receive focus while dialogs are displayed.
+
+2007-06-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* data/gtkpod.glade
+	  src/prefs_window.c: automatically create the checkboxes for
+	  the visible columns selection, greatly simplifying additions.
+
+2007-06-20  Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* src/file_convert.c
+	  src/autodetection.c:
+	  disable debug output for release
+
+	* src/display_coverart.c:
+	  fix a segfault when the coverart display is minimized and
+	  set_covers is called
+
+2007-06-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_itunesdb.c: Todd's patch to display the repository
+          name while writing to the iPod.
+
+	* data/gtkpod.glade: Todd's patch to substitute custom button
+          with stock button in the export dialog.
+
+	* src/file.c: set mediatype to 'audiobook' for .mb4 files.
+
+	* src/ipod_init.c (gp_ipod_init_set_model): avoid segfault if
+          iPod model cannot be selected (possibly GTK+ or glade version
+          incompatibility?).
+
+2007-06-18 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	Bug fixes spotted by Daniele Forsi.
 	
-gtkpod V0.80
-	NEW FEATURE: Added support for WAV audio files
+	Change in coverart not made to coverart display when apply button
+	clicked on Details window.
+	Fetchcover behaved awkwardly with naming the downloaded image files if
+	the tracks concerned lacked album info in their ID3 tags.
+	Coverart files from fetchcover subject to template values in the prefs.
+	Should always be a default value of folder.jpg if none of the templates
+	provide a non-null value.
 
-	NEW FEATURE: Added support for bookmarkable AAC files (.m4b
-	files). Thanks to D.L. Sharp. More information is available at
-	http://www.ipodlounge.com/articles_more.php?id=3233_0_8_0_C
-	http://docs.info.apple.com/article.html?artnum=61695
+	* src/details.c:
+	  details_copy_artwork() has to now always recopy the artwork
+	  from file. The reason being, fetchcover overwrites the artwork hence
+	  the file name will still be the same while different artwork.
+	  
+	* src/display_coverart.h
+	  src/display_coverart.c:
+	  set_covers() and set_cover_item() now has a
+	  parameter to force an update of the cover images from file. Only used
+	  by details_copy_artwork() when the apply button is clicked on the
+	  details window.
+	  
+	* src/fetchcover.c:
+	  dialog will now appear if a cover image file already exists in the
+	  tracks directory. Gives the options to overwrite, save as unique name
+	  or cancel completely.
+	  
+2007-06-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	NEW FEATURE: Added support for syncing contacts and calendar from
-	existing applications to the iPod (on iTunesDB export and/or via
-	the Tools-menu). The sync is done by calling external scripts.
-	Only one script is included so far: kaddressbook_ipod. Please
-	submit more for inclusion into the next release.
+	* src/misc.h
+	  src/details.c
+	  src/misc.c
+	  data/gtkpod.glade: moved mediatype combobox handling in edit
+	  details window completely inside details.c for easier
+	  maintenance.
 
-	NEW FEATURE: Added support for LAME's replay gain to normalize the
-	volume track (thanks to Jens Taprogge). Unfortunately the
-	conversion factor between LAME's replay gain and the iPod's volume
-	tag are not well known yet -- your input is appreciated!
+2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	IMPROVEMENT: Added file selectors for selecting files in the tools
-	section of the preferences dialog.
+	* src/mp4file.c
+	  src/mp3file.c: read/write tempo (BPM) value from/to tags.
 
-	IMPROVEMENT: Added new auto-playlists: "One playlist for each
-	year" and "Playlist with all songs not listed in any playlist".
+	  src/flacfile.c
+	  src/oggfile.c: read tempo (BPM) value from tags (not sure
+	  if this is correct)
 
-	IMPROVEMENT: Can specify several templates to scan the filename
-	for tags using the ';' as a separator
+	  src/file.c (copy_new_info): copy BPM after having read it.
 
-	IMPROVEMENT: Can specify several templates for the export
-	filename. gtkpod selects according to the extension given.
+	* README: some changes initiated by Daniele Forsi.
 
-	IMPROVEMENT: Streamlined layout of info window
+	* src/info.c (gtkpod_statusbar_message): fixed memory leak --
+          thanks to Daniele Forsi.
 
-	IMPROVEMENT: Included Andrew Huntwork's patch to fix issues
-	concerning case-sensitivity of filenames under some conditions.
+	* src/display_sorttabs.c (st_create_special): fixed memory
+          leak.
 
-	IMPROVEMENT: Included Ero Carrera's patch to validate the filename
-	when copying tracks from the iPod and to make a quick sync of the
-	iPod's contents.
+	* src/prefs.c (init_prefs): fixed memory leak.
 
-	IMPROVEMENT: When importing the iTunesDB automatically on startup,
-	no window was opened until the import was finished. Thanks to
-	Andrew Huntwork the window now opens before the import starts and
-	progress can be followed in the usual manner.
+	* src/syncdir.c (sync_playlist): fixed memory leak.
 
-	IMPROVEMENT: Send 'eject' to the iPod after unmounting. This only
-	works under LINUX and if the user has write access to the device
-	file (e.g. /dev/sda2)
+	* src/display_coverart.c (coverart_block_change): fixed memory
+          leak.
 
-	IMPROVEMENT: When writing to the iPod automatically create iPod's
-	directories when they are not present.
+2007-06-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	IMPROVEMENT: Added progress dialog with abort button when copying
-	tracks from the iPod.
+	* po/es.po: new version updated by Alejandro Lamas Daviña.
 
-	BUGFIX: When dragging tracks between two playlist (i.e. into a
-	newly created playlist), a new playlist was created but the tracks
-	were not added.
+2007-06-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	BUGFIX: Fixed hangup when syncing dirs
+	* src/prefs.c (read_prefs_get_key_value): don't strip
+	  whitespace from prefs values. This is none of this
+	  function's business! (Thanks to Todd for tracking this down)
 
-	BUGFIX: Fixed compile error when compiling without mp4 support
+	* src/display_sorttabs.c (st_create_notebook): set up compare
+          function so that the ignore strings work right after startup.
+          (Thanks to Todd for tracking this down)
 
-	BUGFIX: Fixed compile error when compiling with gcc 2.95
+2007-06-08  Todd Zullinger <tmzullinger at users.sourceforge.net>
 
-	BUGFIX: Tags of tracks on the iPod were never changed (fixed
-	thanks to Andrew Huntwork)
+	* gtkpod.glade
+	  src/prefs_window.c:
+	  hide Last.FM tab (déjà vu)
 
-	BUGFIX: Fixed calculation of remaining seconds in progress
-	dialogs.
+	* configure.in
+	  src/display_coverart.c
+	  src/Makefile.am
+	  src/misc.c
+	  data/gtkpod.gladep
+	  data/Makefile.am
+	  Makefile.am
+	  po/es.po
+	  po/fr.po
+	  po/de.po
+	  po/sv.po
+	  po/ja.po
+	  po/gtkpod.pot
+	  po/he.po
+	  po/it.po
+	  po/POTFILES.in
+	  po/POTFILES.skip:
+	  Fixup 'make distcheck' and add some files missing for i18n.
 
-	BUGFIX: automatic update of preferences data from older version
-	went awry when no preference file was present
+	* configure.in
+	  Makefile.am
+	  data/gtkpod.desktop.in
+	  data/Makefile.am
+	  data/icons
+	  data/icons/48x48
+	  data/icons/48x48/Makefile.am
+	  data/icons/32x32
+	  data/icons/32x32/Makefile.am
+	  data/icons/Makefile.am
+	  data/icons/64x64
+	  data/icons/64x64/Makefile.am
+	  autogen.sh
+	  po/POTFILES.in:
+	  Add a .desktop file and reorganize the icons.
 
-gtkpod V0.72
-        NEW FEATURE: tags can now be set from the filename using a
-	template like "%a - %A/%T %t.mp3".
+2007-06-05  P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	IMPROVEMENT: read and write ID3v2.4 tags. This has been achieved
-	by migrating to the id3tag library. Using ID3v2.4 tags with
-	unicode encoding takes away the need to worry about which encoding
-	is used for the tags. Old "broken"-style locale charset encodings
-	in tags are still supported, of course.
+	* src/fetchcover.c
+	  src/fetchcover.h:  
+	  Add license headers to source files.
 
-	BUGFIX: configure script was broken -- even though mp4 support was
-	configured in, gtkpod was built without :-(
+2007-06-05  P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-gtkpod V0.70
-	NEW FEATURE: import of AAC files (.m4a) supported, provided the
-	mp4v2 library from the mpeg4ip project
-	(mpeg4ip.sourceforge.net) is available during the compilation of
-	gtkpod. Writing tags to AAC files is also supported.  .m4p files
-	can also be imported, but they are not played by the iPod. .m4a
-	files work fine.
+	* src/display_coverart.c:
+	  Fixed free_CDWidget() function which tried to free visible
+	  albums twice. Also click hide button on coverart display
+	  once again hides the slider and navigation buttons. Thanks
+	  to Todd for the spot.
 
-	NEW FEATURE: info window showing total file size, play time
-	etc. can be opened.
+2007-06-02  Daniele Forsi <dforsi at users.sourceforge.net>
 
-	IMPROVEMENT: Upon popular request, the menus now provide different
-	entries for "Delete from iPod" and "Delete from Playlist".
+	* po/it.po: updated Italian translation
 
-	IMPROVEMENT: when deleting tracks completely from the iPod, the
-	confirmation dialog also displays the number of playlists the
-	tracks are members of.
+2007-06-01  P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	IMPROVEMENT: Quick sync possible using "Add Tracks".  Details:
+	* src/display_coverart.c:
+	  Added callback on display_coverart content panel for acting
+	  on scroll events with the mouse wheel. Result is that moving
+	  the scroll wheel while the mouse is over the coverart
+	  display will scroll the covers in the respective direction.
+		
+	  Avoided possible null pointer in track_changed function.
+	  Thanks to Daniele Forsi for raising it. May need further
+	  work if this does not solve it.
 
-	  Until now the default action when adding tracks that already
-	  exist (identical full filename) was to add it again (they were
-	  rejected by the duplicate detection, but that took a long time),
-	  or to update the track information (option).
+2007-05-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	  Now the default action is to skip existing tracks (identical
-	  filename) or to update the track information (option). Thus, by
-	  default, only new tracks are read, allowing quick
-	  synchronization of entire directories.
+	* src/autodetection.c: fix non-responsive buttons introduced
+          with automounting.
 
-	IMPROVEMENT: In the past, using programs other than gtkpod to
-	transfer files voided the extended information file. gtkpod will
-	now try to use the MD5 checksums stored in the extended
-	information file to match up the data when this occurs.
+	* scripts/sync-tomboy.sh
+	  scripts/sync-notes.sh: fixes by Oliver Sherouse
 
-	IMPROVEMENT: The 'year' tag is now supported as track view column
-	and as sort tab type.
+	* scripts/sync-abook.sh
+	  scripts/sync-webcalendar.sh:
+	  set more reasonable default path.
 
-	IMPROVEMENT: The tags for track number and total number of tracks
-	are displayed as nn/nn in the track view, and can also be entered
-	as such.
+2007-05-30  P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	IMPROVEMENT: The tags for CD number and total number of CDs can
-	now be displayed (analoguous to track number and total number of
-	tracks above)
+	* src/display_coverart.c:
+	  Changed the on_main_cover_image_clicked so that only the
+	  tracks belonging to the album are displayed in the track
+	  listing. The sorttabs are no longer updated. A lot quicker
+	  and doesnt rely on the artist/album sorttabs being visible.
 
-	IMPROVEMENT: When creating a new playlist a dialog is popped up
-	asking for a name.
+        * /src/fetchcover.c:
+	  Status bar content changes in case album is not found.
 
-	BUGFIX: Drag and Drop of files with spaces did not work.
+2007-05-30  Todd Zullinger <tmzullinger at users.sourceforge.net>
 
-	BUGFIX: "Unsort" (clicking sort column three times) of track view
-	failed if last sort tab was a "special" sort tab.
+	* configure.in
+	  INSTALL
+	  INSTALL_CVS
+	  Makefile.am:
+	  change CVS references and links to SVN
 
-	BUGFIX: updated ID3 tag reading code from easytag's new
-	version. Please also note that id3lib V3.7.3 seems to crash gtkpod
-	every once in a while. V3.8.3 appears to be more stable.
+2007-05-17  P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-gtkpod V0.60
-	NEW FEATURE: normalize song volume (using mp3gain). Uses iPod's
-	volume adjust feature rather than modifying the mp3 file.
+        * display_coverart.c
 
-	NEW FEATURE: define format of filename when copying tracks from
-	iPod (mainly thanks to Sam Clegg).
+	  Completely forgot compile time errors for
+	  g_hash_table_remove_all so removed glib_version call to
+	  ensure back compilation compatibility.
 
-	NEW FEATURE: adjust volume of each track individually by using
-	iPod's per-track volume adjust feature (implemted through a new
-	column in the song view).
+2007-05-16  Todd Zullinger <tmzullinger at users.sourceforge.net>
 
-	NEW FEATURE: automatically create a playlist for each
-	album/artist/genre/composer in your collection (thanks to Chris
-	Cutler), and other automatic playlist generations.
+	* src/tools.c: Fixed a few typos. (Daniele Forsi)
 
-	NEW FEATURE: menu items and context menu items to create new
-	playlist containing displayed songs or selected songs.
+2007-05-16  P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	IMPROVEMENT: Try to press the shift key when dropping songs into a
-	playlist to move rather than copy tracks from one playlist to
-	another. Keep in mind that songs cannot be moved from or to the
-	master play list.
+	* src/display_coverart.c:
+	  Null checks placed in free_album.  g_hash_table_remove_all
+	  only used if running GLib version is newer than 2.12.0.
+	  Otherwise falls back on g_hash_table_foreach_remove.  Thanks
+	  to Mario Rossi for squashing these bugs.
 
-	IMPROVEMENT: better alphabetize interface. Alphabetize settings
-	will be remembered, different settings for playlists, sort tabs,
-	and tracks possible. Also, clicking the column header three times
-	will revert the view to its unsorted state.
+2007-05-16 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	IMPROVEMENT: handle adding of playlist files containing files with
-	relative paths.
+	* scripts/convert-flac2mp3.sh
+	  scripts/convert-ogg2mp3.sh
+	  scripts/convert-wav2mp3.sh:
+	  Added quotes around $genreopts to make script more
+	  robust. Thanks to Andy.
 
-	IMPROVEMENT: context menus more intuitive, context menus will no
-	longer trigger edit mode (most of the time).
+	* src/display_itdb.c (gp_playlist_remove_track): podcasts
+          could not be removed from the iPod.
 
-	IMPROVEMENT: the function copying songs to the iPod used a "large"
-	amount of stack memory (roughly 66000 Bytes) which crashed some
-	systems.
+	* gtkpod.glade: corrected spelling of 'separated' and
+          'iPod'. Thanks to Daniele Forsi.
 
-	BUGFIX: md5 hash for duplicate detection will examine the same
-	number of bytes on all systems now (before it used 4xPATH_MAX).
+2007-05-13  P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	BUGFIX: reading and writing of the Composer ID3 tags implemented
-	(so far the fields could only be set from inside gtkpod -- thanks
-	to Graeme Wilford)
+	* context_menus.c
 
-	BUGFIX: fixed memory holes in sync_songids(), sync_dir_ok(),
-	add_playlist_by_filename().
+	  Fixed segfault in cad_context_menu_init() to avoid freeing
+	  tracks unnecessarily.
 
-	BUGFIX: drag and drop URIs with cr/nl at the end are handled
-	correctly (thanks to Walter Bell).
+	* display_playlist.c
 
-gtkpod V0.52
-	NEW FEATURE: Supports Playcounts, Ratings, Time Last Played / Time
-	Last Modified. The playcounts and ratings are read from the 'Play
-	Count' file produced by iPod's firmware versions V1.3
-	(playcounts only) and V2.0 (playcounts and rating).
+	  Coverart display will only be updated with a track change,
+	  addition or deletion if it is visible and not minimized.
 
-	NEW FEATURE: If you mark several songs and change a tag in the
-	first one, the corresponding tag in the other songs will be
-	changed as well (must activate in the prefs menu). Patch provided
-	by Ramesh Dharan. Thanks!
+	* display_coverart.h
+	  display_coverart.c
 
-	IMPROVEMENT: added auto-dection of Japanese encoding (thanks to
-	Hiroshi Kawashima).
+	  New Album_Item structure introduced for storage of tracks in
+	  coverart display. Replacement of displaytracks GList with a
+	  key list related to an Album_Item hashmap. Track_changed
+	  function changed to speed up changed, removal and addition
+	  operations. Other functions updated to reflect introduction of
+	  Album_Item and hashmap. 
+	  
+2007-05-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	IMPROVEMENT: option to sort case-sensitively. Case-insensitive
-	utf8 sort should work fine, case-sensitive may not work entirely
-	as expected with some charsets.
+	* INSTALL
+	  configure.in
+	  src/Makefile.am
+	  src/autodetection.c (new)
+	  src/autodetection.h (new)
+	  src/display_itdb.h
+	  src/file_convert.c
+	  src/file_itunesdb.c
+	  src/misc.c
+	  src/misc.h
+	  src/misc_input.c
+	  src/tools.c:
 
-	BUGFIX: display free size correctly even if more than 4294967295
-	(or maybe just half that many?) Bytes are free on the iPod.
+	  Autodetection and auto-loading of iPods. This loads iPods
+	  automatically on start-up when they are connected or later
+	  when they are mounted. Uses gnome-vfs for detection of
+	  mounted volumes and HAL for determining if the mounted
+	  volume is an iPod. Works fine without HAL, and compiles fine
+	  without gnome-vfs, but without autodection facility.
 
-	BUGFIX: drag-and-drop: gtkpod should now correctly handle files
-	with "special" characters (like spaces...) that are escaped in the
-	DND URI. (Thanks to Walter Bell).
+	  iPod repositories are added automatically when necessary and
+	  removed when ejecting an iPod. Preferences referring to an
+	  iPod are saved into the iTunes directory (gtkpod.prefs).
 
-	BUGFIX: using 'file_export' from the context menu could crash
-	gtkpod
 
-	BUGFIX: file_export didn't remember directory last used.
+	  gtkpod.glade
+	  src/prefs_windows.c:
+	  src/prefs.c
+	  - removed old auto-import functionality. Auto-import is no
+	    longer supported without gnome-vfs. Code to support
+	    automounting on KDE should be easy to add -- please
+	    contribute.
+	  
 
-	BUGFIX: can now choose zero sort tabs in the prefs dialogue
-	(instead of the minimum one) -- why didn't anyone tell me?
+	  src/prefs.c
+	  src/prefs.h:
+	  - new code to save/load temporary preferences to an
+	    aribtrary file (temp_prefs_load/save(), used by
+	    load/save_ipod_prefs() in misc.c).
+	  - new code to create a subset of keys from the prefs
 
-	BUGFIX: when deleting songs, sometimes adjacent songs got edited
-	(took title or artist... of the deleted song). Hopefully fixed --
-	please report.
+	    structure.
 
-	BUGFIX: after reordering columns in the song view, the selection
-	of which columns are to be displayed went haywire -- fixed.
+2007-05-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	BUGFIX: fixed memory holes in pm_data_compare_func(),
-	st_data_compare_func(), sm_data_compare_func(),
-	get_ipod_used_space(), get_ipod_free_space(),
-	charset_to_description(), add_playlist_by_filename(),
-	sm_cell_edited().
+	* src/prefs.c (prefs_create_subset): removed double-lock of
+          prefs table which locked up prefs_rename_subkey(), used in
+          repository.c
 
-	NEW: Italian translation catalogue (almost complete)
+2007-05-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-gtkpod V0.51
-	NEW FEATURE: Synchronize directories (removed songs can be deleted
-	automatically).
+	* scripts/convert-flac2m4a.sh
+	  scripts/convert-flac2mp3.sh
+	  scripts/convert-m4a2mp3.sh
+	  scripts/convert-mp32m4a.sh
+	  scripts/convert-ogg2m4a.sh
+	  scripts/convert-ogg2mp3.sh
+	  scripts/convert-wav2m4a.sh
+	  scripts/convert-wav2mp3.sh:
 
-	NEW FEATURE: gtkpod remembers charset used when initially
-	importing a song and uses this when "updating" the song
-	information from file or writing tags to file (needs extended
-	information enabled).
+	  Track number was not set correctly in converted file. Thanks
+	  to Javier Kohen for spotting this.
 
-	NEW FEATURE: display free space on iPod.
+2007-05-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	NEW FEATURE: menu item "Arrange Sort Tabs" to make all visible
-	sort tabs the same size
+	* src/display_tracks.c: quick fix for the annoying multi-edit when
+	  dragging multiple tracks from track view to another playlist.
 
-        IMPROVEMENT: gtkpod should now compile "out of the box" under
-	FreeBSD and NetBSD (some adaptations were necessary before).
+	* src/display_coverart.c: ignore simple track changes for
+	  performance reasons 
 
-        IMPROVEMENT: added all supported charsets provided by "iconv -l"
-	to the list of charsets to choose from. Code assumes that "iconv
-	-l" returns a list with the name of one charset in each line, each
-	valid line being terminated by "//".
+	* src/display_coverart.c:
+	  src/misc_confirm.c: changed '//' to '/*' for compatibility
+	  reasons.
 
-	IMPROVEMENT: new song column types: file size, play time,
-	avg. bitrate
+	* src/confirmation.h
+	  src/display_coverart.c
+	  src/display_itdb.c
+	  src/display_itdb.h
+	  src/file.c
+	  src/file.h
+	  src/file_convert.c
+	  src/file_convert.h
+	  src/file_itunesdb.c
+	  src/info.c
+	  src/info.h
+	  src/misc_playlist.c
+	  src/misc_track.c:
+	  gtkpod.glade
 
-	BUGFIX: changed playlength code to that used by mp3info. It's much
-	slower but seems to be more reliable.
+	  - Copying of tracks to the iPod in the background.
+	  - Remove 'oldsize' entry in ExtraTrackData formerly used when
+	    updating tracks.
+	  - Reduce SPACE_TIMEOUT from 4 to 1 seconds (probing device for
+	    free space)
 
-	BUGFIX: fixed "dead" context menu "Alphabetize"
+2007-05-05 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-gtkpod V0.50
-	NEW FEATURE: context sensitive popup menues (right mouse button
-	click in playlist view, sort tabs or song view.
+  * display_playlists.c:
+    Coverart display updated regardless of whether it is
+    displayed.
 
-	NEW FEATURE: play song with xmms (two user definable commands).
+  * display_coverart.c:
+    - coverart_block_change changes the cursor icon to waiting
+      then turns it back after.
+    - search_tracks improved to make debugging easier.
+    - reworking of display_track_changed Delete case. Did not
+      adequately deal with deletion of multiple albums by same
+      or different artists. Thanks to Jorg for good spot.
 
-	NEW FEATURE: option to mount the iPod directory on startup and
-	unmount it on exit.
+2007-05-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	NEW FEATURE: mount/unmount ipod directory on startup/exit, and/or
-	execute ~/.gtkpod/gtkpod.in,out (or /etc/gtkpod/gtkpod.in,out if
-	the former doesn't exist) on startup/exit. First gtkpod.in is
-	executed, then the ipod is mounted (if this option is
-	activated). On exit, it's the other way round.
+	* scripts/convert-wav2mp3.sh: added genre-patch for
+	  genre types not supported by lame.
 
-	NEW FEATURE: read global prefs /etc/gtkpod/prefs if
-	~/.gtkpod/prefs does not exist. Useful, e.g. to set a machine-wide
-	default mountpoint for the ipod.
+2007-05-05 Todd Zullinger <tmzullinger at users.sourceforge.net>
 
-	IMPROVEMENT: "Add Songs" and "Add Directory" has a new default
-	behaviour. They will now add songs/directories to the currently
-	selected playlist. If no playlist is selected, they add to the
-	master playlist.  "Add Playlist" will still create a new playlist
-	before adding the songs into it. Also, when playlist files are
-	added with "Add Songs" or "Add Directory" and no playlist is
-	selected, a new playlist will be selected for each playlist file.
+	* scripts/convert-flac2mp3.sh: fixed a typo, thanks to Andy.
 
-	NEW FEATURE: user settable: save song order after sort action
-	automatically?
+2007-05-01 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
-	NEW FEATURE: columns in song view can be dragged into any
-	order. Order will be saved.
+  * display_coverart.c:
+    When select_cover (track) is called, slider value is
+    adjusted accordingly.
+
+2007-05-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* README: removed references to Offline-Mode which is no
+          longer supported.
+
+	* gtkpod.glade
+	  src/file_convert.c
+	  src/file_convert.h
+	  src/file_itunesdb.c: hopefully worked out some quirks.
+
+2007-04-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_spl.c:
+	  Adoption to namespace cleanup in libgpod.	  
+
+	* configure.in
+	  src/Makefile.am
+	  src/fetchcover.c
+	  src/file_itunesdb.c
+	  src/prefs_window.c
+	  src/lastfm.[ch]:
+	  Removed lastfm support because the code is not ready and
+	  abandoned. I've left the tab in the prefs window and the
+	  md5.[ch] files in CVS in case someone else wants to have
+	  another try.
+
+	* src/date_parser2.l
+	  src/display.h
+	  src/display_playlists.c
+	  src/display_sorttabs.c
+	  src/display_spl.c
+	  src/display_tracks.c
+	  src/file.c
+	  src/lastfm.c
+	  src/misc_conversion.c
+	  src/misc_track.c
+	  src/misc_track.h
+	  src/syncdir.c: removed references to itdb_time_...()
+	  functions that are obsoleted.
+
+2007-04-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* gtkpod.glade
+	  src/prefs_window.c: make sure prefs window is usable on
+	  laptops with screen only 800 pixels high.
+
+	* merge threaded_conversion_branch back to HEAD.
+
+	* src/file_convert.c: avoid GTK assertion with uninitialized
+	  statusbar.
+
+	* gtkpod.glade
+	  src/file.h
+	  src/file_itunesdb.c
+	  src/display.c
+	  src/file.h
+	  src/file_convert.c
+	  src/file_convert.h
+	  src/file_itunesdb.c
+	  src/prefs_window.c
+	  src/info.c: handle closing of window if user
+	  clicks on the 'close-window' buton, general cleanup,
+	  created log window for file conversion output.
+
+2007-04-21 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* Consideration of extra scenario for removal of a track with
+	  respect to display of coverart. Basically, needed to cater
+	  for situation where user removes the first track in an album
+	  but leaves the remaining tracks behind. Need to remove the
+	  first track from displaytracks list but add in the second.
+
+2007-04-21 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* Changed the way coverart display is updated when a track is
+	  removed, added and changed (Thanks to Jorg for thoughts on
+	  this. Much quicker response):
+	    ** display_coverart.h & display_coverart.c:
+	       - coverart_sort_images() made static
+	       - slider initialization broken out into own function
+	       - select_cover() will silently return rather than
+	         throwing an error if selected trk not found in display.
+	       - coverart_track_changed() added for deciding action to
+	         be taken when a track changes. Instead of expensive call
+	         to coverart_set_images()
+	       - coverart_set_images() extra parameter to stop recreation
+	         of display track list every time its called.
+	    ** display_playlists.c: pm_add_track, pm_remove_track, 
+	       pm_track_changed all call coverart_track_changed
+	    ** display_sorttabs.c: resets coverart but only reloads all
+	       tracks if sort is set to none. No way to detect original
+	       sort order efficiently.
+	    ** misc_confirm.c: removal of coverart_set_image calls so pm
+	       functions relied on instead.
+
+2007-04-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/context_menus.c: fixed compile issue when compiling with
+	  GTK+ <V2.8 -- thanks to Daniele Forsi for pointing out.
+
+2007-04-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/POTFILES.in: renamed display_songs.c to display_tracks.c
+
+2007-04-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* gtkpod.glade
+	  src/file_itunesdb.c
+	  src/prefs.c: unified progress dialog across
+	  delete/transfer/writing iTunesDB for better user experience.
+
+	* src/file_convert.c
+	  src/file_convert.h
+	  src/prefs_window.c: set up preferences dialog (number of
+	  background threads, max. cache dir size)
+
+	  src/file_itunesdb.c: avoid mutex deadlock when trying to
+	  cancel delete/transfer of tracks.
+
+2007-04-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* gtkpod.glade
+	  src/file_convert.c
+	  src/file_itunesdb.c: Adapted export progress dialog and
+	  moved layout to gtkpod.glade
+
+2007-04-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Multi-threaded background file conversion, first round
+
+2007-04-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c: fixed "comparison with string literal" issues
+	  by using strcmp instead. Thanks to Petr Gajdos.
+
+2007-04-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc_confirm.c: fixed typo -- thanks to Daniele Forsi.
+
+2007-04-16 P.G. Richardson <phantom_sf at users.sourceforge.net>
+  * fetchcover.c: corrected operations if curl is and is not available
+  * removed calls to itdb_thumb_get_filename() from fetchcover.c and
+    display_coverart.c
+  * corrected behaviour of coverart display slider if only one album 
+    is in the selected playlist
+
+2007-04-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* merged fetchcover_development_branch back to HEAD
+
+	* src/prefs.[ch]: fixed typos ("prefrences") -- thanks to
+          Daniele Forsi.
+	  Changed mkdir() to g_mkdir() and reduced number of #include
+          headers.
+
+2007-04-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* (fetchcover branch) src/fetchcover.c: add NULL pointer at
+	  the end of some variable argument calls to avoid segfaults.
+
+2007-04-14 P.G. Richardson <phantom_sf at users.sourceforge.net>
+(fetchcover branch)
+ - Context menu on display artwork updated with new items:
+   -- Selection of cover from a file
+   -- Download of cover from the web
+ - Fetch Cover button moved up in Edit Details window
+ - Display Coverart slider values sorted out so as to better reflect index
+   of covers
+ - Display Coverart up/down arrows are shown/hidden depending on window start
+ - Fetchcover dialog bordered to clarify a blank image is displayed
+ - Fetchcover dialog added to glade-2 xml file
+ - Hightlighting toned down for main image in Display Coverart window
+ 
+2007-04-01 P.G. Richardson <phantom_sf at users.sourceforge.net>
+(fetchcover branch)
+gtkpod.glade:
+	* rename Fetch Cover button
+
+context_menus.c:
+	* create context menu for main coverart display image
+	* new context action hooks to display artwork in a dialog
+
+display_coverart.c:
+	* coverart_display_big_artwork() for displaying a dialog containing an originally sized coverart image
+	* coverart_get_displayed_tracks() for returning all tracks relating to the main coverart display image
+
+fetchcover.c
+	* completed functionality, including next, previous, cancel and save buttons
+	* status bar to indicate whether images have been recovered
+
+2007-04-10 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* scripts/convert-ogg2mp3.sh: Try to use id3v2 as a fallback
+	  for setting genres that lame doesn't handle
+
+2007-04-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/main.c
+	  src/misc_confirm.c
+	  src/prefs.c
+	  src/prefs.h: avoid assertions when shutting gtkpod down.
+
+	* src/main.c
+	  src/misc.c
+	  src/misc.h
+	  src/misc_confirm.c: moved gtkpod_main_quit() from
+	  misc_confirm.c to misc.c and renamed to
+	  gtkpod_shutdown(). Added ok_to_close_gtkpod().
+	  Moved initialization from main.c to misc.c in gtkpod_init().
+
+	* src/file_convert.c
+	  src/file_convert.h: added header information.
+
+2007-04-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc_track.c (add_tracks_to_playlist):
+	  - when dragging tracks from one iPod to another: remove
+	    original iPod path on copied track.
+	  - set DND origin data when dragging from a local repository
+	    to the iPod.
+
+	* src/misc_track.[ch]: added
+          gp_itdb_find_same_tracks_in_local_itdbs()
+
+	* src/files_itunesdb.c: adjust rating and playcount in local
+          databases when loading ipod.
+
+	* src/prefs.[ch]: make prefs_create_subset() static, make
+          prefs system thread safe, which should be useful when
+          creating other threads doing things in the background.
+
+2007-04-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc_track.c: when adding a duplicate keep the original
+          filename information if it's still valid.
+
+	* src/file_itunesdb.c: removed rating and playcount completely
+          from extended info hash routines. Added local_itdb_id and
+          local_track_dbid.
+
+	* src/display_itdb.c
+	  src/display_itdb.h
+	  src/file_itunesdb.c
+	  src/main.c
+	  src/misc_track.c
+	  src/misc_track.h: introduced and maintain a filename hash
+	  for each repository. Will be used to cross-reference between
+	  repositories for playcounts and on-the-fly conversion.
+
+	* gtkpod.glade
+	  src/clientserver.c
+	  src/display_itdb.c
+	  src/display_itdb.h
+	  src/file.c
+	  src/file_itunesdb.c
+	  src/misc_playlist.c
+	  src/misc_track.c
+	  src/prefs.c
+	  src/prefs_window.c
+	  src/sha1.c: finished renaming of wrong md5 references to sha1.
+
+2007-04-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/sync-evolution: make syncing of contacts containing
+          pictures possible. Thanks to Lars Friedrichs.
+
+2007-03-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_playlist.c (pm_drag_data_received): bugfix:
+          allow to drop contents of one playlist into another playlist
+          even if playlist view is "sorted". (Sorting currently
+          disabled anyway)
+
+	* src/display_playlist.c: small rework in preparation of
+          future changes. New support functions
+          pm_get_position_for_itdb(), pm_get_position_for_playlist(),
+          pm_get_iter_for_itdb(), pm_get_iter_for_playlist() replace
+          some of in-function code. pm_name_changed() changed to
+          pm_itdb_name_changed().
+
+	* src/file_itunesdb.c
+	  src/display_itdb.c: use of new support functions above
+	  instead of dedicated code.
+
+2007-03-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file.c
+	  src/file_itunesdb.c
+	  src/misc_track.c: When podcasts were first introduced,
+	  iTunes did not add podcasts to the master playlist and only
+	  showed them in the Podcast playlist. This has changed in the
+	  meanwhile and Podcasts also appear in the master playlist
+	  (i.e. when browsing through the music files on an
+	  iPod). This patch make gtkpod behave the same. Old iTunesDBs
+	  with podcasts not listed in the MPL are automagically updated.
+
+2007-03-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* misc.c: corrected copyright to show 2002-2007.
+
+	* context_menus.c: Implemented Andrzej Palejko's patch to
+          allow copying of tracks and playlists from within the
+          context menu without using DND.
+
+2007-03-25 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* details.c: removal of coverart_set_images from
+	  details_button_apply_clicked()
+
+  	* display_coverart.c: set prefs key in coverart_init_display()
+	  when coverart display is displayed
+
+	* display_playlists.c: added coverart_set_images to
+	  pm_add_track, pm_remove_track, pm_track_changed.
+	  retained coverart_set_images call in pn_selection_changed_cb
+	  as this displays the coverart when a playlist is selected
+
+	* display_sorttabs.c: coverart_set_images retained in
+	  st_sort() as a reiniting of the coverart is never fired
+	  during an alphabetize operation
+
+	* fileselection.c: calls to coverart_set_images removed as
+          this is taken care of by pm_add_track() in
+          display_playlists.c
+
+	* delete_track_ok.c: call to coverart_set_images retained as
+          although pm_remove_track correctly calls this function, it
+          is too early in the delete process and the deleted track is
+          still displayed
+
+	* prefs.h: addition of KEY_DISPLAY_COVERART key for use by
+          display_playlists functions
+
+2007-03-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* gtkpod.glade: added hbox into which the sorttab/tracklist
+          view is placed (for futures to come).
+
+2007-03-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display.c (display_create): removed reference to stop_button
+
+	* src/display.c
+	  src/display.h
+	  src/display_private.h
+	  src/display_sorttabs.c:
+	  sorted out remaining assertions produced after last night's
+	  changes. Made st_page_selected() and st_create_notebook()
+	  static.
+
+2007-03-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* gtkpod.glade
+	  src/display.c
+	  src/display.h
+	  src/display_playlists.c
+	  src/display_private.h
+	  src/display_sorttabs.c
+	  src/display_tracks.c
+	  src/misc.c
+	  src/misc.h
+	  src/misc_track.c
+	  src/prefs.c
+	  src/prefs_window.c: Clicking on an item with the right mouse
+	  button will select and open the context menu, which is the
+	  intended behavior. As a consequence, the interface will
+	  remain blocked while the selection is being updated and
+	  displayed.
+
+2007-03-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/de.po: update supplied by Kai-Ove Pietsch.
+
+2007-03-11 Todd Zullinger <tmzullinger at users.sourceforge.net>
+
+	* src/prefs_window.c: hide Last.FM tab when not built with
+	  curl libs
+
+2007-02-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* display_coverart.c: Changed coverart_set_images to internally
+	  get the playlist and checks whether the playlist is null
+	  or not. Thus, all calls to coverart_set_images require
+	  no checking of parameters beforehand.
+					
+	* details.c,
+	  display_playlists.c
+	  file_itunesdb.c
+	  fileselection.c
+	  misc_confirm.c: functions updated to call modified version
+	  of coverart_set_images. data_changed function no longer
+	  calls coverart_set_images since this is used in too many
+	  other places where setting coverart is unnecessary and error
+	  prone.
+
+2007-02-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_spl.c: Smart playlists now support the following
+	  new fields: album artist, tv show, last skipped, season
+	  number, skipcount and video kind.
+
+	* configure.in: require libgpod >= 0.4.3
+
+2007-02-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_export.c (export_trackglist_when_necessary):
+          cosmetic change (!a || !b) -> !(a && b)
+
+	* src/misc_track.c (add_tracks_to_playlist): bugfix: dragging
+          tracks between iPods did not work if no local path was
+          available.
+
+	* gtkpod.glade: left-justify "Album Art" in cover display.
+
+	* src/prefs_window.c
+	  src/prefs.c: removed references to "display_artcovers".
+
+	* src/displac.c
+	  src/display_coverart.c: remember if coverart was last shown
+	  or hidden.
+
+2007-02-23 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* display_coverart.c
+		- Avoided null pointer exceptions by testing cdwidget
+		  first in coverart_block_change()
+		- Ensured the pande0 button release event only
+		  initiaties if a width change has truly occurred
+		  ie. gtk_paned_get_position() != WIDTH
+
+	* display_playlists.c
+		- Blocked other coverart related changes while a
+		  pm_playlist_change_cb is being enacted.
+		- Blocking is lifted prior to the call to
+	          coverart_set_images
+		- pm_playlist_change_cb() will occur on deletion of a
+	          playlist. In this case the deleted playlist
+		  will be nullified. In this case, clear any coverart
+		  images rather than setting them (none to set)
+
+	* file_itunesdb.c
+		- data_changed function called whenever track details
+		  are changed. Added a resettting of the coverart to
+		  this function so all tracks in coverart display are
+		  synced with database data
+
+2007-02-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* main.c, display_coverart.c: fixed possible access to
+          uninitialized pointer
+
+	* confirmation.c (cleanup): don't access free'd pointer.
+
+2007-02-22 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+	* display_coverart.c 
+	  - Added "Album Art" title label to display_coverart pane
+	  - Changed set_display_dimensions to make WIDTH=HEIGHT giving
+	    aspect ratio default of 1 rather than 1.2
+	  - Added patch to dispay_coverart.c to correctly cleanup
+	    pixbuf memory leakag. (All credit for this to Christophe
+	    (teuf at gnome.org))
+
+2007-02-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Modified Files:
+	  .cvsignore TODOandBUGS.txt configure.in gtkpod.glade 
+	  src/Makefile.am src/display.c src/display.h 
+	  src/display_playlists.c src/display_private.h 
+	  src/display_sorttabs.c src/display_tracks.c 
+	  src/fileselection.c src/main.c src/misc_confirm.c src/prefs.c 
+	  src/prefs_window.c 
+        * Added Files:
+	  pixmaps/cdshine.png pixmaps/default-cover.png 
+	  src/display_coverart.c src/display_coverart.h
+
+	  Merged P.G. Richardson's album display branch back to the
+	  main trunk. Thanks for your work!
+
+2007-02-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	 * src/display.c
+	   src/display_playlists.c
+	   src/display_private.h: renamed pm_add_all_playlists() to
+	   pm_add_all_itdbs().
+
+2007-02-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	 * po/es.po: updated -- thanks to Alex Lamas.
+
+	 * gtkpod.glade: Renamed "Synchronize Playlist" to
+           "Synchronize Playlist with Dir(s)".
+
+	 * README: updated section "Synchronize with Directories"
+
+2007-02-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	 * README: fixed some typos -- thanks to Daniele Forsi.
+
+2007-02-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	 * sync-evocalendar.sh
+	   sync-kaddressbook.sh
+	   sync-korganizer.sh
+	   sync-notes.sh
+	   sync-tomboy.sh
+	   sync-webcalendar.sh: corrected syntax description from
+	   "-e=none" to "-e none".
+
+	 * src/file_export.c (export_playlist_file_write): simplified
+           prefs_get_*_value() to prefs_get_*()
+
+	 * file.h (FileSource): changed order to reflect the order of
+           options in the Export Playlist file requester
+           dialog. Thanks to Todd.
+
+	 * README: updated instructions on how to restore one's iPod
+           after file system errors or similar devastating events.
+
+2007-02-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_tracks.c (tm_search_equal_func,
+          tm_set_search_column): make tv-show, -episode and -network
+          searchable.
+
+2007-02-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_itunesdb.c: changed message string (thanks to
+          Daniele Forsi)
+
+2007-02-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+        * scripts/convert-flac2m4a.sh
+          scripts/convert-flac2mp3.sh
+          scripts/convert-m4a2mp3.sh
+          scripts/convert-mp32m4a.sh
+          scripts/convert-ogg2m4a.sh
+          scripts/convert-ogg2mp3.sh
+          scripts/convert-wav2m4a.sh
+          scripts/convert-wav2mp3.sh: fixed some bugs in
+          conversion scripts (Mario Rossi).
+
+        * src/file_itunesdb.c
+          src/prefs.c: remember dialog size and "display details"
+          state, display warning when transferring track that cannot
+          be played by the iPod (Mario Rossi).
+
+2007-02-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/details.c
+	  gtkpod.glade: small fixes for "Edit Details Window" by Mario Rossi.
+
+        * gtkpod.glade
+          scripts/convert-flac2m4a.sh
+          scripts/convert-flac2mp3.sh
+          scripts/convert-ogg2m4a.sh
+          scripts/convert-ogg2mp3.sh
+          scripts/Makefile.am
+          src/display_itdb.h
+          src/file.h
+          src/file_convert.c
+          src/file_convert.h
+          src/file_itunesdb.c
+          src/prefs_window.c
+	  src/prefs.c: display of conversion progress and improved
+          conversion scripts (receive meta tags by command line
+          arguments). Thanks to Simon Naunton!
+
+          scripts/convert-m4a2mp3.sh
+          scripts/convert-mp32m4a.sh
+          scripts/convert-wav2m4a.sh
+          scripts/convert-wav2mp3.sh: new scripts for mp3, m4a and wav
+          conversion.
+
+
+2007-02-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+        * gtkpod.glade
+          src/display.h
+          src/display_tracks.c
+          src/misc_conversion.c
+          src/misc_track.c: Patch by Mario Rossi to allow editing of
+          TV show metadata and media type. Big thanks!
+
+	* configure.in: require libgpod >= 0.4.2
+
+	* scripts/Makefile.am: added convert-og2m4a.sh to script list.
+
+	* scripts/sync-webcalendar.sh: applied patch from Giray Devlet
+          for support of differently named calendars.
+
+2007-01-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/convert-flac2mp3.sh: fixed typo (thanks to Peter Edwards)
+
+	* scripts/convert-ogg2mp3.sh: applied Peter Edwards' patch
+
+	* scripts/convert-ogg2m4a.sh: new script courtesy of Peter Edwards
+
+2007-01-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/convert-flac2mp3.sh
+	  scripts/convert-ogg2mp3.sh: some minor fixes pointed out by
+	  Peter Edwards. Thanks!
+
+	* scripts/convert-flac2m4a.sh: thanks to Peter Edwards.
+
+	* src/display_itdb.h
+	  src/file.c
+	  src/file.h
+	  src/file_convert.c
+	  src/file_convert.h
+	  src/file_itunesdb.c
+	  src/flacfile.c
+	  src/oggfile.c: changes in conversion engine. Whether
+	  conversion is necessary will be determined at the time of
+	  copying, not at the time of adding to ensure that drag and
+	  drops from the Local repository work as expected.
+
+	* src/clientserver.c
+	  src/date_parser.l
+	  src/date_parser2.l
+	  src/display_sorttabs.c
+	  src/file_itunesdb.c
+	  src/misc_confirm.c
+	  src/tools.c: corrected typo (occured -> occurred)
+
+2007-01-16 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/convert-flac2mp3.sh
+	  scripts/convert-ogg2mp3.sh
+	  src/file_convert.[ch]
+	  src/flacfile.[ch]
+	  src/oggfile.[ch]: new files for patch mentioned below
+
+	  configure.in
+	  gtkpod.glade
+	  scripts/Makefile.am
+	  src/Makefile.am
+	  src/display_itdb.h
+	  src/display_tracks.c
+	  src/file.c
+	  src/file.h
+	  src/file_itunesdb.c
+	  src/misc.c
+	  src/misc.h
+	  src/misc_conversion.c
+	  src/misc_track.c
+	  src/prefs.c
+	  src/prefs_window.c
+	  src/repository.c
+	  src/syncdir.c
+	  src/tools.c: combined patch by Marc d[r]eadlock and Simon
+	  Naunton for on-the fly conversion of FLAC and OGG files
+	  during export to the iPod, plus some patches thrown in by
+	  myself. Thanks for the contribution!
+
+	* src/charset.c: Default Japanese auto-conversion to UTF8
+          instead of EUC-JP. Thanks to Jun Kobayashi
+
+	* src/display_sorttabs.c (on_st_switch_page): avoid CRITICAL
+          warning when the "Special" filter tab was selected. Thanks
+          to Audrius Meskauskas for pointing this out.
+
+	* src/file.c: when looking for thumbnail files, also look for
+          uppercase filename extensions, like .JPG -- not only for
+          .jpg.
+
+	* gtkpod.glade
+	  src/details.c
+	  src/display.h
+	  src/display_itdb.c
+	  src/file.c
+	  src/misc.c
+	  src/misc.h
+	  src/misc_conversion.c
+	  src/misc_track.c: Mario Rossi's patch to display and select
+	  TV-related data fields and the media type of a given track.
+
+2007-01-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/ja.po: updated Japanese catalog -- thanks to Kentaro Fukuchi
+
+2007-01-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/de.po: update by Kai-Ove -- thanks!
+
+	* po/he.po: update by Assaf Gillat -- thanks!
+
+2007-01-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/it.po: fuzzy'ed out translation with incorrect format
+          string.
+
+	* po/ja.po: fuzzy'ed out translation with two plural forms
+          (Japanese only supports one plural form) until a solution is
+          found.
+
+	* po/fr.po: updated French catalog (thanks to Eric Lassauge)
+
+	* po/POTFILES.in: added support.c
+
+2007-01-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* INSTALL: corrected PKG_CONFIG_PATH
+
+2006-11-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* configure.in:
+	  INSTALL: require gtk >= 2.6.0
+
+2006-11-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_playlists.c: display duplicates when adding
+          tracks through DND.
+
+	* src/display_playlists.c: avoid crash when clicking on the
+          'Eject/Load iPod' icons too quickly.
+
+	* src/details.c: indicate corrupted artwork data.
+
+2006-11-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.c
+	  src/clientserver.[ch]: Add command line argument to print
+	  out the gtkpod sha1 hash of a file ("--hash"). Thanks to
+	  Todd Zullinger.
+
+	* src/context_menus.c: Make context menu more consistent
+          ('Edit Playlist Properties', 'Edit iPod Properties' and
+          'Edit Repository Properties').
+
+	* src/ipod_init.c: gp_ipod_init() would 'forget' what model
+          the user selected earlier when setting up the iPod repository.
+
+2006-11-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/: renamed
+	  - display_songs.c to display_tracks.c
+	  - md5.c to sha1.c
+	  - md5.h to sha1.h
+
+	* subsequent changes to Makefile.am and some #includes.
+
+	* src/md5.[ch], src/lastfm.[ch]: lastfm support by Anant
+          Narayanan.
+
+2006-11-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/*.[ch]: realized that we are using sha1 hash and not md5
+          hash, therefore renamed all relevant occurences of md5
+          (function names only so far).
+
+2006-11-08 James Liggett <freethinkerjim at users.sourceforge.net>
 	
-        Change of copyright: itunesdb.c and itunesdb.h are now under the
-	GNU Lesser General Public License to make it easier to use the
-	code in other programs.
+	* src/file.c
+	  src/file_itunesdb.c: Patch from Rommel G. Custodio
+	  <sessyargc  at yahoo.com> that allows current CVS gtkpod to compile 
+	  with current CVS libgpod.  
 
-	BUGFIX: when writing tags to file, all tags were updated even if
-	you selected only to update changed tags in the the preferences.
+2006-10-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	NEW FEATURE: drag and drop files/directories/playlists from
-	konqueror or nautilus directly into the song view. The songs will
-	be inserted at the specified position. You must already have some
-	songs displayed or a drop is not possible. In that case you should
-	drop into the playlist view since obviously you don't care about
-	the exact position of the files in the playlist (will be added at
-	the end).
+	* scripts/sync-evocalendar.sh: new option for adding a filter
+          script. Thanks to Clarke Brunsdon for the patch.
 
-	NEW FEATURE: drag and drop files/directories/playlists from
-	konqueror or nautilus directly into the playlist view. If you drop
-	between playlists a (number of) new playlist(s) will be created
-	for the drop. If you drop onto a playlist, the songs will be added
-	into that playlist. Alpha-Version!
+2006-10-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-	IMPROVEMENT: speed-up of display refreshs.  - Import of iTunesDB
-	with full non-blocked display: 4x as fast (51'' against 3'35'' on
-	my 2459 songs) - Refresh of first sort tab, non-blocked: 20x as
-	fast (0.65'' against 13'' on my 2459 songs) - Refresh of first
-	sort tab, blocked: 60x as fast (0.13'' against 7.8'' on my 2459
-	songs) - Refresh of song list, non-blocked: 2x as fast (9''
-	against 18'' on my 2459 songs)
+	* src/mp4file.c: fix compilation error when compiling with
+          libmp4v2 package from http://www.debian-multimedia.org/
 
-gtkpod V0.43-1 28-Feb-2003
-	BUGFIX: After DND operation songs were displayed twice in the
-	master playlist (this was just a display artifact).
+	* src/display_songs.c (tm_get_nr_of_tracks): speed up counting
+          of displayed tracks by using
+          gtk_tree_model_iter_n_children() instead of actually
+          counting. Thanks to Clarke Brunsdon for the patch.
 
-gtkpod V0.43 27-Feb-2003
-        Preventive BUGFIX: in the code to import the iTunesDB all absolute
-	references to positions in the iTunesDB were removed. Instead
-	itunesdb.c now uses the header information to find the headers it
-	needs. This should make it more reliable to read third party
-	iTunesDB. This was also part of the problem with the ephpod import
-	problem below (the other half of the problem was ephpod's not
-	really conformant way of writing the database).
+2006-10-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
-        BUGFIX: some iTunesDBs produced by ephpod could not be read (hang
-	after reading the songs and before adding the playlists).
-        
-	New Feature: update song information from file when adding songs
-	with identical filename (option)
+        * src/prefs.c: fix compiler warning on 64bit systems (%llu)
+
+	* src/mp4file.c: don't assume that the audio track is track
+          0. Instead cycle through all tracks until an audio or video
+	  track is found.
+
+2006-10-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_export.c: only write error messages for track for
+          which export failed and not all subsequent tracks as
+          well. Thanks to Joachim Tesch for the patch.
+
+2006-09-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c: Todd Zullinger caught the break statement at
+          the wrong place.
+
+2006-09-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/sv.po: updated version by Stefan Asserhall
+
+	* src/mp3file.c: when adding artwork make sure the correct
+          type is used (preferably type 3 (cover) or type 0 (used by
+          iTunes)). Thanks to Todd Zullinger for the patch.
+
+2006-09-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp3file.c (mp3_write_file_info): YEAR tag was not
+          written to file. Thanks to t0C for the patch.
+
+	* src/syncdir.c (sync_playlist): clean up
+	  'updated/non-updated/duplicate' lists so they don't pop up
+  	  unexpectedly at a later time.
+
+	* po/es.po: updated version by Alejandro Lamas Daviña
+
+	* README
+	  src/main.c
+	  src/misc_confirm.c
+	  src/prefs.c
+	  src/prefs_window.c: removed references to "automount".
+
+	* configure.in: bumped to V0.99.8 for release
+
+	* configure.in: bumped to V0.99.9CVS for new CVS version
+
+2006-09-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file.c: (update_track_from_file): forgot to flag track
+          for re-transfer when hash value had changed (thanks to Todd
+          Zullinger).
+
+	* src/file.c (add_coverart): handle templates better (no
+	  "safety" substitutions of characters). Thanks to Flavio
+	  Stanchino.
+
+	* gtkpod.glade
+	  src/details.c
+	  src/display.h
+	  src/display_itdb.c
+	  src/display_songs.c
+	  src/file.c
+	  src/misc_conversion.c
+	  src/misc_track.c: Display artwork path (thanks to Flavio
+	  Stanchino for most of the patch).
+
+2006-09-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* mp3file.c: support reading of coverart from APIC
+          tag. Work around non-conformant tags written by iTunes.
+
+	* mp4file.c: update instructions at the beginnging of the
+          file, read soundcheck values irrespective of "readtags"
+          setting.
+
+	* gtkpod.glade
+	  src/prefs.c
+	  src/prefs_windows.c
+	  src/mp3file.c
+	  src/file.c: implement "coverart_apic" prefs key allowing to
+	  select whether coverart stored in tags should be used or not.
+
+	* src/display_itdb.c
+	  src/display_itdb.h: new: gp_track_set_thumbnails_from_data()
+
+2006-09-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* misc_conversion.c: Typo: "Suffling" -> "Shuffling". Thanks
+          to Todd for pointing this out.
+
+	* ipod_init.c (set_cell): display iPod sizes smaller 1 GB in
+          MB, instead of displaying "0 GB".
+
+	* INSTALL: update with list of dependencies (thanks to Todd)
+
+2006-09-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display_spl.c (spl_check_number_of_rules): simplify
+          activation/deactivation of button to remove rules.
+
+2006-09-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display_spl.c (spl_update_rule): don't reactivate the '-'
+          button when changing the rule.
+
+2006-09-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c (add_artwork): fix problem when artwork template
+          expands into something containing a '.'. Thanks to Thorsten.
+
+2006-09-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* gtkpod.glade
+	  src/file.c
+	  src/prefs_window.c: file exclusion mask when adding tracks
+	  -- thanks to Richard Hyde for the patch. Will have to add
+	  exclude-support for syncing and updating.
+
+	* src/syncdir.c: fix problem when directory to sync ends with '/'.
+
+2006-08-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* syncdir.c (sync_playlist): fix segfault when removing track
+          from iPod.
+
+2006-08-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c (get_track_info_from_file): don't reset time_added
+          when updating files.
+
+2006-08-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* TROUBLESHOOTING: added hint for ubuntu users. Thanks to
+          Marcelo Varanda.
+
+2006-08-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file.c (get_track_info_from_file): set time_modified to
+          modification date of file instead of current time. Thanks to
+          Richard Hyde.
+
+2006-07-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc_track (track_scan_length): work around problem in
+          conversion from gdouble to gint32 which caused playlength
+          be set incorrectly (most notable in write-through mode in
+          the edit details window).
+
+2006-07-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc_confirm.c (delete_playlist_head): fixed stupid
+          compile error.
+
+2006-06-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/confirmation.c: Add safety to "remove all tracks"
+          context menu.
+
+
+2006-06-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_playlist (pm_remove_playlist): if entire itdb is
+          removed, clear display (filter tabs, playlist view) first to
+          avoid segfaults when non-existent tracks are accessed for
+          display updates.
+
+2006-06-26 James Liggett <freethinkerjim at users.sourceforge.net>
 	
-        New Feature: update song information from file of selected songs
-	(ctrl-u and menu item)
+	* src/misc.c
+	  src/prefs.h: Fixed a translation problem, 
+	  updated copyright. 
 
-	BUGFIX: copy_song_to_ipod() there was a <5% chance that songs were
-	overwritten by new songs during the copy process, if you deleted
-	songs before adding new songs.
+	* src/misc.c
+	  src/prefs.c: Updated copyright info, prefs howto,
+	  and about box. 
+	
+	* src/prefs_window.c: Fixed sort ignore list bug.
 
-        BUGFIX: Deleting songs from the iPod only worked if you exported
-	the iTunesDB twice.
+	* src/main.c
+	  src/misc_confirm.c
+	  src/prefs.c
+	  src/prefs.h
+	  src/prefs_window.c: Got rid of old prefs infrastructure :)
+	  Also added prefs functions for handling double/float keys.
+	 	
+
+2006-06-25 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/md5.c
+	  src/md5.h
+	  src/prefs.c
+	  src/prefs.h
+	  src/prefs_window.c: Fixed the fallout from the charset fiasco:
+			      	- MD5 checksums work again
+				- Reapplied other patches trashed by the reversal
+				- Old prefs is now just a stub (will be removed shortly)
+
+2006-06-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/repository.c
+	  src/prefs.c
+	  src/prefs.h: added temp_prefs_remove_key()
+
+	  src/repository.c: use temp_prefs_remove_key() to remove keys.
+
+	  src/file_itunesdb.c: fix assertions related to get_offline()
+	  introduced yesterday.
+
+	* src/repository.c: only print debug messages about keys
+          added/removed if LOCAL_DEBUG is defined
+
+2006-06-24 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/charset.c
+	  src/prefs.c
+	  src/prefs.h: Redid charset patch.
+
+	* src/charset.c
+	  src/file.c
+	  src/prefs.c
+	  src/prefs_window.c: Finish up charset fixes.
+
+	* src/charset.c: Fixed a possible crash (spotted by 
+	  Jorg) Also got rid of some unneeded casts.
+
+2006-06-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.[ch]: removed unused prefs_print() declaration,
+          moved discard_prefs() declaration to prefs.c
+
+	* gtkpod.glade
+	  src/display.c
+	  src/display.h
+	  src/display_itdb.h
+	  src/display_playlists.c
+	  src/file.c
+	  src/file_export.c
+	  src/file_itunesdb.c
+	  src/info.c
+	  src/misc.c
+	  src/misc.h
+	  src/prefs.c
+	  src/prefs.h: removed global offline prefs key and moved it
+	  to the individual itdbs (ExtraiTunesDBData). The offline
+	  code is still available, but currently not used (no
+	  possibility to toggle offline mode from the GUI).
+
+	* src/display.c (on_check_ipod_files_activate): require that
+          the iPod is loaded before checking files.
+
+	* src/display.c (on_ipod_directories_new): use new
+	  gp_ipod_init() function to create directories.
+
+	  src/file_itunesdb.c (gp_write_itdb): use new gp_ipod_init()
+	  function to create directories.
+
+	  src/misc.h
+	  src/misc_confirm.c: Removed old ipod_directories... code.
+	  code.
+
+2006-06-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display.c
+	  src/misc_confirm.c
+	  src/misc_playlist.c
+	  src/misc_track.c: use message_sb_...() instead of indivudual strings.
+
+	* src/file_export.c
+	  src/file_itunesdb.c
+	  src/info.c
+	  src/info.h
+	  src/misc_playlist.c
+	  src/prefs.c
+	  src/prefs.h
+	  src/tools.c: removed 'statusbar_timeout' prefs key and
+	  introduced 'gtkpod_statusbar_timeout()' call
+	  instead (the value doesn't have to be saved). Statusbar
+	  messages are now displayed again.
+
+	* src/display.c
+	  src/display_itdb.c (gp_get_ipod_itdb): changed default
+          behavior in case more than one iPod itdb is present.
+
+	* src/context_menus.c
+	  src/display.c
+	  src/display_itdb.c
+	  src/display_itdb.h
+	  src/display_playlists.c
+	  src/display_songs.c
+	  src/fileselection.c
+	  src/misc_playlist.c
+	  src/prefs_window.c: changed default behavior of
+	  gp_get_active_itdb() to return NULL when no itdb is
+	  selected and renamed to gp_get_selected_itdb(). Print message
+	  when no itdb is selected when one is needed.
+
+	* src/info.c
+	  src/info.h: added standard error messages, used in the conversion above.
+	      void message_sb_no_itdb_selected (void);
+	      void message_sb_no_tracks_selected (void);
+	      void message_sb_no_playlist_selected (void);
+	      void message_sb_no_ipod_itdb_selected (void);
+
+	* src/display.c (display_adjust_menus): don't completely
+          disable edit menu when no itdb is present.
+
+2006-06-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/context_menus.c: moved context menus over to new
+          system. 
+
+	* src/charset.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Reversed patch from 6/20 -- will be redone.
+
+2006-06-20 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/charset.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved charset to new prefs.
+
+	* src/display_songs.c
+	  src/display_sorttabs.c
+	  src/misc.h
+	  src/misc.c: Renamed disable_sorting to sorting_disabled
+	  to avoid confusion. 
+
+2006-06-19 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/display_playlists.c
+	  src/display_sorttabs.c
+	  src/misc.c
+	  src/misc_track.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved block_display to new prefs.
 	
-	New Feature: Add Playlists (m3u and pls)
+	* src/display.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved display_toolbar and 
+	  toolbar_style to new prefs.
 
-gtkpod V0.42 20-Feb-2003
-        Bugfix: on first start gtkpod complained it could not create
-	~/.gtkpod even though it could... (and vice versa).
+	* src/misc.h
+	  src/misc.c
+	  src/prefs.h
+	  src/prefs.c: Renamed prefs_get_disable_sorting to 
+	  disable_sorting and moved to misc.c/h. 
 
-	Improvement: display update can now be interrupted, selection
-	changed at any time.
+	* src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved display_tooltips_prefs to new prefs.
 
-	Bugfix: gtkpod now sets bitrate (average bitrate for VBR)
+	* src/display.c
+	  src/display_sorttabs.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved display_tooltips_main to new prefs.
 
-        Improvement: export can be interrupted and be continued at a later
-	time. gtkpod will (hopefully) correctly remember which songs have
-	already been copied/deleted from your iPod.
+	* src/display_sorttabs.c:
+	  src/prefs.c
+	  src/prefs.h
+	  src/prefs_window.c: Moved group compilations to new prefs.
+
+2006-06-16 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/context_menus.c: started rewrite of context menu
+	  setup. Cleaned up the playlist context menu.
+
+2006-06-15 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/prefs_window.c: Fixed some sorting window bugs:
+			      	- Pressing cancel shouldn't commit changes
+				- Sorting now works again. 
+
+2006-06-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.c
+	  src/prefs.h:
+	  src/misc.h: moved LIST_END_MARKER to prefs.c (private),
+	  moved SORT_... enum to display.h
+
+2006-06-14 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/misc.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: sort_ign_string_ list now fully uses new
+	  prefs interfaces
+
+	* src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved sort_ign_fields_ to new prefs. 
+	  Also got rid of sortcfg.
+
+2006-06-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp4file.c: mp4_read_soundcheck not defined when mp4v2
+          library was not present.
+
+	* Changelog_detailled: formatting (9 space -> 8 spaces)
+
+	* src/prefs.h
+	  src/syncdir.h
+	  src/syndir.c
+	  src/repositories.c: moved PLAYLIST_AUTOSYNC enum to
+	  syncdir.h and renamed.
+
+	* src/context_menu.c: very first phase of rearrangement.
+
+2006-06-13 James Liggett <freethinkerjimWusers.sourceforge.net>
 	
-	Improvement: removal and copy of songs during export is done in a
-	separate thread, so the display doesn't freeze on long file system
-	operations
+	* src/display_songs.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved tm_sortcol and tm_sort to 
+	  new prefs.
 
-        Bugfix: Kentaro Fukuchi pointed out that MusicMatch (at least the
-	Japanese version) uses song IDs starting with 2 (and not with
-	53). gtkpod then dropped some of your songs -- fixed.
-        
-	Improvement: Delete works on entries in sort tabs now (ctrl-d and
-	new menu item)
+2006-06-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs_window.c (on_path_button_pressed): corrected
+          error when "Browse" button was pressed (current path
+          sometimes was not passed to fileselector)
+
+	* src/fileselection.c: avoid run-time warning.
+
+	* src/prefs.h
+	  src/prefs.c
+	  src/prefs_windows: Made PathType enum redundant outside
+	  prefs.c (needed only for key conversion).
+
+2006-06-12 James Liggett <freethinkerjim at users.sourceforge.net>
 	
-	Improvement?: don't close dirbrowser window until after the songs
-	have been read.
+	* src/display_playlists.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved pm_sort to new prefs.
+	
+	* src/context_menus.c
+	  src/display_sorttabs.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved st_sort to new prefs.
+	
+	* src/display_songs.c
+	  src/misc_playlist.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved tm_autostore to new prefs.
+	
+	* src/file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved write_charset to new prefs.
 
-	Improvement: display is updated while writing tags to disk "in the
-	background"
+	* src/file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved update_charset to new prefs.
 
-	Bugfix: sometimes deleted songs were not removed from the
-	display. Changing tags then could crash the program
+	* src/misc.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved case_sensitive to new prefs.
 
-	Bugfix: convert filenames ot UTF8 based on the charset chosen in
-	the options window
+	* src/misc_playlist.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved misc_track_nr to new prefs.
+	
+	* src/misc_playlist.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved not_played_track to new prefs.
 
-	Bugfix: don't try to access iPod based files when in offline mode
+2006-06-11 James Liggett <freethinkerjim at users.sourceforge.net>
+	
+	* src/prefs.h
+	  src/prefs_window.c: Fixed paths not showing up/being set
+	  in prefs window.	
 
-gtkpod V0.41 01-Feb-2003
-	- minor bugfixes (just possible segfaults and such)
-	- window won't freeze during import/export/add operations
-	- better handling of duplicate songs (e.g. duplicate songs are now
-	  displayed in a window instead of on the console, if duplicate
-	  detection is switched on later, duplicate songs are removed but
-	  the playlists are preserved...)
-	- confirmation window when quitting gtkpod without saving data
-	- Drag-and-drop for sort tab entries
-	- Japanese langauge catalogue
+	* src/display_songs.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved multi_edit to new prefs.
+
+	* src/display_songs.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved multi_edit_title to new prefs.
+
+	* src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved tmp_disable_sort to new prefs.
+
+	* src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved last_prefs_page to new prefs.
+
+	* src/display.c
+	  src/info.c
+	  src/prefs.h
+	  src/prefs.c: Moved info_window to new prefs.
+
+	* src/fileselection.c
+	  src/misc_track.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved add_recursively to new prefs.
 	
-gtkpod V0.40 26-Jan-2003
-	many new features:
+	* src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved startup_messages to new prefs.	
 
-	- Playlists (Drag-and-drop support)
-	- Sort Tabs
-	- Duplicate Detection
-	- German language support
-	- Charset for ID3 tags can be set
-	- Offline modification of iPod contents (and later synchronisation)
-	- Preferences
+	* src/main.c
+	  src/misc_confirm.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved automount to new prefs.
 	
-gtkpod V0.10
-	basic tool to import/export songs to your iPod.
+	* src/file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved mserv_use and 
+	  mserv_username to new prefs. 
+	
+	* src/file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved coverart and 
+	  coverart_template to new prefs.
+
+2006-06-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.h: removed unused declarations.
+
+	* src/file.c: fixed two memory leaks.
+
+	* src/misc_playlist.c: fixed memory leak.
+
+	* src/file.c:
+	  Got rid of get_file_name_verified(),
+	  get_file_name_on_ipod)( as they can be emulated by
+	  get_file_name_from_source().
+
+	  Got rid of get_file_name() and get_file_name_on_harddisk
+	  (substituted where used) used).
+
+	* src/mp3file.c: removed mp3gain code
+
+	* src/tools.c: added mp3gain and aacgain code.
+
+	* src/prefs_windows.c: added aacgain path in the Tools
+          section, improved layout.
+
+2006-06-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/mp4file.c: read aacgain if present.
+
+	* src/display_itdb.h
+	  src/file.c
+	  src/file_itunesdb.c
+	  src/mp3file.c
+	  src/mp4file.c
+	  src/tools.c
+	  Got rid of radio_gain, audiophile_gain, peak_signal_set,
+	  radio_gain_set, audiophile_gain_set.
+
+	  TODO: rework normalisation process -- probably do not
+	  support mp3gain any more. "Normalize" would then just
+	  re-read the gain tags.
+
+	* src/mp3file.c: renamed GainData *etr; to GainData *gd; to
+          avoid confusion (63 occurences)
+
+	* src/ipod_init.[ch]...: renamed init_model_number_combo()
+          and init_ipod() to gp_...()
+
+	* src/file_itunesdb (gp_load_ipod): ask for model number of
+	  the iPod if none is available. If one is available from
+	  SysInfo file, store that information in the prefs system.
+
+	* src/ipod_init.[ch]: new: gp_ipod_init_set_model() asking
+          for a model number string and storing it.
+
+	* src/ipod_init.c (gp_ipod_init_set_model): mention
+          mountpoint when asking for the model.
+
+	* src/prefs.[ch]
+	  src/prefs_window.c
+	  src/display.[ch]
+	  src/display_playlists.c
+	  Did away with pm_autostore.
+
+2006-06-10 James Liggett <freethinkerjim at users.sourceforge.net>
+	
+	* src/prefs.h
+	  src/prefs.c: Got rid of prefs_validate path.
+	
+	* src/file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved parsetags_template to 
+	  new prefs.	
+
+	* src/file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved parsetags_overwrite to 
+	  new prefs
+	
+	* src/file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved parsetags to new prefs.
+	
+	* src/file_itunesdb.c
+	  src/misc.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved write_extended_info to new prefs.
+	
+	* src/main.c
+	  src/prefs.h
+	  src/prefs.c: Moved autoimport_commandline to new prefs.	 
+
+	* src/mp3file.c
+	  src/mp4file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved readtags to new prefs.
+
+	* src/main.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Moved autoimport to new prefs.
+	
+	* src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Got rid of unused_gboolean3.
+
+	* src/prefs.c: Miscellaneous formatting fixes. I've now
+	  switched to using emacs, so I hope this won't be a problem
+	  anymore :)
+
+2006-06-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_sorttabs.c
+	  (sp_update_date_interval_from_string): fix compilation
+	  warning and possible segfault.
+
+2006-06-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* README: some hints from a recent gtkpod-questions thread.
+
+2006-06-08 James Liggett <freethinkerjim at users.sourceforge.net>
+
+        * src/info.c
+          src/prefs.h
+          src/prefs.c: Move size_info to new prefs. Also did some
+	  minor cleanup
+
+        * src/prefs.h
+          src/prefs.c
+          src/prefs_window.c: Move size_prefs to new prefs	 
+
+        * src/fileselection.c
+          src/prefs.h
+          src/prefs.c: Move size_dirbr to new prefs
+
+        * src/confirmation.c
+	  src/prefs.h
+	  src/prefs.c: Move size_conf to new prefs
+	
+	* src/confirmation.c
+	  src/display_sorttabs.c
+	  src/prefs.h
+	  src/prefs.c: Move size_cal and size_conf_sw to new prefs
+	
+	* src/display.c
+	  src/prefs.h
+	  src/prefs.c: Move size_gtkpod to new prefs
+
+2006-06-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/repository.c: set_entry() -> set_entry_index() to
+	  simplify code.
+
+	  Display iPod model number and allow editing.
+
+	  TODO: 
+	  - reset model number if iPod with different number is loaded
+	  - write model number to iPod if iPod without model number
+	    is loaded.
+
+	* src/repository.c: use GtkComboEntry to select iPod model
+	  just like in ipod_init.c
+			 
+2006-06-07 James Liggett <freethinkerjim at users.sourceforge.net>
+	
+	* src/display_playlists.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Move mpl_autoselect to new prefs
+	
+	* src/file.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Move tag_autoset to new prefs.
+	
+	* src/display_sorttabs.c
+	  src/prefs.h
+	  src/prefs.c: Move paned_pos_ keys to new prefs
+		 
+2006-06-06 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/repository.c: use ComboBoxEntry to allow the selection
+          of the iPod model in the same way as in the ipod_init
+          dialog.
+
+	* src/display.c
+	  src/display_songs.c
+	  src/display_sorttabs.c
+	  src/info.c
+	  src/misc_confirm.c
+	  src/misc_input.c
+	  src/prefs.h
+	  src/prefs.c
+	  prefs_window.c: Move sort_tab_num to new prefs.
+
+	* src/display_songs.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Move tm_col_order to new prefs. Also
+	  added a finalize_prefs function to allow prefs to do things
+	  before the file gets saved.
+
+	* src/prefs_window.c: Fix columns not appearing after being
+     	  set in prefs dialog
+
+	* src/display_songs.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Move tm_col_visible to new prefs.
+
+2006-06-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file.c: fixed double g_free() (thanks to Florent
+	  Bouchez).
+
+	* src/ipod_init.c: pretty much finished ipod_init dialog.
+
+2006-06-05 James Liggett <freethinkerjim at users.sourceforge.net>
+
+        * src/display_songs.c
+          src/prefs.h
+          src/prefs.c: Move tm_col_width to new prefs.
+   
+        * src/display_sorttabs.c
+          src/prefs.h
+          src/prefs.c: Move sp_autodisplay to new prefs.
+   
+2006-06-04 James Liggett <freethinkerjim at users.sourceforge.net>
+    
+        * src/display_sorttabs.c
+          src/prefs.h
+          src/prefs.c: Move sp_playcount_low/high to new prefs.
+
+        * src/display_sorttabs.c
+          src/prefs.h
+          src/prefs.c: Move sp_played_state, sp_modified_state, 
+                       and sp_added_state to new prefs.
+
+        * src/display_sorttabs.c
+          src/prefs.h
+          src/prefs.c: Move sp_rating_state to new prefs.
+
+2006-06-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/details.c: removing of artwork did not really work.
+
+	* src/file_itunesdb, src/ipod_init.[ch]: started dialog to
+          create directories when not present on 'load'. Work in
+          progress.
+
+2006-06-02 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/display_sorttabs.c
+	  src/prefs.h
+          src/prefs.c: Move sp_*_cond to new prefs.
+
+	* src/display_sorttabs.c
+	  src/prefs.h
+	  src/prefs.c: Move sp_or to new prefs.
+
+2006-05-31 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/display_sorttabs.c
+	  src/prefs.h
+	  src/prefs.c
+	  src/prefs_window.c: Move st_category to new prefs.
+
+	* src/prefs.c: Add list end marker when setting
+          variable-length list default entries.
+
+	* src/prefs.c
+	  src/prefs.h
+	  src/prefs_window.c
+	  src/display_sorttabs.c: Move sort tabs autoselect key to
+	  new prefs
+
+	* src/prefs.c: Clean up dead path keys in cleanup_keys
+
+	* src/prefs.c: Delete a duplicate check for XMMS command. For
+          some reason, this was in cleanup_keys twice.
+
+2006-05-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.c (cleanup_keys): set "version" after cleanup is
+          done.
+
+	* src/prefs.c (save_prefs): write version string at the start
+          of the file until the old prefs system is completely gone.
+
+2006-05-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.c (clenaup_keys): added check for version
+          dependent transition of 'path_play_now' key.
+
+	* src/prefs.c (save_prefs): update version string before
+          writing to file.
+
+2006-05-29 James Liggett <freethinkerjim at users.sourceforge.net>
+
+        * src/prefs.c: Clean up paths keys
+          - Defaults for path_play_now, path_play_enqueue, and 
+            path_mserv_trackinfo_root are set in set_default_prefrences
+          - Key cleanup done in cleanup_keys 
+
+2006-05-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/details, display.h, misc_conversion.c... 
+	  Support for start time, stop time, skip when shuffling and
+	  remember playback position.
+	  
+	  ******************************************************
+	  Will require photosupport branch of libgpod to compile
+	  ******************************************************
+
+2006-05-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_playlists.c (tree_view_get_cell_from_pos): take
+          into account that bug in gtk_tree_view_get_cell_area() was
+          fixed with GTK+2.8.18 (upon submitting bug report)
+
+	* src/misc_track.c (gp_track_by_filename): fix segfault when
+          adding tracks to iPod without iPod connected.
+
+	* src/mp4file.c (mp4_get_file_info): read iTunNORM tag if
+          present to set soundcheck (volumne normalisation)
+
+2006-05-27 James Liggett <freethinkerjim at users.sourceforge.net>
+   
+	* src/prefs.c: Removed remove_key as it's not needed. 
+   
+	* src/prefs.c: Added new functions remove_key and
+	  cleanup_keys to allow for deleting/renaming old or changed
+	  keys
+          
+	* src/main.c
+	  src/prefs.c: Disable prefs reading by new prefs system; let
+          read_prefs_from_file_desc handle it until the transition is
+          finished so we don't read prefs twice.
+
+2006-05-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/sv.po: updated catalog from Stefan Asserhall
+
+	* src/misc_track.c (track_copy_item): T_YEAR was not copied
+          correctly.
+
+2006-05-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.[ch]: new: temp_prefs_rename_subkey()
+
+	* src/misc.[ch]: new: void set_itdb_index_prefs_string(),
+          set_itdb_index_prefs_int()
+
+	* src/repository.c: it's now possible to add new repositories
+          (hardly tested)
+
+	* gtkpod.glade
+
+2006-05-23 Todd Zullinger <tmz at pobox.com>
+   
+        * src/prefs.c: Fix sort ignore list not working after prefs
+          changes
+          
+2006-05-23 James Liggett <freethinkerjim at users.sourceforge.net>
+
+	* src/prefs.c: Reverse previous patch as it breaks lists (argh!!)
+   
+        * src/prefs.c: Filter out deprecated/other prefs that the new
+	  system doesn't manage, getting rid of the prefs duplication
+	  problem and negating the need to filter out unneeded prefs
+	  manually
+
+2006-05-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/repository.c: continued 'Create Repository' dialog.
+
+	* src/display_playlist.c
+	  src/display.h: new functions pm_set_renderer_pix() and
+	  pm_set_renderer_text() to be able to use the same style for
+	  displayling playlist/repository names throughout gtkpod.
+
+2006-05-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/fileselection.[ch]: replaced fileselection_get_dir()
+          with fileselection_get_file_or_dir().
+
+	* src/repository.c: started 'Create Repository' dialog.
+
+2006-05-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file.c (update_track_from_file): fixed possible segfault.
+
+	* po/POTFILES.in: corrected file list.
+
+	* src/display.c
+	  src/display_itdb.c
+	  src/display_playlists.c
+	  src/display_songs.c
+	  src/file.c
+	  src/file_export.c
+	  src/file_itunesdb.c
+	  src/info.c
+	  src/info.h
+	  src/misc_confirm.c
+	  src/misc_playlist.c
+	  src/misc_track.c
+	  src/tools.c: simplified code by having
+	  gtkpod_statusbar_message() accept printf style arguments.
+
+	* display_spl.c (spl_ok): mark data as changed.
+
+	* context_menus.c: removed (volumne) 'Normalize'. Accessible
+          via Tools-menu.
+
+	* file_itunesdb.c (gp_write_itdb): statusbar message was
+          incorrect (passed mpl instead of mpl->name to be printed).
+
+	* removed remaining code for podcast download support
+
+	* Menu entry to display repository/iPod options.
+
+	* gtkpod.glade: Rearranged 'Edit' main menu
+
+	* info.c: space update will use @itdb instead of 'mountpoint'
+          to deisplay free space -> space_get_ipod_itdb(),
+          gp_free_itdb().
+
+2006-05-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/POTFILES.in: updated file list -> updated .po files.
+
+	* src/misc.c: call_script now accepts an arbitary number of
+	  command line arguments.
+
+	* src/file.c (update_track_from_file): if no local filename
+          is available, use the copy on the iPod to update.
+
+	* src/display_songs.c (tm_cell_edited): when changing the
+          track length also update starttime, stoptime and filesize
+          (all needed to have the iPod play the hole file).
+
+        * src/context_menus.c
+          src/display.c
+          src/display.h
+          src/display_itdb.c
+          src/display_itdb.h
+          src/display_playlists.c
+          src/display_songs.c
+          src/file.h
+          src/file_itunesdb.c
+          src/main.c
+          src/misc.h
+          src/misc_confirm.c
+          src/misc_input.c
+          src/misc_track.c
+	  gtkpod.glade: Introduction of load/eject ipod(s) and 'save
+          changes'. ~/.gtkpod/gtkpod.load and ~/.gtkpod/gtkpod.eject
+          are called before loading/after saving the iPod. Several
+          iPods are supported.
+           
+2006-05-19 James Liggett <freethinkerjim at users.sourceforge.net>
+   
+	* src/prefs.c: Fix a build warning in convert_filename caused
+          by my last patches...
+
+	* src/prefs.c: Reversed part of previous patch on advice from
+          Jorg
+   
+	* src/misc.c 
+	  src/prefs.c: 
+     
+	* Clean up initial_mountpoint:
+	  - Set default in set_default_prefrences rather than cfg_new
+	  - Remove unneeded code in read_prefs_from_file_desc
+	    (new prefs shouldn't use this/other deprecated prefs 
+	    functions)
+	  - Got rid of some superflous envionment reads 
+	    (needs to only be done once in read_environment)
+       
+        * New prefs backend function read_environment is now enabled
+          and used
+       
+        * Fixed convert_filename for use with read_envrionment
+          - Added NULL string pointer check
+   
+        * src/prefs.c: Reversed part of previous patch on advice from
+          Jorg
+
+2006-05-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display_songs.c: simplified code for setup of columns.
+
+	* src/display_playlists.c: connect/disconnect icon for iPods,
+          identify if icon is clicked (printf a statement for the
+          time being -- work in progress!)
+
+2006-05-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/sync-tomboy.sh: recommitted
+
+	* configure.in: gcc < 4.0 does not know -Wno-pointer-sign
+
+	* src/md5.c: hash turned out different on little and big
+	  endian machines
+
+2006-05-16 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/repository.c: (sync_or_update_playlist): implemented
+          update of smart playlist.
+
+	* src/file_itunesdb.c
+	  src/display_itdb.h: make sure, live playlists are updated
+	  _after_ syncing of playlists has taken place.
+
+2006-05-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/misc.[ch]: (get_playlist_prefs_int),
+          get_playlist_prefs_string): new
+
+	* src/display_itdb.c
+	  src/file_itunesdb.c: automatically sync playlists on
+	  startup (when loading database).
+
+	* src/prefs_window.c: redefined the sync settings, set up
+          easy-to extend handling for standard toggle checkboxes.
+
+	* src/context_menu.c
+	  src/display.c: moved 'Sync' over to new 'Sync Playlist'.
+
+	* src/file.c: removed old sync-related code.
+
+2006-05-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* move over gtkpod_confirmation() to using the new prefs
+          system, along with a couple of keys (sync_remove,
+          sync_remove_confirm, show_duplicates, show_sync_dirs,
+          show_non_updated, show_updated, mserv_report_probs,
+          delete_ipod, delete_file, delete_local_file,
+          delete_database). Thanks to James Liggett!
+
+	* src/file.c: copy_new_info() incorrectly handled pc_path and
+          thumbnail_path, possibly leading to corruption of both when
+          updating tracks.
+
+	* src/repository.[ch]
+	* src/syncdir.[ch]
+	  It's now possible to sync directories from within the
+	  repository option catalog. Next step: automatic sync at the
+	  time of loading the database. Almost there!
+
+2006-05-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/syncdir.c:
+	* src/syncdir.h:
+	* src/Makefile.am:
+	  Added new source files for a complete rewrite of the
+	  synchronization code.
+	* file_itunesdb.c:
+	* file.c:
+	  added support for modification time of the song (needed for
+	  fast syncing)
+
+2006-05-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* moved path[i] and concal_autosync pref keys over to the
+          new prefs system. Work in progress: currently the scripts
+          for syncing cannot be set (this will be done from within
+          the repository options).
+
+2006-05-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* misc.[ch]: renamed get_itdb/playlist_key() to
+          get_itdb/playlist_prefs_key()
+
+	* misc.[ch]: new: get/set_itdb/playlist_prefs_string/int().
+
+2006-05-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* preliminarily moved "mountpoint" to new prefs system.
+
+2006-05-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.[ch]: new: temp_prefs_create_subset(),
+          temp_prefs_flush(), prefs_flush_subkey(),
+	  prefs_rename_subkey(), temp_prefs_subkey_exists()
+
+	* src/display_itdb.[ch]: new: gp_itdb_remove(),
+          gp_itdb_free().
+
+	* src/repository.[ch]: new -- repository prefs. Work in
+          progress, but you probably get the idea about what is to
+          be.
+
+	* src/display_playlists.c: streamlined slightly (only one
+          column in model, so no reason to find out which), added
+          indicator for changed repositories (italic), added
+          indicator for local repositories (hard disk icon).
+
+2006-05-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/*: moved 'prefs_get_last_dir_browse()' to new prefs
+          system.
+
+	* src/prefs.c: fixed bug introduced in temp_prefs_get_int().
+
+	* src/fileselection.[ch]: new: fileselection_get_dir().
+
+	* src/prefs.[ch]: new: temp_prefs_size().
+
+2006-05-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs.[ch], src/prefswindow.c: renamed some temp_prefs
+          and temp_list function names.
+
+	* src/prefs.c: use strcmp() to compare keys for temp_prefs
+          (otherwise keys cannot be retrieved safely because
+          g_str_hash() is not unique.
+
+	* src/prefs.[ch]: added temp_prefs_get... functions as well
+          as reformatted some code a bit (way too much whitespace?!)
+
+2006-05-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/md5.c (sha1_hash): corrected signedness warning.
+	* src/charset.c (charset_check_k_code),
+	  (charset_check_k_code_with_default): corrected signedness
+	  warning. 
+	* src/...: removed incomplete podcast code
+	* gtkpod.glade: removed corresponding podcast references
+
+2006-04-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/confirmation.c: pressing 'OK' several time would call
+          the ok_handler several times, most likely resulting in a
+          crash. Thanks to dforsi for pointing this out. Fixed by
+          turning the dialog insensitive while before calling the
+          handler.
+
+	* src/misc.c (select_template): templates were compared
+          case-sensitively, which could lead to non-exported files.
+
+2006-04-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/sync-tomboy.sh: contributed by Tejas Dinkar
+
+2006-04-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* applied James Liggett's preferences patches
+          (id3-write-id3v24)
+
+	* added scripts/sync-thunderbird-nano.sh (writes one file per
+          address to work around a bug in old firmware versions, but
+          may be useful for other users as well). Thanks to Paul
+          Oremland
+
+2006-04-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* applied James Liggett's preferences patches (id3-write,
+          sort-prefs)
+
+	* applied Peter Lieverdink' patch to allow import of h.264
+          video via the mp4file.c interface.
+
+	* mp3file.c (id3_set_string): fixed memory leak (thanks to
+          Scott Guthridge)
+
+2006-04-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* applied James Liggett's preferences patches.
+
+2006-04-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* applied James Liggett's preferences patch (transition in
+          progress).
+
+	* details.c, file.c: copy 'has_artwork' flag when copying
+          artwork info from one track to another.
+
+2006-04-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_itunesdb.c (gp_import_itdb): correct has_artwork flag
+          (formerly flag1) for each track if unset or potentially set
+          incorrectly.
+
+	* bumped version to 0.99.6CVS
+
+2006-03-31 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* added hint about using iPod with Solaris/SPARC to
+          TROUBLESHOOTING file. Thanks to Eric Enright.
+
+	* added Spanish translation catalog es.po. Thanks to
+          Alejandro Lamas.
+
+2006-03-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+        * info.c, misc_confirm.c: fixed typo: HAVE_statvfs ->
+          HAVE_STATVFS
+
+	* misc_confirm.c (delete_playlist_ok): use of playlist->name
+          after removing the playlist could/should crash
+          gtkpod. Fixed.
+
+2006-03-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c (copy_new_info): copy artwork related -- should
+          solve issue of updated artwork not displaying on iPod
+
+2006-03-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Preliminary support for mobile phones supporting iTunes
+          (requires the following directory structure to be present:
+	  <mountpoint>/iTunes
+	  <mountpoint>/iTunes/iTunes_Control
+	  <mountpoint>/iTunes/iTunes_Control/iTunes
+	  <mountpoint>/iTunes/iTunes_Control/Music
+	  <mountpoint>/iTunes/iTunes_Control/Music/F00
+	  <mountpoint>/iTunes/iTunes_Control/Music/F01
+	  <mountpoint>/iTunes/iTunes_Control/Music/F02)
+
+	* cosmetic changes to compile with the newest CVS version of
+          libgpod.
+
+	* use of itdb_get_..._dir() functions to get directory names
+          on the iPod.
+
+2006-03-12 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* md5.c (md5_hash_track): prefer filename on disk over
+          filename on iPod -> changed files are copied to iPod when
+          updating. This was an old bug.
+
+	* file.c (copy_new_info), (get_track_info_from_file);
+          mp3file.c: support new 'lyrics_flag' and 'movie_flag'.
+
+	* configure.in: require libgpod 0.3.3 (CVS version)
+
+	* po/ja.po: updated catalog (thanks to Kentaro Fukuchi)
+
+2006-03-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* prefs.c (prefs_get_cfgdir): fix bug that crashes
+          application when cfgdir cannot be created.
+
+2006-03-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/sync-evocalendar.sh: handle multiple calendar and
+          task files. Thanks to Michele C. Soccio
+
+2006-03-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* bumped to V0.99.5CVS for further development
+
+2006-03-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* bumped to V0.99.4 for release
+
+	* fileselection.c: did not properly clean up after closing
+          the dirbrowser window with the window-close button.
+
+2006-03-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_export.c (export_playlist_file_init): missing
+          initialization of fcd->win_xml made it impossible to change
+          any options when exporting playlists.
+
+2006-02-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_itunesdb.c (write_extended_info): added ipod_path
+          again (got lost somewhere along the way). Thanks to Todd.
+
+	* file_itunesdb.c (gp_write_itdb): do not disable 'Import'
+          button if iTunesDB was not written to the iPod
+          successfully.
+
+2006-02-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c (copy_new_info): forgot to copy
+          thumb_path_utf8/locale resulting in segfaults.
+
+	* mp3file.c. Set encoding before setting text fields. Thanks
+          to 't0c' for the patch.
+
+	* context_menus.c: context menu to remove playlists on the
+          iPod were not displayed.
+
+2006-02-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Allow to run autogen.sh if autoconf/automake/libtool
+	* installations aren't necessarily installed as "automake",
+	* "aclocal", etc. This is typically the case when several
+	* different versions of the autotools are installed, with the
+	* correct binary paths set in the respective environment
+	* variables. (thanks to Mike Heffner)
+
+2006-02-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/file_itunesdb.c: (gp_itdb_set_mountpoint): command line
+          option '-m' to set the mountpoint did not work.
+
+2006-02-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/mab2vcard: added support for mobile phone entries
+          in thunderbird address books. Thanks to Sebastian Cruz.
+
+	* TROUBLESHOOTING: added hint by Ingo Reimann
+
+2006-01-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* INSTALL: hint about PKG_CONFIG_PATH and LD_LIBRARY_PATH.
+
+2006-01-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/prefs_windows.c: browse button for "Sync Notes Script"
+          opened a dirbrowser instead of a file browser.
+
+	* scripts/sync-knotes.sh: changed awk option
+          "--field-separator" to "-F" for better partability. Thanks
+          to cacedo.
+
+2005-12-14 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* sync-thunderbird.sh: Ben Ford's patch to allow export of
+          several address books (by specifying the output filename)
+
+	* remove all podcast code and libcurl dependency (#if 0...)
+
+	* sv.po: updated catalog by Stefan Asserhäll
+
+	* bumped to 0.99.2 for release
+
+	* bumped to 0.99.3 for CVS version
+
+	* TROUBLESHOOTING: added hint about LD_LIBRARY_PATH and
+          libgpod
+
+2005-12-12 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* details.c: fix problem with 'checked' checkbox. 
+
+	* prefs_windows.c, context_menu.c, display.c: hide unfinished
+          references to podcast download support.
+
+	* updated German translation catalog
+
+	* src/itdb.h: added itdb.h
+
+	* bumped version to 0.99.0 for release
+
+	* bumped version to 0.99.1 for CVS version
+
+2005-12-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c, misc.c: add thumbnail images automatically.
+
+2005-12-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* re-enable delete menus (in addition to context menu).
+
+2005-12-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* change permissions to 0777 when creating directories (will
+          be modified by user's umask).
+
+	* display.c, gtkpod.glade: add 'Edit Details' menu entry.
+
+2005-12-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* details.c, display_itdb.h: notify details window when
+          tracks are being removed.
+
+2005-12-04 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* details.c: apply/undo functionality
+
+	* file_itunesdb.c: save thumbnail filename in .ext database
+
+	* misc_track.c: new: track_set_text()
+
+	* misc_conversion.c: recognize "--" as unset time
+
+	* display_songs.c: use track_set_text(), track_copy_item()
+
+	* details.c: writethrough for "remove cover art" added.
+
+	* gtkpod.glade: change "charset" to "encoding"
+
+	* details.c: copy artwork_count and _size when copying
+          artwork, remember last directory.
+
+	* file_itunesdb.c: fixed error when writing iTunesDB.ext
+          (filename/thumbnail)
+
+2005-11-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* mp4file.c: patch by Simon MARTIN fixing support for video
+          mp4.
+
+2005-11-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* details.c: support for set_thumbnails / remove thumbnails.
+
+2005-11-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* globally changed glade_xml_get_widget() to
+          gtkpod_xml_get_widget()
+
+2005-11-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display_sorttabs.c, prefs.[ch], prefs_window.[ch],
+          gtkpod.glade: compilation CD changes (patch by Iain
+          Benson).
+
+	* prefs_window.c: change glade_xml_get_widget() to
+          gtkpod_xml_get_widget() (the latter gives a warning when
+          accessing non-existing widgets).
+
+	* display_playlists.c: compatibility fix for libpango < 1.8
+
+2005-11-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* misc.h: corrected delcaration for (time_field_to_string).
+
+	* display_playlists.c: include <pango/pango-font.h>.
+
+2005-11-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* details.c: added support for thumbnails display in "Show
+          Details" window. Requires libgpod version 0.2.2
+
+2005-11-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* details.c, details.h: detailled display of tracks. Alpha
+          with known issues (no sync of data between main display and
+          details display -> deleting of tracks with the details
+          window open may segfault the appliction if the details
+          window consequently attempts to access the track and
+          similar).
+	  TODO: create menu entries (currently only context menu).
+
+2005-11-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* added support for compilation flag in mp3 files. Thanks to
+          Iain Benson for the patch.
+
+	* added read support for TID, WFD, TDS, TDR, TT3 tags (used
+          by podcasts)
+
+2005-11-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_export.c: Files were not copied from iPod to harddisk
+          during DND.
+
+2005-11-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* gtkpod.glade: added tooltips that disappeared when
+          remodelling the prefs window one or two versions
+          earlier. Removed prefs_window_old from gtkpod.glade.
+
+	* gtkpod.glade, details.c, details.h: started work on window
+          to display details.
+
+2005-11-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c, file.h, file_itunesdb.c: basic video support --
+          thanks to Uwe Hermann for the input.
+
+	* updated smart playlists automatically if 'live updating' is
+          set.
+
+2005-11-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* configure.in: make check for flex fatal.
+
+2005-11-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c: strip whitespace when getting tags from filename
+          via template.
+
+	* take care of flag1/2/3/4 when adding and removing podcasts,
+          normal tracks...
+
+2005-11-12 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* podcasts: some code cleanup, added context menus
+
+	* prefs.c: handle filenames somewhat more decently
+
+	* file_itunesdb.c: bugfix: tracks marked for deletion were
+          not deleted from the iPod.
+
+	* gtkpod.glade: added scrollbars for smart playlist
+          rules-view.
+
+	* display_spl.c: remember last size of edit smartlist window.
+
+	* display_itdb.c, context_menus.c, misc_confirm.c,
+          misc_track.c: provisions for podcasts DND and podcasts
+          deletion.
+
+2005-11-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* moved mkdirhier() from file_export.c to misc.c
+
+2005-11-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_itunesdb.c: API for itdb_shuffle_write() changed.
+
+2005-10-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display_spl.c: turn "-" button (delete rule) insensitive
+          when only one rule is left to avoid that all rules are
+          deleted which would result in a corrupted iTunesDB.
+
+	* display_spl.c: make sure rule frame is turned insensitive
+          when "ignore rules" is active when the spl window opens.
+
+2005-10-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display_itdb.c: added gp_itdb_get_podcasts()
+
+	* file_itunesdb.c: set up 'Podcasts' local store on startup.
+
+	* removed mountpoint as parameter in itdb_write() as it was
+          not used.
+
+2005-10-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* added a number of 64bit patches received from Bodo Bauer --
+          thanks!
+
+2005-10-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* podcast.c: (on_pc_add_button_clicked) declared *text[2]
+	  instead of *text[1] to fix a segfault.
+
+2005-10-17 Alexander Dutton <alexdutton at f2s.com>
+
+	* podcast.c: added function prototypes for abort_fetch(),
+	  abort_fetch_response(), removed some warnings and fixed a
+	  segfault when an URL contains no '/' in 
+	  podcast_set_cur_file_name().
+
+	* podcast.h: added extra items to enums (forgot to update file
+	  earlier.
+
+	* prefs_window.c: declared *text[1] static to fix a segfault.
+	  Thanks to Bodo Bauer for these.
+
+2005-10-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c: (get_file_name) fixed assertion when adding files.
+
+2005-10-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file.c: fixed possible segfault in update_tracks() that can
+          occur when updating tracks that become duplicates through
+          updating. Thanks to Thorsten Brehm.
+
+2005-10-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display_songs.c: allow to select interactive typeahead
+          search row by clicking on the row -- it is no longer
+          necessary to click in the header and initiate sorting.
+	  Please note that the Treeview needs to have keyboard
+          focus.
+
+2005-10-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_itunesdb.c: add podcasts list when creating empty
+          databases. Add podcasts list when importing database
+          without podcasts. Merge podcasts list when importing
+          database with podcasts list present. NOTE: special
+          behaviour of podcasts (i.e. not being listed in MPL and
+          consequences thereof) is not yet addressed.
+
+2005-09-30 Alexander Dutton <asdutton at users.sourceforge.net>
+
+	* podcast.c: removed dependence on gdk_threads_init() as
+	  fetching is now done without threads. Also set up to follow
+	  Location: headers (as used by libsyn.com). Now ready for
+	  integration with the rest of gtkpod.
+
+2005-09-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* mp3file.c: fixed incorrect reading of lame replay gain
+
+2005-09-29 Alexander Dutton <asdutton at users.sourceforge.net>
+
+        * prefs.c: added validation code to prefs_set_pc_dir() to
+          remove any trailing slashes from the podcast directory.
+
+2005-09-27 Alexander Dutton <asdutton at users.sourceforge.net>
+
+        * podcast.c: added podcast_window, which displays progress.
+          Code behind it fetches podcasts from XML files which are
+          behaving (ie conform to Apple XML schema at
+          http://www.itunes.com/DTDs/Podcast-1.0.dtd). Others are
+          being worked on. At present gdk_threads_init() at main.c:65
+          needs commenting in for things to work, breaking other stuff.
+          I'll look into this!
+
+2005-09-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* configure.in: check for libcurl (Jerry Dueitt)
+
+2005-09-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display_songs.c: sorting by size and tracklength did not
+          work because of two missing break statements... Thanks to
+          Flavio Stanchina for tracking this down!
+
+2005-09-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* phased out use of ITDB_PL_TYPE_MPL/NORM and replaced with
+          itdb_playlist_is_mpl()
+
+	* display_playlists.c: give Podcasts playlists a special
+          look.
+
+2005-09-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* added 'date released' to displayable colums
+
+	* applied Alexander Dutton's patch for podcast support (first
+          stages thereof).
+
+2005-09-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_itunesdb.c: ipod_dirs_present(): extend check to
+          iPod_Control/Music/F00/ because on the iPod nano
+          iPod_Control/Music/ exists, but the F.. directories don't.
+
+2005-09-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* scripts/sync-palm-jppy.py: NEW: script to sync contacts
+	  from a Palm (via jppy http://wiki.zanu.org.uk/jppy). Thanks
+	  to Nick Piper, http://www.nickpiper.co.uk/)
+
+	* type-ahead search functionality (thanks to Nick Piper)
+
+2005-09-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* added category, description, podcast url, podcast
+          rss and subtitle fields to displayable fields.
+
+        * BUGFIX: 'Check iPod's files' could crash under certain
+          circumstances (thanks to David Mansfield for the patch).
+
+	* gp_playlist_remove_track(): when removing a track from the
+          database, only the first occurance of track in all other
+          playlists was removed.
+
+	* replaced usleep() with nanosleep() in info.c (usleep would
+          not work for intervals larger than 1 second on some systems).
+
+2005-09-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_itunesdb.c: fixed bug in gp_itdb_set_mountpoint
+          causing gtkpod to crash when exiting the preferences
+          dialog (bug introduced on 9/13)
+
+	* added 'Comment' field to displayed fields.
+
+	* libgpod API change: fdesc -> filetype
+
+	* updated it.po (thanks to Edward Matteucci)
+
+2005-09-16 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Check iPod's files (check_db()) now checks files in all
+	  available F.. directories.
+
+	* Give progress information when matching MD5 checksums to
+          files in case iTunesDB was written by different software.
+
+2005-09-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* new fr.po by Eric Lassauge
+	* removed reference to itdb_ sourcefiles in POTFILES.in (have
+	  been moved to the libgpod project
+	* updated de.po
+
+2005-09-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* implemented changed API for itdb_filename_on_ipod()
+
+	* use new function itdb_set_mountpoint() to set mountpoint.
+
+2005-09-11 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* bumped version to V0.96.CVS
+
+	* gtkpod is now dependent on the new ligbpod
+
+	* note about LD_LIBRARY_PATH when installing libmp4v2 to
+          /usr/local/lib
+
+	* file_itunesdb.c: fixed critical assertion when calling
+          gp_itdb_add_extra_full () with itdb==NULL.
+
+	* misc_confirm.c: (ipod_directories_ok): fixed small
+          potential memory leak.
+
+2005-08-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+        * SAFETY: call sync() and flush all buffers to the iPod after
+          writing the iTunesDB -- should minimise filesystem errors
+          caused by people disconnecting the iPod without unmounting
+          (four instances in itdb_itunesdb.c)
+
+	* NEW: script to sync addressbooks in ldif format provided by
+          Sebastien BERIDOT (scripts/sync-ldif.sh,
+          scripts/ldif2vcf.sh).
+
+        * NEW: script to sync kNotes (KDE note program) provided by
+          Sebastian Scherer (scripts/sync-knotes.sh).
+
+2005-08-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* MP3 tags: use 'Band/Orchestra/Accompaniment' (TPE2) as
+	  artist if it exists. Otherwise use 'Lead artist/Lead
+	  performer/Soloist/Performing group' (TPE1) as before. Let
+	  me know if this causes problems for you.
+
+	* BUGFIX: Copying playlists by drag and drop could confuse
+          smart playlists referencing these playlists. This was due
+          because the DND duplicated the ID by which these playlists
+          were referenced. A new ID is now set automatically when
+          adding playlists by itdb_playlist_add().
+
+2005-08-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+        * UPDATED Hebrew translation (thanks to Assaf Gillat)
+
+	* include <sys/param.h> in misc.c to avoid error when
+          including <sys/mount.h> under FreeBSD 5.4 (reported by
+          Pablo Cacho)
+
+2005-07-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* fixed some gcc 2.95 compatibility issues (thanks to Arno
+	  Overgaauw)
+
+2005-07-16 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Improved handling of dangling files (files that are
+          referenced in the iTunesDB but are not present on the iPod)
+          after I had to use the function myself: iTunes 4.9 removed
+          most of my files from the iPod -- currently restoring with
+          an old iTunesDB copy.
+
+	* Changed writing of iTunesDB to make sure OTG Playlists are
+          handled correctly.
+
+	* Fixed compatibility issue with new firmware 3.1 and iTunes
+          4.9 (only 256 tracks were shown on the iPod, iTunes
+          removed the majority of the tracks from the iPod).
+	  Podcasts are still not supported, however, and will be lost
+	  when handled by gtkpod.
+
+	* Updated German translation catalog
+
+2005-07-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	 * Added Hebrew translation -- thanks to Assaf Gillat!
+
+2005-07-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* itdb_itunesdb.c: fixed OTG playlist filename and handling
+          (thanks to "Todd")
+
+	* Makefile.am: use relative path for symbolic link to
+          gtkpod.glade
+
+2005-07-08 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* misc.c: use 'eject' executable instead of eject code. Also
+          fixes the bug that 'could not unmount' was always
+          displayed, even if the umount was successful (thanks to
+          Andreas Hauber).
+
+2005-07-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Makefile.am: ln complained when installing the second time
+          into the same place -- remove target file before the ln
+          command.
+
+	* itdb_itunesdb.c: changed from version 0x0c (iTunes 4.71/4.8)
+          to version 0x0d (iTunes 4.9). mhods are now considered
+          children of mhips, and the total length of the mhip must be
+          adjusted accordingly.
+
+2005-07-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* finished user-definable sort ignore list (ctrl-s). Still
+          todo: resort automatically when changing the ignore list.
+
+2005-06-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+        * itdb_itunesdb.c: BUGFIX: Some iTunesDB written by iTunes
+          could not be read because of an error in the parse code
+          (gtkpod would attempt to read beyond the end of the file)
+
+	* continued with user definable ignore list in
+          display_sorttabs.c (the list still is not used, but now only
+          the sort function needs to be updated)
+
+2005-06-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* continued with user definable ignore list during sorting
+          ("The", "A",... at the beginning of fields). Prefs can be
+          set, are stored and read, but they are not yet used. Also,
+          the initial values must still be set.
+
+2005-06-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* started with user definable ignore list during sorting
+          ("The", "A",... at the beginning of fields).
+
+2005-06-25 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Changing the mountpoint was not represented correctly in the
+          prefs.
+
+	* Release as 0.93.1
+
+	* bumped to version 0.94-CVS
+
+	* update sort preferences window when clicking on track view
+          headers
+
+	* display_songs.c: implemented stable sorting
+
+2005-06-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Renamed 'Copy from iPod' to 'Export from Database',
+          disabling Export from the iPod in offline mode, and fixing
+          export from local database.
+
+2005-06-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* sync-thunderbird.sh: use of 'iconv' instead of 'recode'
+
+	* bumped version to 0.93 and released
+
+2005-06-22 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* updated sv.po (thanks to Stefan Asserhäll)
+
+2005-06-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* applied gcc4.0 patch provided by Mark Mitchell
+
+	* included updated Japanese catalog (thanks to Kentaro
+          Fukuchi)
+
+	* added sync-thunderbird.sh and mab2vcard scripts provided by
+	  Clinton Gormley.
+
+	* repaired progress dialog display when exporting tracks from
+          the iPod.
+
+	* added more detailled error messages when files could not be
+          added / refreshed.
+
+	* updated de.po
+
+	* added faac entry to TROUBLESHOOTING
+
+2005-06-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* finished code automatically export tracks from iPod to
+          harddisk when dragging from the iPod database to the local
+          database.
+
+2005-06-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* integrated debian patches provided by Frank Lichtenheld
+
+	* replace EjectSCSI code by a version written by Frank
+          Lichtenheld that uses the new SG ioctls.
+
+	* changed copyright notice to 2002-2005 in most files
+
+2005-06-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* added sync-abook.sh and sync-webcalendar.sh scripts provided
+          by Daniel Kercher
+
+	* added sync-thunderbird.sh provided by Clinton Gormley
+
+2005-06-12 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* applied patch provided by Mattias Wadman: don't hang when
+          reading playlist files with empty lines (provided by
+          'Matthias')
+
+	* added checks when adding playlist files to avoid adding
+          directories or the same playlist file again.
+
+	* applied patch provided by Alexey Dokuchaev to replace
+          'recode' by 'iconv' in the export scripts provided.
+
+	* fixed bug when exporting tracks from the iPod: when the
+          original filename of tracks is stored, tracks were not
+          copied from the iPod but from the original location on the
+          user's harddisk. If that file has been removed in the
+          meanwhile, the export would fail.
+
+	* added new Italian catalog (thanks to Edward Matteucci)
+
+	* updated po/POTFILES.in and updated all po-files
+
+	* updated German translation catalog (and some English typos)
+
+2005-06-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* fixed bug when setting up initial local and iPod databases
+          (added the iPod database twice, did not create local
+          database)
+
+	* changed version to 0.91-CVS and made sure the itdb_* prefs
+          settings are skipped for version < 0.91.
+
+	* moved remaining functions in callback.c to better locations
+          (mainly display.c), removed callbacks.c and callbacks.h
+
+2005-06-03 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* included James Ligget's patch to replace the file selectors
+          with filechooser dialogs
+
+	* moved the code in dirbrowser.c to the new file fileselection.c
+
+2005-06-02 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* Fixed bug for display and reading of compilation flag
+          (display reversed, wrong offset during read)
+
+	* Fixed bug for reading of type entry (wrong offset)
+
+	(thanks	to Julien Oster for the patch)
+
+2005-05-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* itdb_cp_track_to_ipod(): no longer uses ipod-ID to create
+          filename.
+
+	* file.c, misc_confirm.c: fixed several non-reported bugs
+          concerning deletion
+
+	* display_playlists.c, display_sortabs.c, display_songs.c:
+          added gtkpod_tracks_statusbar_update() to drag_end()
+          callbacks.
+
+	* file_itunesdb.c: fixed segfault when pressing the 'Cancel'
+          button during file transfer to the iPod.
+
+2005-05-27 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* moved all prefs_windows callbacks from callbacks.c to
+          prefs_windows.c  -- should be continued with other
+          callbacks.
+
+	* display_songs.c: ipod_path in track display set to "Local
+          Database" for ITDB_TYPE_LOCAL
+
+	* prefs_windows.c: fixed error concerning show/hide of
+	  tooltips
+
+	* display*.c: hopefully made tooltips working again throughout
+          gtkpod.
+
+2005-05-26 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* renamed get_track_name* to get_file_name*
+
+	* fixed some issues with track deletion (tracks were never
+          removed from harddisk)
+
+	* moved some more prefs_windows callbacks from callbacks.c to
+          prefs_windows.c (continuous project whenever I feel like it)
+
+	* gtkpod.glade: added a couple of forgotten callbacks to prefs
+          dialog
+
+2005-05-24 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* finished rewrite of delete code (only context-menu delete
+          supported at the moment). Basically untested :-(
+
+2005-05-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display warning if unmounting of the iPod was unsuccessful
+
+	* when syncing dirs remove tracks when dir was removed.
+
+2005-05-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* itdb_itunesdb.c: add check for truncated PlayCounts file and
+          skip it (necessary in case the file has been truncated by
+          dosfsck)
+
+	* display_spl.c: fixed double display of combobox entries
+
+	* mp3file.c: hunted down the meanest segfault encountered so
+          far. "mp3info *mp3info;" sizeof (mp3info) is what?
+
+	  Replaced "mp3info" by "MP3Info" and "mp3header" by
+	  "MP3Header" to avoid similar problems in the future.
+
+2005-05-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* fixed segfault when trying to import read-protected MP3 files
+          (thanks to Chris Pitchford for pointing out this bug).
+
+	* fixed segfault when adding tracks to the local database
+
+	* improved error messages when import of files fails
+
+	* added some g_return_if_fail(itdb->mountpoint) statements.
+
+2005-05-17 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* implemented tree-lookup for track IDs to speed up import of
+	  large iTunesDBs along the lines of Richard Deken's patch
+
+2005-05-16 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_itunesdb.c: fixed infinite loop pointed out by Richard
+          Deken
+
+2005-05-13 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* mp3file.c: applied Christoph Kunz' patch addressing a couple
+          of compatibility issues with non-ID3v2.4 compatible software
+          (most software out there that's not using the id3tag-lib).
+
+	* gtkpod.glade: added delete event signal handler to
+          prefs_window
+
+	* info.c, prefs_window.c: raise prefs/info window to the top
+          when it is already open
+
+	* info.c: added xml_signal_autoconnect() otherwise close
+          buttons wouldn't work.
+
+2005-05-12 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* mp4file.c: changed case-sensitive compare to
+          case-insensitive compare for filetype extension
+
+2005-05-10 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* file_itunesdb.c: Automatic update of smart playlists after
+          import.
+
+	* file_export.c: Fixed segfault in 'copy from iPod' and 'crate
+          playlist file' (caused by transition to libglade)
+
+	* file_export.c: Print warning when overwriting existing files.
+
+2005-05-09 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* tracks deleted from the iPod within gtkpod will now really
+          be deleted during the next Sync (bug introduced through the
+          introduction of itdb)
+
+2005-05-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* TROUBLESHOOTING: added note from Mark Davis that the SHUFFLE
+          cares about it's volume name.
+
+	* itdb_itunesdb.c: make sure version number written to
+          iTunesDB is 0x0c -- otherwise the SHUFFLE is not supported.
+
+	* itdb_playlist.c: correct comparison for smart-list action
+          SPLACTION_IS_IN_THE_RANGE
+
+	* file.c: when adding tracks also copy tracks that are already
+          on the iPod but not in the iPod_Control dir.
+
+2005-05-07 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/ preliminary import/export support for local database as
+          well as for iPod database.
+
+	* file_itunesdb.c, itdb_itunesdb.c: added support for iPod
+          Shuffle. Testing is needes because I don't own a Shuffle.
+
+	* replayed all g_assert() with g_return_if_fail() to avoid
+          program termination on error.
+
+2005-05-07 David Sedeño <david at alderia.com>
+
+	* gtkpod.glade: Put autoselect_hbox name to an hbox in display tab.
+
+2005-05-06 David Sedeño <david at alderia.com>
+
+	* gtkpod.glade: Put Cancel, Apply, Accept buttons in preferences
+	window. Added Misc and Toolbar section to Display tab.
+
+2005-05-06 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/display* and others: DND between filter tabs, playlist
+	  view, track view, as well as external file browsers.
+
+	* display_songs.c, display_playlists.c, display.c,
+          display_sorttabs.c: added text/uri-list as drag and drop
+          type, added autoscroll to playlist- and track view,
+          corrected behaviour during certain drop situations onto the
+          track view.
+
+2005-05-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* display_spl.c: fix spl edit window after transition to
+	  libglade.
+
+2005-05-01 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/*.c: initialize @xml_file to either the local copy or
+	  the installed copy (main.c) and use that for all accesses to
+	  gtkpod.glade
+
+	* Makefile.am: uninstall-hook, rework install-hook and
+          dist-hook, move pixmaps back to pixmaps directory
+
+	* display_playlist.c, display_songs.c: implemented DND within
+          track view as well as between track and playlist view.
+
+	* parse_tracks_from_string(): fixed segfault
+
+2005-04-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* po/sv.po: update received from Stefan Asserhäll
+
+	* file_itunesdb.c: fixed segfault when importing database
+          twice (still need to fix that database _can_ be imported
+          twice, which shouldn't be)
+
+	* file_itunesdb.c: display track info after import of database
+
+	* misc_track.c: fixed error in gp_duplicate_remove() when
+          @track was not yet added to any itdb.
+
+	* display_playlists.c: DND within playlist view across and
+          within itdbs now functional (it appears).
+
+2005-04-29 David Sedeño Fernandez <david at alderia.com>
+
+	* gtkpod.glade: Put scrolled window in General tab.
+
+2005-04-29 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* gtkpod.glade: Set 'Visible' to 'No' on all top level windows
+        to that the resize command still works as it is.
+
+	* src/ removed dependence on support.[ch], interface.[ch] and
+	the files.
+
+	* po/de.po: update
+
+	* src/display_playlist.c, src/misc_track.[ch]: continued work
+          on playlist DND.
+
+2005-04-28  David Sedeño Fernandez <david at alderia.com>
+
+	* gtkpod.glade: Sync option from Reading to General. Put forbidden
+	buttons in mserv option. Add missing tooltips. Add missing callbacks
+	in Edit and Tools tab.
+	
+2005-04-20  David Sedeño Fernandez <david at alderia.com>
+
+	* gtkpod.glade: Preferences window work to follow more the Gnome HIG.
+
+2005-04-18  David Sedeño Fernandez <david at alderia.com>
+
+	* src/prefs_window.c (prefs_window_show_hide_tooltips): Check if we
+	have the correct data.
+	* NEWS: Copy the ChangeLog file to NEWS file.
+	* ChangeLog: Update.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/prefs_window.c: Get the right tooltips object.
+	* src/display.h: Add GtkTooltipsData to SortData;
+	* src/display_sorttabs.c: Show / Hide tooltips.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/Makefile.am: Remove support.c and support.h 
+	* src/main.c: remove add_pixmap_directory calls.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/confirmation.c: Save the glade xml file in ConfData struct in
+	order to take widgets later with glade_xml_get_widget. 
+	* src/misc.c : Change GtkWidget for GladeXML
+	in order to take the widgets with glade_xml_get_widget in some
+	functions.
+	* src/misc.h: Change GtkWidget for GladeXML in some functions.
+	* src/file_export.c: Call option_set_* and
+	option_get_* , with the xml file instead of the window.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/Makefile.am: Remove interface.* for compilation.
+	* src/display_spl.c: Load spl_window from glade file. Change all
+	lookup_widget calls to glade_xml_get_widget for spl_window.
+	* src/interface.h: Remove create_spl_window.
+	* src/interface.c: Remove create_spl_window.
+	* src/prefs_window.c: Fix a not remove line.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/file_export.c: Load export_files_options and
+	export_playlist_file_options from glade file.
+	* src/interfac.c: Remove create_files_options and
+	create_export_playlist_file_options.
+	* src/interfac.h: Remove create_files_options and
+	create_export_playlist_file_options.
+	
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/confirmation.c: Load confirm_dialog from glade file. Change all
+	lookup_widget calls to glade_xml_get_widget for confirm_dialog.
+	* src/interfac.c: Remove create_confirm_dialog.
+	* src/interfac.h: Remove create_confirm_dialog.
+	
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/info.c: Load info window from glade file. Change all
+	lookup_widget calls to glade_xml_get_widget for info_window.
+	* src/interfac.c: Remove create_info_window.
+	* src/interfac.h: Remove create_info_window.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/prefs_window.c: Load sort_window from glade file. Change
+        all lookup_widget calls to glade_xml_get_widget for sort_window.
+	* src/interfac.c: Remove create_sort_window.
+	* src/interfac.h: Remove create_sort_window.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/display_sorttabs.c: Load calendar_window from glade file. Change
+	all lookup_widget calls to glade_xml_get_widget for cal.
+	* src/interfac.c: Remove create_calendar_window.
+	* src/interfac.h: Remove create_calendar_window.
+	
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/display_sorttabs.c: Load special_sorttab from glade file. Change
+	all lookup_widget calls to glade_xml_get_widget for special. 
+	* src/interfac.c: Remove create_special_sorttab.
+	* src/interfac.h: Remove create_special_sorttab.
+	
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* src/misc.h: include glade.h
+	* src/misc.c: Load about window from glade file.
+	* src/interface.c: Remove create_gtkpod_about_window.
+	* src/interface.h: Remove create_gtkpod_about_window.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* gtkpod.glade: Rename on_most_rated_tracks_playlist's1_activate to
+	on_most_rated_tracks_playlist_s1_activate so libglade can handle it.
+	* src/interface.c: Remove create_prefs_window function.
+	* src/interface.h: Remove create_prefs_window and create_gtkpod.
+	* src/prefs_window.c: prefs_window_xml new var. Load prefs_window from
+	xml. Change all lookup_widget calls to glade_xml_get_widget for
+	prefs_window.
+
+2005-04-09  David Sedeño Fernandez <david at alderia.com>
+
+	* configure.in: Check libglade and gmodule
+	* Makefile.am: Install pixmaps without pixmaps prefix. Install glade
+	file.
+	* src/display.h: Include glade.h. Add main xml variable for glade
+	file.
+	* src/display.c: Change lookup_widget calls to glade_xml_get_widget.
+	* src/display_playlists.c: Change lookup_widget calls to
+	glade_xml_get_widget for main window.
+	* src/display_songs.c: Change lookup_widget calls to
+	glade_xml_get_widget for main window.
+	* src/display_sorttabs.c: Change lookup_widget calls
+	to glade_xml_get_widget for main window.
+	* src/info.c: Change lookup_widget calls to glade_xml_get_widget for
+	main window.
+	* src/interface.c: Delete create_gtkpod.
+	* src/main.c: Load main xml glade file.
+	* src/misc_input.c: Change lookup_widget calls to glade_xml_get_widget
+	for main window.
+	* src/prefs.c:  Change lookup_widget calls to glade_xml_get_widget 
+	for main window.

Modified: gtkpod/branches/upstream/current/INSTALL
===================================================================
--- gtkpod/branches/upstream/current/INSTALL	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/INSTALL	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,5 +1,6 @@
 How to compile/install gtkpod:
 
+(For ubuntu/debian please refer to the end of this file for a quick round-up)
 
 1. First, make sure you have compiled and installed the dependencies.
    Most Linux distros will include them, except maybe for libid3tag
@@ -17,15 +18,19 @@
    be found at http://www.gtkpod.org/libgpod.html
 
    The libmp4v2 package is ONLY NEEDED if you need AAC support.  You
-   don't need libmp4v2 if you don't use AAC files.
+   don't need libmp4v2 if you don't use AAC files. Download's
+   available at
 
+        http://downloads.sourceforge.net/mpeg4ip/
+        (http://downloads.sourceforge.net/mpeg4ip/mpeg4ip-1.6.tar.gz)
+
    libid3tag was successfully compiled and installed with
 
-   ./configure ; make ; make install
+       ./configure ; make ; make install
 
    libmp4v2 was successfully compiled and install with
 
-   ./bootstrap --disable-server ; make ; make install
+       ./bootstrap --disable-server ; make ; make install
 
 
    The following packages are required for building gtkpod:
@@ -33,11 +38,10 @@
         autoconf (at least 2.55)
         flex (or lex)
         gettext
-        glib (at least 2.4.0)
-        gtk+ (at least 2.6.0)
+        glib (at least 2.8.0)
+        gtk+ (at least 2.8.0)
         libglade (at least 2.4.0)
-        libgnomecanvas (at least 2.14.0)
-        libgpod (at least 0.5.2)
+        libgpod (at least 0.6.1)
         libid3tag (at least 0.15)
         perl XML::Parser module
         pkgconfig
@@ -49,7 +53,7 @@
         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)
+        libmp4v2 (for AAC/M4A support)
 
 
 2. If you install libraries to /usr/local/lib please don't forget to
@@ -96,6 +100,7 @@
 
 
 ----------------------------------------------------------------------
+
 ** Note that you do not need to accept the default (usually
    /usr/local) install path when you compile and install the software.
    You may choose to install the software in a different location.
@@ -111,3 +116,36 @@
    install gtkpod into $HOME/Applications/gtkpod.  Do this instead:
 
     CFLAGS="-I$HOME/Applications/mpeg4ip/include -L$HOME/Applications/mpeg4ip/lib -I$HOME/Applications/libid3tag/include -L$HOME/Applications/libid3tag/lib" ./configure --prefix=$HOME/Applications/gtkpod ; make ; make install 
+
+------------------------------------------------------------------------
+
+Quick guide for Ubuntu/Debian
+
+The following steps were necessary to install libgpod and gtkpod on a fairly virgin Ubuntu Hardy (LTS 8.04) installation.
+
+# required packages
+sudo apt-get install autoconf flex gettext libglib2.0-dev libgtk2.0-dev libglade2-dev libid3tag0-dev libxml-parser-perl pkg-config automake gcc subversion gtk-doc-tools
+
+# recommended packages
+sudo apt-get install libcurl4-dev libflac-dev libgnomevfs2-dev libhal-dev libvorbis-dev libmp4v2-dev
+
+# checkout of libgpod and gtkpod
+svn co https://gtkpod.svn.sourceforge.net/svnroot/gtkpod/libgpod/trunk libgpod
+svn co https://gtkpod.svn.sourceforge.net/svnroot/gtkpod/gtkpod/trunk gtkpod
+
+# compile libgpod
+cd libgpod/
+./autogen.sh
+make
+sudo make install
+
+# compile gtkpod
+cd ../gtkpod/
+cd libgpod/
+./autogen.sh
+make
+sudo make install
+
+#start gtkpod
+gtkpod &
+

Modified: gtkpod/branches/upstream/current/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/Makefile.am	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src po scripts data
+SUBDIRS = src po scripts data  doc
 
 EXTRA_DIST =			\
 	autogen.sh		\
@@ -19,3 +19,6 @@
 	-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data
 	-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/scripts
 	-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)
+
+update-docs:
+	cd doc && make update-docs

Modified: gtkpod/branches/upstream/current/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/Makefile.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -148,8 +148,6 @@
 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@
@@ -162,6 +160,7 @@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -231,7 +230,7 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = src po scripts data
+SUBDIRS = src po scripts data  doc
 EXTRA_DIST = \
 	autogen.sh		\
 	intltool-extract.in	\
@@ -375,8 +374,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -401,8 +400,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -412,13 +411,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -489,6 +487,10 @@
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -515,6 +517,8 @@
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -668,7 +672,7 @@
 .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 \
+	dist-lzma 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 \
@@ -686,6 +690,9 @@
 	-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data
 	-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/scripts
 	-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)
+
+update-docs:
+	cd doc && make update-docs
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: gtkpod/branches/upstream/current/NEWS
===================================================================
--- gtkpod/branches/upstream/current/NEWS	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/NEWS	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,10 +1,461 @@
-gtkpod V0.90
-	Complete rewrite of reading/writing the iTunesDB
+gtkpod V0.99.14
 
-	IMPROVEMENT: local database to browse local content
+       NEW FEATURE: Help system, still very preliminary.
 
+       NEW FEATURE: Video thumbnail generation, thanks to M. Sean Finney
+
+       NEW FEATURE: Lyrics may be viewed and edited via the Details window
+       for a track. Only mp3 files are supported currently (patches welcome
+       to remove this limitation). Writing lyric tags may still have
+       compatibility issues on some iPod's. Thanks to Dudy Kohen.
+
+       NEW FEATURE: Add a search bar, to quickly filter tracks.
+
+       UPDATE: New application icon.
+
+       UPDATE: Preferences dialog redesigned from the ground up for GNOME
+       HIG compliance.
+
+       UPDATE: Hebrew translation. Thanks to Assaf Gillat.
+
+       UPDATE: Italian translation. Thanks to Daniele Forsi.
+
+       UPDATE: Romanian translation. Thanks to Alex Eftimie.
+
+       UPDATE: Spanish translation. Thanks to Alejandro Lamas Daviña.
+
+       UPDATE: Swedish translation. Thanks to Stefan Asserhäll.
+
+       NEW FEATURE: Added simple Chinese translation. Thanks to Tan Zhixin.
+
+       IMPROVEMENT: Numerous UI cleanups
+
+       IMPROVEMENT: Support for chapter data, thanks to Michael Tiffany
+
+       IMPROVEMENT: Use cairo for coverart display effects. This allows the
+       dependency on libgnomecanvas to be dropped.
+
+       IMPROVEMENT: Coverart display performance has been improved.
+
+       IMPROVEMENT: Better support for Windows compilation in Cygwin,
+       thanks to Éric Lassauge.
+
+       IMPROVEMENT: Set track->lyrics_flag for mp4 files in addition to mp3
+       files.
+
+       IMPROVEMENT: Use the Artist tag for the Artist and fall back to the
+       Album Artist tag only when the former does not exist. For Album
+       Artist, use the Album Artist tag, but only if the Artist tag does
+       exist. Thanks to Dudy Kohen.
+
+       BUGFIX: The Photo "playlist" is now a separate object in the
+       Playlist view.
+
+       BUGFIX: Numerous memory leaks fixed, thanks to Andrea, Tomas
+       Carnecky, and others.
+
+       Many other bug fixes and cleanups, see the ChangeLog for more detail.
+
+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
+       as MP3 and M4A). Thanks to Marc d[readlock], Simon Naunton and
+       Peter Edwards! Multi-threaded background conversion was added by
+       Jorg Schuler.
+
+       NEW FEATURE: editing of TV show metadata and track media
+       type. Thanks to Mario Rossi.
+
+       NEW FEATURE: Display of Album Art. Thanks to P.G. Richardson.
+
+       NEW FEATURE: Download of Album Art from the net. Thanks to
+       P.G. Richardson.
+
+       NEW FEATURE: copy playlists and tracks from within the context
+       menu without DND can simplify life with many playlists. Thanks
+       to Andrzej Palejko for his patch.
+
+       NEW FEATURE: preliminary support for calculating gapless
+       playback information (lame encoded mp3 files only).  Thanks to
+       Michael Tiffany.
+
+       UPDATE: Smart playlists now support the following new fields:
+       album artist, tv show, last skipped, season number, skipcount
+       and video kind.
+
+       IMPROVEMENT: Clicking on an item with the right mouse button
+       will select and open the context menu, which is the intended
+       behavior. As a consequence, the interface will remain blocked
+       while the selection is being updated and displayed.
+
+       BUGFIX: dragging tracks between two iPods would sometimes not
+       actually copy the file.
+
+       UPDATED: Italian translation (thanks to Daniele Forsi)
+
+       PACKAGING: Install a .desktop file and icons according to the
+       freedesktop.org specification.
+
+gtkpod V0.99.8
+
+       NEW FEATURE: Support of several iPods (currently you need to
+       edit the itdb_* entries in ~/.gtkpod/prefs to add
+       repositories). Each iPod can be loaded/ejected
+       individually. Scripts are called before loading (gtkpod.load)
+       and after saving (gtkpod.eject) with the mountpoint as the
+       first argument. If you need to mount the iPod manually, put the
+       mount command in gtkpod.load.
+
+       NEW FEATURE: Support for mobile phones supporting iTunes (see
+       Changelog_detailed for details)
+
+       NEW FEATURE: Lyrics are displayed on the iPod when available.
+
+       NEW FEATURE: Preliminary (no meta data) support of h.264 video
+       format via the libmp4v2 interface. Thanks to Peter Lieverdink.
+
+       NEW FEATURE: Script to sync notes from Tomboy to the
+       iPod. Thanks to Tejas Dinkar.
+
+       NEW FEATURE: Support of iTunes iTunNORM tag for volume
+       normalisation of mp4 tracks.
+
+       NEW FEATURE: Support of aacgain's replay gain tag for volume
+       normalisation of mp4 tracks (takes precedence over the iTunNORM
+       tag, see http://altosdesign.com/aacgain/)
+
+       NEW FEATURE: Support for start time, stop time, skip when
+       shuffling and remember playback position.
+
+       IMPROVEMENT: Support for coverart has been improved. You may
+       have to select your iPod model from a list of available models
+       if your iPod cannot be identified automatically, as is the case
+       for iTunes mobile phones or the new 6th generation iPod Nanos.
+       Coverart embedded in the music file (APIC tag) can now also
+       read. Support to read the coverart from specified files is
+       still available though. Please note that at present APIC
+       support only works when adding tracks directly to the iPod. It
+       does not work when you add tracks to a LOCAL repository first
+       and use Drag and Drop to move the track to your iPod.
+
+       IMPROVEMENT: Podcasts are marked as unplayed (on the iPod, with
+       a bullet in front of the title) when newly added to the podcast
+       list, and unmarked once they have been played once on the iPod.
+
+       IMPROVEMENT: Support to sync thunderbird's address book to an
+       iPod Nano with old firmware that would otherwise only display
+       the first address. This script may be useful to other users as
+       well as it writes out one vcf file per contact instead of just
+       one big file containing all contacts. Thanks to Paul Oremland.
+
+       IMPROVEMENT: Handle multiple calendar and task files in
+       sync-evocalendar script. Thanks to Michele C. Soccio
+
+       NEW: Spanish translation. Thanks to Alejandro Lamas.
+
+       BUGFIX: Pressing 'OK' when syncing directories several times
+       could crash gtkpod. Thanks to dforsi.
+
+       BUGFIX: Exporting tracks did not work if the template
+       extensions (.mp3...) did not match case-sensitively, possibly
+       leading to non-exported tracks. Thanks to Mattias Wadman.
+
+       BUGFIX: When updating tracks, the filename of the music file
+       and the filename of the thumbnail could be messed up. Fixed.
+
+       BUGFIX: The Edit Detail dialog did not handle the 'Year' field
+       correctly.
+
+       BUGFIX: When updating tracks, files were not copied to the iPod
+       even if the file was changed.
+
+       BUGFIX: Removing playlists could crash gtkpod.
+
+       WORKAROUND: Disable sorting of playlist view as this crashed
+       gtkpod.
+
+gtkpod V0.99.4
+
+       BUGFIX: Options for exporting playlist files could not be
+       changed.
+
+       BUGFIX: Fixed segfault when updating tracks or directories with
+       artowrk present.
+
+       BUGFIX: Browse button for "Sync Notes Script" opened a
+       directory browser instead of a file browser.
+
+       BUGFIX: Writing ID3v2.4 tags in UTF8 did not always
+       work. Thanks to 't0c' for the patch.
+
+       BUGFIX: Context Menus for removing playlists from the iPod were
+       not displayed. Thanks to 'rob/biffhero' for pointing this out.
+
+gtkpod V0.99.2
+       BUGFIX: Fix segfault when applying preferences.
+
+       BUGFIX: Don't require libcurl (not actively used).
+
+       UPDATE: Swedish translation catalog
+
+       IMPROVEMENT: Allow export of multiple thunderbird address
+       books (by naming the output filename).
+
+gtkpod V0.99.0
+       NEW: type-ahead search functionality. Thanks to Nick Piper,
+       http://www.nickpiper.co.uk/ -- please note that the list view
+       you want to search in needs to have keyboard focus. Selection
+       of the search column is done by clicking anywhere inside the
+       column.
+
+       NEW: Handle Compilations decently. The compilation mp3 tag is
+       read and written, and compilation artists can be grouped into
+       "Compilations" in the Artist filter tab. Thanks to Iain Benson!
+
+       NEW: Window for edit of track details, including functionality
+       to set thumbnails. The thumbnails are not stored as tags in the
+       file as iTunes does it. Instead, the original filename is
+       stored.
+
+       NEW: Display and setting/removing of thumbnail images. Choose
+       "Show Details" from the context menu (right mouse-button). New
+       thumbnails are displayed by the iPod but get wiped by iTunes,
+       however.
+
+       NEW: Automatic adding of thumbnail images when adding new
+       tracks or updating existing ones. See the option on the 'Track
+       Info' page of the preferences dialog for settings about which
+       filename will be used. Any filename is possible, even filenames
+       constructed from the album or artist name.
+
+       NEW: very basic iPod video support (you can add Videos but no
+       metadata is filled in). Thanks to Uwe Herman for the input.
+
+       NEW: script to sync contacts from a Palm (via jppy
+       http://wiki.zanu.org.uk/jppy). Thanks to Nick Piper,
+       http://www.nickpiper.co.uk/)
+
+       NEW: basic podcast support (use e.g. bashpodder or gpodder to
+       download podcasts, then add them directly into the podcast
+       playlist on the iPod).
+
+       NEW: transition to libgpod to read/write iTunesDB. See
+       www.gtkpod.org/libgpod.html for details.
+
+       IMPROVEMENT: added comment, category, description, podcast url,
+       podcast rss, subtitle fields and release date to displayable
+       fields.
+
+       IMPROVEMENT: Support playcounts on iPod Shuffle as well
+
+       IMPROVEMENT: Remember size of 'Edit Smart Playlist' dialog and
+       use scrolled window for the rules display.
+
+       IMPROVEMENT: Update smart playlists automatically (on
+       load/display/save) if 'live updating' is set.
+
+       IMPROVEMENT: Support for more mp3 file tags: Compilation
+       (TCMP), Podcast URL/Title (TID), Podcast Description (TDS),
+       Podcast Subtitle (TT3), Podcast RSS (WFD), Podcast Release Date
+       (TDR). Mostly reading only because of limited support on
+       id3tag's side.
+
+       UPDATED: Italian translation (thanks to Edward Matteucci)
+
+       BUGFIX: 'Check iPod's files' could crash under certain
+       circumstances (thanks to David Mansfield for the patch).
+
+       BUGFIX: Lame's Replay Gain was read incorrectly for certain
+       values. Thanks to Chris Brotherton for tracking this down.
+
+       BUGFIX: Prevent that all rules in a smart playlist get deleted,
+       which would mess up the iTunesDB.
+
+       BUGFIX: Choosing 'Delete' from the menu (not context menu) now
+       works again.
+
+gtkpod V0.95.CVS
+       NEW: script to sync addressbooks in ldif format provided by
+       Sebastien BERIDOT.
+
+       NEW: script to sync kNotes (KDE note program) provided by
+       Sebastian Scherer.
+
+       CHANGE: MP3 tags: use 'Band/Orchestra/Accompaniment' (TPE2) as
+       artist if it exists. Otherwise use 'Lead artist/Lead
+       performer/Soloist/Performing group' (TPE1) as before. Let me
+       know if this causes problems for you.
+
+       UPDATED Hebrew translation (thanks to Assaf Gillat)
+
+       SAFETY: call sync() and flush all buffers to the iPod after
+       writing the iTunesDB -- should minimise filesystem errors
+       caused by people disconnecting the iPod without unmounting.
+
+       BUGFIX: Copying playlists by drag and drop could confuse smart
+       playlists referencing these playlists. Fixed.
+
+       After copying playlists by drag and drop, smart playlists
+       refering to these playlists could become confused.
+
+gtkpod V0.94.0
+       NEW FEATURE: stable sorting of track view. This allows you, for
+       example, to first sort by title, then by artist. The list will
+       then be sorted by artist, but all titles of each artist remain
+       sorted as well (before the tiles were random).
+       Arbitrary depth and order of stable sorting is possible by
+       clicking the sort columns in the desired order.
+
+       NEW FEATURE: define your own ignore list of words that should
+       be ignored during sorting (sort options: ctrl-s).
+
+       IMPROVEMENT: improved handling of dangling files (files that
+       are referenced in the iTunesDB but are not present on the
+       iPod).
+
+       IMPROVEMENT: use 'eject' instead of 'umount'. Also fixes the
+       bug that 'could not unmount' was always displayed, even if the
+       umount was successful (thanks to Andreas Hauber).
+
+       BUGFIX: Some iTunesDB files written by iTunes could not be read
+       because of an error in the parse code (gtkpod would attempt to
+       read beyond the end of the file).
+
+       BUGFIX: Fixed compatibility issue with new firmware 3.1 and
+       iTunes 4.9 (only 256 tracks were shown on the iPod, iTunes
+       removed the majority of the tracks from the iPod). Podcasts are
+       still not supported, however, and will be lost when handled by
+       gtkpod.
+
+       BUGFIX: Fixed On-The-Go playlist handling (thanks to "Todd").
+
+       UPDATE: Hebrew translation catalog. Thanks to Assaf Gillat!
+
+gtkpod V0.93.1
+       BUGFIX: When changing the mountpoint, the change was not
+       written to the preferences file correctly.
+
+       BUGFIX: 'Copy from iPod' just failed in offline mode instead of
+       giving meaningful error messages -> fixed.
+
+       IMPROVEMENT: 'Copy from iPod' is now 'Export from Database' and
+       allows to export from the local database as well. This is
+       useful if you want to rename files in a consistant manner.
+
+gtkpod V0.93
+	Complete rewrite of reading/writing the iTunesDB. The code for
+	reading and writing the iTunesDB (and other iPod/Shuffle
+	files) is completely self-contained (itdb*.[ch]) and can
+	easily be used in other projects.
+
+	NEW FEATURE: Support of 'local database' containing tracks on
+	local harddisk. The contents of the local hard disk can be
+	browsed in the known gtkpod-fashion: by artist or genre or
+	album etc. Tracks and entire playlists can be dragged over to
+	the iPod or Shuffle database. By using smart playlists with
+	defined size in MBytes, the Shuffle can be filled effectively.
+
+	Drag and drop also works in the opposite direction: drag
+	tracks or entire playlists from the iPod/Shuffle database into
+	your local database. If necessary, the tracks are copied to
+	your harddisk automatically.
+
+	NEW FEATURE: sync-abook.sh and sync-webcalendar.sh scripts
+	provided by Daniel Kercher.
+
+	NEW FEATURE: sync-thunderbird.sh script	provided by Clinton
+	Gormley.
+
 	IMPROVEMENT: support MP3 disc numbers (thanks to Leigh Dyer)
 
+	IMPROVEMENT: Use of GTK filechoosers instead of fileselectors
+	(thanks to James Ligget)
+
+	IMPROVEMENT: sync-notes.sh now also works on directories (thanks
+	to Thomas Perl)
+
+	UPDATE: use 'iconv' instead of 'recode' in the provided export
+	scripts. Thanks to Alexey Dokuchaev.
+
+	UPDATE: All translation catlogs updated (French, German,
+	Italian, Japanese and Swedish)
+
+	BUGFIX: display and reading of compilation flag fixed (thanks
+	to Julien Oster for the patch)
+
+	BUGFIX: don't hang when parsing playlist files with empty
+	lines (thanks to Mattias Wadman)
+
+	BUGFIX: When exporting from the iPod: if the original filename
+        of a track was available, the track was not copied from the
+        iPod but from the original location on the user's
+        harddisk. Had the original file been removed or the export was
+        done on another computer (where the original file was not
+        present), the export failed.
+
 gtkpod V0.88.2
 	IMPROVEMENT: Added '%p' (current playlist) identifier when
 	exporting tracks.
@@ -113,7 +564,7 @@
 	up as "OTG Playlist 1" etc.
 
 	NEW FEATURE: export of PLS or M3U file including meta data.
-	
+
 	NEW FEATURE: registering playcounts when tracks are played on
 	the local machine is now possible (actually it was already
 	possible in V0.80, but now the README explains how to do it).
@@ -175,7 +626,7 @@
 
 	PATCH: reverted to old-style check of id3tag-lib as id3tag.pc
 	is not included with the id3tag distribution by default
-	
+
 gtkpod V0.80
 	NEW FEATURE: Added support for WAV audio files
 
@@ -482,7 +933,7 @@
 
 	NEW FEATURE: columns in song view can be dragged into any
 	order. Order will be saved.
-	
+
         Change of copyright: itunesdb.c and itunesdb.h are now under the
 	GNU Lesser General Public License to make it easier to use the
 	code in other programs.
@@ -527,10 +978,10 @@
 
         BUGFIX: some iTunesDBs produced by ephpod could not be read (hang
 	after reading the songs and before adding the playlists).
-        
+
 	New Feature: update song information from file when adding songs
 	with identical filename (option)
-	
+
         New Feature: update song information from file of selected songs
 	(ctrl-u and menu item)
 
@@ -540,7 +991,7 @@
 
         BUGFIX: Deleting songs from the iPod only worked if you exported
 	the iTunesDB twice.
-	
+
 	New Feature: Add Playlists (m3u and pls)
 
 gtkpod V0.42 20-Feb-2003
@@ -555,7 +1006,7 @@
         Improvement: export can be interrupted and be continued at a later
 	time. gtkpod will (hopefully) correctly remember which songs have
 	already been copied/deleted from your iPod.
-	
+
 	Improvement: removal and copy of songs during export is done in a
 	separate thread, so the display doesn't freeze on long file system
 	operations
@@ -563,10 +1014,10 @@
         Bugfix: Kentaro Fukuchi pointed out that MusicMatch (at least the
 	Japanese version) uses song IDs starting with 2 (and not with
 	53). gtkpod then dropped some of your songs -- fixed.
-        
+
 	Improvement: Delete works on entries in sort tabs now (ctrl-d and
 	new menu item)
-	
+
 	Improvement?: don't close dirbrowser window until after the songs
 	have been read.
 
@@ -591,7 +1042,7 @@
 	- confirmation window when quitting gtkpod without saving data
 	- Drag-and-drop for sort tab entries
 	- Japanese langauge catalogue
-	
+
 gtkpod V0.40 26-Jan-2003
 	many new features:
 
@@ -602,6 +1053,6 @@
 	- Charset for ID3 tags can be set
 	- Offline modification of iPod contents (and later synchronisation)
 	- Preferences
-	
+
 gtkpod V0.10
 	basic tool to import/export songs to your iPod.

Modified: gtkpod/branches/upstream/current/aclocal.m4
===================================================================
--- gtkpod/branches/upstream/current/aclocal.m4	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/aclocal.m4	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008  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,10 +11,13 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-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])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -119,8 +122,7 @@
 #-----------------
 glib_DEFUN([GLIB_WITH_NLS],
   dnl NLS is obligatory
-  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-    USE_NLS=yes
+  [USE_NLS=yes
     AC_SUBST(USE_NLS)
 
     gt_cv_have_gettext=no
@@ -516,6 +518,20 @@
 AC_SUBST(INTLTOOL_SERVICE_RULE)
 AC_SUBST(INTLTOOL_POLICY_RULE)
 
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
 # Use the tools built into the package, not the ones that are installed.
 AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
 AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
@@ -716,16 +732,14 @@
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -769,9 +783,9 @@
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -806,7 +820,7 @@
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -821,7 +835,7 @@
 [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], [],
+m4_if([$1], [1.10.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -837,8 +851,10 @@
 # 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)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -1133,7 +1149,7 @@
   # 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
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -1193,13 +1209,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 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 12
+# serial 13
 
 # 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.
@@ -1304,16 +1320,17 @@
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -1635,7 +1652,7 @@
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 

Modified: gtkpod/branches/upstream/current/config.guess
===================================================================
--- gtkpod/branches/upstream/current/config.guess	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/config.guess	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-07-02'
+timestamp='2008-01-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -161,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -329,7 +330,7 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -531,7 +532,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -780,7 +781,7 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -790,12 +791,18 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -829,7 +836,14 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -950,6 +964,9 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1225,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;

Modified: gtkpod/branches/upstream/current/config.h.in
===================================================================
--- gtkpod/branches/upstream/current/config.h.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/config.h.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,14 +1,12 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 
-/* libmp4v2 probably version 1.6 or higher: MP4GetMetadataCoverArt accepts an
-   extra argument */
+/* MP4GetMetadataCoverArt accepts an extra argument in libmp4v2 >= 1.6 */
 #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 */
+/* MP4GetMetadataFreeForm accepts an extra argument in libmp4v2 >= 1.6 */
 #undef FREEFORM_ACCEPTS_EXTRA_ARG
 
 /* "Gettext package name" */
@@ -50,6 +48,9 @@
 /* Define if you have the mp4v2 library */
 #undef HAVE_LIBMP4V2
 
+/* Define if you have the mp4v2 library version 2.0 or greater */
+#undef HAVE_LIBMP4V2_2
+
 /* Define if you have the ogg/vorbis library */
 #undef HAVE_LIBVORBISFILE
 
@@ -95,6 +96,12 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Set this to the libgpod version */
+#undef LIBGPOD_VERSION
+
+/* MP4GetMetadataAlbumArtist requires libmp4v2 >= 1.6 */
+#undef MP4_ALBUMARTIST_EXISTS
+
 /* Name of package */
 #undef PACKAGE
 

Modified: gtkpod/branches/upstream/current/config.sub
===================================================================
--- gtkpod/branches/upstream/current/config.sub	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/config.sub	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   Free Software Foundation, Inc.
 
-timestamp='2006-09-20'
+timestamp='2008-01-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -324,7 +324,7 @@
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,10 +369,14 @@
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
+	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -443,6 +447,14 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -475,8 +487,8 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16c)
-		basic_machine=cr16c-unknown
+	cr16)
+		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
@@ -668,6 +680,14 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -683,6 +703,10 @@
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -809,6 +833,14 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -925,6 +957,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1014,6 +1049,10 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
+	tile*)
+		basic_machine=tile-unknown
+		os=-linux-gnu
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
@@ -1219,7 +1258,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1414,6 +1453,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;

Modified: gtkpod/branches/upstream/current/configure
===================================================================
--- gtkpod/branches/upstream/current/configure	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/configure	2009-01-24 20:05:38 UTC (rev 361)
@@ -718,6 +718,9 @@
 INTLTOOL_THEME_RULE
 INTLTOOL_SERVICE_RULE
 INTLTOOL_POLICY_RULE
+XGETTEXT
+MSGMERGE
+MSGFMT
 INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
@@ -736,8 +739,6 @@
 GTHREAD_LIBS
 LIBGLADE_CFLAGS
 LIBGLADE_LIBS
-LIBGNOMECANVAS_CFLAGS
-LIBGNOMECANVAS_LIBS
 LIBGPOD_CFLAGS
 LIBGPOD_LIBS
 LEX
@@ -749,10 +750,8 @@
 GREP
 EGREP
 USE_NLS
-MSGFMT
 MSGFMT_OPTS
 GMSGFMT
-XGETTEXT
 CATALOGS
 CATOBJEXT
 GMOFILES
@@ -803,8 +802,6 @@
 GTHREAD_LIBS
 LIBGLADE_CFLAGS
 LIBGLADE_LIBS
-LIBGNOMECANVAS_CFLAGS
-LIBGNOMECANVAS_LIBS
 LIBGPOD_CFLAGS
 LIBGPOD_LIBS
 CPP
@@ -1431,10 +1428,6 @@
               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
@@ -2208,7 +2201,7 @@
 
 # Define the identity of the package.
  PACKAGE=gtkpod
- VERSION=0.99.12
+ VERSION=0.99.14
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5273,6 +5266,141 @@
 
 
 
+# Check the gettext tools to make sure they are GNU
+# 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_XGETTEXT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $XGETTEXT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XGETTEXT="$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_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
+
+  ;;
+esac
+fi
+XGETTEXT=$ac_cv_path_XGETTEXT
+if test -n "$XGETTEXT"; then
+  { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&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_MSGMERGE+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MSGMERGE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MSGMERGE="$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_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
+
+  ;;
+esac
+fi
+MSGMERGE=$ac_cv_path_MSGMERGE
+if test -n "$MSGMERGE"; then
+  { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&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_MSGFMT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $MSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MSGFMT="$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_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
+
+  ;;
+esac
+fi
+MSGFMT=$ac_cv_path_MSGFMT
+if test -n "$MSGFMT"; then
+  { echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
 # Use the tools built into the package, not the ones that are installed.
 INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
 
@@ -5794,41 +5922,37 @@
 { 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 "$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\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
+if test -n "$GTK_CFLAGS"; then
+    pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.6.0" 2>/dev/null`
+  pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.8.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    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\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.6.0") 2>&5
+if test -n "$GTK_LIBS"; then
+    pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.8.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.8.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.6.0" 2>/dev/null`
+  pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.8.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -5841,9 +5965,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0"`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= 2.8.0" 2>&1`
         else
-	        GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.6.0"`
+	        GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= 2.8.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTK_PKG_ERRORS" >&5
@@ -5873,41 +5997,37 @@
 { 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
+if test -n "$GLIB_CFLAGS"; then
+    pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.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`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.8.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ 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
+if test -n "$GLIB_LIBS"; then
+    pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.8.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.8.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`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.8.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -5920,9 +6040,9 @@
         _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"`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.8.0" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0"`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.8.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
@@ -5952,11 +6072,10 @@
 { 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" && \
+if test -n "$GMODULE_CFLAGS"; then
+    pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -5966,15 +6085,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ 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" && \
+if test -n "$GMODULE_LIBS"; then
+    pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -5984,9 +6101,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -5999,9 +6115,9 @@
         _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"`
+	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmodule-2.0" 2>&1`
         else
-	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0"`
+	        GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmodule-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GMODULE_PKG_ERRORS" >&5
@@ -6031,11 +6147,10 @@
 { 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" && \
+if test -n "$GTHREAD_CFLAGS"; then
+    pkg_cv_GTHREAD_CFLAGS="$GTHREAD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -6045,15 +6160,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ 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" && \
+if test -n "$GTHREAD_LIBS"; then
+    pkg_cv_GTHREAD_LIBS="$GTHREAD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -6063,9 +6176,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -6078,9 +6190,9 @@
         _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"`
+	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0 >= 0.14.0" 2>&1`
         else
-	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 >= 0.14.0"`
+	        GTHREAD_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0 >= 0.14.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTHREAD_PKG_ERRORS" >&5
@@ -6110,11 +6222,10 @@
 { 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" && \
+if test -n "$LIBGLADE_CFLAGS"; then
+    pkg_cv_LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -6124,15 +6235,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ 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" && \
+if test -n "$LIBGLADE_LIBS"; then
+    pkg_cv_LIBGLADE_LIBS="$LIBGLADE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    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=$?
@@ -6142,9 +6251,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -6157,9 +6265,9 @@
         _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"`
+	        LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libglade-2.0 >= 2.4.0" 2>&1`
         else
-	        LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libglade-2.0 >= 2.4.0"`
+	        LIBGLADE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libglade-2.0 >= 2.4.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBGLADE_PKG_ERRORS" >&5
@@ -6186,123 +6294,40 @@
 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
+if test -n "$LIBGPOD_CFLAGS"; then
+    pkg_cv_LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 >= 0.6.1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgpod-1.0 >= 0.6.1") 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`
+  pkg_cv_LIBGPOD_CFLAGS=`$PKG_CONFIG --cflags "libgpod-1.0 >= 0.6.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ 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
+if test -n "$LIBGPOD_LIBS"; then
+    pkg_cv_LIBGPOD_LIBS="$LIBGPOD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgpod-1.0 >= 0.6.1\"") >&5
+  ($PKG_CONFIG --exists --print-errors "libgpod-1.0 >= 0.6.1") 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`
+  pkg_cv_LIBGPOD_LIBS=`$PKG_CONFIG --libs "libgpod-1.0 >= 0.6.1" 2>/dev/null`
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -6315,9 +6340,9 @@
         _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"`
+	        LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgpod-1.0 >= 0.6.1" 2>&1`
         else
-	        LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgpod-1.0 >= 0.6.0"`
+	        LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgpod-1.0 >= 0.6.1" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBGPOD_PKG_ERRORS" >&5
@@ -6343,8 +6368,8 @@
 	:
 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"
+CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS $LIBGLADE_CFLAGS $LIBGPOD_CFLAGS"
+LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS $LIBGPOD_LIBS"
 
 for ac_prog in flex lex
 do
@@ -6553,15 +6578,17 @@
 if test "$LEX" = :; then
   LEX=${am_missing_run}flex
 fi
-if ! test "y$LEX" = "yflex"; then
-    if ! test "y$LEX" = "ylex"; then
+case "$LEX" in
+flex|*/flex|lex|*/lex)
+	;;
+*)
         { { echo "$as_me:$LINENO: error: *** flex or lex required
 See \`config.log' for more details." >&5
 echo "$as_me: error: *** flex or lex required
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
-    fi
-fi
+	;;
+esac
 
 # Extract the first word of "mount", so it can be a program name with args.
 set dummy mount; ac_word=$2
@@ -6646,7 +6673,7 @@
 
 
 
-ALL_LINGUAS="de es fr he it ja ru ro sv"
+ALL_LINGUAS="de es fr he it ja ru ro sv zh_CN"
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7484,7 +7511,7 @@
 
     fi
   fi
-         USE_NLS=yes
+     USE_NLS=yes
 
 
     gt_cv_have_gettext=no
@@ -9293,11 +9320,10 @@
 { echo "$as_me:$LINENO: checking for CURL" >&5
 echo $ECHO_N "checking for CURL... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CURL_CFLAGS"; then
-        pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$CURL_CFLAGS"; then
+    pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.10.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "libcurl >= 7.10.0") 2>&5
   ac_status=$?
@@ -9307,15 +9333,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$CURL_LIBS"; then
-        pkg_cv_CURL_LIBS="$CURL_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$CURL_LIBS"; then
+    pkg_cv_CURL_LIBS="$CURL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.10.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "libcurl >= 7.10.0") 2>&5
   ac_status=$?
@@ -9325,9 +9349,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -9340,9 +9363,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl >= 7.10.0"`
+	        CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcurl >= 7.10.0" 2>&1`
         else
-	        CURL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl >= 7.10.0"`
+	        CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcurl >= 7.10.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CURL_PKG_ERRORS" >&5
@@ -9399,11 +9422,10 @@
 { echo "$as_me:$LINENO: checking for GNOME_VFS" >&5
 echo $ECHO_N "checking for GNOME_VFS... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GNOME_VFS_CFLAGS"; then
-        pkg_cv_GNOME_VFS_CFLAGS="$GNOME_VFS_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GNOME_VFS_CFLAGS"; then
+    pkg_cv_GNOME_VFS_CFLAGS="$GNOME_VFS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.6.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.6.0") 2>&5
   ac_status=$?
@@ -9413,15 +9435,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$GNOME_VFS_LIBS"; then
-        pkg_cv_GNOME_VFS_LIBS="$GNOME_VFS_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$GNOME_VFS_LIBS"; then
+    pkg_cv_GNOME_VFS_LIBS="$GNOME_VFS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.6.0\"") >&5
   ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.6.0") 2>&5
   ac_status=$?
@@ -9431,9 +9451,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -9446,9 +9465,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.6.0"`
+	        GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-vfs-2.0 >= 2.6.0" 2>&1`
         else
-	        GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.6.0"`
+	        GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-vfs-2.0 >= 2.6.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOME_VFS_PKG_ERRORS" >&5
@@ -9493,7 +9512,6 @@
     have_gnome_vfs="*no -- will build without iPod autodetection support"
 fi
 
-#dnl Check for HAL
 
 # Check whether --with-hal was given.
 if test "${with_hal+set}" = set; then
@@ -9506,11 +9524,10 @@
 { echo "$as_me:$LINENO: checking for HAL" >&5
 echo $ECHO_N "checking for HAL... $ECHO_C" >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$HAL_CFLAGS"; then
-        pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$HAL_CFLAGS"; then
+    pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5 hal < 0.6\"") >&5
   ($PKG_CONFIG --exists --print-errors "hal >= 0.5 hal < 0.6") 2>&5
   ac_status=$?
@@ -9520,15 +9537,13 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$HAL_LIBS"; then
-        pkg_cv_HAL_LIBS="$HAL_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$HAL_LIBS"; then
+    pkg_cv_HAL_LIBS="$HAL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5 hal < 0.6\"") >&5
   ($PKG_CONFIG --exists --print-errors "hal >= 0.5 hal < 0.6") 2>&5
   ac_status=$?
@@ -9538,9 +9553,8 @@
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
@@ -9553,9 +9567,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hal >= 0.5 hal < 0.6"`
+	        HAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hal >= 0.5 hal < 0.6" 2>&1`
         else
-	        HAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hal >= 0.5 hal < 0.6"`
+	        HAL_PKG_ERRORS=`$PKG_CONFIG --print-errors "hal >= 0.5 hal < 0.6" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$HAL_PKG_ERRORS" >&5
@@ -9607,6 +9621,7 @@
 fi
 
 if test "x$with_mp4v2" != "xno"; then
+    have_mp4v2_2_header=no
     { 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
@@ -9824,25 +9839,213 @@
 fi
 
     if test "x$have_mp4v2_header" = "xno"; then
+        if test "${ac_cv_header_mp4v2_mp4v2_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for mp4v2/mp4v2.h" >&5
+echo $ECHO_N "checking for mp4v2/mp4v2.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_mp4v2_mp4v2_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_mp4v2_mp4v2_h" >&5
+echo "${ECHO_T}$ac_cv_header_mp4v2_mp4v2_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking mp4v2/mp4v2.h usability" >&5
+echo $ECHO_N "checking mp4v2/mp4v2.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <mp4v2/mp4v2.h>
+_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_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking mp4v2/mp4v2.h presence" >&5
+echo $ECHO_N "checking mp4v2/mp4v2.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <mp4v2/mp4v2.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+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_cpp conftest.$ac_ext") 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); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: mp4v2/mp4v2.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: mp4v2/mp4v2.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: mp4v2/mp4v2.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: mp4v2/mp4v2.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: mp4v2/mp4v2.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: mp4v2/mp4v2.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: mp4v2/mp4v2.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: mp4v2/mp4v2.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for mp4v2/mp4v2.h" >&5
+echo $ECHO_N "checking for mp4v2/mp4v2.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_mp4v2_mp4v2_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_mp4v2_mp4v2_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_mp4v2_mp4v2_h" >&5
+echo "${ECHO_T}$ac_cv_header_mp4v2_mp4v2_h" >&6; }
+
+fi
+if test $ac_cv_header_mp4v2_mp4v2_h = yes; then
+  have_mp4v2_2_header=yes; have_mp4v2_header=yes; have_mp4v2=yes
+else
+  have_mp4v2_header=no
+fi
+
+
+        if test "x$have_mp4v2_2_header" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBMP4V2_2 1
+_ACEOF
+
+        fi
+    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;}
+        { echo "$as_me:$LINENO: WARNING: mp4.h and mp4v2/mp4v2.h cannot be found or is unusable. Check your mp4v2 installation." >&5
+echo "$as_me: WARNING: mp4.h and mp4v2/mp4v2.h cannot be found or is unusable. Check your mp4v2 installation." >&2;}
     else
-    cat >conftest.$ac_ext <<_ACEOF
+        if test "x$have_mp4v2_2_header" = "xyes"; then
+            cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <mp4v2/mp4v2.h>
+int
+main ()
+{
+bool TestMP4GetMetadataFreeForm(MP4FileHandle hFile, const char *name,
+                    uint8_t** pValue, uint32_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
+        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);
-            }
+                    u_int8_t** pValue, u_int32_t* valueSize, const char *owner)
+                    {
+                        MP4GetMetadataFreeForm(hFile, name,pValue, valueSize, owner);
+                    }
   ;
   return 0;
 }
@@ -9873,21 +10076,76 @@
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    cat >conftest.$ac_ext <<_ACEOF
+        fi
+        if test "x$freeform_accepts_extra_arg" = "xyes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define FREEFORM_ACCEPTS_EXTRA_ARG 1
+_ACEOF
+
+        fi
+        if test "x$have_mp4v2_2_header" = "xyes"; then
+            cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <mp4v2/mp4v2.h>
+int
+main ()
+{
+bool TestMP4GetMetadataCoverArt(MP4FileHandle hFile,
+                    uint8_t **coverArt, uint32_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 "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        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 TestMP4GetMetadataCoverArt(MP4FileHandle hFile,
-            u_int8_t **coverArt, u_int32_t* size, uint32_t index)
-            {
-                MP4GetMetadataCoverArt(hFile, coverArt, size, index);
-            }
+                    u_int8_t **coverArt, u_int32_t* size, uint32_t index)
+                    {
+                        MP4GetMetadataCoverArt(hFile, coverArt, size, index);
+                    }
   ;
   return 0;
 }
@@ -9918,22 +10176,107 @@
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+        fi
+        if test "x$coverart_accepts_extra_arg" = "xyes"; then
 
-    if test "x$freeform_accepts_extra_arg" = "xyes"; then
-
 cat >>confdefs.h <<\_ACEOF
-#define FREEFORM_ACCEPTS_EXTRA_ARG 1
+#define COVERART_ACCEPTS_EXTRA_ARG 1
 _ACEOF
 
-    fi
-    if test "x$coverart_accepts_extra_arg" = "xyes"; then
+        fi
+        { echo "$as_me:$LINENO: checking for library containing MP4SetMetadataAlbumArtist" >&5
+echo $ECHO_N "checking for library containing MP4SetMetadataAlbumArtist... $ECHO_C" >&6; }
+if test "${ac_cv_search_MP4SetMetadataAlbumArtist+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char MP4SetMetadataAlbumArtist ();
+int
+main ()
+{
+return MP4SetMetadataAlbumArtist ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' -lmp4v2; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+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_link") 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_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_search_MP4SetMetadataAlbumArtist=$ac_res
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext
+  if test "${ac_cv_search_MP4SetMetadataAlbumArtist+set}" = set; then
+  break
+fi
+done
+if test "${ac_cv_search_MP4SetMetadataAlbumArtist+set}" = set; then
+  :
+else
+  ac_cv_search_MP4SetMetadataAlbumArtist=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_search_MP4SetMetadataAlbumArtist" >&5
+echo "${ECHO_T}$ac_cv_search_MP4SetMetadataAlbumArtist" >&6; }
+ac_res=$ac_cv_search_MP4SetMetadataAlbumArtist
+if test "$ac_res" != no; then
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  mp4_albumartist_exists=yes
+else
+  mp4_albumartist_exists=no
+fi
+
+        if test "x$mp4_albumartist_exists" = "xyes"; then
+
 cat >>confdefs.h <<\_ACEOF
-#define COVERART_ACCEPTS_EXTRA_ARG 1
+#define MP4_ALBUMARTIST_EXISTS 1
 _ACEOF
 
+        fi
     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;}
@@ -10693,8 +11036,15 @@
 done
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in scripts/Makefile data/Makefile data/icons/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/64x64/Makefile"
+libgpod_version=`$PKG_CONFIG libgpod-1.0 --modversion`
 
+cat >>confdefs.h <<_ACEOF
+#define LIBGPOD_VERSION "${libgpod_version}"
+_ACEOF
+
+
+ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in scripts/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/64x64/Makefile data/icons/scalable/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/places/Makefile data/icons/hicolor/16x16/status/Makefile data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/places/Makefile data/icons/hicolor/24x24/Makefile data/icons/hicolor/24x24/places/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/places/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/places/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/places/Makefile data/man/Makefile data/man/gtkpod.1 doc/Makefile doc/figures/Makefile"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -11353,9 +11703,31 @@
     "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
+    "data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/Makefile" ;;
+    "data/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/22x22/Makefile" ;;
+    "data/icons/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/24x24/Makefile" ;;
     "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;;
     "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;;
     "data/icons/64x64/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/64x64/Makefile" ;;
+    "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;;
+    "data/icons/hicolor/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/Makefile" ;;
+    "data/icons/hicolor/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/16x16/Makefile" ;;
+    "data/icons/hicolor/16x16/places/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/16x16/places/Makefile" ;;
+    "data/icons/hicolor/16x16/status/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/16x16/status/Makefile" ;;
+    "data/icons/hicolor/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/22x22/Makefile" ;;
+    "data/icons/hicolor/22x22/places/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/22x22/places/Makefile" ;;
+    "data/icons/hicolor/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/24x24/Makefile" ;;
+    "data/icons/hicolor/24x24/places/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/24x24/places/Makefile" ;;
+    "data/icons/hicolor/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/32x32/Makefile" ;;
+    "data/icons/hicolor/32x32/places/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/32x32/places/Makefile" ;;
+    "data/icons/hicolor/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/48x48/Makefile" ;;
+    "data/icons/hicolor/48x48/places/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/48x48/places/Makefile" ;;
+    "data/icons/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/scalable/Makefile" ;;
+    "data/icons/hicolor/scalable/places/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/scalable/places/Makefile" ;;
+    "data/man/Makefile") CONFIG_FILES="$CONFIG_FILES data/man/Makefile" ;;
+    "data/man/gtkpod.1") CONFIG_FILES="$CONFIG_FILES data/man/gtkpod.1" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+    "doc/figures/Makefile") CONFIG_FILES="$CONFIG_FILES doc/figures/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -11565,6 +11937,9 @@
 INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
 INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
 INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+MSGFMT!$MSGFMT$ac_delim
 INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
 INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
 INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
@@ -11583,8 +11958,6 @@
 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
@@ -11596,10 +11969,8 @@
 GREP!$GREP$ac_delim
 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
 CATOBJEXT!$CATOBJEXT$ac_delim
 GMOFILES!$GMOFILES$ac_delim
@@ -11632,7 +12003,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -12033,21 +12404,22 @@
   fi
   rm -f "$tmp/out12"
 # Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -12084,7 +12456,7 @@
   # 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
+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
     dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X\(//\)[^/]' \| \
@@ -12280,8 +12652,9 @@
 
  Host System Type .....: $host
  Install path .........: $prefix
- GTK2 version .........: `pkg-config gtk+-2.0 --modversion`
- GLib2/GThread version : `pkg-config gthread-2.0 --modversion`
+ GTK2 version .........: `$PKG_CONFIG gtk+-2.0 --modversion`
+ GLib2/GThread version : `$PKG_CONFIG gthread-2.0 --modversion`
+ libgpod version ......: $libgpod_version
  gnome-vfs.............: $have_gnome_vfs
  hal...................: $have_hal
  libcurl ..............: $have_curl

Modified: gtkpod/branches/upstream/current/configure.in
===================================================================
--- gtkpod/branches/upstream/current/configure.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/configure.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -4,7 +4,7 @@
 AC_PREREQ(2.55)
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gtkpod, 0.99.12)
+AM_INIT_AUTOMAKE(gtkpod, 0.99.14)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
@@ -40,24 +40,25 @@
 fi
 
 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(GTK, gtk+-2.0 >= 2.8.0,, [AC_MSG_FAILURE([*** $GTK_PKG_ERRORS])])
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.8.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])])
+PKG_CHECK_MODULES(LIBGPOD, libgpod-1.0 >= 0.6.1,, [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"
+CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS $LIBGLADE_CFLAGS $LIBGPOD_CFLAGS"
+LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS $LIBGPOD_LIBS"
 
 dnl we need 'flex'
 AM_PROG_LEX
-if ! test "y$LEX" = "yflex"; then
-    if ! test "y$LEX" = "ylex"; then
+case "$LEX" in
+flex|*/flex|lex|*/lex)
+	;;
+*)
         AC_MSG_FAILURE([*** flex or lex required])
-    fi
-fi
+	;;
+esac
 
 dnl Retrieve the path of mount and umount binaries
 AC_PATH_PROG(MOUNT, mount)
@@ -66,14 +67,14 @@
 AC_SUBST(UMOUNT)
 
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="de es fr he it ja ru ro sv"
+ALL_LINGUAS="de es fr he it ja ru ro sv zh_CN"
 AM_GLIB_GNU_GETTEXT
 
 dnl Check if we have to supply getopt_long
 dnl If getopt_long_only is not available, getopt.c and getopt1.c
 dnl (providing getopt_long*) will be included into the binary.
-AC_CHECK_FUNCS(getopt_long_only, , [AC_LIBOBJ(getopt)]) 
-AC_CHECK_FUNCS(getopt_long_only, , [AC_LIBOBJ(getopt1)]) 
+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 solaris versions)
 AC_CHECK_FUNCS(flock)
@@ -124,7 +125,7 @@
     have_gnome_vfs="*no -- will build without iPod autodetection support"
 fi
 
-#dnl Check for HAL
+dnl Check for HAL
 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, have_hal=yes, have_hal=no)
@@ -143,38 +144,71 @@
     have_hal="*no -- will build without HAL support"
 fi
 
-dnl Check for libmp4v2 (and mp4.h)
+dnl Check for libmp4v2 (and mp4.h or mp4v2/mp4v2.h)
 AC_ARG_WITH(mp4v2, AC_HELP_STRING([--without-mp4v2], [Disable MP4/AAC support]))
 if test "x$with_mp4v2" != "xno"; then
+    have_mp4v2_2_header=no
     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
+        AC_CHECK_HEADER(mp4v2/mp4v2.h, [have_mp4v2_2_header=yes; have_mp4v2_header=yes; have_mp4v2=yes], have_mp4v2_header=no)
+        if test "x$have_mp4v2_2_header" = "xyes"; then
+            AC_DEFINE(HAVE_LIBMP4V2_2, 1, [Define if you have the mp4v2 library version 2.0 or greater])
+        fi
+    fi
+    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 "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])
+        AC_MSG_WARN([mp4.h and mp4v2/mp4v2.h cannot be found or is unusable. Check your mp4v2 installation.])
+    else
+dnl Check if MP4GetMetadataFreeForm() requires an extra argument
+        if test "x$have_mp4v2_2_header" = "xyes"; then
+            AC_TRY_COMPILE( [#include <mp4v2/mp4v2.h>],
+                [bool TestMP4GetMetadataFreeForm(MP4FileHandle hFile, const char *name,
+                    uint8_t** pValue, uint32_t* valueSize, const char *owner)
+                    {
+                        MP4GetMetadataFreeForm(hFile, name,pValue, valueSize, owner);
+                    } ], freeform_accepts_extra_arg=yes)
+        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)
+        fi
+        if test "x$freeform_accepts_extra_arg" = "xyes"; then
+            AC_DEFINE(FREEFORM_ACCEPTS_EXTRA_ARG, 1, [MP4GetMetadataFreeForm
+                      accepts an extra argument in libmp4v2 >= 1.6])
+        fi
+dnl Check if MP4GetMetadataCoverArt() requires an extra argument
+        if test "x$have_mp4v2_2_header" = "xyes"; then
+            AC_TRY_COMPILE( [#include <mp4v2/mp4v2.h>],
+                [bool TestMP4GetMetadataCoverArt(MP4FileHandle hFile,
+                    uint8_t **coverArt, uint32_t* size, uint32_t index)
+                    {
+                        MP4GetMetadataCoverArt(hFile, coverArt, size, index);
+                    }], coverart_accepts_extra_arg=yes)
+        else
+            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)
+        fi
+        if test "x$coverart_accepts_extra_arg" = "xyes"; then
+            AC_DEFINE(COVERART_ACCEPTS_EXTRA_ARG, 1, [MP4GetMetadataCoverArt
+                      accepts an extra argument in libmp4v2 >= 1.6])
+        fi
+dnl Check if MP4SetMetadataAlbumArtist() exists
+        AC_SEARCH_LIBS([MP4SetMetadataAlbumArtist], [-lmp4v2],
+        mp4_albumartist_exists=yes, mp4_albumartist_exists=no)
+        if test "x$mp4_albumartist_exists" = "xyes"; then
+            AC_DEFINE(MP4_ALBUMARTIST_EXISTS, 1, [MP4GetMetadataAlbumArtist
+                      requires libmp4v2 >= 1.6])
+        fi
     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
@@ -236,6 +270,9 @@
 dnl stuff only when compiling under Linux)
 AC_CHECK_HEADERS(linux/cdrom.h scsi/sg.h scsi/scsi.h scsi/scsi_ioctl.h)
 
+libgpod_version=`$PKG_CONFIG libgpod-1.0 --modversion`
+AC_DEFINE_UNQUOTED(LIBGPOD_VERSION, "${libgpod_version}", [Set this to the libgpod version])
+
 AC_OUTPUT([
 Makefile
 src/Makefile
@@ -243,9 +280,31 @@
 scripts/Makefile
 data/Makefile
 data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
 data/icons/32x32/Makefile
 data/icons/48x48/Makefile
 data/icons/64x64/Makefile
+data/icons/scalable/Makefile
+data/icons/hicolor/Makefile
+data/icons/hicolor/16x16/Makefile
+data/icons/hicolor/16x16/places/Makefile
+data/icons/hicolor/16x16/status/Makefile
+data/icons/hicolor/22x22/Makefile
+data/icons/hicolor/22x22/places/Makefile
+data/icons/hicolor/24x24/Makefile
+data/icons/hicolor/24x24/places/Makefile
+data/icons/hicolor/32x32/Makefile
+data/icons/hicolor/32x32/places/Makefile
+data/icons/hicolor/48x48/Makefile
+data/icons/hicolor/48x48/places/Makefile
+data/icons/hicolor/scalable/Makefile
+data/icons/hicolor/scalable/places/Makefile
+data/man/Makefile
+data/man/gtkpod.1
+doc/Makefile
+doc/figures/Makefile
 ])
 
 echo "
@@ -254,8 +313,9 @@
 
  Host System Type .....: $host
  Install path .........: $prefix
- GTK2 version .........: `pkg-config gtk+-2.0 --modversion`
- GLib2/GThread version : `pkg-config gthread-2.0 --modversion`
+ GTK2 version .........: `$PKG_CONFIG gtk+-2.0 --modversion`
+ GLib2/GThread version : `$PKG_CONFIG gthread-2.0 --modversion`
+ libgpod version ......: $libgpod_version
  gnome-vfs.............: $have_gnome_vfs
  hal...................: $have_hal
  libcurl ..............: $have_curl

Modified: gtkpod/branches/upstream/current/data/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/Makefile.am	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-SUBDIRS = icons
+SUBDIRS = icons man
 
 desktopdir = $(datadir)/applications
 desktop_in_files = gtkpod.desktop.in
@@ -8,8 +8,6 @@
 appdatadir = $(pkgdatadir)/data
 appdata_DATA =				\
 	gtkpod.glade			\
-	cdshine.png			\
-	cdshine_main.png		\
 	default-cover.png		\
 	gtkpod-add-dirs.png		\
 	gtkpod-add-files.png		\
@@ -18,18 +16,10 @@
 	gtkpod-icon-32.png		\
 	gtkpod-icon-48.png		\
 	gtkpod-logo.png			\
-	gtkpod-new-playlist.png		\
 	gtkpod-read.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
+	photo-toolbar-album.png \
+	photo-toolbar-photos.png
 
 EXTRA_DIST = 				\
 	$(desktop_in_files)		\

Modified: gtkpod/branches/upstream/current/data/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/Makefile.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -143,8 +143,6 @@
 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@
@@ -157,6 +155,7 @@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -226,15 +225,13 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = icons
+SUBDIRS = icons man
 desktopdir = $(datadir)/applications
 desktop_in_files = gtkpod.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 appdatadir = $(pkgdatadir)/data
 appdata_DATA = \
 	gtkpod.glade			\
-	cdshine.png			\
-	cdshine_main.png		\
 	default-cover.png		\
 	gtkpod-add-dirs.png		\
 	gtkpod-add-files.png		\
@@ -243,18 +240,10 @@
 	gtkpod-icon-32.png		\
 	gtkpod-icon-48.png		\
 	gtkpod-logo.png			\
-	gtkpod-new-playlist.png		\
 	gtkpod-read.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
+	photo-toolbar-album.png \
+	photo-toolbar-photos.png
 
 EXTRA_DIST = \
 	$(desktop_in_files)		\
@@ -406,8 +395,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -432,8 +421,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -443,13 +432,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Deleted: gtkpod/branches/upstream/current/data/cdshine.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/cdshine_main.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/default-cover.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gphoto_album_menuitem-32.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gphoto_album_menuitem-48.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gphoto_images_menuitem-32.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gphoto_images_menuitem-48.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gphoto_playlist_icon-48.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gphoto_tools_menuitem-32.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gphoto_tools_menuitem-48.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/gtkpod-icon-32-2.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/gtkpod-icon-32.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/gtkpod-icon-48.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/gtkpod-logo.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gtkpod-new-playlist.png
===================================================================
(Binary files differ)

Deleted: gtkpod/branches/upstream/current/data/gtkpod-sync.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/gtkpod.desktop.in
===================================================================
--- gtkpod/branches/upstream/current/data/gtkpod.desktop.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/gtkpod.desktop.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,9 @@
 [Desktop Entry]
-_Name=GtkPod
+_Name=gtkpod iPod Manager
 _GenericName=iPod Manager
 _Comment=Manage music and video on an Apple iPod
 Exec=gtkpod
 Icon=gtkpod
+Terminal=false
 Type=Application
 Categories=GTK;AudioVideo;

Modified: gtkpod/branches/upstream/current/data/gtkpod.glade
===================================================================
--- gtkpod/branches/upstream/current/data/gtkpod.glade	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/gtkpod.glade	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,20907 +1,13657 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
-
-<widget class="GtkWindow" id="gtkpod">
-  <property name="title" translatable="yes">gtkpod</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">600</property>
-  <property name="default_height">500</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon">gtkpod-icon-48.png</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>
-  <signal name="delete_event" handler="on_gtkpod_delete_event" last_modification_time="Sun, 24 Nov 2002 13:00:13 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkMenuBar" id="menubar">
-	  <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="GtkMenuItem" id="menuitem10">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_File</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menuitem10_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="load_ipods_mi">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Load iPod(s)</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_load_ipods_mi" last_modification_time="Sat, 20 May 2006 14:21:46 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image3992">
-			  <property name="visible">True</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>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="save_changes_mi">
-		      <property name="visible">True</property>
-		      <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">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-save</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="add_files1">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Add _Files</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="create_add_files_callback" last_modification_time="Sun, 24 Jun 2007 14:43:18 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image3994">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</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="add_directory1">
-		      <property name="visible">True</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"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image3995">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</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="add_playlist1">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Add _Playlist</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="create_add_playlists_callback" last_modification_time="Sun, 24 Jun 2007 15:42:46 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image3996">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</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="GtkSeparatorMenuItem" id="separator3">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="update_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Update Tracks from File</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image3997">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-refresh</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>
-
-		      <child>
-			<widget class="GtkMenu" id="update_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="update_playlist_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_update_playlist_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="update_tab_entry_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected Tab _Entry</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_update_tab_entry_activate" last_modification_time="Sat, 15 Mar 2003 03:49:29 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="update_tracks_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_update_tracks_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="mserv_from_file_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Update _mserv Data from File</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image3998">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-refresh</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>
-
-		      <child>
-			<widget class="GtkMenu" id="mserv_from_file_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="mserv_from_file_playlist_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_mserv_from_file_playlist_menu_activate" last_modification_time="Sat, 02 Oct 2004 05:09:52 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="mserv_from_file_entry_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected Tab _Entry</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_mserv_from_file_entry_menu_activate" last_modification_time="Sat, 02 Oct 2004 05:09:52 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="mserv_from_file_tracks_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_mserv_from_file_tracks_menu_activate" last_modification_time="Sat, 02 Oct 2004 05:09:52 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="sync_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Synchronize Playlist with Dir(s)</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_sync_playlist_activate" last_modification_time="Mon, 15 May 2006 15:39:05 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image3999">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-refresh</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="GtkSeparatorMenuItem" id="separator6">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="export_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Export Tracks from Database</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4000">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-save-as</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>
-
-		      <child>
-			<widget class="GtkMenu" id="export_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="export_playlist">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_export_playlist_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="export_tab_entry_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected Tab _Entry</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_export_tab_entry_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="export_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_export_tracks_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="create_playlist_file_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Create _Playlist File</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4001">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-save-as</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>
-
-		      <child>
-			<widget class="GtkMenu" id="create_playlist_file_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="playlist_file_playlist">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_playlist_file_playlist_activate" last_modification_time="Sat, 21 Aug 2004 08:43:11 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="playlist_file_tab_entry">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected Tab _Entry</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_playlist_file_tab_entry_activate" last_modification_time="Sat, 21 Aug 2004 08:43:11 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="playlist_file_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_playlist_file_tracks_activate" last_modification_time="Sat, 21 Aug 2004 08:43:11 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="trennlinie6">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="ipod_directories">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Create iPod's Directories</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_ipod_directories_menu" last_modification_time="Sat, 18 Jan 2003 02:10:39 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4002">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-execute</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="check_ipod_files_mi">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Find orphan files (files with no track info in DB) and dangling tracks (tracks with no corresponding files on iPod)</property>
-		      <property name="label" translatable="yes">_Check iPod's Files</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_check_ipod_files_activate" last_modification_time="Sat, 24 Jan 2004 09:02:49 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="trennlinie3">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="quit1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-quit</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_quit1_activate" last_modification_time="Sat, 23 Nov 2002 03:06:04 GMT"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="edit_menu">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Edit</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="edit_menu_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="edit_details_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Edit Track Details</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4003">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-edit</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>
-
-		      <child>
-			<widget class="GtkMenu" id="edit_details_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="edit_details_selected_playlist">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Tracks in Selected _Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_edit_details_selected_playlist" last_modification_time="Fri, 09 Dec 2005 15:42:30 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="edit_details_selected_tab_entry">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Tracks in Selected Tab _Entry</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_edit_details_selected_tab_entry" last_modification_time="Fri, 09 Dec 2005 15:42:30 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="edit_details_selected_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_edit_details_selected_tracks" last_modification_time="Fri, 09 Dec 2005 15:42:30 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="edit_smart_playlist">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Edit Smart Playlist</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_edit_smart_playlist" last_modification_time="Sat, 10 Dec 2005 07:48:01 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="delete_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Delete</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4004">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-delete</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>
-
-		      <child>
-			<widget class="GtkMenu" id="delete_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="delete_selected_playlist">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_delete_selected_playlist" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>
-			    </widget>
-			  </child>
-
-			  <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="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>
-			  </child>
-
-			  <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="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>
-			  </child>
-
-			  <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 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>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSeparatorMenuItem" id="delete_separator1">
-			      <property name="visible">True</property>
-			    </widget>
-			  </child>
-
-			  <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="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>
-			  </child>
-
-			  <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="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>
-			  </child>
-
-			  <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="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>
-			  </child>
-
-			  <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 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>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSeparatorMenuItem" id="delete_separator2">
-			      <property name="visible">True</property>
-			    </widget>
-			  </child>
-
-			  <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="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>
-			  </child>
-
-			  <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="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>
-			  </child>
-
-			  <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="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>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="delete_selected_tracks_from_harddisk">
-			      <property name="visible">True</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>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator7">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="create_playlists_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Create Playlists</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4005">
-			  <property name="visible">True</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>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkMenu" id="create_playlists_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="new_playlist1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Empty Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_new_playlist1_activate" last_modification_time="Sun, 03 Aug 2003 03:58:25 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="smart_playlist">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Smart Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_smart_playlist_activate" last_modification_time="Mon, 06 Dec 2004 14:36:42 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSeparatorMenuItem" id="separator8">
-			      <property name="visible">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="random_playlist">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Random Playlist from Displayed Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_random_playlist_activate" last_modification_time="Fri, 19 Mar 2004 17:27:51 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="pl_containing_displayed_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Containing Displayed Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_pl_containing_displayed_tracks_activate" last_modification_time="Sun, 03 Aug 2003 04:03:36 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="pl_containing_selected_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Containing Selected Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_pl_containing_selected_tracks_activate" last_modification_time="Sun, 03 Aug 2003 04:03:36 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="pl_for_each_artist">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">One for each Artist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_pl_for_each_artist_activate" last_modification_time="Sun, 03 Aug 2003 03:48:28 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="pl_for_each_album">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">One for each Album</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_pl_for_each_album_activate" last_modification_time="Sun, 03 Aug 2003 03:48:28 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="pl_for_each_genre">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">One for each Genre</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_pl_for_each_genre_activate" last_modification_time="Sun, 03 Aug 2003 03:48:28 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="pl_for_each_composer">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">One for each Composer</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_pl_for_each_composer_activate" last_modification_time="Sun, 03 Aug 2003 03:48:28 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="pl_for_each_year">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">One for each Year</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_pl_for_each_year_activate" last_modification_time="Thu, 11 Mar 2004 14:10:34 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="pl_for_each_rating">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">One for each Rating</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_pl_for_each_rating_activate" last_modification_time="Sun, 05 Dec 2004 12:52:43 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="most_rated_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Best Rated Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_most_rated_tracks_playlist_s1_activate" last_modification_time="Sun, 10 Aug 2003 14:21:51 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="most_listened_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Tracks Most Often Listened To</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_most_listened_tracks1_activate" last_modification_time="Sun, 10 Aug 2003 14:24:20 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="most_recent_played_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Most Recently Played Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_most_recent_played_tracks_activate" last_modification_time="Sun, 10 Aug 2003 14:24:57 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="played_since_last_time1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">All Tracks Played Since Last Time</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_played_since_last_time1_activate" last_modification_time="Fri, 22 Aug 2003 12:24:50 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="all_tracks_never_listened_to1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">All Tracks Never Listened To</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_all_tracks_never_listened_to1_activate" last_modification_time="Fri, 07 Nov 2003 15:51:06 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="all_tracks_not_listed_in_any_playlist1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">All Tracks not Listed in any Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_all_tracks_not_listed_in_any_playlist1_activate" last_modification_time="Thu, 11 Mar 2004 14:09:28 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator1">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="sorting1">
-		      <property name="visible">True</property>
-		      <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"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4006">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-sort-ascending</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="randomize_current_playlist_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Randomize Current Playlist</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_randomize_current_playlist_activate" last_modification_time="Fri, 19 Mar 2004 17:27:51 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="save_track_order_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Save Displayed Track Order</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_save_track_order1_activate" last_modification_time="Sat, 08 Mar 2003 13:45:01 GMT"/>
-		      <accelerator key="s" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4007">
-			  <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="GtkSeparatorMenuItem" id="separator2">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="edit_repository_options">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Edit Repository/iPod Options</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_edit_repository_options_activate" last_modification_time="Sun, 21 May 2006 03:40:14 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4008">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-preferences</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="edit_preferences">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Edit _Preferences</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_edit_preferences_activate" last_modification_time="Sun, 21 May 2006 03:41:05 GMT"/>
-		      <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4009">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-preferences</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="GtkMenuItem" id="item1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_View</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="item1_menu">
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="toolbar_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Toolbar</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="activate" handler="on_toolbar_menu_activate" last_modification_time="Fri, 14 Mar 2003 10:58:38 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="tooltips_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Tooltips</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="activate" handler="on_tooltips_menu_activate" last_modification_time="Sat, 14 Jun 2003 16:48:32 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="info_window_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Info Window</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="activate" handler="on_info_window1_activate" last_modification_time="Sun, 23 Nov 2003 15:25:04 GMT"/>
-		      <accelerator key="i" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="conversion_log">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Conversion Log</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="activate" handler="on_conversion_log1_activate" last_modification_time="Sun, 22 Apr 2007 15:25:48 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="more_sort_tabs">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_More Sort Tabs</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_more_sort_tabs_activate" last_modification_time="Fri, 14 Mar 2003 11:57:43 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4010">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-add</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="less_sort_tabs">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Less Sort Tabs</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_less_sort_tabs_activate" last_modification_time="Fri, 14 Mar 2003 11:57:43 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4011">
-			  <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="arrange_sort_tabs">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Arrange Sort Tabs</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_arrange_sort_tabs_activate" last_modification_time="Tue, 25 Mar 2003 13:59:28 GMT"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="tools1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Tools</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="tools1_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="play_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Play Now</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4012">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-cdrom</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>
-
-		      <child>
-			<widget class="GtkMenu" id="play_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="play_playlist_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_play_playlist_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="play_tab_entry_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected Tab _Entry</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_play_tab_entry_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="play_tracks_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_play_tracks_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="enqueue_menu">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Enqueue</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image4013">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-cdrom</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>
-
-		      <child>
-			<widget class="GtkMenu" id="enqueue_menu_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="enqueue_playlist_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_enqueue_playlist_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="enqueue_tab_entry_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected Tab _Entry</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_enqueue_tab_entry_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="enqueue_tracks_menu">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_enqueue_tracks_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="trennlinie4">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="normalize_tracks1">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Normalize Volume</property>
-		      <property name="use_underline">True</property>
-
-		      <child>
-			<widget class="GtkMenu" id="normalize_tracks1_menu">
-
-			  <child>
-			    <widget class="GtkMenuItem" id="normalize_selected_playlist">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Playlist</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_normalize_selected_playlist_activate" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="normalize_selected_tab_entry">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected Tab _Entry</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_normalize_selected_tab_entry_activate" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="normalize_selected_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Selected _Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_normalize_selected_tracks_activate" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="normalize_displayed_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Displayed Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_normalize_displayed_tracks_activate" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="normalize_all_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_All Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_normalize_all_tracks" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="normalize_newly_added_tracks">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Newly Added Tracks</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="on_normalize_newly_added_tracks" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="trennlinie5">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="sync_all">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Synchronise Contacts, Calendar and Notes</property>
-		      <property name="label" translatable="yes">Synchronize All</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_sync_all_activate" last_modification_time="Thu, 16 Dec 2004 00:15:04 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="sync_contacts">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Synchronize Contacts</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_sync_contacts_activate" last_modification_time="Sun, 01 Feb 2004 10:51:37 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="sync_calendar">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Synchronize Calendar</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_sync_calendar_activate" last_modification_time="Sun, 01 Feb 2004 10:51:37 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="sync_notes">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Synchronize Notes</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_sync_notes_activate" last_modification_time="Thu, 16 Dec 2004 00:15:04 GMT"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="menuitem13">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Help</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="menuitem13_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="about1">
-		      <property name="visible">True</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-about</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="GtkWindow" id="gtkpod">
+    <property name="title" translatable="yes">gtkpod iPod Manager</property>
+    <property name="default_width">600</property>
+    <property name="default_height">500</property>
+    <property name="icon">gtkpod-icon-48.png</property>
+    <signal name="delete_event" handler="on_gtkpod_delete_event"/>
+    <child>
+      <widget class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkMenuBar" id="menubar">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkMenuItem" id="menuitem10">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Music</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menuitem10_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="load_ipods_mi">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Load iPod(s)</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_load_ipods_mi"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image3992">
+                            <property name="visible">True</property>
+                            <property name="pixbuf">gtkpod-read-16.png</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="save_changes_mi">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Save Changes</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_save_changes_mi"/>
+                        <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image3993">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-save</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="add_files1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Add _Files</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="create_add_files_callback"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image3994">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-add</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="add_directory1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Add Fol_der</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="dirbrowser_create_callback"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image3995">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-add</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="add_playlist1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Add _Playlist</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="create_add_playlists_callback"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image3996">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-add</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator3">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="update_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Update Tracks from File</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="update_menu_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="update_playlist_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_update_playlist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="update_tab_entry_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected Tab _Entry</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_update_tab_entry_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="update_tracks_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_update_tracks_activate"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image3997">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-refresh</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="mserv_from_file_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Update _mserv Data from File</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="mserv_from_file_menu_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="mserv_from_file_playlist_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_mserv_from_file_playlist_menu_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="mserv_from_file_entry_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected Tab _Entry</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_mserv_from_file_entry_menu_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="mserv_from_file_tracks_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_mserv_from_file_tracks_menu_activate"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image3998">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-refresh</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="sync_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Synchronize Playlist with Dir(s)</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_sync_playlist_activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image3999">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-refresh</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator6">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="export_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Export Tracks from Database</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="export_menu_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="export_playlist">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_export_playlist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="export_tab_entry_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected Tab _Entry</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_export_tab_entry_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="export_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_export_tracks_activate"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4000">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-save-as</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="create_playlist_file_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Create _Playlist File</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="create_playlist_file_menu_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="playlist_file_playlist">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_playlist_file_playlist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="playlist_file_tab_entry">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected Tab _Entry</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_playlist_file_tab_entry_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="playlist_file_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_playlist_file_tracks_activate"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4001">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-save-as</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="trennlinie6">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="ipod_directories">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Create iPod's Directories</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_ipod_directories_menu"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4002">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-execute</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="check_ipod_files_mi">
+                        <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Find orphan files (files with no track info in DB) and dangling tracks (tracks with no corresponding files on iPod)</property>
+                        <property name="label" translatable="yes">_Check iPod's Files</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_check_ipod_files_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="trennlinie3">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="quit1">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-quit</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_quit1_activate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="edit_menu">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Edit</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="edit_menu_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="edit_details_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Edit Track Details</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="edit_details_menu_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="edit_details_selected_playlist">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Tracks in Selected _Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_edit_details_selected_playlist"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="edit_details_selected_tab_entry">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Tracks in Selected Tab _Entry</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_edit_details_selected_tab_entry"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="edit_details_selected_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_edit_details_selected_tracks"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4003">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-edit</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="edit_smart_playlist">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Edit Smart Playlist</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_edit_smart_playlist"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="delete_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Delete</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="delete_menu_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="delete_selected_playlist">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_playlist"/>
+                              </widget>
+                            </child>
+                            <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="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_ipod"/>
+                              </widget>
+                            </child>
+                            <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="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_database"/>
+                              </widget>
+                            </child>
+                            <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 Hard Disk</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_harddisk"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkSeparatorMenuItem" id="delete_separator1">
+                                <property name="visible">True</property>
+                              </widget>
+                            </child>
+                            <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="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_entry_from_playlist"/>
+                              </widget>
+                            </child>
+                            <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="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_entry_from_ipod"/>
+                              </widget>
+                            </child>
+                            <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="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_entry_from_database"/>
+                              </widget>
+                            </child>
+                            <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 Hard Disk</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_entry_from_harddisk"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkSeparatorMenuItem" id="delete_separator2">
+                                <property name="visible">True</property>
+                              </widget>
+                            </child>
+                            <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="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_tracks_from_playlist"/>
+                              </widget>
+                            </child>
+                            <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="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_tracks_from_ipod"/>
+                              </widget>
+                            </child>
+                            <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="use_underline">True</property>
+                                <signal name="activate" handler="on_delete_selected_tracks_from_database"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="delete_selected_tracks_from_harddisk">
+                                <property name="visible">True</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"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4004">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-delete</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator7">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="create_playlists_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Create Playlists</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="create_playlists_menu_menu">
+                            <child>
+                              <widget class="GtkImageMenuItem" id="new_playlist1">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Empty Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_new_playlist1_activate"/>
+                                <child internal-child="image">
+                                  <widget class="GtkImage" id="menu-item-image34">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="icon_size">1</property>
+                                    <property name="icon_name">playlist</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="smart_playlist">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Smart Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_smart_playlist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkSeparatorMenuItem" id="separator8">
+                                <property name="visible">True</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="random_playlist">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Random Playlist from Displayed Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_random_playlist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="pl_containing_displayed_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Containing Displayed Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_pl_containing_displayed_tracks_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="pl_containing_selected_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Containing Selected Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_pl_containing_selected_tracks_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkSeparatorMenuItem" id="menuitem2">
+                                <property name="visible">True</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="most_rated_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Best Rated Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_most_rated_tracks_playlist_s1_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="most_listened_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Tracks Most Often Listened To</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_most_listened_tracks1_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="most_recent_played_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Most Recently Played Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_most_recent_played_tracks_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="played_since_last_time1">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">All Tracks Played Since Last Time</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_played_since_last_time1_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="all_tracks_never_listened_to1">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">All Tracks Never Listened To</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_all_tracks_never_listened_to1_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="all_tracks_not_listed_in_any_playlist1">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">All Tracks not Listed in any Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_all_tracks_not_listed_in_any_playlist1_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkSeparatorMenuItem" id="menuitem3">
+                                <property name="visible">True</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="pl_for_each_artist">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">One for each Artist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_pl_for_each_artist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="pl_for_each_album">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">One for each Album</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_pl_for_each_album_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="pl_for_each_genre">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">One for each Genre</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_pl_for_each_genre_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="pl_for_each_composer">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">One for each Composer</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_pl_for_each_composer_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="pl_for_each_year">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">One for each Year</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_pl_for_each_year_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="pl_for_each_rating">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">One for each Rating</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_pl_for_each_rating_activate"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4005">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-new</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="sorting1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Sorting</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_sorting_activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4006">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-sort-ascending</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="randomize_current_playlist_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Randomize Current Playlist</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_randomize_current_playlist_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="save_track_order_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Save Displayed Track Order</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_save_track_order1_activate"/>
+                        <accelerator key="s" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4007">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-justify-fill</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separator2">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="edit_repository_options">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Repository/iPod Options</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_edit_repository_options_activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4008">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-preferences</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="preferences_exp">
+                        <property name="visible">True</property>
+                        <property name="label">gtk-preferences</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="open_prefs_dlg"/>
+                        <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="item1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_View</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="item1_menu">
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="toolbar_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Toolbar</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_toolbar_menu_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="filterbar_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Filter Bar</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_filterbar_menu_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="tooltips_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Tooltips</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_tooltips_menu_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="menuitem4">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="info_window_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Info Window</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_info_window1_activate"/>
+                        <accelerator key="i" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="view_conversion_log">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Conversion Log</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_conversion_log1_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="menuitem1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="more_sort_tabs">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_More Filter Tabs</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_more_sort_tabs_activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4010">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-add</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="less_sort_tabs">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Fewer Filter Tabs</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_less_sort_tabs_activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4011">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-remove</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="arrange_sort_tabs">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Arrange Filter Tabs</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_arrange_sort_tabs_activate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="tools1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Tools</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="tools1_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="play_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Play Now</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="play_menu_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="play_playlist_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_play_playlist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="play_tab_entry_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected Tab _Entry</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_play_tab_entry_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="play_tracks_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_play_tracks_activate"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4012">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-cdrom</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="enqueue_menu">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Enqueue</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="enqueue_menu_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="enqueue_playlist_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_enqueue_playlist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="enqueue_tab_entry_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected Tab _Entry</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_enqueue_tab_entry_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="enqueue_tracks_menu">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_enqueue_tracks_activate"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4013">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-cdrom</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="trennlinie4">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="normalize_tracks1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Normalize Volume</property>
+                        <property name="use_underline">True</property>
+                        <child>
+                          <widget class="GtkMenu" id="normalize_tracks1_menu">
+                            <child>
+                              <widget class="GtkMenuItem" id="normalize_selected_playlist">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Playlist</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_normalize_selected_playlist_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="normalize_selected_tab_entry">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected Tab _Entry</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_normalize_selected_tab_entry_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="normalize_selected_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Selected _Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_normalize_selected_tracks_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="normalize_displayed_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Displayed Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_normalize_displayed_tracks_activate"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="normalize_all_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_All Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_normalize_all_tracks"/>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkMenuItem" id="normalize_newly_added_tracks">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Newly Added Tracks</property>
+                                <property name="use_underline">True</property>
+                                <signal name="activate" handler="on_normalize_newly_added_tracks"/>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="trennlinie5">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="sync_all">
+                        <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Synchronise Contacts, Calendar and Notes</property>
+                        <property name="label" translatable="yes">Synchronize All</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_sync_all_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="sync_contacts">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Synchronize Contacts</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_sync_contacts_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="sync_calendar">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Synchronize Calendar</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_sync_calendar_activate"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="sync_notes">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Synchronize Notes</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="on_sync_notes_activate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkMenuItem" id="menuitem13">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menuitem13_menu">
+                    <child>
+                      <widget class="GtkImageMenuItem" id="help_contents">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Contents</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="open_help_contents"/>
+                        <accelerator key="F1" modifiers="" signal="activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="menu-item-image24">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-help</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="help_online">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Get Help _Online</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="open_help_online"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkMenuItem" id="help_reportbug">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Report a _Problem</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="open_help_reportbug"/>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
+                        <property name="visible">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="about1">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_About gtkpod</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="open_about_window"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4014">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-about</property>
+                            <property name="icon_size">1</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </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"/>
+            <property name="visible">True</property>
+            <property name="toolbar_style">GTK_TOOLBAR_BOTH</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="is_important">True</property>
+                <property name="label" translatable="yes">Load iPod(s)</property>
+                <property name="use_underline">True</property>
+                <property name="icon">gtkpod-read.png</property>
+                <signal name="clicked" handler="on_load_ipods_clicked"/>
+              </widget>
+              <packing>
+                <property name="expand">False</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>
+                <signal name="clicked" handler="on_save_changes_clicked"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
+                <property name="visible">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>
+                <signal name="clicked" handler="create_add_files_callback"/>
+              </widget>
+              <packing>
+                <property name="expand">False</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>
+                <signal name="clicked" handler="dirbrowser_create_callback"/>
+              </widget>
+              <packing>
+                <property name="expand">False</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>
+                <signal name="clicked" handler="create_add_playlists_callback"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
+                <property name="visible">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkMenuToolButton" id="new_PL_button">
+                <property name="visible">True</property>
+                <property name="tooltip" translatable="yes">Create New Playlist</property>
+                <property name="is_important">True</property>
+                <property name="label" translatable="yes">New Playlist</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-new</property>
+                <property name="menu">create_playlists_menu_menu</property>
+                <signal name="clicked" handler="on_new_playlist_button"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHPaned" id="paned0">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="position">235</property>
+            <signal name="button_release_event" handler="on_paned0_button_release_event"/>
+            <child>
+              <widget class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="playlist_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>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </widget>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="cover_visible_control_box">
+                    <property name="height_request">23</property>
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="lbl_albumart">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Album Art</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                      </widget>
+                      <packing>
+                        <property name="padding">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="cover_down_button">
+                        <property name="width_request">25</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="response_id">0</property>
+                        <signal name="clicked" handler="on_cover_down_button_clicked"/>
+                        <child>
+                          <widget class="GtkArrow" id="arrow1">
+                            <property name="width_request">22</property>
+                            <property name="visible">True</property>
+                            <property name="arrow_type">GTK_ARROW_DOWN</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="cover_up_button">
+                        <property name="width_request">25</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="response_id">0</property>
+                        <signal name="clicked" handler="on_cover_up_button_clicked"/>
+                        <child>
+                          <widget class="GtkArrow" id="arrow2">
+                            <property name="visible">True</property>
+                            <property name="arrow_type">GTK_ARROW_UP</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
                   <packing>
-                      <property name="expand">False</property>
-                      <property name="homogeneous">True</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</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"/>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="cover_display_window">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkHBox" id="cover_display_canvasbox">
+                        <property name="visible">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="cover_display_controlbox">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkButton" id="cover_display_leftbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">&lt;</property>
+                            <property name="relief">GTK_RELIEF_NONE</property>
+                            <property name="response_id">0</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHScale" id="cover_display_scaler">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="adjustment">0 0 0 1 9 0</property>
+                            <property name="digits">0</property>
+                            <property name="draw_value">False</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="cover_display_rightbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">&gt;</property>
+                            <property name="relief">GTK_RELIEF_NONE</property>
+                            <property name="response_id">0</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
-                      <property name="expand">False</property>
-                      <property name="homogeneous">True</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</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>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="main_vbox">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkVPaned" id="paned1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="position">320</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox29">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <child>
+                          <widget class="GtkHBox" id="searchbar_hpanel">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="border_width">6</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkLabel" id="current_playlist_label">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">&lt;span weight='bold' size='larger'&gt;No playlist selected&lt;/span&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="search_entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="width_chars">20</property>
+                                <signal name="changed" handler="on_search_entry_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">GTK_PACK_END</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label22">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="label" translatable="yes">Filter:</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">GTK_PACK_END</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkButton" id="searchbar_down_button">
+                                <property name="width_request">25</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="relief">GTK_RELIEF_NONE</property>
+                                <property name="response_id">0</property>
+                                <signal name="clicked" handler="on_searchbar_down_button_clicked"/>
+                                <child>
+                                  <widget class="GtkArrow" id="arrow4">
+                                    <property name="width_request">22</property>
+                                    <property name="visible">True</property>
+                                    <property name="arrow_type">GTK_ARROW_DOWN</property>
+                                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">GTK_PACK_END</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkScrolledWindow" id="track_window">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="shadow_type">GTK_SHADOW_IN</property>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="resize">True</property>
+                        <property name="shrink">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="paned1_dummy">
+                        <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>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="resize">True</property>
+                        <property name="shrink">True</property>
+                      </packing>
+                    </child>
                   </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHBox" id="hbox77">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <child>
+              <widget class="GtkHPaned" id="paned2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <widget class="GtkStatusbar" id="gtkpod_status">
+                    <property name="width_request">300</property>
+                    <property name="visible">True</property>
+                    <property name="border_width">1</property>
+                    <property name="has_resize_grip">False</property>
+                  </widget>
                   <packing>
-                      <property name="expand">False</property>
-                      <property name="homogeneous">False</property>
+                    <property name="resize">True</property>
+                    <property name="shrink">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"/>
+                </child>
+                <child>
+                  <widget class="GtkHPaned" id="paned3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="position">130</property>
+                    <child>
+                      <widget class="GtkStatusbar" id="space_statusbar">
+                        <property name="width_request">80</property>
+                        <property name="visible">True</property>
+                        <property name="border_width">1</property>
+                        <property name="has_resize_grip">False</property>
+                      </widget>
+                      <packing>
+                        <property name="resize">False</property>
+                        <property name="shrink">True</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkStatusbar" id="tracks_statusbar">
+                        <property name="width_request">175</property>
+                        <property name="visible">True</property>
+                        <property name="border_width">1</property>
+                      </widget>
+                      <packing>
+                        <property name="resize">True</property>
+                        <property name="shrink">True</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
-                      <property name="expand">False</property>
-                      <property name="homogeneous">True</property>
+                    <property name="resize">True</property>
+                    <property name="shrink">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"/>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="searchbar_up_button">
+                <property name="width_request">25</property>
+                <property name="can_focus">True</property>
+                <property name="relief">GTK_RELIEF_NONE</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_searchbar_up_button_clicked"/>
+                <child>
+                  <widget class="GtkArrow" id="arrow6">
+                    <property name="visible">True</property>
+                    <property name="arrow_type">GTK_ARROW_UP</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
                   </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="special_sorttab">
+    <property name="title" translatable="yes">special_sorttab -- Don't translate!</property>
+    <child>
+      <widget class="GtkViewport" id="special_viewport">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkVBox" id="vbox37">
+            <property name="visible">True</property>
+            <property name="spacing">18</property>
+            <child>
+              <widget class="GtkHBox" id="hbox20">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <child>
+                  <widget class="GtkLabel" id="label52">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Logic:</property>
+                  </widget>
                   <packing>
-                      <property name="expand">False</property>
-                      <property name="homogeneous">True</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</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"/>
+                </child>
+                <child>
+                  <widget class="GtkRadioButton" id="sp_or_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Any (OR)</property>
+                    <property name="use_underline">True</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
                   </widget>
                   <packing>
-                      <property name="expand">False</property>
-                      <property name="homogeneous">True</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</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>
+                </child>
+                <child>
+                  <widget class="GtkRadioButton" id="sp_and_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">All (AND)</property>
+                    <property name="use_underline">True</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">sp_or_button</property>
                   </widget>
                   <packing>
-                      <property name="expand">False</property>
-                      <property name="homogeneous">False</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</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"/>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkTable" id="table6">
+                <property name="visible">True</property>
+                <property name="n_rows">5</property>
+                <property name="n_columns">2</property>
+                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
+                <child>
+                  <widget class="GtkHBox" id="hbox181">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_added_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Added:</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
-                      <property name="expand">False</property>
-                      <property name="homogeneous">True</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
                   </packing>
-              </child>
-              
-              <child>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox180">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_modified_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Modified:</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox179">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_played_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Played:</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox178">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_playcount_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">Specify interval</property>
+                        <property name="label" translatable="yes">Playcount:</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox177">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_rating_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Rating:</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox57">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkEntry" id="sp_added_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">'DD/MM/YYYY HH:MM &lt; d &lt; DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished.</property>
+                        <property name="invisible_char">*</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="sp_added_cal_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Calendar</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox18">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkEntry" id="sp_modified_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">'DD/MM/YYYY HH:MM &lt; d &lt; DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished.</property>
+                        <property name="invisible_char">*</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="sp_modified_cal_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Calendar</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox17">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkEntry" id="sp_played_entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">'DD/MM/YYYY HH:MM &lt; d &lt; DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished.</property>
+                        <property name="invisible_char">*</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="sp_played_cal_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Calendar</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox15">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox23">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkSpinButton" id="sp_playcount_low">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Select '0' for no lower limit.</property>
+                            <property name="adjustment">0 0 99 1 10 10</property>
+                            <property name="climb_rate">1</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label54">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes"> &lt;= cts &lt;= </property>
+                            <property name="selectable">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkSpinButton" id="sp_playcount_high">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Select '-1' for no upper limit.</property>
+                            <property name="adjustment">0 -1 99 1 10 10</property>
+                            <property name="climb_rate">1</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </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">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox14">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_rating0">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">0</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_rating1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">1</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_rating2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">2</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_rating3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">3</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_rating4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">4</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="sp_rating5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">5</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox21">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkCheckButton" id="sp_go_always">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip" translatable="yes">Automatically start displaying tracks that match the criteria entered above. If not selected, you must press 'Display' to start displaying.</property>
+                    <property name="label" translatable="yes">Start display automatically</property>
+                    <property name="use_underline">True</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="sp_go">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip" translatable="yes">Display tracks that match the criteria entered above.</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment1">
+                        <property name="visible">True</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox22">
+                            <property name="visible">True</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <widget class="GtkImage" id="image1056">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-execute</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label53">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Display</property>
+                                <property name="use_underline">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="padding">2</property>
+                    <property name="pack_type">GTK_PACK_END</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="calendar_window">
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Calendar</property>
+    <property name="resizable">False</property>
+    <property name="default_width">480</property>
+    <property name="default_height">290</property>
+    <property name="icon">gtkpod-icon-48.png</property>
+    <child>
+      <widget class="GtkVBox" id="vbox43">
+        <property name="visible">True</property>
+        <property name="spacing">6</property>
+        <child>
+          <widget class="GtkVBox" id="vbox7">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
+            <child>
+              <widget class="GtkLabel" id="label63">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">&lt;span weight="bold" size="larger"&gt;Please specify a time interval&lt;/span&gt;</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox29">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <child>
+                  <widget class="GtkLabel" id="label64">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Filter tab:</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkSpinButton" id="sorttab_num_spin">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="adjustment">1 0 100 1 10 10</property>
+                    <property name="climb_rate">1</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label66">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Category:</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkComboBox" id="cat_combo">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="items" translatable="yes">Last Played
+Last Modified
+Added
+</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">2</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox25">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox44">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkLabel" id="label57">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Lower Margin&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                        <property name="selectable">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkVBox" id="lower_cal_box">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkCalendar" id="lower_cal">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="lower_time_fullbox">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="lower_time">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Time:</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="lower_time_box">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkSpinButton" id="lower_hours">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">0 0 23 1 2 10</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="numeric">True</property>
+                                    <property name="wrap">True</property>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label59">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkSpinButton" id="lower_minutes">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">3 0 59 1 5 2</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="numeric">True</property>
+                                    <property name="wrap">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="no_lower_margin">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">No lower margin</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkVSeparator" id="vseparator1">
+                    <property name="visible">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox47">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkLabel" id="label58">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Upper Margin&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="justify">GTK_JUSTIFY_CENTER</property>
+                        <property name="selectable">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkVBox" id="upper_cal_box">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkCalendar" id="upper_cal">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="upper_time_fullbox">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="upper_time">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Time:</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="upper_time_box">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkSpinButton" id="upper_hours">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">0 0 23 1 2 10</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="numeric">True</property>
+                                    <property name="wrap">True</property>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label62">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkSpinButton" id="upper_minutes">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">3 0 59 1 5 2</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="numeric">True</property>
+                                    <property name="wrap">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="no_upper_margin">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">No upper margin</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox7">
+            <property name="visible">True</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cal_apply">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-apply</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="cal_cancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="cal_ok">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="padding">2</property>
+            <property name="pack_type">GTK_PACK_END</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="sort_window">
+    <property name="title" translatable="yes">Sorting Options</property>
+    <property name="icon">gtkpod-icon-48.png</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <signal name="delete_event" handler="on_sort_window_delete_event"/>
+    <child>
+      <widget class="GtkVBox" id="vbox52">
+        <property name="visible">True</property>
+        <property name="border_width">6</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox31">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="spacing">18</property>
+            <child>
+              <widget class="GtkVBox" id="vbox135">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkLabel" id="label283">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Sort Order&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox128">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label284">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkVBox" id="vbox53">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkTextView" id="textview2">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="editable">False</property>
+                            <property name="wrap_mode">GTK_WRAP_WORD</property>
+                            <property name="text" translatable="yes">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.</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox30">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkTable" id="table11">
+                                <property name="visible">True</property>
+                                <property name="border_width">4</property>
+                                <property name="n_rows">9</property>
+                                <property name="n_columns">11</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox69">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label89">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Tracks</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</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">7</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox68">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label88">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Filter tabs</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</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">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox67">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label87">
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Playlists</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</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">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox34">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="st_ascend">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_st_ascend_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image1931">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-sort-ascending</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox35">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="st_descend">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">st_ascend</property>
+                                        <signal name="toggled" handler="on_st_descend_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image1932">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-sort-descending</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">5</property>
+                                    <property name="right_attach">6</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox36">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="st_none">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">st_ascend</property>
+                                        <signal name="toggled" handler="on_st_none_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image1933">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-undo</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">7</property>
+                                    <property name="right_attach">8</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox33">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="pm_none">
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">pm_ascend</property>
+                                        <signal name="toggled" handler="on_pm_none_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image1930">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-undo</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">7</property>
+                                    <property name="right_attach">8</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox32">
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="pm_descend">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">pm_ascend</property>
+                                        <signal name="toggled" handler="on_pm_descend_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image1929">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-sort-descending</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">5</property>
+                                    <property name="right_attach">6</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox37">
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="pm_ascend">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_pm_ascend_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image1928">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-sort-ascending</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkVSeparator" id="vseparator2">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkVSeparator" id="vseparator3">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">8</property>
+                                    <property name="right_attach">9</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkVSeparator" id="vseparator6">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkVSeparator" id="vseparator8">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">6</property>
+                                    <property name="right_attach">7</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkTable" id="table12">
+                                    <property name="visible">True</property>
+                                    <property name="border_width">3</property>
+                                    <property name="n_rows">1</property>
+                                    <property name="n_columns">1</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label82">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;Ascending&lt;/b&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkTable" id="table13">
+                                    <property name="visible">True</property>
+                                    <property name="border_width">3</property>
+                                    <property name="n_rows">1</property>
+                                    <property name="n_columns">1</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label85">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;Descending&lt;/b&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">5</property>
+                                    <property name="right_attach">6</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkTable" id="table14">
+                                    <property name="visible">True</property>
+                                    <property name="border_width">3</property>
+                                    <property name="n_rows">1</property>
+                                    <property name="n_columns">1</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label86">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;None&lt;/b&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">7</property>
+                                    <property name="right_attach">8</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label91">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                  </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"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHSeparator" id="hseparator9">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="right_attach">11</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHSeparator" id="hseparator10">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="right_attach">11</property>
+                                    <property name="top_attach">8</property>
+                                    <property name="bottom_attach">9</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHSeparator" id="hseparator13">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">10</property>
+                                    <property name="top_attach">6</property>
+                                    <property name="bottom_attach">7</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHSeparator" id="hseparator12">
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">10</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHSeparator" id="hseparator11">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">10</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkVSeparator" id="vseparator9">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">10</property>
+                                    <property name="right_attach">11</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkTable" id="table19">
+                                    <property name="visible">True</property>
+                                    <property name="border_width">3</property>
+                                    <property name="n_rows">1</property>
+                                    <property name="n_columns">1</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label95">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">&lt;b&gt;Auto Store&lt;/b&gt;</property>
+                                        <property name="use_markup">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">9</property>
+                                    <property name="right_attach">10</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox41">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="tm_autostore">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip" translatable="yes">Please refer to the notice below.</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_tm_autostore_toggled"/>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">9</property>
+                                    <property name="right_attach">10</property>
+                                    <property name="top_attach">7</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label96">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">n/a</property>
+                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">9</property>
+                                    <property name="right_attach">10</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox43">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="tm_ascend">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_tm_ascend_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image2013">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-sort-ascending</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">3</property>
+                                    <property name="right_attach">4</property>
+                                    <property name="top_attach">7</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkVSeparator" id="vseparator7">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">4</property>
+                                    <property name="right_attach">5</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox44">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="tm_descend">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">tm_ascend</property>
+                                        <signal name="toggled" handler="on_tm_descend_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image2014">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-sort-descending</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">5</property>
+                                    <property name="right_attach">6</property>
+                                    <property name="top_attach">7</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox45">
+                                    <property name="visible">True</property>
+                                    <property name="homogeneous">True</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="tm_none">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">tm_ascend</property>
+                                        <signal name="toggled" handler="on_tm_none_toggled"/>
+                                        <child>
+                                          <widget class="GtkImage" id="image2015">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-undo</property>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">7</property>
+                                    <property name="right_attach">8</property>
+                                    <property name="top_attach">7</property>
+                                    <property name="bottom_attach">8</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label431">
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">n/a</property>
+                                    <property name="justify">GTK_JUSTIFY_CENTER</property>
+                                    <property name="selectable">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">9</property>
+                                    <property name="right_attach">10</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox46">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkLabel" id="label97">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Sort tracks according to: </property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="sort_combo">
+                                <property name="visible">True</property>
+                                <property name="items">Dummy - do not delete
+</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="cfg_case_sensitive">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">If checked, sorting will be case sensitive. Please note that case sensitive sorting will not work well with most charsets.</property>
+                            <property name="label" translatable="yes">Case sensitive sorting</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_sort_case_sensitive_toggled"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox136">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkLabel" id="label297">
+                    <property name="visible">True</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Ignore Frequent Words&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox143">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label298">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">    </property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkVBox" id="vbox137">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkScrolledWindow" id="scrolledwindow15">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="border_width">4</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>
+                            <child>
+                              <widget class="GtkTextView" id="sort_ign_strings">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label310">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="xalign">0.039999999105930328</property>
+                            <property name="label" translatable="yes">Ignore these words when at the beginning of the following fields:</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox158">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox138">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="sort_ign_field_3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="sort_ign_field_1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkVBox" id="vbox139">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="sort_ign_field_2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="sort_ign_field_6">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkVBox" id="vbox140">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox8">
+            <property name="visible">True</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="sort_cancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_sort_cancel_clicked"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="sort_apply">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-apply</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_sort_apply_clicked"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="sort_ok">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_sort_ok_clicked"/>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="confirm_dialog">
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes"> </property>
+    <property name="icon">gtkpod-icon-48.png</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">1</property>
+        <child>
+          <widget class="GtkHBox" id="hbox169">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="border_width">6</property>
+            <property name="spacing">12</property>
+            <child>
+              <widget class="GtkImage" id="image18">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-dialog-warning</property>
+                <property name="icon_size">6</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox6">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkLabel" id="label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="xalign">0</property>
+                    <property name="yalign">0</property>
+                    <property name="label" translatable="yes">label21</property>
+                    <property name="wrap">True</property>
+                    <property name="selectable">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scroller">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <widget class="GtkTreeView" id="tree">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="headers_visible">False</property>
+                        <property name="headers_clickable">True</property>
+                        <property name="rules_hint">True</property>
+                        <signal name="size_allocate" handler="on_confirm_tree_size_allocate"/>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="option_hbox">
+                    <property name="visible">True</property>
+                    <property name="homogeneous">True</property>
+                    <child>
+                      <widget class="GtkVBox" id="option_vbox">
+                        <property name="visible">True</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="never_again">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Never show this dialogue again</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="pack_type">GTK_PACK_END</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
                   <placeholder/>
-              </child>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </widget>
           <packing>
-              <property name="padding">0</property>
-              <property name="expand">False</property>
-              <property name="fill">False</property>
+            <property name="position">1</property>
           </packing>
-      </child>
-
-      <child>
-	<widget class="GtkHPaned" id="paned0">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="position">150</property>
-	  <signal name="button_release_event" handler="on_paned0_button_release_event" last_modification_time="Sat, 17 Feb 2007 20:51:03 GMT"/>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox2">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="playlist_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="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="cover_visible_control_box">
-		  <property name="height_request">23</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="cover_down_button">
-		      <property name="width_request">25</property>
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NONE</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="on_cover_down_button_clicked" last_modification_time="Sat, 17 Feb 2007 19:15:25 GMT"/>
-
-		      <child>
-			<widget class="GtkArrow" id="arrow1">
-			  <property name="width_request">22</property>
-			  <property name="visible">True</property>
-			  <property name="arrow_type">GTK_ARROW_DOWN</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</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>
-		      <property name="pack_type">GTK_PACK_END</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="cover_up_button">
-		      <property name="width_request">25</property>
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NONE</property>
-		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="on_cover_up_button_clicked" last_modification_time="Sat, 17 Feb 2007 19:37:56 GMT"/>
-
-		      <child>
-			<widget class="GtkArrow" id="arrow2">
-			  <property name="visible">True</property>
-			  <property name="arrow_type">GTK_ARROW_UP</property>
-			  <property name="shadow_type">GTK_SHADOW_NONE</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>
-		      <property name="pack_type">GTK_PACK_END</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="lbl_albumart">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Album Art</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</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="padding">2</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="cover_display_window">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="cover_display_canvasbox">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<placeholder/>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="cover_display_controlbox">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkButton" id="cover_display_leftbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">&lt;</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="GtkHScale" id="cover_display_scaler">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="draw_value">False</property>
-			  <property name="value_pos">GTK_POS_TOP</property>
-			  <property name="digits">0</property>
-			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			  <property name="inverted">False</property>
-			  <property name="adjustment">0 0 0 1 9 0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="cover_display_rightbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">&gt;</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>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</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="GtkVBox" id="main_vbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkVPaned" id="paned1">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="position">180</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="paned1_dummy">
-		      <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">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="track_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>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<placeholder/>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="shrink">True</property>
-	      <property name="resize">True</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="GtkHPaned" id="paned2">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="position">0</property>
-
-	  <child>
-	    <widget class="GtkStatusbar" id="gtkpod_status">
-	      <property name="border_width">1</property>
-	      <property name="width_request">300</property>
-	      <property name="visible">True</property>
-	      <property name="has_resize_grip">False</property>
-	    </widget>
-	    <packing>
-	      <property name="shrink">False</property>
-	      <property name="resize">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHPaned" id="paned3">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="position">130</property>
-
-	      <child>
-		<widget class="GtkStatusbar" id="space_statusbar">
-		  <property name="border_width">1</property>
-		  <property name="width_request">80</property>
-		  <property name="visible">True</property>
-		  <property name="has_resize_grip">False</property>
-		</widget>
-		<packing>
-		  <property name="shrink">True</property>
-		  <property name="resize">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkStatusbar" id="tracks_statusbar">
-		  <property name="border_width">1</property>
-		  <property name="width_request">175</property>
-		  <property name="visible">True</property>
-		  <property name="has_resize_grip">True</property>
-		</widget>
-		<packing>
-		  <property name="shrink">True</property>
-		  <property name="resize">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="shrink">True</property>
-	      <property name="resize">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="gtkpod_about_window">
-  <property name="width_request">350</property>
-  <property name="height_request">0</property>
-  <property name="title" translatable="yes">About gtkpod</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">450</property>
-  <property name="default_height">450</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon">gtkpod-icon-48.png</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>
-  <signal name="delete_event" handler="on_about_window_close" last_modification_time="Sat, 30 Nov 2002 16:10:01 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkVBox" id="about_top_box">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkImage" id="logo_image">
-	      <property name="visible">True</property>
-	      <property name="pixbuf">gtkpod-logo.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>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="about_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</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>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkNotebook" id="notebook1">
-	  <property name="border_width">2</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow2">
-	      <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>
-		<widget class="GtkTextView" id="credits_textview">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">False</property>
-		  <property name="overwrite">False</property>
-		  <property name="accepts_tab">True</property>
-		  <property name="justification">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap_mode">GTK_WRAP_WORD</property>
-		  <property name="cursor_visible">True</property>
-		  <property name="pixels_above_lines">0</property>
-		  <property name="pixels_below_lines">0</property>
-		  <property name="pixels_inside_wrap">0</property>
-		  <property name="left_margin">0</property>
-		  <property name="right_margin">0</property>
-		  <property name="indent">0</property>
-		  <property name="text" translatable="yes"></property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label3">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Credits</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.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="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow3">
-	      <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>
-		<widget class="GtkTextView" id="translators_textview">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">False</property>
-		  <property name="overwrite">False</property>
-		  <property name="accepts_tab">True</property>
-		  <property name="justification">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap_mode">GTK_WRAP_WORD</property>
-		  <property name="cursor_visible">True</property>
-		  <property name="pixels_above_lines">0</property>
-		  <property name="pixels_below_lines">0</property>
-		  <property name="pixels_inside_wrap">0</property>
-		  <property name="left_margin">0</property>
-		  <property name="right_margin">0</property>
-		  <property name="indent">0</property>
-		  <property name="text" translatable="yes"></property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label4">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Translators</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.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="type">tab</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="GtkHButtonBox" id="hbuttonbox2">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkButton" id="about_close">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_about_window_close_button" object="gtkpod_about_window" last_modification_time="Sat, 30 Nov 2002 17:00:55 GMT"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="special_sorttab">
-  <property name="title" translatable="yes">special_sorttab -- Don't translate!</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="special_viewport">
-      <property name="visible">True</property>
-      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-      <child>
-	<widget class="GtkVBox" id="vbox37">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox20">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label52">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes"> Logic: </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">True</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>
-
-	      <child>
-		<widget class="GtkRadioButton" id="sp_or_button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Any (OR)</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="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkRadioButton" id="sp_and_button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">All (AND)</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>
-		  <property name="group">sp_or_button</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">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHSeparator" id="hseparator1">
-	      <property name="visible">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">2</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkTable" id="table6">
-	      <property name="visible">True</property>
-	      <property name="n_rows">5</property>
-	      <property name="n_columns">2</property>
-	      <property name="homogeneous">False</property>
-	      <property name="row_spacing">0</property>
-	      <property name="column_spacing">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox14">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="sp_rating0">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">0</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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="sp_rating1">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">1</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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="sp_rating2">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">2</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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="sp_rating3">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">3</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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="sp_rating4">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">4</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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="sp_rating5">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">5</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="padding">0</property>
-		      <property name="expand">False</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">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox15">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox23">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkSpinButton" id="sp_playcount_low">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Select '0' for no lower limit.</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 0 2147480000 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label54">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes"> &lt;= cts &lt;= </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">True</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>
-
-		      <child>
-			<widget class="GtkSpinButton" id="sp_playcount_high">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Select '-1' for no upper limit.</property>
-			  <property name="can_focus">True</property>
-			  <property name="climb_rate">1</property>
-			  <property name="digits">0</property>
-			  <property name="numeric">False</property>
-			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			  <property name="snap_to_ticks">False</property>
-			  <property name="wrap">False</property>
-			  <property name="adjustment">1 -1 2147480000 1 10 10</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</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="GtkHBox" id="hbox17">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkEntry" id="sp_played_entry">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">'DD/MM/YYYY HH:MM &lt; d &lt; DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished.</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label49">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></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.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>
-
-		  <child>
-		    <widget class="GtkButton" id="sp_played_cal_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Calendar</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="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox18">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkEntry" id="sp_modified_entry">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">'DD/MM/YYYY HH:MM &lt; d &lt; DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished.</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label50">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></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.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>
-
-		  <child>
-		    <widget class="GtkButton" id="sp_modified_cal_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Calendar</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="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="sp_playcount_button">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Specify interval</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Playcount</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">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
-		  <property name="x_padding">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="sp_rating_button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Rating</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">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
-		  <property name="x_padding">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="sp_played_button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Played</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">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_padding">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="sp_modified_button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Modified</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">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="x_padding">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox57">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkEntry" id="sp_added_entry">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">'DD/MM/YYYY HH:MM &lt; d &lt; DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished.</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label159">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></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.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>
-
-		  <child>
-		    <widget class="GtkButton" id="sp_added_cal_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Calendar</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="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="x_options">fill</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="sp_added_button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Added</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">0</property>
-		  <property name="right_attach">1</property>
-		  <property name="top_attach">4</property>
-		  <property name="bottom_attach">5</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHSeparator" id="hseparator2">
-	      <property name="visible">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox21">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkButton" id="sp_go">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Display tracks that match the criteria entered above.</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="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</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="hbox22">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image1056">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-execute</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="label53">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Display</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">2</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkCheckButton" id="sp_go_always">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">Automatically start displaying tracks that match the criteria entered above. If not selected, you must press 'Display' to start displaying.</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Start display automatically</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="padding">2</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>
-	    </packing>
-	  </child>
-	</widget>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="calendar_window">
-  <property name="title" translatable="yes">Calendar</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">480</property>
-  <property name="default_height">290</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon">gtkpod-icon-48.png</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="GtkScrolledWindow" id="scrolledwindow4">
-      <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_ETCHED_IN</property>
-      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-      <child>
-	<widget class="GtkViewport" id="viewport1">
-	  <property name="visible">True</property>
-	  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox43">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox29">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label64">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Sorttab: </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">True</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">3</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSpinButton" id="sorttab_num_spin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="climb_rate">1</property>
-		      <property name="digits">0</property>
-		      <property name="numeric">False</property>
-		      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-		      <property name="snap_to_ticks">False</property>
-		      <property name="wrap">False</property>
-		      <property name="adjustment">1 0 100 1 10 10</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="label65">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">     </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.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>
-
-		  <child>
-		    <widget class="GtkLabel" id="label66">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Category: </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">True</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">3</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCombo" id="cat_combo">
-		      <property name="visible">True</property>
-		      <property name="value_in_list">True</property>
-		      <property name="allow_empty">False</property>
-		      <property name="case_sensitive">False</property>
-		      <property name="enable_arrow_keys">True</property>
-		      <property name="enable_arrows_always">False</property>
-
-		      <child internal-child="entry">
-			<widget class="GtkEntry" id="cat_entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-		      </child>
-
-		      <child internal-child="list">
-			<widget class="GtkList" id="cat_list">
-			  <property name="visible">True</property>
-			  <property name="selection_mode">GTK_SELECTION_BROWSE</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">2</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator6">
-		  <property name="visible">True</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="label63">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Please specify a time interval</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">True</property>
-		  <property name="selectable">True</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">3</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator5">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox25">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox44">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label57">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Lower Margin</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">True</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">2</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="lower_cal_box">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkCalendar" id="lower_cal">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="display_options">GTK_CALENDAR_SHOW_HEADING|GTK_CALENDAR_SHOW_DAY_NAMES|GTK_CALENDAR_WEEK_START_MONDAY</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="lower_time_fullbox">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="lower_time">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Time:</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="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="lower_time_box">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkSpinButton" id="lower_hours">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">1</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">True</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">False</property>
-				      <property name="wrap">True</property>
-				      <property name="adjustment">0 0 23 1 2 10</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label59">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">:</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.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>
-
-				  <child>
-				    <widget class="GtkSpinButton" id="lower_minutes">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">1</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">True</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">False</property>
-				      <property name="wrap">True</property>
-				      <property name="adjustment">3 0 59 1 5 2</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </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">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHSeparator" id="hseparator3">
-			  <property name="visible">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="no_lower_margin">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">No lower margin</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="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>
-
-		  <child>
-		    <widget class="GtkVSeparator" id="vseparator1">
-		      <property name="visible">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox47">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label58">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Upper margin</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">True</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">2</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="upper_cal_box">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkCalendar" id="upper_cal">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="display_options">GTK_CALENDAR_SHOW_HEADING|GTK_CALENDAR_SHOW_DAY_NAMES|GTK_CALENDAR_WEEK_START_MONDAY</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="upper_time_fullbox">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="upper_time">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Time:</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="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="upper_time_box">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkSpinButton" id="upper_hours">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">1</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">True</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">False</property>
-				      <property name="wrap">True</property>
-				      <property name="adjustment">0 0 23 1 2 10</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label62">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">:</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.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>
-
-				  <child>
-				    <widget class="GtkSpinButton" id="upper_minutes">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">1</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">True</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">False</property>
-				      <property name="wrap">True</property>
-				      <property name="adjustment">3 0 59 1 5 2</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </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">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHSeparator" id="hseparator4">
-			  <property name="visible">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="no_upper_margin">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">No upper margin</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="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>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator7">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHButtonBox" id="hbuttonbox7">
-		  <property name="visible">True</property>
-		  <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkButton" id="cal_apply">
-		      <property name="visible">True</property>
-		      <property name="can_default">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label">gtk-apply</property>
-		      <property name="use_stock">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="cal_cancel">
-		      <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>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="cal_ok">
-		      <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>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">2</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		  <property name="pack_type">GTK_PACK_END</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="sort_window">
-  <property name="title" translatable="yes">Sorting Options</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="icon">gtkpod-icon-48.png</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>
-  <signal name="delete_event" handler="on_sort_window_delete_event" last_modification_time="Mon, 22 Sep 2003 11:54:32 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox52">
-      <property name="border_width">6</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">4</property>
-
-      <child>
-	<widget class="GtkVBox" id="vbox135">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label283">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Sort Order&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</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="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox128">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label284">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">    </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.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>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox53">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label296">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">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.</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">True</property>
-		      <property name="selectable">True</property>
-		      <property name="xalign">0.0399999991059</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">4</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox30">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkTable" id="table11">
-			  <property name="border_width">4</property>
-			  <property name="visible">True</property>
-			  <property name="n_rows">9</property>
-			  <property name="n_columns">11</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">0</property>
-			  <property name="column_spacing">0</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox34">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="st_ascend">
-				  <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>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="on_st_ascend_toggled" last_modification_time="Mon, 22 Sep 2003 11:25:58 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image1931">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-sort-ascending</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="left_attach">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox35">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="st_descend">
-				  <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>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">st_ascend</property>
-				  <signal name="toggled" handler="on_st_descend_toggled" last_modification_time="Mon, 22 Sep 2003 11:25:53 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image1932">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-sort-descending</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="left_attach">5</property>
-			      <property name="right_attach">6</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox36">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="st_none">
-				  <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>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">st_ascend</property>
-				  <signal name="toggled" handler="on_st_none_toggled" last_modification_time="Mon, 22 Sep 2003 11:25:46 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image1933">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-undo</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="left_attach">7</property>
-			      <property name="right_attach">8</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox33">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="pm_none">
-				  <property name="can_focus">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_pm_none_toggled" last_modification_time="Mon, 22 Sep 2003 11:26:52 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image1930">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-undo</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="left_attach">7</property>
-			      <property name="right_attach">8</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox32">
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="pm_descend">
-				  <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>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">pm_none</property>
-				  <signal name="toggled" handler="on_pm_descend_toggled" last_modification_time="Mon, 22 Sep 2003 11:26:59 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image1929">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-sort-descending</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="left_attach">5</property>
-			      <property name="right_attach">6</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox37">
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="pm_ascend">
-				  <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>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">pm_none</property>
-				  <signal name="toggled" handler="on_pm_ascend_toggled" last_modification_time="Mon, 22 Sep 2003 11:27:07 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image1928">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-sort-ascending</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="left_attach">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator2">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options"></property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator3">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">8</property>
-			      <property name="right_attach">9</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options"></property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator6">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options"></property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator8">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">6</property>
-			      <property name="right_attach">7</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options"></property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkTable" id="table12">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">1</property>
-			      <property name="n_columns">1</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">0</property>
-			      <property name="column_spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label82">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Ascending</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">True</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="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">3</property>
-			      <property name="right_attach">4</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="GtkTable" id="table13">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">1</property>
-			      <property name="n_columns">1</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">0</property>
-			      <property name="column_spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label85">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Descending</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">True</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="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">5</property>
-			      <property name="right_attach">6</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="GtkTable" id="table14">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">1</property>
-			      <property name="n_columns">1</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">0</property>
-			      <property name="column_spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label86">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">None</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">True</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="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">7</property>
-			      <property name="right_attach">8</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="GtkTable" id="table15">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">1</property>
-			      <property name="n_columns">1</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">0</property>
-			      <property name="column_spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label87">
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Playlists</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">True</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="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>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkTable" id="table16">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">1</property>
-			      <property name="n_columns">1</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">0</property>
-			      <property name="column_spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label88">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Sorttabs</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">True</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="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>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkTable" id="table17">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">1</property>
-			      <property name="n_columns">1</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">0</property>
-			      <property name="column_spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label89">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Tracks</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">True</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="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>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label91">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes"></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">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"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator9">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">11</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="GtkHSeparator" id="hseparator10">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">11</property>
-			      <property name="top_attach">8</property>
-			      <property name="bottom_attach">9</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator13">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">6</property>
-			      <property name="bottom_attach">7</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator12">
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">4</property>
-			      <property name="bottom_attach">5</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator11">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator9">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">10</property>
-			      <property name="right_attach">11</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options"></property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkTable" id="table19">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">1</property>
-			      <property name="n_columns">1</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">0</property>
-			      <property name="column_spacing">0</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label95">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Auto Store</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">True</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="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">9</property>
-			      <property name="right_attach">10</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="GtkHBox" id="hbox41">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="tm_autostore">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Please refer to the notice below.</property>
-				  <property name="can_focus">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_tm_autostore_toggled" last_modification_time="Mon, 22 Sep 2003 13:30:09 GMT"/>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">9</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label96">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">n/a</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">True</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="left_attach">9</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox43">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="tm_ascend">
-				  <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>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="on_tm_ascend_toggled" last_modification_time="Tue, 23 Sep 2003 03:07:09 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image2013">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-sort-ascending</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="left_attach">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator7">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">4</property>
-			      <property name="right_attach">5</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options"></property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox44">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="tm_descend">
-				  <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>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">tm_ascend</property>
-				  <signal name="toggled" handler="on_tm_descend_toggled" last_modification_time="Tue, 23 Sep 2003 03:07:03 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image2014">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-sort-descending</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="left_attach">5</property>
-			      <property name="right_attach">6</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox45">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">True</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="tm_none">
-				  <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>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">tm_ascend</property>
-				  <signal name="toggled" handler="on_tm_none_toggled" last_modification_time="Tue, 23 Sep 2003 03:06:56 GMT"/>
-
-				  <child>
-				    <widget class="GtkImage" id="image2015">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-undo</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="left_attach">7</property>
-			      <property name="right_attach">8</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label431">
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">n/a</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">True</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="left_attach">9</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </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">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox46">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label97">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Sort tracks according to: </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">True</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">4</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCombo" id="sort_combo">
-			  <property name="visible">True</property>
-			  <property name="value_in_list">False</property>
-			  <property name="allow_empty">True</property>
-			  <property name="case_sensitive">False</property>
-			  <property name="enable_arrow_keys">True</property>
-			  <property name="enable_arrows_always">False</property>
-
-			  <child internal-child="entry">
-			    <widget class="GtkEntry" id="sort_combo-entry">
-			      <property name="visible">True</property>
-			      <property name="tooltip" translatable="yes">You can also use the table headers, but this allows you to sort according to a column that is not displayed.</property>
-			      <property name="can_focus">True</property>
-			      <property name="editable">True</property>
-			      <property name="visibility">True</property>
-			      <property name="max_length">0</property>
-			      <property name="text" translatable="yes"></property>
-			      <property name="has_frame">True</property>
-			      <property name="invisible_char">*</property>
-			      <property name="activates_default">False</property>
-			    </widget>
-			  </child>
-
-			  <child internal-child="list">
-			    <widget class="GtkList" id="sort_combo-list">
-			      <property name="visible">True</property>
-			      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</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="GtkCheckButton" id="cfg_case_sensitive">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">If checked, sorting will be case sensitive. Please note that case sensitive sorting will not work well with most charsets.</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Sorting case sensitive</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_sort_case_sensitive_toggled" last_modification_time="Sun, 21 Sep 2003 14:47:47 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>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox136">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label297">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Ignore Frequent Words&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</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="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox143">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label298">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">    </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.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>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox137">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow15">
-		      <property name="border_width">4</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="GtkTextView" id="sort_ign_strings">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="overwrite">False</property>
-			  <property name="accepts_tab">True</property>
-			  <property name="justification">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap_mode">GTK_WRAP_NONE</property>
-			  <property name="cursor_visible">True</property>
-			  <property name="pixels_above_lines">0</property>
-			  <property name="pixels_below_lines">0</property>
-			  <property name="pixels_inside_wrap">0</property>
-			  <property name="left_margin">0</property>
-			  <property name="right_margin">0</property>
-			  <property name="indent">0</property>
-			  <property name="text" translatable="yes"></property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label310">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Ignore these words when at the beginning of the following fields:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">True</property>
-		      <property name="selectable">True</property>
-		      <property name="xalign">0.0399999991059</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">4</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox158">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox138">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="sort_ign_field_3">
-			      <property name="visible">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="sort_ign_field_1">
-			      <property name="visible">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-
-			  <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="GtkVBox" id="vbox139">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="sort_ign_field_2">
-			      <property name="visible">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="sort_ign_field_6">
-			      <property name="visible">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-
-			  <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="GtkVBox" id="vbox140">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</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="GtkHSeparator" id="hseparator49">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox8">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkButton" id="sort_cancel">
-	      <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>
-	      <signal name="clicked" handler="on_sort_cancel_clicked" last_modification_time="Mon, 22 Sep 2003 11:30:46 GMT"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="sort_apply">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_sort_apply_clicked" last_modification_time="Mon, 22 Sep 2003 11:30:39 GMT"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="sort_ok">
-	      <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>
-	      <signal name="clicked" handler="on_sort_ok_clicked" last_modification_time="Mon, 22 Sep 2003 11:31:10 GMT"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="gtkpod_info">
-  <property name="title" translatable="yes">gtkpod Info</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="icon">gtkpod-icon-48.png</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>
-  <signal name="delete_event" handler="on_gtkpod_info_delete_event" last_modification_time="Sun, 16 May 2004 04:40:47 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox56">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<placeholder/>
-      </child>
-
-      <child>
-	<widget class="GtkScrolledWindow" id="scrolledwindow10">
-	  <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>
-	    <widget class="GtkViewport" id="viewport7">
-	      <property name="visible">True</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox57">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox49">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkTable" id="table22">
-			  <property name="border_width">4</property>
-			  <property name="visible">True</property>
-			  <property name="n_rows">21</property>
-			  <property name="n_columns">13</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">0</property>
-			  <property name="column_spacing">1</property>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator39">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">5</property>
-			      <property name="top_attach">20</property>
-			      <property name="bottom_attach">21</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="free_space">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">19</property>
-			      <property name="bottom_attach">20</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="non_transferred_filesize">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">17</property>
-			      <property name="bottom_attach">18</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator37">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">5</property>
-			      <property name="top_attach">16</property>
-			      <property name="bottom_attach">17</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="non_transferred_tracks">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">15</property>
-			      <property name="bottom_attach">16</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator17">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">20</property>
-			      <property name="x_options"></property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator18">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">2</property>
-			      <property name="right_attach">3</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">20</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator19">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">4</property>
-			      <property name="right_attach">5</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">20</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator42">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">12</property>
-			      <property name="bottom_attach">13</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="deleted_filesize">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">13</property>
-			      <property name="bottom_attach">14</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="deleted_tracks">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">11</property>
-			      <property name="bottom_attach">12</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator41">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">14</property>
-			      <property name="bottom_attach">15</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator38">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">5</property>
-			      <property name="top_attach">18</property>
-			      <property name="bottom_attach">19</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="total_tracks_ipod">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">      </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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="total_playtime_ipod">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="total_filesize_ipod">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="total_playlists_ipod">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">      </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">True</property>
-			      <property name="xalign">1</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">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">9</property>
-			      <property name="bottom_attach">10</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="playlist_tracks">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">      </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">True</property>
-			      <property name="xalign">1</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">7</property>
-			      <property name="right_attach">8</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="playlist_playtime">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">7</property>
-			      <property name="right_attach">8</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="playlist_filesize">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">7</property>
-			      <property name="right_attach">8</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="tracks_displayed">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">9</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="playtime_displayed">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">9</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="filesize_displayed">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">9</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator21">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">8</property>
-			      <property name="right_attach">9</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="tracks_selected">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">11</property>
-			      <property name="right_attach">12</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="playtime_selected">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">11</property>
-			      <property name="right_attach">12</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="filesize_selected">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">11</property>
-			      <property name="right_attach">12</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator22">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">10</property>
-			      <property name="right_attach">11</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label137">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Number of tracks</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label139">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Play time</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_padding">1</property>
-			      <property name="y_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label141">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">File size</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label147">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Number of playlists</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">9</property>
-			      <property name="bottom_attach">10</property>
-			      <property name="x_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label149">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Deleted tracks</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">11</property>
-			      <property name="bottom_attach">12</property>
-			      <property name="x_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label150">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">File size (deleted)</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">13</property>
-			      <property name="bottom_attach">14</property>
-			      <property name="x_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label143">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Non-transferred tracks</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">15</property>
-			      <property name="bottom_attach">16</property>
-			      <property name="x_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label145">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">File size (non-transferred)</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">17</property>
-			      <property name="bottom_attach">18</property>
-			      <property name="x_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label146">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Effective free space</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">True</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">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">19</property>
-			      <property name="bottom_attach">20</property>
-			      <property name="x_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label99">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Total
-(iPod)</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">True</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="left_attach">3</property>
-			      <property name="right_attach">4</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_padding">1</property>
-			      <property name="y_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label153">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Selected
-Playlist</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">True</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="left_attach">7</property>
-			      <property name="right_attach">8</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_padding">1</property>
-			      <property name="y_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label154">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Displayed
-Tracks</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">True</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="left_attach">9</property>
-			      <property name="right_attach">10</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_padding">1</property>
-			      <property name="y_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label155">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Selected
-Tracks</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">True</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="left_attach">11</property>
-			      <property name="right_attach">12</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_padding">1</property>
-			      <property name="y_padding">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label176">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Total
-(local)</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_CENTER</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">True</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="left_attach">5</property>
-			      <property name="right_attach">6</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="total_tracks_local">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">      </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">True</property>
-			      <property name="xalign">1</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">5</property>
-			      <property name="right_attach">6</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="total_playtime_local">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">5</property>
-			      <property name="right_attach">6</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="total_filesize_local">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes"></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">True</property>
-			      <property name="xalign">1</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">5</property>
-			      <property name="right_attach">6</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox58">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox50">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkHButtonBox" id="hbuttonbox9">
-				      <property name="border_width">5</property>
-				      <property name="visible">True</property>
-				      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkButton" id="info_close">
-					  <property name="visible">True</property>
-					  <property name="can_default">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label">gtk-close</property>
-					  <property name="use_stock">True</property>
-					  <property name="relief">GTK_RELIEF_NORMAL</property>
-					  <property name="focus_on_click">True</property>
-					  <signal name="clicked" handler="on_info_close_clicked" last_modification_time="Sun, 23 Nov 2003 15:28:50 GMT"/>
-					</widget>
-				      </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">False</property>
-				  <property name="fill">False</property>
-				  <property name="pack_type">GTK_PACK_END</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">5</property>
-			      <property name="right_attach">11</property>
-			      <property name="top_attach">11</property>
-			      <property name="bottom_attach">21</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="total_playlists_local">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">      </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">True</property>
-			      <property name="xalign">1</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">5</property>
-			      <property name="right_attach">6</property>
-			      <property name="top_attach">9</property>
-			      <property name="bottom_attach">10</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator45">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">13</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator35">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">13</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator32">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">13</property>
-			      <property name="top_attach">4</property>
-			      <property name="bottom_attach">5</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator33">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">13</property>
-			      <property name="top_attach">6</property>
-			      <property name="bottom_attach">7</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator34">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">13</property>
-			      <property name="top_attach">8</property>
-			      <property name="bottom_attach">9</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator20">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">6</property>
-			      <property name="right_attach">7</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">10</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="hseparator36">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">7</property>
-			      <property name="top_attach">10</property>
-			      <property name="bottom_attach">11</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVSeparator" id="vseparator23">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">12</property>
-			      <property name="right_attach">13</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">9</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </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">6</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </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="GtkDialog" id="confirm_dialog">
-  <property name="title" translatable="yes"></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="icon">gtkpod-icon-48.png</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-vbox1">
-      <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_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel">
-	      <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">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="apply">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</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">-10</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok">
-	      <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="vbox6">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">label21</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">True</property>
-	      <property name="selectable">True</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</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">6</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox7">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scroller">
-		  <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="GtkTextView" id="text">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="overwrite">False</property>
-		      <property name="accepts_tab">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</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="GtkHBox" id="option_hbox">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">True</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkVBox" id="option_vbox">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="never_again">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Never show this dialogue again</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="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">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <placeholder/>
-	  </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="export_playlist_file_options">
-  <property name="title" translatable="yes">window1</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="GtkFrame" id="options_frame">
-      <property name="visible">True</property>
-      <property name="label_xalign">0</property>
-      <property name="label_yalign">0.5</property>
-      <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
-
-      <child>
-	<widget class="GtkAlignment" id="alignment4">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xscale">1</property>
-	  <property name="yscale">1</property>
-	  <property name="top_padding">0</property>
-	  <property name="bottom_padding">0</property>
-	  <property name="left_padding">12</property>
-	  <property name="right_padding">0</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox61">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkTable" id="table29">
-		  <property name="visible">True</property>
-		  <property name="n_rows">2</property>
-		  <property name="n_columns">2</property>
-		  <property name="homogeneous">False</property>
-		  <property name="row_spacing">0</property>
-		  <property name="column_spacing">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox59">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">10</property>
-
-		      <child>
-			<widget class="GtkRadioButton" id="type_m3u">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_M3U</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="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="type_pls">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_PLS</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>
-			  <property name="group">type_m3u</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<placeholder/>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="left_attach">1</property>
-		      <property name="right_attach">2</property>
-		      <property name="top_attach">0</property>
-		      <property name="bottom_attach">1</property>
-		      <property name="y_options">fill</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox60">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">10</property>
-
-		      <child>
-			<widget class="GtkRadioButton" id="source_prefer_local">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">If available, the local copy of the track is referenced in the playlist. Otherwise the file on the iPod is used.</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Prefer Local</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="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="source_local">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">The local copy of the track is referenced in the playlist. If the track is not available locally, an error message is displayed.</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Local</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>
-			  <property name="group">source_prefer_local</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkRadioButton" id="source_ipod">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">The track on the iPod is referenced in the playlist file.</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_iPod</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>
-			  <property name="group">source_prefer_local</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<placeholder/>
-		      </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="GtkLabel" id="label167">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Playlist type:</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="y_padding">4</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label168">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Source:</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">1</property>
-		      <property name="bottom_attach">2</property>
-		      <property name="y_padding">4</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options"></property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox58">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label165">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Template for info field: </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">True</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="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="export_playlist_file_template">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">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 '%': %%.</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label166">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">gtkpod options</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</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="type">label_item</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="export_files_options">
-  <property name="title" translatable="yes">window1</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="GtkFrame" id="options_frame">
-      <property name="visible">True</property>
-      <property name="label_xalign">0</property>
-      <property name="label_yalign">0.5</property>
-      <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
-
-      <child>
-	<widget class="GtkVBox" id="vbox50">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox51">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label70">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Filename Format: </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">True</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="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="export_files_template">
-		  <property name="visible">True</property>
-		  <property name="tooltip" translatable="yes">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 '%': %%.</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"> </property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="export_files_special_charset">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">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.</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Use selected charset (Preferences/'Adding/Updating/ Syncing')
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancel">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="apply">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-apply</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-10</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="ok">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="export_playlist_file_options">
+    <property name="title" translatable="yes">window1</property>
+    <child>
+      <widget class="GtkFrame" id="ep_options_frame">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">GTK_SHADOW_NONE</property>
+        <child>
+          <widget class="GtkAlignment" id="alignment4">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="left_padding">12</property>
+            <child>
+              <widget class="GtkTable" id="table29">
+                <property name="visible">True</property>
+                <property name="n_rows">3</property>
+                <property name="n_columns">2</property>
+                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
+                <child>
+                  <widget class="GtkHBox" id="hbox66">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label165">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Info field template:</property>
+                        <property name="selectable">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox65">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label168">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Source:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox58">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label167">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Playlist type:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox59">
+                    <property name="visible">True</property>
+                    <property name="spacing">10</property>
+                    <child>
+                      <widget class="GtkRadioButton" id="type_m3u">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">_M3U</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioButton" id="type_pls">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">_PLS</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">type_m3u</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox60">
+                    <property name="visible">True</property>
+                    <property name="spacing">10</property>
+                    <child>
+                      <widget class="GtkRadioButton" id="source_prefer_local">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">If available, the local copy of the track is referenced in the playlist. Otherwise the file on the iPod is used.</property>
+                        <property name="label" translatable="yes">_Prefer Local</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioButton" id="source_local">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">The local copy of the track is referenced in the playlist. If the track is not available locally, an error message is displayed.</property>
+                        <property name="label" translatable="yes">_Local</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">source_prefer_local</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkRadioButton" id="source_ipod">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">The track on the iPod is referenced in the playlist file.</property>
+                        <property name="label" translatable="yes">_iPod</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">source_prefer_local</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </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"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="export_playlist_file_template">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip" translatable="yes">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 '%': %%.</property>
+                    <property name="invisible_char">*</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkLabel" id="label166">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">&lt;b&gt;gtkpod Options&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </widget>
+          <packing>
+            <property name="type">label_item</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="export_files_options">
+    <property name="title" translatable="yes">window1</property>
+    <child>
+      <widget class="GtkFrame" id="ef_options_frame">
+        <property name="visible">True</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">GTK_SHADOW_NONE</property>
+        <child>
+          <widget class="GtkAlignment" id="alignment43">
+            <property name="visible">True</property>
+            <property name="top_padding">6</property>
+            <property name="left_padding">12</property>
+            <child>
+              <widget class="GtkVBox" id="vbox50">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkHBox" id="hbox51">
+                    <property name="visible">True</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <widget class="GtkLabel" id="label70">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Filename format: </property>
+                        <property name="selectable">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkEntry" id="export_files_template">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">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 '%': %%.</property>
+                        <property name="invisible_char">*</property>
+                        <property name="text" translatable="yes"> </property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkCheckButton" id="export_files_special_charset">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip" translatable="yes">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.</property>
+                    <property name="label" translatable="yes">Use selected charset (Preferences/'Adding/Updating/ Syncing')
 for this filename.</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="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="export_files_check_existing">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">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.</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Check for existing files when copying from iPod.</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="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="message_box">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator48">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">2</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="message">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes"></property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">True</property>
-		  <property name="selectable">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0</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>
-
-	      <child>
-		<widget class="GtkScrolledWindow" id="scrolledwindow13">
-		  <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="GtkTextView" id="textview">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="overwrite">False</property>
-		      <property name="accepts_tab">True</property>
-		      <property name="justification">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">True</property>
-		      <property name="pixels_above_lines">0</property>
-		      <property name="pixels_below_lines">0</property>
-		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
-		      <property name="indent">0</property>
-		      <property name="text" translatable="yes"></property>
-		    </widget>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">2</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-      </child>
-
-      <child>
-	<widget class="GtkLabel" id="label72">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="label" translatable="yes">gtkpod options</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">True</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="type">label_item</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="spl_window">
-  <property name="title" translatable="yes">Smart Playlist</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="icon">gtkpod-icon-48.png</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="GtkScrolledWindow" id="spl_scroll">
-      <property name="visible">True</property>
-      <property name="can_focus">True</property>
-      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-      <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-      <property name="shadow_type">GTK_SHADOW_IN</property>
-      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-      <child>
-	<widget class="GtkViewport" id="spl_viewport">
-	  <property name="visible">True</property>
-	  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox63">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkHBox" id="spl_name_hbox">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label175">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Playlist name:</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.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">5</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="spl_name_entry">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">0</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">4</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator47">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">4</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox61">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="spl_all_radio">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Match al_l of the following</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="padding">5</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="spl_any_radio">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Match an_y of the following</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>
-		      <property name="group">spl_all_radio</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">5</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkRadioButton" id="spl_none_radio">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Ignore rules</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>
-		      <property name="group">spl_all_radio</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">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="spl_rules_frame">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_OUT</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow16">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_NEVER</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>
-			<widget class="GtkViewport" id="viewport10">
-			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-			  <child>
-			    <widget class="GtkAlignment" id="spl_rules_table_align">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">1</property>
-			      <property name="yscale">1</property>
-			      <property name="top_padding">5</property>
-			      <property name="bottom_padding">5</property>
-			      <property name="left_padding">5</property>
-			      <property name="right_padding">5</property>
-
-			      <child>
-				<placeholder/>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label174">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Rules</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">True</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="type">label_item</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="GtkHBox" id="hbox62">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="spl_checklimits_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Limit to</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="padding">5</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkEntry" id="spl_limitvalue_entry">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="editable">True</property>
-		      <property name="visibility">True</property>
-		      <property name="max_length">12</property>
-		      <property name="text" translatable="yes"></property>
-		      <property name="has_frame">True</property>
-		      <property name="invisible_char">*</property>
-		      <property name="activates_default">False</property>
-		      <property name="width_chars">6</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkComboBox" id="spl_limittype_combobox">
-		      <property name="visible">True</property>
-		      <property name="add_tearoffs">False</property>
-		      <property name="focus_on_click">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="spl_limitsort_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">   Sort by:</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.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">5</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkComboBox" id="spl_limitsort_combobox">
-		      <property name="visible">True</property>
-		      <property name="add_tearoffs">False</property>
-		      <property name="focus_on_click">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">2</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox63">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="spl_matchcheckedonly_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Match only _checked tracks</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="padding">5</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">5</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox64">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="spl_liveupdate_button">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Live _updating</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="padding">5</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">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHSeparator" id="hseparator46">
-		  <property name="visible">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">4</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox65">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkHButtonBox" id="hbuttonbox11">
-		      <property name="visible">True</property>
-		      <property name="layout_style">GTK_BUTTONBOX_END</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkButton" id="spl_cancel_button">
-			  <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>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="spl_ok_button">
-			  <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>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="prefs_window">
-  <property name="title" translatable="yes">Preferences</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="icon">gtkpod-icon-48.png</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>
-  <signal name="delete_event" handler="on_prefs_window_delete_event" last_modification_time="Fri, 13 May 2005 17:19:54 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox64">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">8</property>
-
-      <child>
-	<widget class="GtkNotebook" id="notebook">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow11">
-	      <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>
-		<widget class="GtkViewport" id="viewport8">
-		  <property name="visible">True</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox111">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">18</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox166">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label418">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Mountpoint and individual repository/playlist options&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox202">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label419">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox167">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkButton" id="cfg_edit_repository_button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Set mountpoint or edit repository options</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <signal name="clicked" handler="on_edit_repository_clicked" last_modification_time="Mon, 01 May 2006 11:37:56 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">3</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<placeholder/>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox114">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label256">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Adding/Updating/Syncing&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox109">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label257">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox115">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox205">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">8</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label435">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Exclude file mask(s)</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="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkEntry" id="exclude_file_mask_entry">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Semicolon separated list of file exclusion masks, e.g. '*.mp3'</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</property>
-					  <signal name="changed" handler="on_exclude_file_mask_entry_changed" last_modification_time="Mon, 21 Aug 2006 10:37:14 GMT"/>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</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="GtkHBox" id="hbox110">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">8</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label258">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">_Encoding (ID3, files):</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="mnemonic_widget">charset_combo_entry</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>
-
-				      <child>
-					<widget class="GtkCombo" id="charset_combo">
-					  <property name="visible">True</property>
-					  <property name="value_in_list">False</property>
-					  <property name="allow_empty">True</property>
-					  <property name="case_sensitive">False</property>
-					  <property name="enable_arrow_keys">True</property>
-					  <property name="enable_arrows_always">False</property>
-
-					  <child internal-child="entry">
-					    <widget class="GtkEntry" id="charset_combo_entry">
-					      <property name="visible">True</property>
-					      <property name="tooltip" translatable="yes">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.</property>
-					      <property name="can_focus">True</property>
-					      <property name="editable">False</property>
-					      <property name="visibility">True</property>
-					      <property name="max_length">0</property>
-					      <property name="text" translatable="yes"></property>
-					      <property name="has_frame">True</property>
-					      <property name="invisible_char">*</property>
-					      <property name="activates_default">False</property>
-					      <signal name="changed" handler="on_charset_combo_entry_changed" last_modification_time="Tue, 14 Jan 2003 13:53:44 GMT"/>
-					    </widget>
-					  </child>
-
-					  <child internal-child="list">
-					    <widget class="GtkList" id="list1">
-					      <property name="visible">True</property>
-					      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="file_convert_background_transfer_button">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Transfer tracks to the iPod in the background</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_cfg_update_charset_toggled" last_modification_time="Thu, 14 Apr 2005 19:38:42 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_update_charset">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Use selected encoding also when updating or syncing tracks</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_cfg_update_charset_toggled" last_modification_time="Thu, 14 Apr 2005 19:38:42 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_add_recursively">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">If you check this, gtkpod will descend into subdirectories recursively.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Add directories recursively</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_cfg_add_recursively_toggled" last_modification_time="Thu, 14 Apr 2005 19:38:51 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_sha1tracks">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Duplicate Recognition is based on a (modified) sha1 hash over the file.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Don't allow file duplication</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_cfg_sha1tracks_toggled" last_modification_time="Sat, 07 Apr 2007 04:29:18 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox111">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label259">
-					  <property name="visible">True</property>
-					  <property name="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.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>
-
-				      <child>
-					<widget class="GtkCheckButton" id="cfg_show_duplicates">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Display the list of duplicates that have been detected after adding files.</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Display info about detected duplicates</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_cfg_show_duplicates_toggled" last_modification_time="Thu, 14 Apr 2005 19:39:08 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>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_update_existing">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">When adding dirs/files, update information of
-existing tracks with identical filenames</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_cfg_update_existing_toggled" last_modification_time="Thu, 14 Apr 2005 19:39:15 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox112">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label260">
-					  <property name="visible">True</property>
-					  <property name="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.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>
-
-				      <child>
-					<widget class="GtkCheckButton" id="cfg_show_updated">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Display a list of tracks that could actually be updated.</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Display info about updated tracks</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_cfg_show_updated_toggled" last_modification_time="Thu, 14 Apr 2005 19:39:19 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>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox113">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label261">
-					  <property name="visible">True</property>
-					  <property name="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.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>
-
-				      <child>
-					<widget class="GtkCheckButton" id="cfg_show_non_updated">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Display a list of tracks that could not be updated.</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Display info about non-updated tracks</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_cfg_show_non_updated_toggled" last_modification_time="Thu, 14 Apr 2005 19:39:22 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>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label262">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">When syncing playlists</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="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox114">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label263">
-					  <property name="visible">True</property>
-					  <property name="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.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>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment13">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</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="GtkVBox" id="vbox116">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">4</property>
-
-					      <child>
-						<widget class="GtkCheckButton" id="sync_confirm_dirs_toggle">
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Confirm lists of directories</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="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkCheckButton" id="sync_delete_tracks_toggle">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">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.
-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.
-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.</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Delete tracks that are no longer present from the
-iPod or repository</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="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkCheckButton" id="sync_confirm_delete_toggle">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">This is the same option as in 'Edit/Delete Confirmation'</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Confirm before removing tracks from the iPod or repository</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_sync_confirm_delete_toggled" last_modification_time="Mon, 15 May 2006 15:28:49 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkCheckButton" id="sync_show_summary_toggle">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">Will show a list of tracks removed and a list of tracks newly added or updated.</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Show summary of sync result</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="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox117">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">8</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label264">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Sync&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox115">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label265">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkCheckButton" id="cfg_write_extended">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">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 &quot;transferred=&quot; entries in your backuped database).</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Write extended information (PC filenames, SHA1 hashes,
-encoding...). Recommended.</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_cfg_write_extended_info_toggled" last_modification_time="Sat, 04 Jan 2003 16:44:20 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>
-			      <property name="expand">False</property>
-			      <property name="fill">True</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>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label252">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_General</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="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow29">
-	      <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>
-		<widget class="GtkViewport" id="viewport24">
-		  <property name="visible">True</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox72">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">19</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox73">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label191">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Tag Reading&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox75">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label192">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox74">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="readtags">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Read tags from file contents (e.g. ID3 tags in MP3 files)</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_readtags_toggled" last_modification_time="Thu, 26 May 2005 15:28:01 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="parsetags">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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'.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Use this template to parse filename for tag information:</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_parsetags_toggled" last_modification_time="Thu, 26 May 2005 15:27:49 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox76">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label193">
-					  <property name="visible">True</property>
-					  <property name="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.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>
-
-				      <child>
-					<widget class="GtkVBox" id="vbox75">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">8</property>
-
-					  <child>
-					    <widget class="GtkEntry" id="parsetags_template">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="editable">True</property>
-					      <property name="visibility">True</property>
-					      <property name="max_length">0</property>
-					      <property name="text" translatable="yes"></property>
-					      <property name="has_frame">True</property>
-					      <property name="invisible_char">*</property>
-					      <property name="activates_default">False</property>
-					      <signal name="changed" handler="on_parsetags_template_changed" last_modification_time="Thu, 26 May 2005 15:28:19 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkCheckButton" id="parsetags_overwrite">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Overwrite tags that are already set</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_parsetags_overwrite_toggled" last_modification_time="Thu, 26 May 2005 15:28:32 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>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label194">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">As a last resort set the following tags to the
-filename if they are (still) empty:</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="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkTable" id="table32">
-				      <property name="visible">True</property>
-				      <property name="n_rows">2</property>
-				      <property name="n_columns">3</property>
-				      <property name="homogeneous">True</property>
-				      <property name="row_spacing">0</property>
-				      <property name="column_spacing">8</property>
-
-				      <child>
-					<widget class="GtkCheckButton" id="tag_autoset1">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Artist</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">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="GtkCheckButton" id="tag_autoset3">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Genre</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">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="tag_autoset2">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Album</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">1</property>
-					  <property name="right_attach">2</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="GtkCheckButton" id="tag_autoset4">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Composer</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">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"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="tag_autoset0">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Title</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">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>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox155">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label394">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Coverart&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox195">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label395">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox156">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="coverart_apic">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Music files can have images embedded in the APIC tag. Currently this is only supported for MP3 files.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Read coverart from embedded APIC data</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_coverart_apic_toggled" last_modification_time="Mon, 18 Sep 2006 06:14:57 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="coverart_file">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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'.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Add coverart from file using the following template</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_coverart_file_toggled" last_modification_time="Mon, 18 Sep 2006 06:14:44 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox196">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label396">
-					  <property name="visible">True</property>
-					  <property name="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.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>
-
-				      <child>
-					<widget class="GtkVBox" id="vbox157">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">6</property>
-
-					  <child>
-					    <widget class="GtkEntry" id="coverart_template">
-					      <property name="visible">True</property>
-					      <property name="tooltip" translatable="yes">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 '%': %%.</property>
-					      <property name="can_focus">True</property>
-					      <property name="editable">True</property>
-					      <property name="visibility">True</property>
-					      <property name="max_length">0</property>
-					      <property name="text" translatable="yes"></property>
-					      <property name="has_frame">True</property>
-					      <property name="invisible_char">*</property>
-					      <property name="activates_default">False</property>
-					      <signal name="changed" handler="on_coverart_template_changed" last_modification_time="Sat, 10 Dec 2005 13:42:35 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="label397">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">&lt;b&gt;Examples&lt;/b&gt;</property>
-					      <property name="use_underline">False</property>
-					      <property name="use_markup">True</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="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkTable" id="table42">
-					      <property name="visible">True</property>
-					      <property name="n_rows">6</property>
-					      <property name="n_columns">2</property>
-					      <property name="homogeneous">False</property>
-					      <property name="row_spacing">2</property>
-					      <property name="column_spacing">20</property>
-
-					      <child>
-						<widget class="GtkLabel" id="label398">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">folder.jpg</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="label399">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">folder</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">1</property>
-						  <property name="bottom_attach">2</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label400">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">../%A.jpg</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">2</property>
-						  <property name="bottom_attach">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label401">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">%A</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">3</property>
-						  <property name="bottom_attach">4</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label402">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Use &lt;i&gt;folder.jpg&lt;/i&gt; as cover art.</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">True</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">1</property>
-						  <property name="right_attach">2</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="label403">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Use &lt;i&gt;folder.jpg&lt;/i&gt;, &lt;i&gt;folder.png&lt;/i&gt;...</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">True</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">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"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label404">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Use &lt;i&gt;&amp;lt;Album&amp;gt;.jpg&lt;/i&gt; in the parent directory</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">True</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">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">2</property>
-						  <property name="bottom_attach">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label405">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Use &lt;i&gt;&amp;lt;Album&amp;gt;.jpg&lt;/i&gt;, &lt;i&gt;&amp;lt;Album&amp;gt;.png&lt;/i&gt;...</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">True</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">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">3</property>
-						  <property name="bottom_attach">4</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label406">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">folder.jpg;%a.jpg</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">4</property>
-						  <property name="bottom_attach">5</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label407">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">First try &lt;i&gt;folder.jpg&lt;/i&gt;, then &lt;i&gt;&amp;lt;artist&amp;gt;.jpg&lt;/i&gt;</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">True</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">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">4</property>
-						  <property name="bottom_attach">5</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label436">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">If both options are selected, embedded APIC data takes precedence.</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="padding">4</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>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox76">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label195">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;mserv&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox77">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label196">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox77">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">8</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_mserv_use">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Currently only rating is supported.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Use mserv database to fill additional information</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_mserv_use_toggled" last_modification_time="Sat, 16 Apr 2005 11:22:56 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkTable" id="table33">
-				      <property name="visible">True</property>
-				      <property name="n_rows">3</property>
-				      <property name="n_columns">3</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">6</property>
-				      <property name="column_spacing">12</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label198">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Music Root:</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="GtkEntry" id="mserv_music_root_entry">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">mserv database lookup will be done for music in this directory.</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label199">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">mserv Root:</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">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkEntry" id="mserv_trackinfo_root_entry">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Root directory of mserv database (trackinfo root).</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</property>
-					</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="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label200">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Username:</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">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkEntry" id="mserv_username_entry">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Username to be used for mserv database lookup.</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</property>
-					  <signal name="changed" handler="on_mserv_username_entry_changed" last_modification_time="Thu, 26 May 2005 15:29:20 GMT"/>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkButton" id="mserv_music_root_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Browse</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="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="GtkButton" id="mserv_trackinfo_root_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-					  <property name="right_attach">3</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></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="GtkCheckButton" id="cfg_mserv_report_probs">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Currently only rating is supported.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Show information about problems when accessing mserv</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_mserv_report_probs_toggled" last_modification_time="Sat, 16 Apr 2005 11:22:09 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>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label178">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Track Info</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="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow12">
-	      <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>
-		<widget class="GtkViewport" id="viewport9">
-		  <property name="visible">True</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox118">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">18</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox119">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label267">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Track Attributes&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="visible_cols_hbox">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label268">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<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>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</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="GtkVBox" id="vbox124">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label269">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Sort Tabs&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox118">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label270">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox125">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_group_compilations">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Keeps all compilation CDs grouped together in the artists sort tab.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Group artists on compilation CDs</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_cfg_group_compilations_toggled" last_modification_time="Sun, 23 Nov 2003 22:23:00 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox119">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">12</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label271">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">_Number of sort tabs:</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="mnemonic_widget">cfg_sort_tab_num_sb</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>
-
-				      <child>
-					<widget class="GtkSpinButton" id="cfg_sort_tab_num_sb">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="climb_rate">1</property>
-					  <property name="digits">0</property>
-					  <property name="numeric">False</property>
-					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-					  <property name="snap_to_ticks">False</property>
-					  <property name="wrap">False</property>
-					  <property name="adjustment">0 0 100 1 10 10</property>
-					  <signal name="value_changed" handler="on_cfg_sort_tab_num_sb_value_changed" last_modification_time="Thu, 14 Apr 2005 19:41:27 GMT"/>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</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="GtkVBox" id="vbox126">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label272">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Automatically select...&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox121">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label273">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="autoselect_vbox">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">8</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_mpl_autoselect">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">...master playlist</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_cfg_mpl_autoselect_toggled" last_modification_time="Sun, 09 Feb 2003 07:01:19 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label274">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">...entry 'All' in sort tab...</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">True</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">20</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>
-
-				  <child>
-				    <widget class="GtkHBox" id="autoselect_hbox">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<placeholder/>
-				      </child>
-
-				      <child>
-					<placeholder/>
-				      </child>
-
-				      <child>
-					<placeholder/>
-				      </child>
-
-				      <child>
-					<placeholder/>
-				      </child>
-
-				      <child>
-					<placeholder/>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</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="GtkVBox" id="vbox128">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label275">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Tooltips&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox123">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label276">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox129">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_display_tooltips_main">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Display tooltips in main window</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_cfg_display_tooltips_main_toggled" last_modification_time="Sat, 14 Jun 2003 16:46:29 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_display_tooltips_prefs">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Display tooltips in prefs window</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_cfg_display_tooltips_prefs_toggled" last_modification_time="Sat, 14 Jun 2003 16:46:49 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>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</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="GtkVBox" id="vbox132">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label280">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Toolbar&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox126">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label281">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox133">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_display_toolbar">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Display toolbar...</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_cfg_display_toolbar_toggled" last_modification_time="Fri, 14 Mar 2003 11:50:10 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox127">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label282">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </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.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>
-
-				      <child>
-					<widget class="GtkVBox" id="vbox134">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">6</property>
-
-					  <child>
-					    <widget class="GtkRadioButton" id="cfg_toolbar_style_icons">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">...as icons</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_cfg_toolbar_style_icons_toggled" last_modification_time="Fri, 14 Mar 2003 13:46:08 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkRadioButton" id="cfg_toolbar_style_text">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">...as text</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>
-					      <property name="group">cfg_toolbar_style_icons</property>
-					      <signal name="toggled" handler="on_cfg_toolbar_style_text_toggled" last_modification_time="Fri, 14 Mar 2003 13:29:43 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkRadioButton" id="cfg_toolbar_style_both">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">...both as icons and text</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>
-					      <property name="group">cfg_toolbar_style_icons</property>
-					      <signal name="toggled" handler="on_cfg_toolbar_style_both_toggled" last_modification_time="Fri, 14 Mar 2003 13:29:49 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>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</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="GtkVBox" id="vbox130">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label277">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Misc&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox124">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label278">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox131">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_startup_messages">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">This option will be re-activated when you upgrade gtkpod.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Display messages and warnings at startup</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_cfg_startup_messages" last_modification_time="Thu, 16 Dec 2004 12:49:12 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="button8">
-				      <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>
-				      <signal name="clicked" handler="on_sorting_clicked" last_modification_time="Fri, 06 May 2005 18:33:34 GMT"/>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment5">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</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="hbox125">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">2</property>
-
-					      <child>
-						<widget class="GtkImage" id="image2938">
-						  <property name="visible">True</property>
-						  <property name="stock">gtk-sort-ascending</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="label279">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Advanced Sorting Options</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">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</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>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label266">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Display</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="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow30">
-	      <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>
-		<widget class="GtkViewport" id="viewport25">
-		  <property name="visible">True</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox78">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">18</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox79">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label202">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Track Editing&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox79">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label203">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox80">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">8</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_id3_write">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">The tags are written to the files on your harddrive and on the iPod (if available).</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Write ID3 tags to disk when modified in gtkpod</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_cfg_id3_write_toggled" last_modification_time="Thu, 28 Apr 2005 18:07:39 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox80">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label204">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </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.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>
-
-				      <child>
-					<widget class="GtkVBox" id="vbox81">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">0</property>
-
-					  <child>
-					    <widget class="GtkCheckButton" id="cfg_write_charset">
-					      <property name="visible">True</property>
-					      <property name="tooltip" translatable="yes">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.</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Use selected encoding (on the 'General' page)
-when writing tags</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_cfg_write_charset_toggled" last_modification_time="Thu, 26 May 2005 15:32:16 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkCheckButton" id="cfg_id3_write_id3v24">
-					      <property name="visible">True</property>
-					      <property name="tooltip" translatable="yes">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.</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Always write ID3v2.4 tags (only applies to MP3)</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_cfg_id3_write_id3v24_toggled" last_modification_time="Thu, 26 May 2005 15:32:35 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>
-					  <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>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_multi_edit">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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.</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Use 'Multi-Edit' for tracks selections</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_cfg_multi_edit_toggled" last_modification_time="Thu, 28 Apr 2005 18:08:31 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox81">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label205">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">    </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.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>
-
-				      <child>
-					<widget class="GtkCheckButton" id="cfg_multi_edit_title">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">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).</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Use 'Multi-Edit' also for title field</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_cfg_multi_edit_title_toggled" last_modification_time="Thu, 26 May 2005 15:32:53 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>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox82">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label206">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Auto-Generated Playlists&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox82">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label207">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox83">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">8</property>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox83">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">8</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label208">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Number of tracks in generated playlists:</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.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>
-
-				      <child>
-					<widget class="GtkSpinButton" id="cfg_misc_track_nr">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Number of tracks in the generated playlists 'Most Often Listened', 'Best Rated' and 'Most Recently Played'. Choose '0' for 'no limit'.</property>
-					  <property name="can_focus">True</property>
-					  <property name="climb_rate">1</property>
-					  <property name="digits">0</property>
-					  <property name="numeric">False</property>
-					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-					  <property name="snap_to_ticks">False</property>
-					  <property name="wrap">False</property>
-					  <property name="adjustment">20 0 100 1 10 10</property>
-					  <signal name="value_changed" handler="on_cfg_misc_track_nr_value_changed" last_modification_time="Thu, 28 Apr 2005 18:09:09 GMT"/>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</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="GtkCheckButton" id="cfg_not_played_track">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Also include tracks never played in &quot;Best Rated&quot; playlist</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_cfg_not_played_track_toggled" last_modification_time="Thu, 28 Apr 2005 18:08:52 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>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox84">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label209">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Delete Confirmation&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox84">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label210">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox85">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">8</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_delete_track_from_playlist">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Before removing playlists or tracks from a playlist</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_cfg_delete_track_from_playlist_toggled" last_modification_time="Thu, 28 Apr 2005 18:09:28 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_delete_track_from_ipod">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Before removing tracks from the iPod</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_cfg_delete_track_from_ipod_toggled" last_modification_time="Thu, 28 Apr 2005 18:09:36 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_track_local_file_deletion">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Before removing tracks from the harddisk</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_cfg_track_local_file_deletion_toggled" last_modification_time="Tue, 24 May 2005 14:27:44 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="cfg_track_database_deletion">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Before removing tracks from the local 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_cfg_track_database_deletion_toggled" last_modification_time="Tue, 24 May 2005 14:28:06 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="sync_confirm_delete_toggle2">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Confirm before removing tracks from the iPod or repository
-when syncing playlists</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_sync_confirm_delete_toggled" last_modification_time="Mon, 15 May 2006 15:29:44 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <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>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label201">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Edit</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="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow31">
-	      <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>
-		<widget class="GtkViewport" id="viewport26">
-		  <property name="visible">True</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox86">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">18</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox87">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label212">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Play&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox85">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label213">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkTable" id="table50">
-				  <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">8</property>
-				  <property name="column_spacing">8</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="label214">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Command for 'Play now':</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="label215">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Command for 'Enqueue':</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">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="play_now_path_entry">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">For example, 'xmms %s' will clear xmms' current playlist, add the selected tracks and start playing.</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="play_enqueue_path_entry">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' current playlist.</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </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="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="play_now_path_button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Browse</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="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="GtkButton" id="play_enqueue_path_button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox89">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label216">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Volume Normalization&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox88">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label218">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkTable" id="table49">
-				  <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">8</property>
-				  <property name="column_spacing">8</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="label219">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">'mp3gain' executable:</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="GtkEntry" id="mp3gain_path_entry">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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.</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="mp3gain_path_button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Browse</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="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="GtkLabel" id="label432">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">'aacgain' executable:</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">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="aacgain_path_entry">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">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.</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </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="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="aacgain_path_button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-				      <property name="right_attach">3</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox90">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label220">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Calendar/Contacts/Notes&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox90">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label221">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox91">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkButton" id="button23">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Set options for Calendar/Contacts/Notes</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <signal name="clicked" handler="on_calendar_contact_notes_options_clicked" last_modification_time="Tue, 09 May 2006 15:54:43 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox174">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label432">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;On-the-fly Conversion&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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</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>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox210">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label457">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox181">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">7</property>
-
-				  <child>
-				    <widget class="GtkTable" id="convert_table">
-				      <property name="visible">True</property>
-				      <property name="n_rows">5</property>
-				      <property name="n_columns">4</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">8</property>
-				      <property name="column_spacing">8</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label436">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Ogg with :</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.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="left_attach">1</property>
-					  <property name="right_attach">2</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="GtkEntry" id="path_conv_ogg_entry">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</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="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkButton" id="path_conv_ogg_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Browse</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="left_attach">3</property>
-					  <property name="right_attach">4</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="label449">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Flac with :</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.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="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"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkEntry" id="path_conv_flac_entry">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</property>
-					</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>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkButton" id="path_conv_flac_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Browse</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="left_attach">3</property>
-					  <property name="right_attach">4</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label456">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">M4A with :</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.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="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkEntry" id="path_conv_m4a_entry">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">2</property>
-					  <property name="right_attach">3</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkButton" id="path_conv_m4a_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Browse</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="left_attach">3</property>
-					  <property name="right_attach">4</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label452">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">MP3 with :</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.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="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">3</property>
-					  <property name="bottom_attach">4</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkEntry" id="path_conv_mp3_entry">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">2</property>
-					  <property name="right_attach">3</property>
-					  <property name="top_attach">3</property>
-					  <property name="bottom_attach">4</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkButton" id="path_conv_mp3_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Browse</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="left_attach">3</property>
-					  <property name="right_attach">4</property>
-					  <property name="top_attach">3</property>
-					  <property name="bottom_attach">4</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label454">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">WAV with :</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.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="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">4</property>
-					  <property name="bottom_attach">5</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkEntry" id="path_conv_wav_entry">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="editable">True</property>
-					  <property name="visibility">True</property>
-					  <property name="max_length">0</property>
-					  <property name="text" translatable="yes"></property>
-					  <property name="has_frame">True</property>
-					  <property name="invisible_char">*</property>
-					  <property name="activates_default">False</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">2</property>
-					  <property name="right_attach">3</property>
-					  <property name="top_attach">4</property>
-					  <property name="bottom_attach">5</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkButton" id="path_conv_wav_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Browse</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="left_attach">3</property>
-					  <property name="right_attach">4</property>
-					  <property name="top_attach">4</property>
-					  <property name="bottom_attach">5</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="convert_ogg">
-					  <property name="visible">True</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">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="GtkCheckButton" id="convert_flac">
-					  <property name="visible">True</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">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="convert_m4a">
-					  <property name="visible">True</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">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="convert_mp3">
-					  <property name="visible">True</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">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">3</property>
-					  <property name="bottom_attach">4</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="convert_wav">
-					  <property name="visible">True</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">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">4</property>
-					  <property name="bottom_attach">5</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></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="GtkTable" id="table52">
-				      <property name="visible">True</property>
-				      <property name="n_rows">4</property>
-				      <property name="n_columns">2</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">8</property>
-				      <property name="column_spacing">8</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label459">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Maximum number of background threads:</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="label460">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Maximum size of cache directory (in GB):</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">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkSpinButton" id="file_convert_max_threads_num_spinbutton">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Set to 0 to use as many background threads as CPUs are available on your system.</property>
-					  <property name="can_focus">True</property>
-					  <property name="climb_rate">1</property>
-					  <property name="digits">0</property>
-					  <property name="numeric">True</property>
-					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-					  <property name="snap_to_ticks">True</property>
-					  <property name="wrap">False</property>
-					  <property name="adjustment">0 0 1048576 1 10 10</property>
-					  <signal name="value_changed" handler="on_file_convert_max_threads_num_spinbutton_value_changed" last_modification_time="Sat, 21 Apr 2007 08:08:12 GMT"/>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkSpinButton" id="file_convert_maxdirsize_spinbutton">
-					  <property name="visible">True</property>
-					  <property name="tooltip" translatable="yes">Set to 0 to effectively disable caching (a maximum of one track will be cached at a time).</property>
-					  <property name="can_focus">True</property>
-					  <property name="climb_rate">1</property>
-					  <property name="digits">1</property>
-					  <property name="numeric">True</property>
-					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-					  <property name="snap_to_ticks">False</property>
-					  <property name="wrap">False</property>
-					  <property name="adjustment">4 0 1048576 1 10 10</property>
-					  <signal name="value_changed" handler="on_file_convert_maxdirsize_spinbutton_value_changed" last_modification_time="Sat, 21 Apr 2007 08:11:25 GMT"/>
-					</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="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkHBox" id="hbox212">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">8</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="label461">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Cache directory:</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="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkEntry" id="file_convert_cachedir_entry">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="editable">False</property>
-					      <property name="visibility">True</property>
-					      <property name="max_length">0</property>
-					      <property name="text" translatable="yes"></property>
-					      <property name="has_frame">False</property>
-					      <property name="invisible_char">*</property>
-					      <property name="activates_default">False</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="x_options">fill</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="file_convert_display_log_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Display conversion log</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">0</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">3</property>
-					  <property name="bottom_attach">4</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">8</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label211">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Tools</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="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindowfm">
-	      <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>
-		<widget class="GtkViewport" id="viewport27">
-		  <property name="visible">True</property>
-		  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vboxfm">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">18</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vboxfm1">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="labelfm1">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Audioscrobbler&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hboxfm1">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label439">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkTable" id="tablefm1">
-				  <property name="visible">True</property>
-				  <property name="n_rows">1</property>
-				  <property name="n_columns">1</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">8</property>
-				  <property name="column_spacing">8</property>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="lastfm_active">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Scrobble Tracks?</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_lastfm_active_toggled" last_modification_time="Mon, 23 Oct 2006 09:12:05 GMT"/>
-				    </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>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vboxfm2">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="labelfm2">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Account Information&lt;/b&gt;</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</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="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hboxfm2">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">8</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label443">
-				  <property name="visible">True</property>
-				  <property name="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.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>
-
-			      <child>
-				<widget class="GtkTable" id="tablefm2">
-				  <property name="visible">True</property>
-				  <property name="n_rows">2</property>
-				  <property name="n_columns">2</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">8</property>
-				  <property name="column_spacing">8</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="labelfm21">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Username:</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="GtkEntry" id="lastfm_username">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Set this to your last.fm username</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">20</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				      <signal name="changed" handler="on_lastfm_username_entry_changed" last_modification_time="Mon, 23 Oct 2006 09:14:10 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="label22">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Password:</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">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="lastfm_password">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Set this to your last.fm password</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">False</property>
-				      <property name="max_length">32</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				      <signal name="changed" handler="on_lastfm_password_entry_changed" last_modification_time="Mon, 23 Oct 2006 09:15:27 GMT"/>
-				    </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="y_options"></property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="labelfm">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Last.FM</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="type">tab</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="GtkHButtonBox" id="hbuttonbox12">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">8</property>
-
-	  <child>
-	    <widget class="GtkButton" id="prefs_apply">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_prefs_apply_clicked" last_modification_time="Fri, 06 May 2005 17:42:20 GMT"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="prefs_cancel">
-	      <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>
-	      <signal name="clicked" handler="on_prefs_cancel_clicked" last_modification_time="Fri, 06 May 2005 17:41:59 GMT"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="prefs_ok">
-	      <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>
-	      <signal name="clicked" handler="on_prefs_ok_clicked" last_modification_time="Fri, 06 May 2005 17:22:23 GMT"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="details_window">
-  <property name="title" translatable="yes">Details</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="icon">gtkpod-icon-48.png</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="GtkVBox" id="vbox150">
-      <property name="border_width">6</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">4</property>
-
-      <child>
-	<widget class="GtkLabel" id="details_label_artist_title">
-	  <property name="visible">True</property>
-	  <property name="label">label</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">True</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">3</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>
-
-      <child>
-	<widget class="GtkViewport" id="details_viewport">
-	  <property name="border_width">2</property>
-	  <property name="visible">True</property>
-	  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox188">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">4</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox151">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label340">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Cover</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.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">6</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">2</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkViewport" id="viewport18">
-		      <property name="visible">True</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		      <child>
-			<widget class="GtkImage" id="details_image_thumbnail">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">3</property>
-			  <property name="ypad">3</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">6</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="details_button_set_artwork">
-		      <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="alignment6">
-			  <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="hbox190">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image3072">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-open</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="label341">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Set Cover Art from _File</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">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="details_checkbutton_writethrough">
-		      <property name="border_width">3</property>
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">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.</property>
-		      <property name="can_focus">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>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment7">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</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="hbox191">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image3074">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-dialog-warning</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="label342">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Change all tracks
+                    <property name="use_underline">True</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkCheckButton" id="export_files_check_existing">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip" translatable="yes">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.</property>
+                    <property name="label" translatable="yes">Check for existing files when copying from iPod.</property>
+                    <property name="use_underline">True</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="ef_message_box">
+                    <property name="visible">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="ef_message">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="yalign">0</property>
+                        <property name="wrap">True</property>
+                        <property name="selectable">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="scrolledwindow13">
+                        <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>
+                        <child>
+                          <widget class="GtkTextView" id="ef_textview">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="wrap_mode">GTK_WRAP_WORD</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="padding">2</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkLabel" id="label72">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="label" translatable="yes">&lt;b&gt;gtkpod Options&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+            <property name="selectable">True</property>
+          </widget>
+          <packing>
+            <property name="type">label_item</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="spl_window">
+    <property name="title" translatable="yes">Smart Playlist</property>
+    <property name="icon">gtkpod-icon-48.png</property>
+    <child>
+      <widget class="GtkVBox" id="vbox28">
+        <property name="visible">True</property>
+        <property name="border_width">5</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox63">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="spacing">18</property>
+            <child>
+              <widget class="GtkFrame" id="frame17">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment35">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkTable" id="table3">
+                        <property name="visible">True</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <widget class="GtkEntry" id="spl_name_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">*</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox38">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkLabel" id="label175">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Playlist name:</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox39">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkLabel" id="label34">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Match:</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox40">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkComboBox" id="spl_match_rules">
+                                <property name="visible">True</property>
+                                <property name="items" translatable="yes">Any rules
+All rules
+Ignore rules</property>
+                                <signal name="changed" handler="spl_match_rules_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</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="y_options"></property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;General Options&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="spl_rules_frame">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment34">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox30">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkScrolledWindow" id="scrolledwindow16">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <child>
+                              <widget class="GtkViewport" id="viewport10">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="spl_rules_table_align">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label174">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Rules&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                    <property name="selectable">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="frame18">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment33">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox28">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox62">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="spl_checklimits_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Limit to</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="spl_limitvalue_entry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="max_length">12</property>
+                                <property name="invisible_char">*</property>
+                                <property name="width_chars">6</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="spl_limittype_combobox">
+                                <property name="visible">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment32">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox63">
+                                <property name="visible">True</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <widget class="GtkLabel" id="spl_limitsort_label">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Sort by:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkComboBox" id="spl_limitsort_combobox">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="spl_matchcheckedonly_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Match only _checked tracks</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="spl_liveupdate_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Live _updating</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label35">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Advanced Options&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox11">
+            <property name="visible">True</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="spl_cancel_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="spl_ok_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-save</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="details_window">
+    <property name="title" translatable="yes">Details</property>
+    <property name="icon">gtkpod-icon-48.png</property>
+    <child>
+      <widget class="GtkVBox" id="vbox150">
+        <property name="visible">True</property>
+        <property name="border_width">6</property>
+        <property name="spacing">4</property>
+        <child>
+          <widget class="GtkLabel" id="details_label_artist_title">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="ypad">3</property>
+            <property name="label">label</property>
+            <property name="use_markup">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkViewport" id="details_viewport">
+            <property name="visible">True</property>
+            <property name="border_width">2</property>
+            <child>
+              <widget class="GtkHBox" id="hbox188">
+                <property name="visible">True</property>
+                <property name="spacing">4</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox151">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label340">
+                        <property name="visible">True</property>
+                        <property name="ypad">6</property>
+                        <property name="label" translatable="yes">Cover</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkViewport" id="viewport18">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkImage" id="details_image_thumbnail">
+                            <property name="visible">True</property>
+                            <property name="xpad">3</property>
+                            <property name="ypad">3</property>
+                            <property name="stock">gtk-missing-image</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">6</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="details_button_set_artwork">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox190">
+                            <property name="visible">True</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <widget class="GtkLabel" id="label60">
+                                <property name="visible">True</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkImage" id="image3072">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-open</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label341">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Set Cover Art from _File</property>
+                                <property name="use_underline">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label61">
+                                <property name="visible">True</property>
+                              </widget>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="details_button_remove_artwork">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox192">
+                            <property name="visible">True</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <widget class="GtkLabel" id="label67">
+                                <property name="visible">True</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkImage" id="image3075">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-delete</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label389">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Remove Cover Art</property>
+                                <property name="use_underline">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label68">
+                                <property name="visible">True</property>
+                              </widget>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHSeparator" id="hseparator56">
+                        <property name="visible">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="padding">5</property>
+                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="details_checkbutton_writethrough">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="tooltip" translatable="yes">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.</property>
+                        <property name="border_width">3</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment7">
+                            <property name="visible">True</property>
+                            <property name="xscale">0</property>
+                            <property name="yscale">0</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox191">
+                                <property name="visible">True</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <widget class="GtkImage" id="image3074">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-dialog-warning</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label342">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Change all tracks
 simultaneously</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>
-		      <property name="pack_type">GTK_PACK_END</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHSeparator" id="hseparator56">
-		      <property name="visible">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">5</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		      <property name="pack_type">GTK_PACK_END</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkButton" id="details_button_remove_artwork">
-		      <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="alignment8">
-			  <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="hbox192">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
-
-			      <child>
-				<widget class="GtkImage" id="image3075">
-				  <property name="visible">True</property>
-				  <property name="stock">gtk-delete</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="label389">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Remove Cover Art</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">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">2</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkNotebook" id="details_notebook">
-		  <property name="border_width">2</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="show_tabs">True</property>
-		  <property name="show_border">True</property>
-		  <property name="tab_pos">GTK_POS_TOP</property>
-		  <property name="scrollable">False</property>
-		  <property name="enable_popup">False</property>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow20">
-		      <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="GtkViewport" id="viewport14">
-			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox153">
-			      <property name="border_width">6</property>
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkTable" id="table36">
-				  <property name="visible">True</property>
-				  <property name="n_rows">13</property>
-				  <property name="n_columns">4</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">2</property>
-				  <property name="column_spacing">10</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_47">
-				      <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">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="GtkCheckButton" id="details_checkbutton_38">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label">(Remember playback position)</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">2</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">10</property>
-				      <property name="bottom_attach">11</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="details_checkbutton_35">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">(Checked)</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">2</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">11</property>
-				      <property name="bottom_attach">12</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="details_checkbutton_28">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label">(Compilation)</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">0</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">12</property>
-				      <property name="bottom_attach">13</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="details_checkbutton_39">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label">(Skip when shuffling)</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">0</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">11</property>
-				      <property name="bottom_attach">12</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_41">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">10</property>
-				      <property name="bottom_attach">11</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_11">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">9</property>
-				      <property name="bottom_attach">10</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_11">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">9</property>
-				      <property name="bottom_attach">10</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_37">
-				      <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">9</property>
-				      <property name="bottom_attach">10</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_37">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">9</property>
-				      <property name="bottom_attach">10</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_26">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">8</property>
-				      <property name="bottom_attach">9</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_18">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">7</property>
-				      <property name="bottom_attach">8</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_25">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">6</property>
-				      <property name="bottom_attach">7</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_26">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">8</property>
-				      <property name="bottom_attach">9</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_18">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">7</property>
-				      <property name="bottom_attach">8</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_25">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">6</property>
-				      <property name="bottom_attach">7</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_36">
-				      <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">8</property>
-				      <property name="bottom_attach">9</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_14">
-				      <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">7</property>
-				      <property name="bottom_attach">8</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_19">
-				      <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">6</property>
-				      <property name="bottom_attach">7</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_36">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">8</property>
-				      <property name="bottom_attach">9</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_14">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">7</property>
-				      <property name="bottom_attach">8</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_19">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">6</property>
-				      <property name="bottom_attach">7</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_4">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">5</property>
-				      <property name="bottom_attach">6</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_6">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">4</property>
-				      <property name="bottom_attach">5</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_3">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">3</property>
-				      <property name="bottom_attach">4</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_4">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">5</property>
-				      <property name="bottom_attach">6</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_6">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">4</property>
-				      <property name="bottom_attach">5</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_3">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">3</property>
-				      <property name="bottom_attach">4</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_47">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkComboBox" id="details_combobox_41">
-				      <property name="visible">True</property>
-				      <property name="add_tearoffs">False</property>
-				      <property name="focus_on_click">True</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">10</property>
-				      <property name="bottom_attach">11</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_1">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_1">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_2">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_2">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<placeholder/>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label343">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_General</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="mnemonic_widget">scrolledwindow20</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="type">tab</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow32">
-		      <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="GtkViewport" id="viewport28">
-			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-			  <child>
-			    <widget class="GtkTable" id="table53">
-			      <property name="border_width">6</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">6</property>
-			      <property name="n_columns">2</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">2</property>
-			      <property name="column_spacing">10</property>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_51">
-				  <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">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="details_label_48">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_50">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_49">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_52">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">4</property>
-				  <property name="bottom_attach">5</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_51">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_48">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</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="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_50">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_49">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_52">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">4</property>
-				  <property name="bottom_attach">5</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_53">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">5</property>
-				  <property name="bottom_attach">6</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_53">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">5</property>
-				  <property name="bottom_attach">6</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label465">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Sorting</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="mnemonic_widget">details_notebook</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="type">tab</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow22">
-		      <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="GtkViewport" id="viewport16">
-			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-			  <child>
-			    <widget class="GtkTable" id="table41">
-			      <property name="border_width">6</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">6</property>
-			      <property name="n_columns">5</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">2</property>
-			      <property name="column_spacing">10</property>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_5">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">4</property>
-				  <property name="bottom_attach">5</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_31">
-				  <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">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="details_label_34">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_33">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">5</property>
-				  <property name="bottom_attach">6</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_30">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_32">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_31">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">5</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_34">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">5</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_32">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">5</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkScrolledWindow" id="scrolledwindow25">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-				  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-				  <property name="shadow_type">GTK_SHADOW_IN</property>
-				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-				  <child>
-				    <widget class="GtkTextView" id="details_textview_5">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="overwrite">False</property>
-				      <property name="accepts_tab">True</property>
-				      <property name="justification">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap_mode">GTK_WRAP_WORD</property>
-				      <property name="cursor_visible">True</property>
-				      <property name="pixels_above_lines">0</property>
-				      <property name="pixels_below_lines">0</property>
-				      <property name="pixels_inside_wrap">0</property>
-				      <property name="left_margin">0</property>
-				      <property name="right_margin">0</property>
-				      <property name="indent">0</property>
-				      <property name="text"></property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">5</property>
-				  <property name="top_attach">4</property>
-				  <property name="bottom_attach">5</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkScrolledWindow" id="scrolledwindow26">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-				  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-				  <property name="shadow_type">GTK_SHADOW_IN</property>
-				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-				  <child>
-				    <widget class="GtkTextView" id="details_textview_33">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="overwrite">False</property>
-				      <property name="accepts_tab">True</property>
-				      <property name="justification">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap_mode">GTK_WRAP_WORD</property>
-				      <property name="cursor_visible">True</property>
-				      <property name="pixels_above_lines">0</property>
-				      <property name="pixels_below_lines">0</property>
-				      <property name="pixels_inside_wrap">0</property>
-				      <property name="left_margin">0</property>
-				      <property name="right_margin">0</property>
-				      <property name="indent">0</property>
-				      <property name="text"></property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">5</property>
-				  <property name="top_attach">5</property>
-				  <property name="bottom_attach">6</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkScrolledWindow" id="scrolledwindow24">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-				  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-				  <property name="shadow_type">GTK_SHADOW_IN</property>
-				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-				  <child>
-				    <widget class="GtkTextView" id="details_textview_30">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="overwrite">False</property>
-				      <property name="accepts_tab">True</property>
-				      <property name="justification">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap_mode">GTK_WRAP_WORD</property>
-				      <property name="cursor_visible">True</property>
-				      <property name="pixels_above_lines">0</property>
-				      <property name="pixels_below_lines">0</property>
-				      <property name="pixels_inside_wrap">0</property>
-				      <property name="left_margin">0</property>
-				      <property name="right_margin">0</property>
-				      <property name="indent">0</property>
-				      <property name="text"></property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">5</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label345">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Podcasts</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="mnemonic_widget">scrolledwindow20</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="type">tab</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow28">
-		      <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="GtkViewport" id="viewport23">
-			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-			  <child>
-			    <widget class="GtkTable" id="table51">
-			      <property name="border_width">6</property>
-			      <property name="visible">True</property>
-			      <property name="n_rows">5</property>
-			      <property name="n_columns">2</property>
-			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">2</property>
-			      <property name="column_spacing">10</property>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_42">
-				  <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">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="details_label_43">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_44">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_45">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="details_label_46">
-				  <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">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">4</property>
-				  <property name="bottom_attach">5</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_42">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_43">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</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="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_44">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_45">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">3</property>
-				  <property name="bottom_attach">4</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkEntry" id="details_entry_46">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">4</property>
-				  <property name="bottom_attach">5</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label444">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Video</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="mnemonic_widget">details_notebook</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="type">tab</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow23">
-		      <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="GtkViewport" id="viewport17">
-			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox152">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkTable" id="table37">
-				  <property name="border_width">6</property>
-				  <property name="visible">True</property>
-				  <property name="n_rows">13</property>
-				  <property name="n_columns">4</property>
-				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">2</property>
-				  <property name="column_spacing">10</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_20">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_22">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">3</property>
-				      <property name="bottom_attach">4</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_21">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">4</property>
-				      <property name="bottom_attach">5</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_27">
-				      <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">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="details_label_29">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_8">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">5</property>
-				      <property name="bottom_attach">6</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_9">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">6</property>
-				      <property name="bottom_attach">7</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_12">
-				      <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">0</property>
-				      <property name="right_attach">1</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="GtkLabel" id="details_label_17">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">11</property>
-				      <property name="bottom_attach">12</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_15">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">10</property>
-				      <property name="bottom_attach">11</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_23">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">9</property>
-				      <property name="bottom_attach">10</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_7">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">8</property>
-				      <property name="bottom_attach">9</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_13">
-				      <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">11</property>
-				      <property name="bottom_attach">12</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_16">
-				      <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">10</property>
-				      <property name="bottom_attach">11</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_24">
-				      <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">9</property>
-				      <property name="bottom_attach">10</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_10">
-				      <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">8</property>
-				      <property name="bottom_attach">9</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_13">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">11</property>
-				      <property name="bottom_attach">12</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkLabel" id="details_label_40">
-				      <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">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">7</property>
-				      <property name="bottom_attach">8</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_40">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">False</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">False</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">7</property>
-				      <property name="bottom_attach">8</property>
-				      <property name="x_padding">1</property>
-				      <property name="y_padding">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_9">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">False</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">False</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">6</property>
-				      <property name="bottom_attach">7</property>
-				      <property name="x_padding">1</property>
-				      <property name="y_padding">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_8">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">False</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">False</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">5</property>
-				      <property name="bottom_attach">6</property>
-				      <property name="x_padding">1</property>
-				      <property name="y_padding">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_21">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">4</property>
-				      <property name="bottom_attach">5</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_22">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">3</property>
-				      <property name="bottom_attach">4</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_20">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">2</property>
-				      <property name="bottom_attach">3</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_29">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_27">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkCheckButton" id="details_checkbutton_12">
-				      <property name="visible">True</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">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">12</property>
-				      <property name="bottom_attach">13</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_17">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">11</property>
-				      <property name="bottom_attach">12</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_15">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">10</property>
-				      <property name="bottom_attach">11</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_23">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">9</property>
-				      <property name="bottom_attach">10</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_7">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">8</property>
-				      <property name="bottom_attach">9</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_10">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">False</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">False</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">8</property>
-				      <property name="bottom_attach">9</property>
-				      <property name="x_padding">1</property>
-				      <property name="y_padding">1</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_24">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">9</property>
-				      <property name="bottom_attach">10</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkEntry" id="details_entry_16">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">3</property>
-				      <property name="right_attach">4</property>
-				      <property name="top_attach">10</property>
-				      <property name="bottom_attach">11</property>
-				      <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>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<placeholder/>
-			      </child>
-
-			      <child>
-				<placeholder/>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="tab_expand">False</property>
-		      <property name="tab_fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label346">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Misc.</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="mnemonic_widget">scrolledwindow20</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="type">tab</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>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator55">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox187">
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox186">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">0</property>
-
-	      <child>
-		<widget class="GtkButton" id="details_button_first">
-		  <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="GtkImage" id="image3068">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-goto-first</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="details_button_previous">
-		  <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="GtkImage" id="image3069">
-		      <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>
-
-	      <child>
-		<widget class="GtkLabel" id="details_label_index">
-		  <property name="visible">True</property>
-		  <property name="label">n/n</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.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">5</property>
-		  <property name="ypad">4</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">5</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="details_button_next">
-		  <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="GtkImage" id="image3070">
-		      <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="details_button_last">
-		  <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="GtkImage" id="image3071">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-goto-last</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">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHButtonBox" id="hbuttonbox13">
-	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_END</property>
-	      <property name="spacing">7</property>
-
-	      <child>
-		<widget class="GtkButton" id="details_button_apply">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-apply</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="details_button_cancel">
-		  <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>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="details_button_ok">
-		  <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>
-		</widget>
-	      </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>
-
-	  <child>
-	    <widget class="GtkHButtonBox" id="hbuttonbox14">
-	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_END</property>
-	      <property name="spacing">7</property>
-
-	      <child>
-		<widget class="GtkButton" id="details_button_undo_all">
-		  <property name="visible">True</property>
-		  <property name="can_default">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="alignment9">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</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="hbox193">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image3076">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-undo</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="label390">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Undo All</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>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="details_button_undo_track">
-		  <property name="visible">True</property>
-		  <property name="can_default">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="alignment10">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</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="hbox194">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image3077">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-undo</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="label391">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Undo _Track</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>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</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>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="repository_window">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Repository Options</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="icon">gtkpod-icon-48.png</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="GtkVBox" id="vbox159">
-      <property name="border_width">12</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">4</property>
-
-      <child>
-	<widget class="GtkScrolledWindow" id="scrolledwindow27">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_NEVER</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>
-	    <widget class="GtkViewport" id="viewport19">
-	      <property name="visible">True</property>
-	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox168">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">10</property>
-
-		  <child>
-		    <widget class="GtkFrame" id="frame1">
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment11">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</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="GtkViewport" id="viewport21">
-			      <property name="visible">True</property>
-			      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox160">
-				  <property name="border_width">6</property>
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">4</property>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox198">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">6</property>
-
-				      <child>
-					<widget class="GtkComboBox" id="repository_combo">
-					  <property name="visible">True</property>
-					  <property name="add_tearoffs">False</property>
-					  <property name="focus_on_click">True</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="repository_type_label">
-					  <property name="visible">True</property>
-					  <property name="label">&lt;i&gt;Repository type&lt;/i&gt;</property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">True</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">6</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkButton" id="new_repository_button">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Add new repository/iPod</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>
-					  <property name="pack_type">GTK_PACK_END</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox197">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">8</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label408">
-					  <property name="visible">True</property>
-					  <property name="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.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>
-
-				      <child>
-					<widget class="GtkVBox" id="repository_vbox">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">4</property>
-
-					  <child>
-					    <widget class="GtkTable" id="path_table_ipod">
-					      <property name="visible">True</property>
-					      <property name="n_rows">10</property>
-					      <property name="n_columns">3</property>
-					      <property name="homogeneous">False</property>
-					      <property name="row_spacing">0</property>
-					      <property name="column_spacing">0</property>
-
-					      <child>
-						<widget class="GtkLabel" id="mountpoint_label">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">iPod mountpoint:</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">10</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">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="backup_label">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">iTunesDB backup:</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">10</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">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="GtkLabel" id="ipod_model_label">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Model:</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">10</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">2</property>
-						  <property name="bottom_attach">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="local_path_label">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Path:</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">10</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">3</property>
-						  <property name="bottom_attach">4</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="ipod_sync_label">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">&lt;b&gt;Synchronization&lt;/b&gt;</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">True</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">1</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">4</property>
-						  <property name="bottom_attach">5</property>
-						  <property name="y_padding">4</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="spacer_label1">
-						  <property name="visible">True</property>
-						  <property name="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">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">4</property>
-						  <property name="bottom_attach">5</property>
-						  <property name="y_padding">6</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="ipod_sync_contacts_label">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Contacts sync command:</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">10</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">5</property>
-						  <property name="bottom_attach">6</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="ipod_sync_calendar_label">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Calendar sync command:</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">10</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">6</property>
-						  <property name="bottom_attach">7</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="ipod_sync_notes_label">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Notes sync command:</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">10</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">7</property>
-						  <property name="bottom_attach">8</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkCheckButton" id="ipod_concal_autosync_toggle">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Call automatically when synchronizing iTunesDB</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_concal_autosync_toggled" last_modification_time="Thu, 28 Apr 2005 18:12:10 GMT"/>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">8</property>
-						  <property name="bottom_attach">9</property>
-						  <property name="x_padding">10</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkEntry" id="mountpoint_entry">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
-						  <property name="can_focus">True</property>
-						  <property name="editable">True</property>
-						  <property name="visibility">True</property>
-						  <property name="max_length">0</property>
-						  <property name="text" translatable="yes"></property>
-						  <property name="has_frame">True</property>
-						  <property name="invisible_char">*</property>
-						  <property name="activates_default">False</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">0</property>
-						  <property name="bottom_attach">1</property>
-						  <property name="x_padding">3</property>
-						  <property name="y_padding">3</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkEntry" id="backup_entry">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
-						  <property name="can_focus">True</property>
-						  <property name="editable">True</property>
-						  <property name="visibility">True</property>
-						  <property name="max_length">0</property>
-						  <property name="text" translatable="yes"></property>
-						  <property name="has_frame">True</property>
-						  <property name="invisible_char">*</property>
-						  <property name="activates_default">False</property>
-						</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_padding">3</property>
-						  <property name="y_padding">3</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkEntry" id="local_path_entry">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
-						  <property name="can_focus">True</property>
-						  <property name="editable">False</property>
-						  <property name="visibility">True</property>
-						  <property name="max_length">0</property>
-						  <property name="text" translatable="yes"></property>
-						  <property name="has_frame">True</property>
-						  <property name="invisible_char">*</property>
-						  <property name="activates_default">False</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">3</property>
-						  <property name="bottom_attach">4</property>
-						  <property name="x_padding">3</property>
-						  <property name="y_padding">3</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkEntry" id="ipod_sync_contacts_entry">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
-						  <property name="can_focus">True</property>
-						  <property name="editable">True</property>
-						  <property name="visibility">True</property>
-						  <property name="max_length">0</property>
-						  <property name="text" translatable="yes"></property>
-						  <property name="has_frame">True</property>
-						  <property name="invisible_char">*</property>
-						  <property name="activates_default">False</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">5</property>
-						  <property name="bottom_attach">6</property>
-						  <property name="x_padding">3</property>
-						  <property name="y_padding">3</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkEntry" id="ipod_sync_calendar_entry">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
-						  <property name="can_focus">True</property>
-						  <property name="editable">True</property>
-						  <property name="visibility">True</property>
-						  <property name="max_length">0</property>
-						  <property name="text" translatable="yes"></property>
-						  <property name="has_frame">True</property>
-						  <property name="invisible_char">*</property>
-						  <property name="activates_default">False</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">6</property>
-						  <property name="bottom_attach">7</property>
-						  <property name="x_padding">3</property>
-						  <property name="y_padding">3</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkEntry" id="ipod_sync_notes_entry">
-						  <property name="visible">True</property>
-						  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
-						  <property name="can_focus">True</property>
-						  <property name="editable">True</property>
-						  <property name="visibility">True</property>
-						  <property name="max_length">0</property>
-						  <property name="text" translatable="yes"></property>
-						  <property name="has_frame">True</property>
-						  <property name="invisible_char">*</property>
-						  <property name="activates_default">False</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">7</property>
-						  <property name="bottom_attach">8</property>
-						  <property name="x_padding">3</property>
-						  <property name="y_padding">3</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkButton" id="mountpoint_button">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Browse</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="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_padding">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkButton" id="ipod_sync_contacts_button">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">5</property>
-						  <property name="bottom_attach">6</property>
-						  <property name="x_padding">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkButton" id="ipod_sync_calendar_button">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">6</property>
-						  <property name="bottom_attach">7</property>
-						  <property name="x_padding">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkButton" id="ipod_sync_notes_button">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">7</property>
-						  <property name="bottom_attach">8</property>
-						  <property name="x_padding">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkButton" id="backup_button">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-						  <property name="right_attach">3</property>
-						  <property name="top_attach">1</property>
-						  <property name="bottom_attach">2</property>
-						  <property name="x_padding">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkComboBoxEntry" id="ipod_model_combo">
-						  <property name="visible">True</property>
-						  <property name="add_tearoffs">False</property>
-						  <property name="has_frame">True</property>
-						  <property name="focus_on_click">True</property>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">2</property>
-						  <property name="bottom_attach">3</property>
-						  <property name="x_padding">3</property>
-						  <property name="y_padding">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-					    </widget>
-					    <packing>
-					      <property name="padding">6</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkTable" id="table45">
-					      <property name="visible">True</property>
-					      <property name="n_rows">2</property>
-					      <property name="n_columns">2</property>
-					      <property name="homogeneous">False</property>
-					      <property name="row_spacing">0</property>
-					      <property name="column_spacing">12</property>
-
-					      <child>
-						<widget class="GtkButton" id="update_all_playlists_button">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Update/Sync all playlists now</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="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">0</property>
-						  <property name="bottom_attach">1</property>
-						  <property name="y_padding">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkButton" id="delete_repository_button">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Delete repository</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="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">1</property>
-						  <property name="bottom_attach">2</property>
-						  <property name="y_padding">3</property>
-						  <property name="x_options">fill</property>
-						  <property name="y_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkCheckButton" id="delete_repository_checkbutton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">I'm sure</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">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"></property>
-						</packing>
-					      </child>
-					    </widget>
-					    <packing>
-					      <property name="padding">6</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <placeholder/>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label423">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Repositories&lt;/b&gt;</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</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="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox203">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">8</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label421">
-			  <property name="visible">True</property>
-			  <property name="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.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>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox169">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkFrame" id="playlist_frame">
-			      <property name="visible">True</property>
-			      <property name="label_xalign">0</property>
-			      <property name="label_yalign">0.5</property>
-			      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment12">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</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="GtkViewport" id="viewport20">
-				      <property name="visible">True</property>
-				      <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-				      <child>
-					<widget class="GtkVBox" id="vbox162">
-					  <property name="border_width">6</property>
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">4</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox199">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">6</property>
-
-					      <child>
-						<widget class="GtkComboBox" id="playlist_combo">
-						  <property name="visible">True</property>
-						  <property name="add_tearoffs">False</property>
-						  <property name="focus_on_click">True</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">True</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="playlist_type_label">
-						  <property name="visible">True</property>
-						  <property name="label">&lt;i&gt;Playlist type&lt;/i&gt;</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">True</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">6</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<placeholder/>
-					      </child>
-					    </widget>
-					    <packing>
-					      <property name="padding">3</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox200">
-					      <property name="border_width">4</property>
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">8</property>
-
-					      <child>
-						<widget class="GtkLabel" id="label416">
-						  <property name="visible">True</property>
-						  <property name="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.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>
-
-					      <child>
-						<widget class="GtkVBox" id="vbox164">
-						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">8</property>
-
-						  <child>
-						    <widget class="GtkVBox" id="standard_playlist_vbox">
-						      <property name="visible">True</property>
-						      <property name="homogeneous">False</property>
-						      <property name="spacing">8</property>
-
-						      <child>
-							<widget class="GtkRadioButton" id="sync_playlist_mode_automatic_radio">
-							  <property name="visible">True</property>
-							  <property name="tooltip" translatable="yes">Directories to sync with are determined from the filenames of the tracks in the playlist.</property>
-							  <property name="can_focus">True</property>
-							  <property name="label" translatable="yes">On startup automatically sync with playlist directories</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="padding">0</property>
-							  <property name="expand">False</property>
-							  <property name="fill">False</property>
-							</packing>
-						      </child>
-
-						      <child>
-							<widget class="GtkRadioButton" id="sync_playlist_mode_manual_radio">
-							  <property name="visible">True</property>
-							  <property name="can_focus">True</property>
-							  <property name="label" translatable="yes">On startup automatically sync with the following directory</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>
-							  <property name="group">sync_playlist_mode_automatic_radio</property>
-							</widget>
-							<packing>
-							  <property name="padding">0</property>
-							  <property name="expand">False</property>
-							  <property name="fill">False</property>
-							</packing>
-						      </child>
-
-						      <child>
-							<widget class="GtkHBox" id="hbox201">
-							  <property name="visible">True</property>
-							  <property name="homogeneous">False</property>
-							  <property name="spacing">0</property>
-
-							  <child>
-							    <widget class="GtkLabel" id="label417">
-							      <property name="visible">True</property>
-							      <property name="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.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">1</property>
-							      <property name="expand">False</property>
-							      <property name="fill">False</property>
-							    </packing>
-							  </child>
-
-							  <child>
-							    <widget class="GtkEntry" id="manual_syncdir_entry">
-							      <property name="visible">True</property>
-							      <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
-							      <property name="can_focus">True</property>
-							      <property name="editable">True</property>
-							      <property name="visibility">True</property>
-							      <property name="max_length">0</property>
-							      <property name="text" translatable="yes"></property>
-							      <property name="has_frame">True</property>
-							      <property name="invisible_char">*</property>
-							      <property name="activates_default">False</property>
-							    </widget>
-							    <packing>
-							      <property name="padding">3</property>
-							      <property name="expand">True</property>
-							      <property name="fill">True</property>
-							    </packing>
-							  </child>
-
-							  <child>
-							    <widget class="GtkButton" id="manual_syncdir_button">
-							      <property name="visible">True</property>
-							      <property name="can_focus">True</property>
-							      <property name="label" translatable="yes">Browse</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">3</property>
-							      <property name="expand">False</property>
-							      <property name="fill">False</property>
-							    </packing>
-							  </child>
-							</widget>
-							<packing>
-							  <property name="padding">2</property>
-							  <property name="expand">False</property>
-							  <property name="fill">False</property>
-							</packing>
-						      </child>
-
-						      <child>
-							<widget class="GtkRadioButton" id="sync_playlist_mode_none_radio">
-							  <property name="visible">True</property>
-							  <property name="can_focus">True</property>
-							  <property name="label" translatable="yes">Don't automatically sync on startup</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>
-							  <property name="group">sync_playlist_mode_automatic_radio</property>
-							</widget>
-							<packing>
-							  <property name="padding">0</property>
-							  <property name="expand">False</property>
-							  <property name="fill">False</property>
-							</packing>
-						      </child>
-
-						      <child>
-							<widget class="GtkHBox" id="sync_options_hbox">
-							  <property name="visible">True</property>
-							  <property name="homogeneous">False</property>
-							  <property name="spacing">0</property>
-
-							  <child>
-							    <widget class="GtkLabel" id="label422">
-							      <property name="visible">True</property>
-							      <property name="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.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>
-
-							  <child>
-							    <widget class="GtkVBox" id="vbox_720">
-							      <property name="visible">True</property>
-							      <property name="homogeneous">False</property>
-							      <property name="spacing">8</property>
-
-							      <child>
-								<widget class="GtkCheckButton" id="playlist_sync_delete_tracks_toggle">
-								  <property name="visible">True</property>
-								  <property name="tooltip" translatable="yes">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.
+                                    <property name="use_underline">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">6</property>
+                        <property name="pack_type">GTK_PACK_END</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkNotebook" id="details_notebook">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="border_width">2</property>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="details_window_general">
+                        <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>
+                        <child>
+                          <widget class="GtkViewport" id="viewport14">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox153">
+                                <property name="visible">True</property>
+                                <property name="border_width">6</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkTable" id="table36">
+                                    <property name="visible">True</property>
+                                    <property name="n_rows">13</property>
+                                    <property name="n_columns">4</property>
+                                    <property name="column_spacing">12</property>
+                                    <property name="row_spacing">6</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox96">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_37">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">9</property>
+                                        <property name="bottom_attach">10</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox95">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_36">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox94">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_14">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">7</property>
+                                        <property name="bottom_attach">8</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox93">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_19">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">6</property>
+                                        <property name="bottom_attach">7</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox92">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_41">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">10</property>
+                                        <property name="bottom_attach">11</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox91">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_11">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">9</property>
+                                        <property name="bottom_attach">10</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox89">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_26">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox87">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_18">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">7</property>
+                                        <property name="bottom_attach">8</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox86">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_25">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">6</property>
+                                        <property name="bottom_attach">7</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox78">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_4">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">5</property>
+                                        <property name="bottom_attach">6</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox74">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_6">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">4</property>
+                                        <property name="bottom_attach">5</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox73">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_3">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox72">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_1">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox71">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_2">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox70">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_47">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_2">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkComboBox" id="details_combobox_41">
+                                        <property name="visible">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">10</property>
+                                        <property name="bottom_attach">11</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_47">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_3">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_6">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">4</property>
+                                        <property name="bottom_attach">5</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">5</property>
+                                        <property name="bottom_attach">6</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_19">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">3</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">6</property>
+                                        <property name="bottom_attach">7</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_14">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">3</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">7</property>
+                                        <property name="bottom_attach">8</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_36">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">3</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_25">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">6</property>
+                                        <property name="bottom_attach">7</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_18">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">7</property>
+                                        <property name="bottom_attach">8</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_26">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_37">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">3</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">9</property>
+                                        <property name="bottom_attach">10</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_11">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">9</property>
+                                        <property name="bottom_attach">10</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="details_checkbutton_39">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label">(Skip when shuffling)</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">11</property>
+                                        <property name="bottom_attach">12</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="details_checkbutton_28">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label">(Compilation)</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">12</property>
+                                        <property name="bottom_attach">13</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="details_checkbutton_35">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">(Checked)</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">11</property>
+                                        <property name="bottom_attach">12</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="details_checkbutton_38">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label">(Remember playback position)</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">10</property>
+                                        <property name="bottom_attach">11</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label343">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_General</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">details_window_general</property>
+                      </widget>
+                      <packing>
+                        <property name="type">tab</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="details_window_sorting">
+                        <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>
+                        <child>
+                          <widget class="GtkViewport" id="viewport28">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkTable" id="table53">
+                                <property name="visible">True</property>
+                                <property name="border_width">6</property>
+                                <property name="n_rows">6</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">6</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox102">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_53">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox101">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_52">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox100">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_49">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox99">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_50">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox98">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_48">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox97">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_51">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_53">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_52">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_49">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_50">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_48">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </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="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_51">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label465">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Sorting</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">details_window_sorting</property>
+                      </widget>
+                      <packing>
+                        <property name="type">tab</property>
+                        <property name="position">1</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="details_window_podcasts">
+                        <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>
+                        <child>
+                          <widget class="GtkViewport" id="viewport16">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkTable" id="table41">
+                                <property name="visible">True</property>
+                                <property name="border_width">6</property>
+                                <property name="n_rows">6</property>
+                                <property name="n_columns">5</property>
+                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">6</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox108">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_33">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox107">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_5">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox106">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_30">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox105">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_32">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox104">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_34">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox103">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_31">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkScrolledWindow" id="scrolledwindow24">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <child>
+                                      <widget class="GtkTextView" id="details_textview_30">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="wrap_mode">GTK_WRAP_WORD</property>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">5</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkScrolledWindow" id="scrolledwindow26">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <child>
+                                      <widget class="GtkTextView" id="details_textview_33">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="wrap_mode">GTK_WRAP_WORD</property>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">5</property>
+                                    <property name="top_attach">5</property>
+                                    <property name="bottom_attach">6</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkScrolledWindow" id="scrolledwindow25">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <child>
+                                      <widget class="GtkTextView" id="details_textview_5">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="wrap_mode">GTK_WRAP_WORD</property>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">5</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_32">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">5</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_34">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">5</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_31">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">5</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label345">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Podcasts</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">details_window_podcasts</property>
+                      </widget>
+                      <packing>
+                        <property name="type">tab</property>
+                        <property name="position">2</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="details_window_lyrics">
+                        <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>
+                        <child>
+                          <widget class="GtkViewport" id="viewport2">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox49">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="details_label_55">
+                                    <property name="visible">True</property>
+                                    <property name="yalign">0</property>
+                                    <property name="label">label</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="padding">6</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkScrolledWindow" id="scrolledwindow36">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="border_width">6</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <child>
+                                      <widget class="GtkTextView" id="details_textview_55">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="wrap_mode">GTK_WRAP_WORD</property>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label48">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Lyrics</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">details_window_lyrics</property>
+                      </widget>
+                      <packing>
+                        <property name="type">tab</property>
+                        <property name="position">3</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="details_window_video">
+                        <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>
+                        <child>
+                          <widget class="GtkViewport" id="viewport23">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkTable" id="table51">
+                                <property name="visible">True</property>
+                                <property name="border_width">6</property>
+                                <property name="n_rows">5</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">6</property>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_42">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_43">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </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="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_44">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_45">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="details_entry_46">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox116">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_42">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox117">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_43">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox120">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_44">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox122">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_45">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox129">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="details_label_46">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label">label</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label444">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Video</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">details_window_video</property>
+                      </widget>
+                      <packing>
+                        <property name="type">tab</property>
+                        <property name="position">4</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="details_window_misc">
+                        <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>
+                        <child>
+                          <widget class="GtkViewport" id="viewport17">
+                            <property name="visible">True</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox152">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkTable" id="table37">
+                                    <property name="visible">True</property>
+                                    <property name="border_width">6</property>
+                                    <property name="n_rows">13</property>
+                                    <property name="n_columns">4</property>
+                                    <property name="column_spacing">12</property>
+                                    <property name="row_spacing">6</property>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_13">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">3</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">11</property>
+                                        <property name="bottom_attach">12</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_40">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="editable">False</property>
+                                        <property name="has_frame">False</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">7</property>
+                                        <property name="bottom_attach">8</property>
+                                        <property name="y_options"></property>
+                                        <property name="x_padding">1</property>
+                                        <property name="y_padding">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_9">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="editable">False</property>
+                                        <property name="has_frame">False</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">6</property>
+                                        <property name="bottom_attach">7</property>
+                                        <property name="y_options"></property>
+                                        <property name="x_padding">1</property>
+                                        <property name="y_padding">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_8">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="editable">False</property>
+                                        <property name="has_frame">False</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">5</property>
+                                        <property name="bottom_attach">6</property>
+                                        <property name="y_options"></property>
+                                        <property name="x_padding">1</property>
+                                        <property name="y_padding">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_21">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">4</property>
+                                        <property name="bottom_attach">5</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_22">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_20">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_29">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_27">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="details_checkbutton_12">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">12</property>
+                                        <property name="bottom_attach">13</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_17">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">11</property>
+                                        <property name="bottom_attach">12</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_15">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">10</property>
+                                        <property name="bottom_attach">11</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_23">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">9</property>
+                                        <property name="bottom_attach">10</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_7">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_10">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="editable">False</property>
+                                        <property name="has_frame">False</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">3</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="y_options"></property>
+                                        <property name="x_padding">1</property>
+                                        <property name="y_padding">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_24">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">3</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">9</property>
+                                        <property name="bottom_attach">10</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="details_entry_16">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">3</property>
+                                        <property name="right_attach">4</property>
+                                        <property name="top_attach">10</property>
+                                        <property name="bottom_attach">11</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="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </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>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox130">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_27">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox131">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_29">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox132">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_20">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox134">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_22">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">3</property>
+                                        <property name="bottom_attach">4</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox135">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_21">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">4</property>
+                                        <property name="bottom_attach">5</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox136">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_8">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">5</property>
+                                        <property name="bottom_attach">6</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox137">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_9">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">6</property>
+                                        <property name="bottom_attach">7</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox138">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_40">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">7</property>
+                                        <property name="bottom_attach">8</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox139">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_7">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox140">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_23">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">9</property>
+                                        <property name="bottom_attach">10</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox141">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_15">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">10</property>
+                                        <property name="bottom_attach">11</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox142">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_17">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">11</property>
+                                        <property name="bottom_attach">12</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox144">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_12">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">12</property>
+                                        <property name="bottom_attach">13</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox145">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_10">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">8</property>
+                                        <property name="bottom_attach">9</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox146">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_24">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">9</property>
+                                        <property name="bottom_attach">10</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox147">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_16">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">10</property>
+                                        <property name="bottom_attach">11</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox148">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_13">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">11</property>
+                                        <property name="bottom_attach">12</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox149">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="details_label_54">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label">label</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </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"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label346">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Misc.</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">details_window_misc</property>
+                      </widget>
+                      <packing>
+                        <property name="type">tab</property>
+                        <property name="position">5</property>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHBox" id="hbox187">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkHBox" id="hbox186">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkButton" id="details_button_first">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkImage" id="image3068">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-goto-first</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="details_button_previous">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkImage" id="image3069">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-go-back</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="details_label_index">
+                    <property name="visible">True</property>
+                    <property name="xpad">5</property>
+                    <property name="ypad">4</property>
+                    <property name="label">n/n</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="details_button_next">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkImage" id="image3070">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-go-forward</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="details_button_last">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkImage" id="image3071">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-goto-last</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHButtonBox" id="hbuttonbox14">
+                <property name="visible">True</property>
+                <property name="spacing">7</property>
+                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                <child>
+                  <widget class="GtkButton" id="details_button_undo_all">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment9">
+                        <property name="visible">True</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox193">
+                            <property name="visible">True</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <widget class="GtkImage" id="image3076">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-undo</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label390">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Undo All</property>
+                                <property name="use_underline">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="details_button_undo_track">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment10">
+                        <property name="visible">True</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox194">
+                            <property name="visible">True</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <widget class="GtkImage" id="image3077">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-undo</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label391">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Undo _Track</property>
+                                <property name="use_underline">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHButtonBox" id="hbuttonbox13">
+                <property name="visible">True</property>
+                <property name="spacing">7</property>
+                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                <child>
+                  <widget class="GtkButton" id="details_button_apply">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="label">gtk-apply</property>
+                    <property name="use_stock">True</property>
+                    <property name="response_id">0</property>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="details_button_cancel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="label">gtk-cancel</property>
+                    <property name="use_stock">True</property>
+                    <property name="response_id">0</property>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="details_button_ok">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="label">gtk-ok</property>
+                    <property name="use_stock">True</property>
+                    <property name="response_id">0</property>
+                  </widget>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="repository_window">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Repository Options</property>
+    <property name="icon">gtkpod-icon-48.png</property>
+    <child>
+      <widget class="GtkVBox" id="vbox159">
+        <property name="visible">True</property>
+        <property name="border_width">6</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox168">
+            <property name="visible">True</property>
+            <property name="spacing">10</property>
+            <child>
+              <widget class="GtkHBox" id="hbox198">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkComboBox" id="repository_combo">
+                    <property name="visible">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="repository_type_label">
+                    <property name="visible">True</property>
+                    <property name="label">&lt;i&gt;Repository type&lt;/i&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">6</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="new_repository_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox182">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image6">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="stock">gtk-add</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label71">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label" translatable="yes">Add new repository/iPod...</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="pack_type">GTK_PACK_END</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkNotebook" id="notebook3">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <child>
+                  <widget class="GtkVBox" id="repository_vbox">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <property name="spacing">18</property>
+                    <child>
+                      <widget class="GtkFrame" id="general_frame">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment6">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="top_padding">6</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkTable" id="path_table_ipod">
+                                <property name="visible">True</property>
+                                <property name="n_rows">4</property>
+                                <property name="n_columns">3</property>
+                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">6</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox211">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="local_path_label">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Path:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox209">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="ipod_model_label">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Model:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox203">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="backup_label">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">iTunesDB backup:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox197">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="mountpoint_label">
+                                        <property name="visible">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">iPod mountpoint:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label76">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label75">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkComboBoxEntry" id="ipod_model_combo">
+                                    <property name="visible">True</property>
+                                    <child internal-child="entry">
+                                      <widget class="GtkEntry" id="comboboxentry-entry1">
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="backup_button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox189">
+                                        <property name="visible">True</property>
+                                        <property name="spacing">2</property>
+                                        <child>
+                                          <widget class="GtkImage" id="image11">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-directory</property>
+                                          </widget>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="label80">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">Browse...</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </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>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="mountpoint_button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox185">
+                                        <property name="visible">True</property>
+                                        <property name="spacing">2</property>
+                                        <child>
+                                          <widget class="GtkImage" id="image10">
+                                            <property name="visible">True</property>
+                                            <property name="stock">gtk-directory</property>
+                                          </widget>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="label79">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">Browse...</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="x_options"></property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="local_path_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
+                                    <property name="editable">False</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="backup_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
+                                    <property name="invisible_char">*</property>
+                                  </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="y_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkEntry" id="mountpoint_entry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
+                                    <property name="invisible_char">*</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="y_options"></property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label98">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkFrame" id="sync_frame">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment8">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="top_padding">6</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox41">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkTable" id="table5">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="n_rows">3</property>
+                                    <property name="n_columns">3</property>
+                                    <property name="column_spacing">12</property>
+                                    <property name="row_spacing">6</property>
+                                    <child>
+                                      <widget class="GtkButton" id="ipod_sync_notes_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <child>
+                                          <widget class="GtkHBox" id="hbox207">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">2</property>
+                                            <child>
+                                              <widget class="GtkImage" id="image14">
+                                                <property name="visible">True</property>
+                                                <property name="stock">gtk-directory</property>
+                                              </widget>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="label84">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Browse...</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="ipod_sync_calendar_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <child>
+                                          <widget class="GtkHBox" id="hbox206">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">2</property>
+                                            <child>
+                                              <widget class="GtkImage" id="image13">
+                                                <property name="visible">True</property>
+                                                <property name="stock">gtk-directory</property>
+                                              </widget>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="label83">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Browse...</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </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>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="ipod_sync_contacts_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <child>
+                                          <widget class="GtkHBox" id="hbox204">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">2</property>
+                                            <child>
+                                              <widget class="GtkImage" id="image12">
+                                                <property name="visible">True</property>
+                                                <property name="stock">gtk-directory</property>
+                                              </widget>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="label81">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Browse...</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="ipod_sync_calendar_entry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
+                                        <property name="invisible_char">*</property>
+                                      </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="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="ipod_sync_contacts_entry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="ipod_sync_notes_entry">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
+                                        <property name="invisible_char">*</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox217">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="ipod_sync_calendar_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Calendar sync command:</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox218">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="ipod_sync_notes_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Notes sync command:</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">2</property>
+                                        <property name="bottom_attach">3</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkHBox" id="hbox215">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <child>
+                                          <widget class="GtkLabel" id="ipod_sync_contacts_label">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Contacts sync command:</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="ipod_concal_autosync_toggle">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Call automatically when synchronizing iTunesDB</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="ipod_sync_label">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">1</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Synchronization&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHButtonBox" id="hbuttonbox5">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="spacing">6</property>
+                        <property name="layout_style">GTK_BUTTONBOX_END</property>
+                        <child>
+                          <widget class="GtkButton" id="update_all_playlists_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="response_id">0</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox208">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label49">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkImage" id="image15">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock">gtk-refresh</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label90">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Update/Sync All Playlists</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label77">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="delete_repository_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="response_id">0</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox183">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label78">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkImage" id="image9">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="stock">gtk-delete</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label92">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Delete Repository</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label93">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">Repository</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="playlist_tab_contents">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <property name="spacing">18</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox199">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkComboBox" id="playlist_combo">
+                            <property name="visible">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="playlist_type_label">
+                            <property name="visible">True</property>
+                            <property name="label">&lt;i&gt;Playlist type&lt;/i&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="padding">6</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkVBox" id="vbox164">
+                        <property name="visible">True</property>
+                        <property name="spacing">8</property>
+                        <child>
+                          <widget class="GtkFrame" id="frame25">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment11">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="top_padding">6</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <widget class="GtkVBox" id="vbox40">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <widget class="GtkVBox" id="standard_playlist_vbox">
+                                        <property name="visible">True</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <widget class="GtkRadioButton" id="sync_playlist_mode_automatic_radio">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="tooltip" translatable="yes">Directories to sync with are determined from the filenames of the tracks in the playlist.</property>
+                                            <property name="label" translatable="yes">On startup automatically sync with playlist directories</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="response_id">0</property>
+                                            <property name="draw_indicator">True</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkRadioButton" id="sync_playlist_mode_manual_radio">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="label" translatable="yes">On startup automatically sync with the following directory</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="response_id">0</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">sync_playlist_mode_automatic_radio</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkHBox" id="hbox201">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">12</property>
+                                            <child>
+                                              <widget class="GtkLabel" id="label417">
+                                                <property name="visible">True</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkEntry" id="manual_syncdir_entry">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
+                                                <property name="invisible_char">*</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkButton" id="manual_syncdir_button">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="response_id">0</property>
+                                                <child>
+                                                  <widget class="GtkHBox" id="hbox220">
+                                                    <property name="visible">True</property>
+                                                    <property name="spacing">2</property>
+                                                    <child>
+                                                      <widget class="GtkImage" id="image20">
+                                                        <property name="visible">True</property>
+                                                        <property name="stock">gtk-directory</property>
+                                                      </widget>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="label108">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">Browse...</property>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </widget>
+                                                </child>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">2</property>
+                                              </packing>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="padding">2</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkRadioButton" id="sync_playlist_mode_none_radio">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="label" translatable="yes">Don't automatically sync on startup</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="response_id">0</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">sync_playlist_mode_automatic_radio</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkHBox" id="sync_options_hbox">
+                                            <property name="visible">True</property>
+                                            <child>
+                                              <widget class="GtkLabel" id="label422">
+                                                <property name="visible">True</property>
+                                                <property name="xpad">6</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkVBox" id="vbox_720">
+                                                <property name="visible">True</property>
+                                                <property name="spacing">6</property>
+                                                <child>
+                                                  <widget class="GtkCheckButton" id="playlist_sync_delete_tracks_toggle">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="tooltip" translatable="yes">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.
 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.
 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.</property>
-								  <property name="can_focus">True</property>
-								  <property name="label" translatable="yes">Delete tracks that are no longer present from the
-iPod or repository</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="padding">0</property>
-								  <property name="expand">False</property>
-								  <property name="fill">False</property>
-								</packing>
-							      </child>
-
-							      <child>
-								<widget class="GtkCheckButton" id="playlist_sync_confirm_delete_toggle">
-								  <property name="visible">True</property>
-								  <property name="can_focus">True</property>
-								  <property name="label" translatable="yes">Confirm before removing tracks from the iPod or repository</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="padding">0</property>
-								  <property name="expand">False</property>
-								  <property name="fill">False</property>
-								</packing>
-							      </child>
-
-							      <child>
-								<widget class="GtkCheckButton" id="playlist_sync_show_summary_toggle">
-								  <property name="visible">True</property>
-								  <property name="tooltip" translatable="yes">Will show a list of tracks removed and a list of tracks newly added or updated.</property>
-								  <property name="can_focus">True</property>
-								  <property name="label" translatable="yes">Show summary of sync result</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="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>
-							<packing>
-							  <property name="padding">4</property>
-							  <property name="expand">True</property>
-							  <property name="fill">True</property>
-							</packing>
-						      </child>
-						    </widget>
-						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						    </packing>
-						  </child>
-
-						  <child>
-						    <widget class="GtkVBox" id="spl_vbox">
-						      <property name="visible">True</property>
-						      <property name="homogeneous">False</property>
-						      <property name="spacing">8</property>
-
-						      <child>
-							<widget class="GtkCheckButton" id="spl_live_update_toggle">
-							  <property name="visible">True</property>
-							  <property name="can_focus">True</property>
-							  <property name="label" translatable="yes">On startup automatically update (Live Playlist)</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="padding">0</property>
-							  <property name="expand">False</property>
-							  <property name="fill">False</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>
-						    <widget class="GtkButton" id="update_playlist_button">
-						      <property name="visible">True</property>
-						      <property name="can_focus">True</property>
-						      <property name="label" translatable="yes">Update/Sync playlist now</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>
-						    <placeholder/>
-						  </child>
-
-						  <child>
-						    <placeholder/>
-						  </child>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">True</property>
-						  <property name="fill">True</property>
-						</packing>
-					      </child>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label424">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">&lt;b&gt;Playlists&lt;/b&gt;</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</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="type">label_item</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator57">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">2</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox15">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">7</property>
-
-	  <child>
-	    <widget class="GtkButton" id="apply_button">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-apply</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel_button">
-	      <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>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok_button">
-	      <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>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="create_repository_window">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Create Repository</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</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="GtkVBox" id="vbox170">
-      <property name="border_width">6</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">4</property>
-
-      <child>
-	<placeholder/>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table46">
-	  <property name="visible">True</property>
-	  <property name="n_rows">7</property>
-	  <property name="n_columns">3</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">0</property>
-	  <property name="column_spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="local_path_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Path:</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">10</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">5</property>
-	      <property name="bottom_attach">6</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="ipod_model_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Model:</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">10</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">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="backup_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">iTunesDB backup:</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">10</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">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="mountpoint_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">iPod mountpoint:</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">10</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">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="local_path_entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
-	      <property name="x_padding">3</property>
-	      <property name="y_padding">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="backup_entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">3</property>
-	      <property name="y_padding">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="mountpoint_button">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="mountpoint_entry">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_padding">3</property>
-	      <property name="y_padding">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="backup_button">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">3</property>
-	      <property name="bottom_attach">4</property>
-	      <property name="x_padding">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="local_path_button">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Browse</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="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">5</property>
-	      <property name="bottom_attach">6</property>
-	      <property name="x_padding">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkComboBox" id="insert_before_after_combo">
-	      <property name="visible">True</property>
-	      <property name="items" translatable="yes">Insert before
-Insert after</property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">6</property>
-	      <property name="bottom_attach">7</property>
-	      <property name="x_padding">3</property>
-	      <property name="y_padding">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkComboBox" id="repository_combo">
-	      <property name="visible">True</property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">6</property>
-	      <property name="bottom_attach">7</property>
-	      <property name="x_padding">3</property>
-	      <property name="y_padding">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="repository_type_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Repository type:</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">10</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="GtkComboBox" id="repository_type_combo">
-	      <property name="visible">True</property>
-	      <property name="items" translatable="yes" comments="These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!">iPod
+                                                    <property name="label" translatable="yes">Delete missing tracks from the iPod or repository</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkCheckButton" id="playlist_sync_confirm_delete_toggle">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">Confirm before removing tracks from the iPod or repository</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkCheckButton" id="playlist_sync_show_summary_toggle">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="tooltip" translatable="yes">Will show a list of tracks removed and a list of tracks newly added or updated.</property>
+                                                    <property name="label" translatable="yes">Show summary of sync result</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">2</property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                              <packing>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">4</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkVBox" id="spl_vbox">
+                                        <property name="visible">True</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <widget class="GtkCheckButton" id="spl_live_update_toggle">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="label" translatable="yes">On startup automatically update (Live Playlist)</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="response_id">0</property>
+                                            <property name="draw_indicator">True</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label100">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Playlist Options&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="type">label_item</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkHButtonBox" id="hbuttonbox6">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="layout_style">GTK_BUTTONBOX_END</property>
+                            <child>
+                              <widget class="GtkButton" id="update_playlist_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="response_id">0</property>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox200">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="label103">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                      </widget>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkImage" id="image17">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="stock">gtk-refresh</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label104">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="label" translatable="yes">Update/Sync Playlist</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label105">
+                                        <property name="visible">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="playlist_tab_label">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">Playlists</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox15">
+            <property name="visible">True</property>
+            <property name="border_width">4</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="apply_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-apply</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="cancel_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="ok_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="create_repository_window">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Create Repository</property>
+    <property name="modal">True</property>
+    <property name="skip_taskbar_hint">True</property>
+    <child>
+      <widget class="GtkVBox" id="vbox170">
+        <property name="visible">True</property>
+        <property name="border_width">6</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox39">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkTable" id="table46">
+                <property name="visible">True</property>
+                <property name="border_width">6</property>
+                <property name="n_rows">7</property>
+                <property name="n_columns">3</property>
+                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
+                <child>
+                  <widget class="GtkEntry" id="crw_local_path_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="invisible_char">*</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="crw_backup_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="editable">False</property>
+                    <property name="invisible_char">*</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="crw_mountpoint_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">*</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="crw_backup_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox166">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image7">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-directory</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label73">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Browse...</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="crw_local_path_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="response_id">0</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox167">
+                        <property name="visible">True</property>
+                        <property name="spacing">2</property>
+                        <child>
+                          <widget class="GtkImage" id="image8">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-directory</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label74">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Browse...</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="crw_repository_name_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
+                    <property name="invisible_char">*</property>
+                  </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="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkComboBoxEntry" id="crw_ipod_model_combo">
+                    <property name="visible">True</property>
+                    <child internal-child="entry">
+                      <widget class="GtkEntry" id="crw_ipod_model_entry">
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox150">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkComboBox" id="crw_repository_type_combo">
+                        <property name="visible">True</property>
+                        <property name="items" translatable="yes" comments="These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!">iPod
 Local Repository (Standard)
 Local Repository (Podcasts)
 </property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_padding">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox151">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="crw_repository_type_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Repository type:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox152">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="crw_repository_name_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Repository name:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox153">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="crw_mountpoint_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">iPod mountpoint:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox154">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="crw_backup_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">iTunesDB backup:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">3</property>
+                    <property name="bottom_attach">4</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox155">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="crw_ipod_model_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Model:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox156">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="crw_local_path_label">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Path:</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">5</property>
+                    <property name="bottom_attach">6</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox157">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkComboBox" id="crw_insert_before_after_combo">
+                        <property name="visible">True</property>
+                        <property name="items" translatable="yes">Insert before
+Insert after</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
+                    <property name="x_options">GTK_EXPAND</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox159">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkComboBox" id="crw_repository_combo">
+                        <property name="visible">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</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">6</property>
+                    <property name="bottom_attach">7</property>
+                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox160">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkButton" id="crw_mountpoint_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox133">
+                            <property name="visible">True</property>
+                            <property name="spacing">2</property>
+                            <child>
+                              <widget class="GtkImage" id="image5">
+                                <property name="visible">True</property>
+                                <property name="stock">gtk-directory</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label69">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Browse...</property>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox161">
+                    <property name="visible">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox162">
+                    <property name="visible">True</property>
+                    <child>
+                      <placeholder/>
+                    </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>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox163">
+                    <property name="visible">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">4</property>
+                    <property name="bottom_attach">5</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox165">
+                    <property name="visible">True</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="right_attach">3</property>
+                    <property name="top_attach">6</property>
+                    <property name="bottom_attach">7</property>
+                    <property name="x_options"></property>
+                    <property name="y_options"></property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox16">
+            <property name="visible">True</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="crw_cancel_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="crw_ok_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-add</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="ipod_init_dialog">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Initialize iPod</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkVBox" id="vbox172">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <child>
+              <widget class="GtkLabel" id="ipod_init_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Please select mountpoint and your iPod model&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">5</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkViewport" id="viewport22">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox173">
+                    <property name="visible">True</property>
+                    <property name="border_width">6</property>
+                    <property name="spacing">4</property>
+                    <child>
+                      <widget class="GtkTable" id="table48">
+                        <property name="visible">True</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">3</property>
+                        <child>
+                          <widget class="GtkComboBoxEntry" id="iid_model_combo">
+                            <property name="visible">True</property>
+                            <child internal-child="entry">
+                              <widget class="GtkEntry" id="iid_comboboxentry_entry">
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                            <property name="x_padding">3</property>
+                            <property name="y_padding">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label430">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">10</property>
+                            <property name="label" translatable="yes">Model:</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="iid_mountpoint_button">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Browse</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                            <property name="x_padding">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="iid_mountpoint_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">*</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                            <property name="x_padding">3</property>
+                            <property name="y_padding">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label428">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">10</property>
+                            <property name="label" translatable="yes">iPod mountpoint:</property>
+                          </widget>
+                          <packing>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancelbutton1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="okbutton1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="set_ipod_model_dialog">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Initialize iPod</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkVBox" id="vbox3">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <child>
+              <widget class="GtkLabel" id="simd_label">
+                <property name="visible">True</property>
+                <property name="label">label set by application</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">5</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkViewport" id="viewport1">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox4">
+                    <property name="visible">True</property>
+                    <property name="border_width">6</property>
+                    <property name="spacing">4</property>
+                    <child>
+                      <widget class="GtkTable" id="table1">
+                        <property name="visible">True</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">3</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <widget class="GtkComboBoxEntry" id="simd_model_combo">
+                            <property name="width_request">250</property>
+                            <property name="visible">True</property>
+                            <child internal-child="entry">
+                              <widget class="GtkEntry" id="comboboxentry-entry4">
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">3</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="y_options"></property>
+                            <property name="x_padding">3</property>
+                            <property name="y_padding">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">10</property>
+                            <property name="label" translatable="yes">Model:</property>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <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_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="okbutton2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</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>
+    <property name="skip_taskbar_hint">True</property>
+    <child>
+      <widget class="GtkVBox" id="vbox180">
+        <property name="visible">True</property>
+        <property name="border_width">5</property>
+        <property name="spacing">5</property>
+        <child>
+          <widget class="GtkLabel" id="textlabel">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label">Some placeholder text to assure reasonable size.</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkProgressBar" id="progressbar">
+            <property name="visible">True</property>
+            <property name="pulse_step">0.10000000149</property>
+            <property name="text"></property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <widget class="GtkHSeparator" id="hseparator59">
+            <property name="visible">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox17">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkButton" id="abortbutton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="tooltip" translatable="yes">Export can be continued at a later time if canceled.</property>
+                <property name="border_width">2</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="conversion_log">
+    <property name="border_width">4</property>
+    <property name="title" translatable="yes">Conversion Progress Display</property>
+    <child>
+      <widget class="GtkVBox" id="conversion_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">4</property>
+        <child>
+          <widget class="GtkLabel" id="label463">
+            <property name="visible">True</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">The output of the background conversion scripts is copied below. Each page of the notebook corresponds to one background thread.</property>
+            <property name="wrap">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">8</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <widget class="GtkStatusbar" id="conversion_statusbar">
+            <property name="visible">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="coverart_preview_dialog">
+    <property name="visible">True</property>
+    <property name="type">GTK_WINDOW_POPUP</property>
+    <property name="title" translatable="yes">Artwork Preview</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+    <property name="icon_name">gtk-dialog-info</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkVBox" id="coverart_preview_dialog_vbox">
+            <property name="visible">True</property>
+            <child>
+              <widget class="GtkDrawingArea" id="coverart_preview_dialog_drawarea">
+                <property name="visible">True</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="coverart_preview_dialog_res_lbl">
+                <property name="visible">True</property>
+                <property name="ypad">6</property>
+                <property name="label">&lt;b&gt;Placeholder for image information&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+                <property name="justify">GTK_JUSTIFY_CENTER</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area4">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="okbutton3">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</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>
+    <child>
+      <widget class="GtkViewport" id="photo_viewport">
+        <property name="visible">True</property>
+        <property name="border_width">5</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>
+                <child>
+                  <widget class="GtkMenuBar" id="menubar1">
+                    <property name="visible">True</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"/>
+                        <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>
+                                  </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>
+                                  </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>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4266">
+                            <property name="visible">True</property>
+                            <property name="pixbuf">photo-toolbar-album.png</property>
+                            <property name="icon_size">2</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menuitem14">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Photos</property>
+                        <property name="use_underline">True</property>
+                        <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-add</property>
+                                    <property name="icon_size">1</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>
+                                  </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-remove</property>
+                                    <property name="icon_size">1</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4269">
+                            <property name="visible">True</property>
+                            <property name="pixbuf">photo-toolbar-photos.png</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="menuitem15">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">_Zoom</property>
+                        <property name="use_underline">True</property>
+                        <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>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="image4273">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-zoom-fit</property>
+                            <property name="icon_size">2</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <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>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="padding">1</property>
+                    <property name="position">1</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="stock">gtk-missing-image</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">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>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+          </widget>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_dialog">
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Preferences</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <signal name="delete_event" handler="on_prefs_dialog_close"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox5">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkNotebook" id="notebook1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <child>
+              <widget class="GtkVBox" id="vbox5">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <widget class="GtkFrame" id="frame2">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox8">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox1">
+                                <property name="visible">True</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label5">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Number of filter tabs:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkSpinButton" id="filter_tabs_count">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="adjustment">2 0 6 1 1 1</property>
+                                    <property name="climb_rate">1</property>
+                                    <signal name="value_changed" handler="on_filter_tabs_count_value_changed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox76">
+                                <property name="visible">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label94">
+                                    <property name="visible">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Position:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="filter_tabs_top">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Top</property>
+                                    <property name="response_id">0</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_filter_tabs_top_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="filter_tabs_bottom">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="label" translatable="yes">Bottom</property>
+                                    <property name="response_id">0</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">filter_tabs_top</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="group_compilations">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Group artist filter tab by compilation CDs</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_group_compilations_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Filter Tabs&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame4">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment14">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox46">
+                            <property name="visible">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox3">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <child>
+                                      <widget class="GtkTreeView" id="displayed_columns">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="headers_visible">False</property>
+                                        <property name="rules_hint">True</property>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkVButtonBox" id="vbuttonbox2">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">6</property>
+                                    <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                                    <child>
+                                      <widget class="GtkButton" id="column_add">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label">gtk-add</property>
+                                        <property name="use_stock">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="on_column_add_clicked"/>
+                                      </widget>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="column_remove">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label">gtk-remove</property>
+                                        <property name="use_stock">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="on_column_remove_clicked"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="sorting_button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="on_sorting_button_clicked"/>
+                                        <child>
+                                          <widget class="GtkHBox" id="hbox64">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">2</property>
+                                            <child>
+                                              <widget class="GtkLabel" id="label23">
+                                                <property name="visible">True</property>
+                                              </widget>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkImage" id="image3">
+                                                <property name="visible">True</property>
+                                                <property name="stock">gtk-sort-ascending</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="label21">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Sorting...</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">2</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="label56">
+                                                <property name="visible">True</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="position">3</property>
+                                              </packing>
+                                            </child>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="horizontal_scrollbar">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="label" translatable="yes">Expand columns beyond the track list width</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_horizontal_scrollbar_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Displayed Columns&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame15">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment29">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox214">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkColorButton" id="coverart_display_bg_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="response_id">0</property>
+                                <property name="title" translatable="yes">Choose a Different Colour for the CoverArt Display Background</property>
+                                <signal name="color_set" handler="on_coverart_dialog_bg_color_set"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label472">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Background color</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkColorButton" id="coverart_display_fg_button">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="response_id">0</property>
+                                <property name="title" translatable="yes">Choose a Different Colour for the CoverArt Display Background</property>
+                                <property name="color">#ffffffffffff</property>
+                                <signal name="color_set" handler="on_coverart_dialog_fg_color_set"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label50">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Text color</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label18">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Cover Art Display&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment44">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="display_tooltips">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label" translatable="yes">Display tooltips in main window</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_display_tooltips_toggled"/>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label65">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Tooltips&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame3">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment3">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox2">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkComboBox" id="toolbar_style">
+                                <property name="visible">True</property>
+                                <property name="items">Dummy
+</property>
+                                <signal name="changed" handler="on_toolbar_style_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Toolbar Style&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="display_page_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Display</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox9">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <widget class="GtkFrame" id="frame5">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment15">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox10">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="background_transfer">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Transfer tracks in background mode</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="add_subfolders">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Add subfolders recursively</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="allow_duplicates">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Allow duplicate files</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="delete_missing">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Delete missing tracks when synchronizing playlists</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHButtonBox" id="hbuttonbox1">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                                <child>
+                                  <widget class="GtkButton" id="exclusions">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Excluded files...</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="on_exclusions_clicked"/>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="music_encoding">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Encoding...</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="open_encoding_dialog"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="commands">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Commands...</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="on_commands_clicked"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label9">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Import and Synchronization&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame7">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment17">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox9">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkRadioButton" id="update_existing_track">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Update information about the existing track</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkRadioButton" id="skip_track_update">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Skip the track</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">update_existing_track</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;When Attempting to Add an Existing Track&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame11">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment23">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox14">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox9">
+                                <property name="visible">True</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label13">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Number of tracks:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkSpinButton" id="agp_track_count">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="adjustment">25 0 100 1 10 10</property>
+                                    <property name="climb_rate">1</property>
+                                    <signal name="value_changed" handler="on_agp_track_count_value_changed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="include_neverplayed">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Include tracks never played in the "Best Rated" playlist</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled" after="yes"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label12">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Auto-Generated Playlists&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame10">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment22">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox13">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox7">
+                                <property name="visible">True</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label3">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Convert incompatible music formats to:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkComboBox" id="target_format">
+                                    <property name="visible">True</property>
+                                    <property name="items" translatable="yes">MP3
+AAC
+</property>
+                                    <signal name="changed" handler="on_target_format_changed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkHButtonBox" id="hbuttonbox2">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                                <child>
+                                  <widget class="GtkButton" id="conversion_settings">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="on_conversion_settings_clicked"/>
+                                    <child>
+                                      <widget class="GtkAlignment" id="alignment38">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkHBox" id="hbox8">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">2</property>
+                                            <child>
+                                              <widget class="GtkImage" id="image1">
+                                                <property name="visible">True</property>
+                                                <property name="stock">gtk-convert</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="label11">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">Conversion Settings...</property>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                          </widget>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;On-the-fly Conversion&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="music_page_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Music</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox11">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <widget class="GtkFrame" id="frame6">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment16">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox12">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="read_tags">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Read embedded tags from music files</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox4">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="parse_filename_tags">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Parse file name to set missing tags</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="customize_tags">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Customize...</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="on_customize_tags_clicked"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="pack_type">GTK_PACK_END</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="last_resort_tags">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Set still missing tags to file name</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_unsetdeps_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment19">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <widget class="GtkTable" id="table2">
+                                    <property name="visible">True</property>
+                                    <property name="n_rows">2</property>
+                                    <property name="n_columns">3</property>
+                                    <property name="column_spacing">12</property>
+                                    <property name="row_spacing">6</property>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="tag_album">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Album</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_tag_checkbox_toggled"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">1</property>
+                                        <property name="right_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="tag_composer">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Composer</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_tag_checkbox_toggled"/>
+                                      </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">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="tag_genre">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Genre</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_tag_checkbox_toggled"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="left_attach">2</property>
+                                        <property name="right_attach">3</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="tag_title">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Title</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_tag_checkbox_toggled"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="tag_artist">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Artist</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_tag_checkbox_toggled"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="top_attach">1</property>
+                                        <property name="bottom_attach">2</property>
+                                        <property name="x_options">GTK_FILL</property>
+                                        <property name="y_options"></property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label15">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Tags&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame9">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment20">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox15">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="mass_modify_tags">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Mass-modify tags when multiple tracks are selected</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox5">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="write_tags">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Write tags to disk when edited</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="tag_encoding">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Encoding...</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="open_encoding_dialog"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="pack_type">GTK_PACK_END</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment21">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <widget class="GtkVBox" id="vbox15">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="write_tags_legacy">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Use legacy format for MP3 tags</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label16">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Tag Editing&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame8">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment18">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox11">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="read_coverart">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Read embedded cover art information</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox6">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="template_coverart">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Add cover art using file name template</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="customize_coverart">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Customize...</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="on_customize_coverart_clicked"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="pack_type">GTK_PACK_END</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox79">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="generate_video_thumbnails">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="has_tooltip">True</property>
+                                    <property name="tooltip_text" translatable="yes">Automatically generate a thumbnail from the video, if no thumbnail is otherwise provided.</property>
+                                    <property name="label" translatable="yes">Automatically generate video thumbnails</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkButton" id="customize_video_thumbnailer">
+                                    <property name="visible">True</property>
+                                    <property name="sensitive">False</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Customize...</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="on_customize_video_thumbnailer_clicked"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="pack_type">GTK_PACK_END</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label17">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Cover Art&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame16">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment30">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox11">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkLabel" id="label20">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">To fill additional information, &lt;i&gt;gtkpod&lt;/i&gt; can use a database provided by the &lt;i&gt;mserv&lt;/i&gt; music server. If you do not know what &lt;i&gt;mserv&lt;/i&gt; is, leave this alone.</property>
+                                <property name="use_markup">True</property>
+                                <property name="wrap">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkVBox" id="vbox21">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkButton" id="mserv_settings">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Settings...</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <signal name="clicked" handler="on_mserv_settings_clicked"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <placeholder/>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="pack_type">GTK_PACK_END</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label19">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;mserv&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="metadata_page_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Metadata</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox16">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="spacing">18</property>
+                <child>
+                  <widget class="GtkFrame" id="frame12">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment24">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox17">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="confirm_del_tracks">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Confirm deletion of tracks:</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_unsetdeps_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment25">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <widget class="GtkVBox" id="vbox20">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="confirm_from_ipod">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">From the iPod</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="confirm_from_hdd">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">From the hard disk</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="confirm_from_db">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">From the local database</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="confirm_del_pl">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Confirm deletion of playlists or tracks from a playlist</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="confirm_del_sync">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Confirm deletion of tracks during synchronization</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label24">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Deletion Confirmation Messages&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame13">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment26">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox18">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="msg_startup">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Display messages and warnings at startup</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="msg_duplicates">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Display information about detected duplicate files</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="msg_results">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Display synchronization results</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox10">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label25">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">When updating tracks, display information:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment27">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <widget class="GtkVBox" id="vbox19">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">6</property>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="msg_updated">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">About updated tracks</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkCheckButton" id="msg_unupdated">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">About unupdated tracks</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="active">True</property>
+                                        <property name="draw_indicator">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="position">4</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label26">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Information Messages&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="feedback_page_label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Feedback</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area5">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <child>
+              <widget class="GtkButton" id="help_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">1</property>
+                <signal name="clicked" handler="on_prefs_dialog_help"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="revert_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label">gtk-revert-to-saved</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="on_prefs_dialog_revert"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="close_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-7</property>
+                <signal name="clicked" handler="on_prefs_dialog_close"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_columns_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Add Column</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="default_width">300</property>
+    <property name="default_height">400</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox6">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkFrame" id="frame14">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">GTK_SHADOW_NONE</property>
+            <child>
+              <widget class="GtkAlignment" id="alignment28">
+                <property name="visible">True</property>
+                <property name="top_padding">6</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <child>
+                      <widget class="GtkTreeView" id="available_columns">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="headers_visible">False</property>
+                        <property name="rules_hint">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label27">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">&lt;b&gt;Available Columns&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area6">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="cancel_button2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="add_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-add</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">1</property>
+                <signal name="clicked" handler="on_columns_dialog_add"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_encoding_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Encoding Preferences</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox7">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox22">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="spacing">6</property>
+            <child>
+              <widget class="GtkHBox" id="hbox12">
+                <property name="visible">True</property>
+                <property name="spacing">12</property>
+                <child>
+                  <widget class="GtkLabel" id="label28">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Tag and filename encoding:</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkComboBox" id="encoding_combo">
+                <property name="visible">True</property>
+                <signal name="changed" handler="on_encoding_combo_changed"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox13">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkTextView" id="textview1">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="editable">False</property>
+                    <property name="wrap_mode">GTK_WRAP_WORD</property>
+                    <property name="text" translatable="yes">Normally, the encoding specified above will only be used when importing new tracks, and for any operations involving existing tracks, the encoding specified when the file was first imported will be used. You can use the options below to override this behavior, in case you specified the encoding incorrectly for the first import.</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="use_encoding_for_update">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Also use this encoding when updating or synchronizing tracks</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="use_encoding_for_writing">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Also use this encoding when writing tracks</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+              </widget>
+              <packing>
+                <property name="position">4</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area7">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="close_button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_tag_parse_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Filename Parse Preferences</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox8">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox23">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="spacing">6</property>
+            <child>
+              <widget class="GtkHBox" id="hbox16">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="label29">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Filename parse pattern:</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="filename_pattern">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <signal name="changed" handler="on_filename_pattern_changed"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label30">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">You can separate several templates by a ';'. The first one matching the filename will be used.
 
-	  <child>
-	    <widget class="GtkLabel" id="repository_name_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Repository name:</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">10</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">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
+Example: &lt;i&gt;%a - %A/%T %t.mp3;%t.wav&lt;/i&gt;.
 
-	  <child>
-	    <widget class="GtkEntry" id="repository_name_entry">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">True</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes"></property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </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_padding">3</property>
-	      <property name="y_padding">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
+- artist: %a
+- album: %A
+- composer: %c
+- title: %t
+- genre: %G
+- track nr: %T
+- CD nr: %C
+- year: %Y
+- skip data: %*
+- the character '%': %%.</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkCheckButton" id="overwrite_tags">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Overwrite existing tags</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area8">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="close_button2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_coverart_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Cover Art Search Preferences</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox10">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox25">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="spacing">6</property>
+            <child>
+              <widget class="GtkHBox" id="hbox24">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="label31">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Cover art file pattern:</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="coverart_pattern">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <signal name="changed" handler="on_coverart_pattern_changed"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label32">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">You can separate several templates by a ';'. The first one matching the filename will be used.
 
-	  <child>
-	    <widget class="GtkComboBoxEntry" id="ipod_model_combo">
-	      <property name="visible">True</property>
-	      <property name="add_tearoffs">False</property>
-	      <property name="has_frame">True</property>
-	      <property name="focus_on_click">True</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">4</property>
-	      <property name="bottom_attach">5</property>
-	      <property name="x_padding">3</property>
-	      <property name="y_padding">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
+Examples:
+- &lt;i&gt;folder.jpg&lt;/i&gt;: Use &lt;i&gt;folder.jpg&lt;/i&gt; as cover art.
+- &lt;i&gt;folder&lt;/i&gt;: Use &lt;i&gt;folder.jpg&lt;/i&gt;, &lt;i&gt;folder.png&lt;/i&gt;...
+- &lt;i&gt;../%A.jpg&lt;/i&gt;: Use &lt;i&gt;&amp;lt;Album&amp;gt;.jpg&lt;/i&gt; in the parent directory
+- &lt;i&gt;%A&lt;/i&gt;: Use &lt;i&gt;&amp;lt;Album&amp;gt;.jpg&lt;/i&gt;, &lt;i&gt;&amp;lt;Album&amp;gt;.png&lt;/i&gt;...
+- &lt;i&gt;folder.jpg;%a.jpg&lt;/i&gt;: First try &lt;i&gt;folder.jpg&lt;/i&gt;, then &lt;i&gt;&amp;lt;artist&amp;gt;.jpg&lt;/i&gt;
 
-      <child>
-	<placeholder/>
-      </child>
+- artist: %a
+- album: %A
+- composer: %c
+- title: %t
+- genre: %G
+- track nr: %T
+- CD nr: %C
+- year: %Y
+- skip data: %*
+- the character '%': %%.</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area10">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="close_button3">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_video_thumbnailer_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Video Thumbnail Generation</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox17">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox48">
+            <property name="visible">True</property>
+            <property name="spacing">6</property>
+            <child>
+              <widget class="GtkHBox" id="hbox75">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="label99">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="label" translatable="yes">Video thumbnailing program:</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="video_thumbnailer">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <signal name="changed" handler="on_video_thumbnailer_changed"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label101">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Provide a shell command to generate a thumbnail image of your video file.  The following format strings will be expanded:
+- %f: the input file
+- %o: the output file (which is automatically generated)
+</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area17">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="close_button4">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_exclusions_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Exclusions List</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="default_height">350</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox11">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox24">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="spacing">6</property>
+            <child>
+              <widget class="GtkHBox" id="hbox19">
+                <property name="visible">True</property>
+                <child>
+                  <widget class="GtkLabel" id="label33">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Add file masks to be excluded from import and synchronization, for example, &lt;i&gt;*.mp3&lt;/i&gt;.</property>
+                    <property name="use_markup">True</property>
+                    <property name="wrap">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkEntry" id="new_exclusion">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHButtonBox" id="hbuttonbox3">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                <child>
+                  <widget class="GtkButton" id="add_exclusion">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label">gtk-add</property>
+                    <property name="use_stock">True</property>
+                    <property name="response_id">0</property>
+                    <signal name="clicked" handler="on_add_exclusion_clicked"/>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="remove_exclusion">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label">gtk-remove</property>
+                    <property name="use_stock">True</property>
+                    <property name="response_id">0</property>
+                    <signal name="clicked" handler="on_remove_exclusion_clicked"/>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                <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>
+                <child>
+                  <widget class="GtkTreeView" id="exclusion_list">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="headers_visible">False</property>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area11">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="close_button5">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_mserv_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">mserv Preferences</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="default_width">400</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox12">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox26">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="spacing">18</property>
+            <child>
+              <widget class="GtkCheckButton" id="use_mserv">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label" translatable="yes">Use mserv database to fill track information</property>
+                <property name="use_underline">True</property>
+                <property name="response_id">0</property>
+                <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="mserv_settings_frame">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment31">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox27">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkTable" id="table4">
+                            <property name="visible">True</property>
+                            <property name="n_rows">3</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">12</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <widget class="GtkEntry" id="mserv_username">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <signal name="changed" handler="on_mserv_username_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkFileChooserButton" id="mserv_root">
+                                <property name="visible">True</property>
+                                <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                                <signal name="current_folder_changed" handler="on_mserv_root_current_folder_changed"/>
+                              </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>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkFileChooserButton" id="music_root">
+                                <property name="visible">True</property>
+                                <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                                <signal name="current_folder_changed" handler="on_music_root_current_folder_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox26">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label36">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Music root:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="x_options"></property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox27">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label37">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">mserv root:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options"></property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox28">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label38">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Username:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options"></property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="report_mserv_problems">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Report problems when accessing mserv</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label39">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;mserv Settings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area12">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="close_button6">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_commands_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox13">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox32">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="spacing">18</property>
+            <child>
+              <widget class="GtkFrame" id="frame19">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment36">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkTable" id="table7">
+                        <property name="visible">True</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">3</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox56">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkButton" id="browse_enqueue">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="response_id">0</property>
+                                <signal name="clicked" handler="on_browse_button_clicked"/>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox61">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image4">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-directory</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label40">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Browse...</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">GTK_PACK_END</property>
+                              </packing>
+                            </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>
+                            <property name="x_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox42">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkButton" id="browse_playnow">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="response_id">0</property>
+                                <signal name="clicked" handler="on_browse_button_clicked"/>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox42">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image2">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-directory</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label41">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Browse...</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">GTK_PACK_END</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="x_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="cmd_enqueue">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <signal name="changed" handler="on_cmd_entry_changed"/>
+                          </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="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="cmd_playnow">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <signal name="changed" handler="on_cmd_entry_changed"/>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox47">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkLabel" id="label46">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Command for "Play now":</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox48">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkLabel" id="label47">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Command for "Enqueue":</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label44">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Playback&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="frame24">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment5">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkTable" id="table10">
+                        <property name="visible">True</property>
+                        <property name="n_rows">2</property>
+                        <property name="n_columns">3</property>
+                        <property name="column_spacing">12</property>
+                        <property name="row_spacing">6</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox80">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkButton" id="browse_aacgain">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="response_id">0</property>
+                                <signal name="clicked" handler="on_browse_button_clicked"/>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox81">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image19">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-directory</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label110">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Browse...</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">GTK_PACK_END</property>
+                              </packing>
+                            </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>
+                            <property name="x_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox82">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkButton" id="browse_mp3gain">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="response_id">0</property>
+                                <signal name="clicked" handler="on_browse_button_clicked"/>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox83">
+                                    <property name="visible">True</property>
+                                    <property name="spacing">2</property>
+                                    <child>
+                                      <widget class="GtkImage" id="image21">
+                                        <property name="visible">True</property>
+                                        <property name="stock">gtk-directory</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkLabel" id="label111">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes">Browse...</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="pack_type">GTK_PACK_END</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="x_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="cmd_aacgain">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <signal name="changed" handler="on_cmd_entry_changed"/>
+                          </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="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="cmd_mp3gain">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <signal name="changed" handler="on_cmd_entry_changed"/>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox84">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkLabel" id="label112">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">&lt;i&gt;mp3gain&lt;/i&gt; executable:</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox85">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkLabel" id="label113">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">&lt;i&gt;aacgain&lt;/i&gt; executable:</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label114">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Volume Normalization&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area13">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="prefs_conversion_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Conversion Preferences</property>
+    <property name="resizable">False</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox14">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkVBox" id="vbox33">
+            <property name="visible">True</property>
+            <property name="border_width">7</property>
+            <property name="spacing">18</property>
+            <child>
+              <widget class="GtkFrame" id="frame21">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment39">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox34">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="convert_ogg">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Convert Ogg Vorbis</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="convert_flac">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Convert FLAC</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label42">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Incompatible Formats&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="frame22">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment40">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox35">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkLabel" id="label45">
+                            <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Convert compatible formats to a single format</property>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment42">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox36">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="convert_mp3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Convert MP3</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="convert_aac">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Convert AAC (M4A)</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="convert_wav">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Convert WAV</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label43">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Compatible Formats&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkFrame" id="frame23">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment41">
+                    <property name="visible">True</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox38">
+                        <property name="visible">True</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkTable" id="table9">
+                            <property name="visible">True</property>
+                            <property name="n_rows">3</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">12</property>
+                            <property name="row_spacing">6</property>
+                            <child>
+                              <widget class="GtkHBox" id="hbox31">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label55">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Maximum threads:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox49">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label102">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Maximum cache size:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox50">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkLabel" id="label106">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Cache folder:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox54">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkSpinButton" id="bg_threads">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="adjustment">0 0 100 1 10 10</property>
+                                    <property name="climb_rate">1</property>
+                                    <signal name="value_changed" handler="on_bg_threads_value_changed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox55">
+                                <property name="visible">True</property>
+                                <property name="spacing">12</property>
+                                <child>
+                                  <widget class="GtkSpinButton" id="cache_size">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="adjustment">4 0 100 1 10 10</property>
+                                    <property name="climb_rate">1</property>
+                                    <property name="digits">1</property>
+                                    <signal name="value_changed" handler="on_cache_size_value_changed"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label107">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">GB</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</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="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkFileChooserButton" id="cache_folder">
+                                <property name="visible">True</property>
+                                <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                                <signal name="current_folder_changed" handler="on_cache_folder_current_folder_changed"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="display_conversion_log">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Display conversion log</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="on_simple_checkbox_toggled"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label109">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Conversion Settings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area14">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="button2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="info_dialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">gtkpod Information</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="default_width">600</property>
+    <property name="default_height">350</property>
+    <property name="icon">gtkpod-icon-48.png</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <signal name="delete_event" handler="close_info_dialog"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox15">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkScrolledWindow" id="scrolledwindow5">
+            <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_NEVER</property>
+            <property name="shadow_type">GTK_SHADOW_IN</property>
+            <child>
+              <widget class="GtkTreeView" id="info_tree">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="rules_hint">True</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area15">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="button3">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="close_info_dialog"/>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="input_box">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes"> </property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox16">
+        <property name="visible">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="spacing">12</property>
+        <child>
+          <widget class="GtkHBox" id="hbox184">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="border_width">6</property>
+            <property name="spacing">12</property>
+            <child>
+              <widget class="GtkImage" id="image16">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="yalign">0</property>
+                <property name="stock">gtk-dialog-question</property>
+                <property name="icon_size">6</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox42">
+                <property name="visible">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkLabel" id="input_box_label">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="xalign">0</property>
+                    <property name="label">&lt;span weight='bold' size='larger'&gt;Message&lt;/span&gt;
 
-      <child>
-	<placeholder/>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator58">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">2</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox16">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">7</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancel_button">
-	      <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>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="ok_button">
-	      <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>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="ipod_init_dialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Initialize iPod</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_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-vbox2">
-      <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_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <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">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <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="vbox172">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="ipod_init_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;b&gt;Please select mountpoint and your iPod model&lt;/b&gt;</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</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">5</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkViewport" id="viewport22">
-	      <property name="visible">True</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox173">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">4</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table48">
-		      <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">0</property>
-		      <property name="column_spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label428">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">iPod mountpoint:</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">10</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">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="mountpoint_entry">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes"></property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
-			  <property name="activates_default">False</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_padding">3</property>
-			  <property name="y_padding">3</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="mountpoint_button">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Browse</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="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_padding">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label430">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Model:</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">10</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">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="GtkComboBoxEntry" id="model_combo">
-			  <property name="visible">True</property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="has_frame">True</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_padding">3</property>
-			  <property name="y_padding">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">6</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</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="GtkDialog" id="set_ipod_model_dialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Initialize iPod</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_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-vbox2">
-      <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_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelbutton1">
-	      <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">-6</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <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="vbox172">
-	  <property name="border_width">5</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label">
-	      <property name="visible">True</property>
-	      <property name="label">label set by application</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</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">5</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkViewport" id="viewport22">
-	      <property name="visible">True</property>
-	      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox173">
-		  <property name="border_width">6</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">4</property>
-
-		  <child>
-		    <widget class="GtkTable" id="table48">
-		      <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">0</property>
-		      <property name="column_spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label430">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Model:</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">10</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">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="GtkComboBoxEntry" id="model_combo">
-			  <property name="width_request">250</property>
-			  <property name="visible">True</property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="has_frame">True</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_padding">3</property>
-			  <property name="y_padding">3</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">6</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <placeholder/>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</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>
-  <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="GtkVBox" id="vbox180">
-      <property name="border_width">5</property>
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">5</property>
-
-      <child>
-	<widget class="GtkLabel" id="textlabel">
-	  <property name="visible">True</property>
-	  <property name="label">Some placeholder text to assure reasonable size.</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="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkProgressBar" id="progressbar">
-	  <property name="visible">True</property>
-	  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
-	  <property name="fraction">0</property>
-	  <property name="pulse_step">0.10000000149</property>
-	  <property name="text"></property>
-	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<placeholder/>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator59">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox17">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkButton" id="abortbutton">
-	      <property name="border_width">2</property>
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Export can be continued at a later time if canceled.</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>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkWindow" id="conversion_log">
-  <property name="border_width">4</property>
-  <property name="title" translatable="yes">Conversion Progress Display</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="GtkVBox" id="conversion_vbox">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">4</property>
-
-      <child>
-	<widget class="GtkLabel" id="label463">
-	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">The output of the background conversion scripts is copied below. Each page of the notebook corresponds to one background thread.</property>
-	  <property name="use_underline">False</property>
-	  <property name="use_markup">False</property>
-	  <property name="justify">GTK_JUSTIFY_LEFT</property>
-	  <property name="wrap">True</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="padding">8</property>
-	  <property name="expand">False</property>
-	  <property name="fill">False</property>
-	</packing>
-      </child>
-
-      <child>
-	<placeholder/>
-      </child>
-
-      <child>
-	<widget class="GtkStatusbar" id="conversion_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>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-    </widget>
-  </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">&lt;b&gt;Placeholder for image information&lt;/b&gt;</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>
-
+The quick brown fox jumps over the lazy dog.</property>
+                    <property name="use_markup">True</property>
+                    <property name="wrap">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkAlignment" id="alignment12">
+                    <property name="visible">True</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox45">
+                        <property name="visible">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkEntry" id="input_box_entry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="input_box_checkbox">
+                            <property name="can_focus">True</property>
+                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                            <property name="label">checkbutton</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area16">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>

Added: gtkpod/branches/upstream/current/data/icons/16x16/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/16x16/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/16x16/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+appicondir = $(datadir)/icons/hicolor/16x16/apps
+appicon_DATA = gtkpod.png
+
+EXTRA_DIST = $(appicon_DATA)

Added: gtkpod/branches/upstream/current/data/icons/16x16/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/16x16/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/16x16/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/16x16
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+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/16x16/apps
+appicon_DATA = gtkpod.png
+EXTRA_DIST = $(appicon_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/16x16/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/16x16/Makefile
+.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)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appicondir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/16x16/gtkpod.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/16x16/gtkpod.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/22x22/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/22x22/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/22x22/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+appicondir = $(datadir)/icons/hicolor/22x22/apps
+appicon_DATA = gtkpod.png
+
+EXTRA_DIST = $(appicon_DATA)

Added: gtkpod/branches/upstream/current/data/icons/22x22/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/22x22/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/22x22/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/22x22
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+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/22x22/apps
+appicon_DATA = gtkpod.png
+EXTRA_DIST = $(appicon_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/22x22/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/22x22/Makefile
+.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)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appicondir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/22x22/gtkpod.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/22x22/gtkpod.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/24x24/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/24x24/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/24x24/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+appicondir = $(datadir)/icons/hicolor/24x24/apps
+appicon_DATA = gtkpod.png
+
+EXTRA_DIST = $(appicon_DATA)

Added: gtkpod/branches/upstream/current/data/icons/24x24/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/24x24/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/24x24/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/24x24
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+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/24x24/apps
+appicon_DATA = gtkpod.png
+EXTRA_DIST = $(appicon_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/24x24/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/24x24/Makefile
+.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)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appicondir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/24x24/gtkpod.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/24x24/gtkpod.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: gtkpod/branches/upstream/current/data/icons/32x32/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/32x32/Makefile.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/icons/32x32/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -130,8 +130,6 @@
 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@
@@ -144,6 +142,7 @@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

Modified: gtkpod/branches/upstream/current/data/icons/32x32/gtkpod.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/icons/48x48/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/48x48/Makefile.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/icons/48x48/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -130,8 +130,6 @@
 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@
@@ -144,6 +142,7 @@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

Modified: gtkpod/branches/upstream/current/data/icons/48x48/gtkpod.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/icons/64x64/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/64x64/Makefile.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/icons/64x64/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -130,8 +130,6 @@
 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@
@@ -144,6 +142,7 @@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

Modified: gtkpod/branches/upstream/current/data/icons/64x64/gtkpod.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/data/icons/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/Makefile.am	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/icons/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-SUBDIRS = 32x32 48x48 64x64
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 64x64 scalable hicolor
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 

Modified: gtkpod/branches/upstream/current/data/icons/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/Makefile.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/data/icons/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -132,8 +132,6 @@
 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@
@@ -146,6 +144,7 @@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -215,7 +214,7 @@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = 32x32 48x48 64x64
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 64x64 scalable hicolor
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 all: all-recursive
 
@@ -325,8 +324,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -351,8 +350,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -362,13 +361,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/16x16/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/16x16/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1 @@
+SUBDIRS = places status

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/16x16/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/16x16/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,525 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/16x16
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = places status
+all: all-recursive
+
+.SUFFIXES:
+$(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/hicolor/16x16/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/16x16/Makefile
+.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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+placesdir = $(pkgdatadir)/icons/hicolor/16x16/places
+places_DATA = playlist.png playlist-photo.png
+
+EXTRA_DIST = $(places_DATA)

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/16x16/places
+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)$(placesdir)"
+placesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(places_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+placesdir = $(pkgdatadir)/icons/hicolor/16x16/places
+places_DATA = playlist.png playlist-photo.png
+EXTRA_DIST = $(places_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/hicolor/16x16/places/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/16x16/places/Makefile
+.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-placesDATA: $(places_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(placesdir)" || $(MKDIR_P) "$(DESTDIR)$(placesdir)"
+	@list='$(places_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(placesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(placesdir)/$$f'"; \
+	  $(placesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+
+uninstall-placesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(places_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(placesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(placesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-placesDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-placesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-placesDATA 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-placesDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/playlist-photo.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/playlist-photo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/playlist.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/places/playlist.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+statusdir = $(pkgdatadir)/icons/hicolor/16x16/status
+status_DATA = star-none.png star-set.png star-unset.png
+
+EXTRA_DIST = $(status_DATA)

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/16x16/status
+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)$(statusdir)"
+statusDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(status_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+statusdir = $(pkgdatadir)/icons/hicolor/16x16/status
+status_DATA = star-none.png star-set.png star-unset.png
+EXTRA_DIST = $(status_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/hicolor/16x16/status/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/16x16/status/Makefile
+.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-statusDATA: $(status_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(statusdir)" || $(MKDIR_P) "$(DESTDIR)$(statusdir)"
+	@list='$(status_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(statusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(statusdir)/$$f'"; \
+	  $(statusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(statusdir)/$$f"; \
+	done
+
+uninstall-statusDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(status_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(statusdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(statusdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(statusdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-statusDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-statusDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-statusDATA install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-statusDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-none.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-none.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-set.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-set.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-unset.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/16x16/status/star-unset.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/22x22/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/22x22/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/22x22/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1 @@
+SUBDIRS = places

Added: gtkpod/branches/upstream/current/data/icons/hicolor/22x22/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/22x22/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/22x22/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,525 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/22x22
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = places
+all: all-recursive
+
+.SUFFIXES:
+$(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/hicolor/22x22/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/22x22/Makefile
+.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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+placesdir = $(pkgdatadir)/icons/hicolor/22x22/places
+places_DATA = playlist.png playlist-photo.png
+
+EXTRA_DIST = $(places_DATA)

Added: gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/22x22/places
+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)$(placesdir)"
+placesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(places_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+placesdir = $(pkgdatadir)/icons/hicolor/22x22/places
+places_DATA = playlist.png playlist-photo.png
+EXTRA_DIST = $(places_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/hicolor/22x22/places/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/22x22/places/Makefile
+.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-placesDATA: $(places_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(placesdir)" || $(MKDIR_P) "$(DESTDIR)$(placesdir)"
+	@list='$(places_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(placesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(placesdir)/$$f'"; \
+	  $(placesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+
+uninstall-placesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(places_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(placesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(placesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-placesDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-placesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-placesDATA 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-placesDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/playlist-photo.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/playlist-photo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/playlist.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/22x22/places/playlist.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/24x24/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/24x24/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/24x24/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1 @@
+SUBDIRS = places

Added: gtkpod/branches/upstream/current/data/icons/hicolor/24x24/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/24x24/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/24x24/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,525 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/24x24
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = places
+all: all-recursive
+
+.SUFFIXES:
+$(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/hicolor/24x24/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/24x24/Makefile
+.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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+placesdir = $(pkgdatadir)/icons/hicolor/24x24/places
+places_DATA = playlist.png playlist-photo.png
+
+EXTRA_DIST = $(places_DATA)

Added: gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/24x24/places
+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)$(placesdir)"
+placesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(places_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+placesdir = $(pkgdatadir)/icons/hicolor/24x24/places
+places_DATA = playlist.png playlist-photo.png
+EXTRA_DIST = $(places_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/hicolor/24x24/places/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/24x24/places/Makefile
+.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-placesDATA: $(places_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(placesdir)" || $(MKDIR_P) "$(DESTDIR)$(placesdir)"
+	@list='$(places_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(placesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(placesdir)/$$f'"; \
+	  $(placesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+
+uninstall-placesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(places_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(placesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(placesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-placesDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-placesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-placesDATA 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-placesDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/playlist-photo.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/playlist-photo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/playlist.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/24x24/places/playlist.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/32x32/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/32x32/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/32x32/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1 @@
+SUBDIRS = places

Added: gtkpod/branches/upstream/current/data/icons/hicolor/32x32/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/32x32/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/32x32/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,525 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/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 =
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = places
+all: all-recursive
+
+.SUFFIXES:
+$(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/hicolor/32x32/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/32x32/Makefile
+.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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+placesdir = $(pkgdatadir)/icons/hicolor/32x32/places
+places_DATA = playlist.png playlist-photo.png
+
+EXTRA_DIST = $(places_DATA)

Added: gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/32x32/places
+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)$(placesdir)"
+placesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(places_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+placesdir = $(pkgdatadir)/icons/hicolor/32x32/places
+places_DATA = playlist.png playlist-photo.png
+EXTRA_DIST = $(places_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/hicolor/32x32/places/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/32x32/places/Makefile
+.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-placesDATA: $(places_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(placesdir)" || $(MKDIR_P) "$(DESTDIR)$(placesdir)"
+	@list='$(places_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(placesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(placesdir)/$$f'"; \
+	  $(placesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+
+uninstall-placesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(places_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(placesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(placesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-placesDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-placesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-placesDATA 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-placesDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/playlist-photo.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/playlist-photo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/playlist.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/32x32/places/playlist.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/48x48/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/48x48/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/48x48/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1 @@
+SUBDIRS = places

Added: gtkpod/branches/upstream/current/data/icons/hicolor/48x48/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/48x48/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/48x48/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,525 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/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 =
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = places
+all: all-recursive
+
+.SUFFIXES:
+$(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/hicolor/48x48/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/48x48/Makefile
+.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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+placesdir = $(pkgdatadir)/icons/hicolor/48x48/places
+places_DATA = playlist.png playlist-photo.png
+
+EXTRA_DIST = $(places_DATA)

Added: gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/48x48/places
+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)$(placesdir)"
+placesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(places_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+placesdir = $(pkgdatadir)/icons/hicolor/48x48/places
+places_DATA = playlist.png playlist-photo.png
+EXTRA_DIST = $(places_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/hicolor/48x48/places/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/48x48/places/Makefile
+.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-placesDATA: $(places_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(placesdir)" || $(MKDIR_P) "$(DESTDIR)$(placesdir)"
+	@list='$(places_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(placesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(placesdir)/$$f'"; \
+	  $(placesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+
+uninstall-placesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(places_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(placesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(placesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-placesDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-placesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-placesDATA 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-placesDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/playlist-photo.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/playlist-photo.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/playlist.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/icons/hicolor/48x48/places/playlist.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/icons/hicolor/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1 @@
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable

Added: gtkpod/branches/upstream/current/data/icons/hicolor/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,525 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
+all: all-recursive
+
+.SUFFIXES:
+$(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/hicolor/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/Makefile
+.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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/scalable/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/scalable/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/scalable/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1 @@
+SUBDIRS = places

Added: gtkpod/branches/upstream/current/data/icons/hicolor/scalable/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/scalable/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/scalable/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,525 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/scalable
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = places
+all: all-recursive
+
+.SUFFIXES:
+$(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/hicolor/scalable/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/scalable/Makefile
+.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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-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
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+placesdir = $(pkgdatadir)/icons/hicolor/scalable/places
+places_DATA = playlist.svg playlist-photo.svg
+
+EXTRA_DIST = $(places_DATA)

Added: gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/hicolor/scalable/places
+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)$(placesdir)"
+placesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(places_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+placesdir = $(pkgdatadir)/icons/hicolor/scalable/places
+places_DATA = playlist.svg playlist-photo.svg
+EXTRA_DIST = $(places_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/hicolor/scalable/places/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/hicolor/scalable/places/Makefile
+.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-placesDATA: $(places_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(placesdir)" || $(MKDIR_P) "$(DESTDIR)$(placesdir)"
+	@list='$(places_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(placesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(placesdir)/$$f'"; \
+	  $(placesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+
+uninstall-placesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(places_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(placesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(placesdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(placesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-placesDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-placesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-placesDATA 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-placesDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/playlist-photo.svg
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/playlist-photo.svg	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/playlist-photo.svg	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,2571 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2307"
+   sodipodi:version="0.32"
+   inkscape:version="0.45"
+   sodipodi:docname="emblem-photos.svg"
+   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/emblems"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs2309">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4840">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4842" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4844" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3848">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3850" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop3852" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3820"
+       inkscape:collect="always">
+      <stop
+         id="stop3822"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop3824"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3806">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0"
+         id="stop3808" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop3810" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3790">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3792" />
+      <stop
+         style="stop-color:#e9b96e;stop-opacity:1"
+         offset="1"
+         id="stop3794" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3773">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3775" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3777" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3542">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3544" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48669201"
+         offset="1"
+         id="stop3547" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3520">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3522" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop3525" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3527">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3529" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3531" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3601">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3603" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3605" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3552"
+       inkscape:collect="always">
+      <stop
+         id="stop3554"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+      <stop
+         id="stop3556"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3544"
+       inkscape:collect="always">
+      <stop
+         id="stop3546"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop3548"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3538"
+       inkscape:collect="always">
+      <stop
+         id="stop3540"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop3542"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3530">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop3532" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0"
+         offset="1"
+         id="stop3534" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3522"
+       inkscape:collect="always">
+      <stop
+         id="stop3524"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1" />
+      <stop
+         id="stop3526"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3705">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3707" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:0;"
+         offset="1"
+         id="stop3709" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3697">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3699" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:0;"
+         offset="1"
+         id="stop3701" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3513">
+      <stop
+         style="stop-color:#f57900;stop-opacity:1"
+         offset="0"
+         id="stop3515" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3517" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3493">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3495" />
+      <stop
+         id="stop3503"
+         offset="0.81308645"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3501"
+         offset="0.84008509"
+         style="stop-color:#fdf4a7;stop-opacity:1;" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:0;"
+         offset="1"
+         id="stop3497" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3431">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3433" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3435" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3405">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3407" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3409" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3397">
+      <stop
+         style="stop-color:#e9b96e;stop-opacity:1"
+         offset="0"
+         id="stop3399" />
+      <stop
+         style="stop-color:#653f01;stop-opacity:1"
+         offset="1"
+         id="stop3401" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3389">
+      <stop
+         style="stop-color:#8f5902;stop-opacity:1"
+         offset="0"
+         id="stop3391" />
+      <stop
+         style="stop-color:#8f5902;stop-opacity:0"
+         offset="1"
+         id="stop3393" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3389"
+       id="linearGradient3395"
+       x1="34.9375"
+       y1="-59.28125"
+       x2="34.9375"
+       y2="-60.439186"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3397"
+       id="linearGradient3415"
+       x1="12.227922"
+       y1="-53.602253"
+       x2="12.227922"
+       y2="-65.245789"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3431"
+       id="radialGradient3440"
+       cx="7.0863543"
+       cy="-81.039185"
+       fx="7.0863543"
+       fy="-81.039185"
+       r="15.5"
+       gradientTransform="matrix(2.1388215,0,0,0.781307,-10.156447,-10.683516)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3405"
+       id="linearGradient3455"
+       gradientUnits="userSpaceOnUse"
+       x1="21.8125"
+       y1="-73.30188"
+       x2="21.8125"
+       y2="-63.037922" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3431"
+       id="radialGradient3459"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.5831757,0,0,0.9436286,-13.121666,-28.19018)"
+       cx="6.6730971"
+       cy="-76.966545"
+       fx="6.6730971"
+       fy="-76.966545"
+       r="15.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3493"
+       id="radialGradient3499"
+       cx="22"
+       cy="-96"
+       fx="22"
+       fy="-96"
+       r="4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,1.9999994)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3513"
+       id="linearGradient3519"
+       x1="23.931919"
+       y1="-104.15109"
+       x2="23.931919"
+       y2="-94.357811"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3431"
+       id="radialGradient3672"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1388215,0,0,0.781307,29.843553,-10.683516)"
+       cx="7.0863543"
+       cy="-81.039185"
+       fx="7.0863543"
+       fy="-81.039185"
+       r="15.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3405"
+       id="linearGradient3680"
+       gradientUnits="userSpaceOnUse"
+       x1="21.8125"
+       y1="-73.30188"
+       x2="21.8125"
+       y2="-63.037922"
+       gradientTransform="translate(40,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3697"
+       id="linearGradient3703"
+       x1="62.375"
+       y1="-58.5"
+       x2="61.5"
+       y2="-64.375"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3705"
+       id="linearGradient3711"
+       x1="66.375"
+       y1="-61.75"
+       x2="65.875"
+       y2="-68.375"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3544"
+       id="radialGradient3506"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0845846,0,0,1.1782442,-2.0300301,-4.1887404)"
+       cx="24"
+       cy="23.5"
+       fx="24"
+       fy="23.5"
+       r="24" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3538"
+       id="radialGradient3508"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0845846,0,0,3.6828459,-2.0300301,-63.04688)"
+       cx="24"
+       cy="23.5"
+       fx="24"
+       fy="23.5"
+       r="24" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3530"
+       id="radialGradient3528"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0845846,0,0,3.4021649,-2.0300301,-56.450876)"
+       cx="24"
+       cy="23.5"
+       fx="24"
+       fy="23.5"
+       r="24" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3522"
+       id="radialGradient3536"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0845846,0,0,3.6828459,-2.0300301,-63.04688)"
+       cx="24"
+       cy="23.5"
+       fx="24"
+       fy="23.5"
+       r="24" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3601"
+       id="radialGradient3471"
+       gradientUnits="userSpaceOnUse"
+       cx="24.218407"
+       cy="24.218407"
+       fx="24.218407"
+       fy="24.218407"
+       r="24.218407" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3405"
+       id="linearGradient3473"
+       gradientUnits="userSpaceOnUse"
+       x1="21.8125"
+       y1="-73.30188"
+       x2="21.8125"
+       y2="-63.037922" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3397"
+       id="linearGradient3475"
+       gradientUnits="userSpaceOnUse"
+       x1="12.227922"
+       y1="-53.602253"
+       x2="12.227922"
+       y2="-65.245789" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3389"
+       id="linearGradient3477"
+       gradientUnits="userSpaceOnUse"
+       x1="34.9375"
+       y1="-59.28125"
+       x2="34.9375"
+       y2="-60.439186" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3431"
+       id="radialGradient3479"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1388215,0,0,0.781307,-10.156447,-10.683516)"
+       cx="7.0863543"
+       cy="-81.039185"
+       fx="7.0863543"
+       fy="-81.039185"
+       r="15.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3405"
+       id="linearGradient3481"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(40,0)"
+       x1="21.8125"
+       y1="-73.30188"
+       x2="21.8125"
+       y2="-63.037922" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3431"
+       id="radialGradient3483"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1388215,0,0,0.781307,29.843553,-10.683516)"
+       cx="7.0863543"
+       cy="-81.039185"
+       fx="7.0863543"
+       fy="-81.039185"
+       r="15.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3705"
+       id="linearGradient3485"
+       gradientUnits="userSpaceOnUse"
+       x1="66.375"
+       y1="-61.75"
+       x2="65.875"
+       y2="-68.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3697"
+       id="linearGradient3487"
+       gradientUnits="userSpaceOnUse"
+       x1="62.375"
+       y1="-58.5"
+       x2="61.5"
+       y2="-64.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3489"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-70,0)"
+       x1="86.5"
+       y1="27.988253"
+       x2="78.9375"
+       y2="35.8125" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3552"
+       id="linearGradient3491"
+       gradientUnits="userSpaceOnUse"
+       x1="33.067142"
+       y1="-68.606171"
+       x2="12.312527"
+       y2="-115.58344" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3513"
+       id="linearGradient3494"
+       gradientUnits="userSpaceOnUse"
+       x1="23.931919"
+       y1="-104.15109"
+       x2="23.931919"
+       y2="-94.357811" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3493"
+       id="radialGradient3496"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,1.9999994)"
+       cx="22"
+       cy="-96"
+       fx="22"
+       fy="-96"
+       r="4" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3431"
+       id="radialGradient3498"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.5831757,0,0,0.9436286,-13.121666,-28.19018)"
+       cx="6.6730971"
+       cy="-76.966545"
+       fx="6.6730971"
+       fy="-76.966545"
+       r="15.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3520"
+       id="radialGradient3538"
+       cx="76.625"
+       cy="36.080647"
+       fx="76.625"
+       fy="36.080647"
+       r="20"
+       gradientTransform="matrix(1.625,0,0,1.259375,-47.890625,-12.189063)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3542"
+       id="linearGradient3550"
+       x1="64.989273"
+       y1="14.550339"
+       x2="71.388336"
+       y2="56.04731"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3773"
+       id="linearGradient3779"
+       x1="43.310287"
+       y1="11.230447"
+       x2="44.125"
+       y2="44.994797"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3820"
+       id="radialGradient3830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8735036,0,0,0.8735036,4.5333351,3.4959452)"
+       cx="31.122519"
+       cy="32.693764"
+       fx="31.122519"
+       fy="32.693764"
+       r="8.5509113" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3806"
+       id="radialGradient3832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8735036,0,0,0.8735036,4.5333351,3.4959452)"
+       cx="35.880283"
+       cy="27.836349"
+       fx="35.880283"
+       fy="27.836349"
+       r="8.5509113" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4840"
+       id="linearGradient4846"
+       x1="38"
+       y1="23.66666"
+       x2="30.833328"
+       y2="34.333332"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3848"
+       id="radialGradient4854"
+       cx="39.5"
+       cy="23.999998"
+       fx="39.5"
+       fy="23.999998"
+       r="9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8338068,0,0,1.8338068,-32.93537,-20.011363)" />
+    <linearGradient
+       id="linearGradient10691"
+       inkscape:collect="always">
+      <stop
+         id="stop10693"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop10695"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3524">
+      <stop
+         id="stop5270"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:0;" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:0;"
+         offset="0.85000002"
+         id="stop5272" />
+      <stop
+         id="stop3528"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3670">
+      <stop
+         style="stop-color:#d3d7cf"
+         offset="0"
+         id="stop3672" />
+      <stop
+         style="stop-color:#555753"
+         offset="1"
+         id="stop3674" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3676"
+       inkscape:collect="always">
+      <stop
+         id="stop3678"
+         offset="0"
+         style="stop-color:#eeeeec" />
+      <stop
+         id="stop3680"
+         offset="1"
+         style="stop-color:#555753" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3692"
+       inkscape:collect="always">
+      <stop
+         id="stop3694"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3696"
+         offset="1"
+         style="stop-color:#babdb6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3730">
+      <stop
+         style="stop-color:#eeeeec"
+         offset="0"
+         id="stop3732" />
+      <stop
+         style="stop-color:#888a85"
+         offset="1"
+         id="stop3734" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3776"
+       inkscape:collect="always">
+      <stop
+         id="stop3778"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop3780"
+         offset="1"
+         style="stop-color:#e9b96e" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3802">
+      <stop
+         id="stop3804"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3806"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4179">
+      <stop
+         id="stop4181"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop4183"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4443"
+       inkscape:collect="always">
+      <stop
+         id="stop4445"
+         offset="0"
+         style="stop-color:#2e3436" />
+      <stop
+         id="stop4447"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4457">
+      <stop
+         style="stop-color:#cc0000"
+         offset="0"
+         id="stop4459" />
+      <stop
+         style="stop-color:#ef2929"
+         offset="1"
+         id="stop4461" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1557">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop1559" />
+      <stop
+         style="stop-color:#888a85"
+         offset="1"
+         id="stop1561" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4457"
+       id="linearGradient5639"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)"
+       x1="28.976408"
+       y1="31.069963"
+       x2="29"
+       y2="40.00526" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4457"
+       id="linearGradient5643"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.750053,0,0,0.750052,49.87293,11.12351)"
+       x1="28.976408"
+       y1="31.069963"
+       x2="29"
+       y2="40.00526" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4457"
+       id="linearGradient5654"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-222.45316,-277.85765)"
+       x1="28.976408"
+       y1="31.069963"
+       x2="29"
+       y2="40.00526" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5664"
+       gradientUnits="userSpaceOnUse"
+       x1="31.122492"
+       y1="37.319328"
+       x2="26.595585"
+       y2="27.982578" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5666"
+       gradientUnits="userSpaceOnUse"
+       x1="31.122492"
+       y1="37.319328"
+       x2="26.595585"
+       y2="27.982578" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5669"
+       gradientUnits="userSpaceOnUse"
+       x1="31.122492"
+       y1="37.319328"
+       x2="26.595585"
+       y2="27.982578" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5671"
+       gradientUnits="userSpaceOnUse"
+       x1="31.122492"
+       y1="37.319328"
+       x2="26.595585"
+       y2="27.982578" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3524"
+       id="radialGradient5688"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.706667,-3.134658e-7,3.134999e-7,1.706852,-278.41317,-270.82086)"
+       cx="24"
+       cy="23.998266"
+       fx="24"
+       fy="23.998266"
+       r="9.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5693"
+       gradientUnits="userSpaceOnUse"
+       x1="31.122492"
+       y1="37.319328"
+       x2="26.595585"
+       y2="27.982578" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5695"
+       gradientUnits="userSpaceOnUse"
+       x1="31.122492"
+       y1="37.319328"
+       x2="26.595585"
+       y2="27.982578" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5697"
+       gradientUnits="userSpaceOnUse"
+       x1="31.122492"
+       y1="37.319328"
+       x2="26.595585"
+       y2="27.982578" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5699"
+       gradientUnits="userSpaceOnUse"
+       x1="31.122492"
+       y1="37.319328"
+       x2="26.595585"
+       y2="27.982578" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3524"
+       id="radialGradient5721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.133334,5.970086e-7,-5.970733e-7,2.133565,-288.65317,-281.06076)"
+       cx="24"
+       cy="23.997831"
+       fx="24"
+       fy="23.997831"
+       r="9.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5726"
+       gradientUnits="userSpaceOnUse"
+       x1="14.547794"
+       y1="32.813522"
+       x2="20.205004"
+       y2="27.916948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5728"
+       gradientUnits="userSpaceOnUse"
+       x1="14.547794"
+       y1="32.813522"
+       x2="20.205004"
+       y2="27.916948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5730"
+       gradientUnits="userSpaceOnUse"
+       x1="14.547794"
+       y1="32.813522"
+       x2="20.205004"
+       y2="27.916948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5732"
+       gradientUnits="userSpaceOnUse"
+       x1="14.547794"
+       y1="32.813522"
+       x2="20.205004"
+       y2="27.916948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5734"
+       gradientUnits="userSpaceOnUse"
+       x1="40.308037"
+       y1="18.052834"
+       x2="28.882694"
+       y2="22.09783" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5736"
+       gradientUnits="userSpaceOnUse"
+       x1="40.308037"
+       y1="18.052834"
+       x2="28.882694"
+       y2="22.09783" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5738"
+       gradientUnits="userSpaceOnUse"
+       x1="40.308037"
+       y1="18.052834"
+       x2="28.882694"
+       y2="22.09783" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient5740"
+       gradientUnits="userSpaceOnUse"
+       x1="40.308037"
+       y1="18.052834"
+       x2="28.882694"
+       y2="22.09783" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3524"
+       id="radialGradient5770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.56,1.62901e-7,-1.629132e-7,2.560192,-298.89316,-291.29944)"
+       cx="24"
+       cy="23.99819"
+       fx="24"
+       fy="23.99819"
+       r="9.375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10691"
+       id="radialGradient5783"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="scale(1.902215,0.525703)"
+       cx="6.7027131"
+       cy="73.615714"
+       fx="6.7027131"
+       fy="73.615714"
+       r="7.2284161" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3527"
+       id="radialGradient5795"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.370852e-2,-1.424475,1.547293,6.92112e-2,-9.530629,30.98681)"
+       cx="12.704856"
+       cy="13.847466"
+       fx="12.704856"
+       fy="13.847466"
+       r="9.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3692"
+       id="linearGradient5797"
+       gradientUnits="userSpaceOnUse"
+       x1="-0.51990569"
+       y1="-0.51990569"
+       x2="-0.51990569"
+       y2="19.269905" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3670"
+       id="radialGradient5799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.240749,0,0,1.157631,-1.713645,-1.134736)"
+       cx="6.8797626"
+       cy="7.1986876"
+       fx="6.8797626"
+       fy="7.1986876"
+       r="9.375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3802"
+       id="linearGradient5843"
+       gradientUnits="userSpaceOnUse"
+       x1="11.205317"
+       y1="10.494597"
+       x2="36.958458"
+       y2="13.041261"
+       gradientTransform="translate(-261.45316,-253.85765)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3730"
+       id="radialGradient5853"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.310032,2.110862,-2.082775,-0.305867,-243.70028,-237.44306)"
+       cx="-1.0016617"
+       cy="0.99004257"
+       fx="-1.0016617"
+       fy="0.99004257"
+       r="9.9205223" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3676"
+       id="radialGradient5856"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.127582,1.416065,-1.630141,-0.146854,-243.96565,-238.29644)"
+       cx="-1.0016617"
+       cy="0.99004257"
+       fx="-1.0016617"
+       fy="0.99004257"
+       r="9.9205223" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1557"
+       id="linearGradient5858"
+       gradientUnits="userSpaceOnUse"
+       x1="17.0625"
+       y1="34.950001"
+       x2="20.3125"
+       y2="5.375"
+       gradientTransform="translate(-261.45316,-253.85765)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3790"
+       id="linearGradient5861"
+       gradientUnits="userSpaceOnUse"
+       x1="11"
+       y1="24"
+       x2="37"
+       y2="24"
+       gradientTransform="translate(-261.45316,-253.85765)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3776"
+       id="radialGradient5864"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.705951e-2,0.632425,-1.64403,-9.63398e-2,-231.61824,-255.70077)"
+       cx="14.98359"
+       cy="8.6957369"
+       fx="14.98359"
+       fy="8.6957369"
+       r="14" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4443"
+       id="linearGradient5868"
+       gradientUnits="userSpaceOnUse"
+       x1="43.14547"
+       y1="36.220219"
+       x2="46.613785"
+       y2="36.832134"
+       gradientTransform="translate(-261.45316,-173.85765)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3524"
+       id="radialGradient5875"
+       gradientUnits="userSpaceOnUse"
+       cx="9.375"
+       cy="9.375"
+       fx="9.375"
+       fy="9.375"
+       r="9.375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3524"
+       id="radialGradient5877"
+       gradientUnits="userSpaceOnUse"
+       cx="9.375"
+       cy="9.375"
+       fx="9.375"
+       fy="9.375"
+       r="9.375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3524"
+       id="radialGradient5879"
+       gradientUnits="userSpaceOnUse"
+       cx="9.375"
+       cy="9.375"
+       fx="9.375"
+       fy="9.375"
+       r="9.375" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="48.618333"
+     inkscape:cy="8.1246267"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showborder="false"
+     gridspacingx="0.5px"
+     gridspacingy="0.5px"
+     gridempspacing="2"
+     inkscape:grid-points="true"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1056"
+     inkscape:window-height="983"
+     inkscape:window-x="139"
+     inkscape:window-y="24"
+     width="48px"
+     height="48px"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata2312">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Photos</dc:title>
+        <dc:date>2006-06-11</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Lapo Calamandrei</dc:title>
+          </cc:Agent>
+        </dc:creator>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="base"
+     sodipodi:insensitive="true"
+     style="display:none">
+    <image
+       y="4.393683"
+       x="11.503743"
+       id="image3690"
+       height="39.962635"
+       width="67.242516"
+       sodipodi:absref="/home/lapo/Desktop/maudiodx4.jpg"
+       xlink:href="maudiodx4.jpg" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="righe nere"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="righe bianche"
+     style="display:none">
+    <g
+       id="g2475"
+       style="opacity:1;fill:url(#radialGradient3508);fill-opacity:1"
+       transform="translate(-80,0)">
+      <rect
+         y="18"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2477"
+         style="opacity:1;fill:url(#radialGradient3508);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="38"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2479"
+         style="opacity:1;fill:url(#radialGradient3508);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="28"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2481"
+         style="opacity:1;fill:url(#radialGradient3508);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="8"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2483"
+         style="opacity:1;fill:url(#radialGradient3536);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g2485"
+       style="opacity:1;fill:url(#radialGradient3506);fill-opacity:1"
+       transform="translate(-80,2)">
+      <rect
+         y="18"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2487"
+         style="opacity:1;fill:url(#radialGradient3506);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="38"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2489"
+         style="opacity:1;fill:url(#radialGradient3506);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="28"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2491"
+         style="opacity:1;fill:url(#radialGradient3506);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="8"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2493"
+         style="opacity:1;fill:url(#radialGradient3506);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g2495"
+       style="opacity:1;fill:url(#radialGradient3528);fill-opacity:1"
+       transform="translate(-80,1)">
+      <rect
+         y="18"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2497"
+         style="opacity:1;fill:url(#radialGradient3528);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="38"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2499"
+         style="opacity:1;fill:url(#radialGradient3528);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="28"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2501"
+         style="opacity:1;fill:url(#radialGradient3528);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         y="8"
+         x="0"
+         height="1"
+         width="48"
+         id="rect2503"
+         style="opacity:1;fill:url(#radialGradient3528);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display:inline">
+    <g
+       id="g3238"
+       style="opacity:0.30632181"
+       transform="translate(9,3)" />
+    <g
+       id="g3374"
+       transform="translate(1.0000005,98.6875)" />
+    <g
+       id="g3446">
+      <path
+         transform="matrix(0.9489185,0.2856547,-0.2618501,0.869842,7.7138511,-2.16203)"
+         d="M 48.436813 24.218407 A 24.218407 24.218407 0 1 1  0,24.218407 A 24.218407 24.218407 0 1 1  48.436813 24.218407 z"
+         sodipodi:ry="24.218407"
+         sodipodi:rx="24.218407"
+         sodipodi:cy="24.218407"
+         sodipodi:cx="24.218407"
+         id="path3599"
+         style="opacity:0.70114938;fill:url(#radialGradient3471);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <g
+         transform="matrix(0.964477,-0.2641668,0.2641668,0.964477,21.29531,86.05314)"
+         id="g3612">
+        <rect
+           style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3614"
+           width="38"
+           height="21.999998"
+           x="1.5"
+           y="-77.5"
+           rx="0.96564269"
+           ry="0.86008656" />
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3616"
+           width="36"
+           height="20"
+           x="2.5"
+           y="-76.5"
+           rx="0"
+           ry="0" />
+        <g
+           id="g3618">
+          <rect
+             ry="0"
+             rx="0"
+             y="-74.5"
+             x="4.5"
+             height="16"
+             width="32"
+             id="rect3620"
+             style="opacity:1;fill:url(#linearGradient3473);fill-opacity:1;stroke:#729fcf;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cccccccccc"
+             id="path3622"
+             d="M 5,-58.5 C 6.4374991,-66 8.9476793,-63.298522 11.1875,-69.6875 C 12.500716,-68.915662 12.986696,-69.420476 14,-68.5625 C 15.008661,-67.310159 15.472316,-65.331143 16,-63.4375 C 18.902977,-68 19.560828,-62 23.1875,-61.0625 C 27,-62.47312 27.5,-71 29.5,-70 C 30.317656,-70.761636 31.063694,-75.577727 32,-72 C 33,-68 35.664333,-63.743 36.5,-60 L 36.5,-58.5 L 5,-58.5 z "
+             style="fill:url(#linearGradient3475);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3477);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             id="path3624"
+             d="M 5,-74 L 36,-74 L 36,-67 C 19.658484,-70.066748 9.5831815,-65.279102 5,-60 L 5,-74 z "
+             style="opacity:0.5249042;fill:url(#radialGradient3479);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+        </g>
+      </g>
+      <g
+         transform="matrix(0.9659258,0.258819,-0.258819,0.9659258,-54.177707,80.868334)"
+         id="g3720">
+        <rect
+           style="fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3722"
+           width="38"
+           height="21.999998"
+           x="41.5"
+           y="-77.5"
+           rx="0.96564269"
+           ry="0.86008656" />
+        <rect
+           style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3724"
+           width="36"
+           height="20"
+           x="42.5"
+           y="-76.5"
+           rx="0"
+           ry="0" />
+        <rect
+           style="fill:url(#linearGradient3481);fill-opacity:1;stroke:#729fcf;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3726"
+           width="32"
+           height="16"
+           x="44.5"
+           y="-74.5"
+           rx="0"
+           ry="0" />
+        <path
+           style="opacity:0.5249042;fill:url(#radialGradient3483);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+           d="M 45,-74 L 76,-74 L 76,-67 C 59.658484,-70.066748 49.583182,-65.279102 45,-60 L 45,-74 z "
+           id="path3728"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:url(#linearGradient3485);fill-opacity:1;stroke:url(#linearGradient3487);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+           d="M 44.5,-63.4375 C 52.611108,-65.715279 64.468464,-66.119935 76.5,-66.4375 L 76.5,-58.5 L 44.5,-58.5 L 44.5,-63.4375 z "
+           id="path3730"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <path
+         id="path3742"
+         d="M 6.5,16.46875 L 8.46875,35.40625 C 8.594085,36.605498 9.718166,37.367629 10.84375,37.25 L 41.1875,34.0625 L 42.9375,27.5625 C 43.1398,26.807506 42.63292,26.046833 41.875,25.84375 L 7.03125,16.53125 C 6.852297,16.4833 6.676447,16.453056 6.5,16.46875 z "
+         style="opacity:0.2;fill:url(#linearGradient3489);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         transform="matrix(0.9945833,-0.1039425,0.1039425,0.9945833,17.141488,121.35811)"
+         id="g3546">
+        <rect
+           style="opacity:1;fill:url(#linearGradient3491);fill-opacity:1;stroke:#888a85;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3548"
+           width="38"
+           height="21.999998"
+           x="1.5"
+           y="-107.5"
+           rx="0.96564269"
+           ry="0.86008656" />
+        <rect
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3550"
+           width="36"
+           height="20"
+           x="2.5"
+           y="-106.5"
+           rx="0"
+           ry="0" />
+        <g
+           id="g3552">
+          <rect
+             style="opacity:1;fill:url(#linearGradient3494);fill-opacity:1;stroke:#f57900;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="rect3554"
+             width="32"
+             height="16"
+             x="4.5"
+             y="-104.5"
+             rx="0"
+             ry="0" />
+          <rect
+             y="-98"
+             x="13"
+             height="8"
+             width="8"
+             id="rect3556"
+             style="opacity:1;fill:url(#radialGradient3496);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cccccccc"
+             id="path3558"
+             d="M 4.5,-89 C 6.2654963,-90.895317 7.2341619,-91.121361 11.8125,-92.8125 C 14.329963,-90.71539 17.444278,-89.559204 20.375,-91.25 C 24.028079,-93.656706 26.31287,-91.058804 29.8125,-93.875 C 31.411842,-92.979167 32.567613,-92.020833 36.5,-91 L 36.5,-88.5 L 4.5,-88.5 L 4.5,-89 z "
+             style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             style="opacity:0.75478929;fill:url(#radialGradient3498);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+             d="M 5,-104 L 36,-104 L 36,-97 C 19.658484,-100.06675 9.5831815,-95.279102 5,-90 L 5,-104 z "
+             id="path3560"
+             sodipodi:nodetypes="ccccc" />
+        </g>
+      </g>
+    </g>
+    <rect
+       y="-253.85765"
+       x="-203.45316"
+       height="16"
+       width="16"
+       id="rect1315"
+       style="color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible" />
+    <rect
+       y="-227.85765"
+       x="-203.45316"
+       height="22"
+       width="22"
+       id="rect3481"
+       style="color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible" />
+    <path
+       transform="matrix(1.706666,0,0,1.706666,-151.45316,-198.85765)"
+       d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
+       sodipodi:ry="9.375"
+       sodipodi:rx="9.375"
+       sodipodi:cy="9.375"
+       sodipodi:cx="9.375"
+       id="path3584"
+       style="color:#000000;fill:url(#radialGradient5875);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60878164;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(2.133334,0,0,2.133334,-155.45316,-202.85766)"
+       d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
+       sodipodi:ry="9.375"
+       sodipodi:rx="9.375"
+       sodipodi:cy="9.375"
+       sodipodi:cx="9.375"
+       id="path3586"
+       style="color:#000000;fill:url(#radialGradient5877);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.48148614;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(2.559999,0,0,2.559999,-159.45316,-206.85765)"
+       d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
+       sodipodi:ry="9.375"
+       sodipodi:rx="9.375"
+       sodipodi:cy="9.375"
+       sodipodi:cx="9.375"
+       id="path3588"
+       style="color:#000000;fill:url(#radialGradient5879);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.39974412;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible"
+       sodipodi:type="arc" />
+    <g
+       transform="translate(-339.45321,-219.35765)"
+       id="g3977"
+       style="display:none">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path3954"
+         sodipodi:cx="55.25"
+         sodipodi:cy="28.5"
+         sodipodi:rx="1.75"
+         sodipodi:ry="1"
+         d="M 57 28.5 A 1.75 1 0 1 1  53.5,28.5 A 1.75 1 0 1 1  57 28.5 z"
+         transform="matrix(1.142857,0,0,1.5,-11.14285,-8.25)" />
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect3956"
+         width="1"
+         height="8.5"
+         x="53"
+         y="26" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 54,26 C 56,26 55.5,29 56.5,28.999999 C 54.5,29 56,27.5 54,27.5 L 54,26 z "
+         id="path3964"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       transform="translate(-339.45321,-219.35765)"
+       id="g3997"
+       style="display:none">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path3984"
+         sodipodi:cx="55.25"
+         sodipodi:cy="28.5"
+         sodipodi:rx="1.75"
+         sodipodi:ry="1"
+         d="M 57 28.5 A 1.75 1 0 1 1  53.5,28.5 A 1.75 1 0 1 1  57 28.5 z"
+         transform="matrix(1.142857,0,0,1.5,-2.642849,-8.25)" />
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect3986"
+         width="1"
+         height="8.5"
+         x="61.5"
+         y="26" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 62.500001,26 C 64.5,26 64,28.500001 65,28.5 C 63.499999,28.500001 64.500001,27.5 62.500001,27.5 L 62.500001,26 z "
+         id="path3988"
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+         d="M 62.500001,28 C 64.5,28 64,30.500001 65,30.5 C 63.499999,30.500001 64.500001,29.5 62.500001,29.5 L 62.500001,28 z "
+         id="path3995"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       style="display:none"
+       id="g4113"
+       transform="translate(-261.45316,-253.85765)">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path4005"
+         sodipodi:cx="55.25"
+         sodipodi:cy="28.5"
+         sodipodi:rx="1.75"
+         sodipodi:ry="1"
+         d="M 57 28.5 A 1.75 1 0 1 1  53.5,28.5 A 1.75 1 0 1 1  57 28.5 z"
+         transform="matrix(-1.142857,0,0,-1.5,56.14275,104.75)" />
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect4007"
+         width="1"
+         height="8.5"
+         x="8.0000496"
+         y="-70.5"
+         transform="scale(-1,-1)" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+         d="M -8.00005,70.499999 C -6.00005,70.499999 -6.50005,67.499999 -5.50005,67.5 C -7.50005,67.499999 -6.00005,68.999999 -8.00005,68.999999 L -8.00005,70.499999 z "
+         id="path4009"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       transform="translate(-339.95316,-219.35765)"
+       id="g4028"
+       style="display:none">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path4016"
+         sodipodi:cx="55.25"
+         sodipodi:cy="28.5"
+         sodipodi:rx="1.75"
+         sodipodi:ry="1"
+         d="M 57 28.5 A 1.75 1 0 1 1  53.5,28.5 A 1.75 1 0 1 1  57 28.5 z"
+         transform="matrix(-1.142857,0,0,-1.5,142.6428,70.25)" />
+      <rect
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect4018"
+         width="1"
+         height="8.5"
+         x="-78.5"
+         y="-36"
+         transform="scale(-1,-1)" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 78.500001,36 C 80.5,36 80,33.499999 81,33.5 C 79.499999,33.499999 80.500001,34.5 78.500001,34.5 L 78.500001,36 z "
+         id="path4020"
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
+         d="M 78.500001,34 C 80.5,34 80,31.499999 81,31.5 C 79.499999,31.499999 80.500001,32.5 78.500001,32.5 L 78.500001,34 z "
+         id="path4022"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       style="display:none"
+       transform="translate(-260.45316,-254.85765)"
+       id="g4074">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path4053"
+         sodipodi:cx="55.25"
+         sodipodi:cy="28.5"
+         sodipodi:rx="1.75"
+         sodipodi:ry="1"
+         d="M 57 28.5 A 1.75 1 0 1 1  53.5,28.5 A 1.75 1 0 1 1  57 28.5 z"
+         transform="matrix(1.142857,0,0,1.5,-89.14285,39.75)" />
+      <path
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -25,74 L -19,75.5 L -19,84 L -20,84 L -20,77 L -24,76 L -24,82.5 L -25,82.5 L -25,74 z "
+         id="rect4055"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path4061"
+         sodipodi:cx="55.25"
+         sodipodi:cy="28.5"
+         sodipodi:rx="1.75"
+         sodipodi:ry="1"
+         d="M 57 28.5 A 1.75 1 0 1 1  53.5,28.5 A 1.75 1 0 1 1  57 28.5 z"
+         transform="matrix(1.142857,0,0,1.5,-84.14285,41.25)" />
+    </g>
+    <g
+       style="display:none"
+       transform="translate(-261.95316,-255.85765)"
+       id="g4090">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path4081"
+         sodipodi:cx="55.25"
+         sodipodi:cy="28.5"
+         sodipodi:rx="1.75"
+         sodipodi:ry="1"
+         d="M 57 28.5 A 1.75 1 0 1 1  53.5,28.5 A 1.75 1 0 1 1  57 28.5 z"
+         transform="matrix(1.142857,0,0,-1.5,-74.64285,120.75)" />
+      <path
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -13.5,86.5 L -7.5,85 L -7.5,76.5 L -8.5,76.5 L -8.5,83.5 L -12.5,84.5 L -12.5,78 L -13.5,78 L -13.5,86.5 z "
+         id="path4083"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="path4085"
+         sodipodi:cx="55.25"
+         sodipodi:cy="28.5"
+         sodipodi:rx="1.75"
+         sodipodi:ry="1"
+         d="M 57 28.5 A 1.75 1 0 1 1  53.5,28.5 A 1.75 1 0 1 1  57 28.5 z"
+         transform="matrix(1.142857,0,0,-1.5,-69.64285,119.25)" />
+    </g>
+    <path
+       transform="translate(-197.94836,-174.85285)"
+       d="M 80 37 A 16 16 0 1 1  48,37 A 16 16 0 1 1  80 37 z"
+       sodipodi:ry="16"
+       sodipodi:rx="16"
+       sodipodi:cy="37"
+       sodipodi:cx="64"
+       id="path5560"
+       style="color:#000000;fill:#5c3566;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.7503,0,0,0.7503,-181.96756,-165.61395)"
+       d="M 80 37 A 16 16 0 1 1  48,37 A 16 16 0 1 1  80 37 z"
+       sodipodi:ry="16"
+       sodipodi:rx="16"
+       sodipodi:cy="37"
+       sodipodi:cx="64"
+       id="path5562"
+       style="color:#000000;fill:#75507b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.499916,0,0,0.499916,-165.943,-156.34975)"
+       d="M 80 37 A 16 16 0 1 1  48,37 A 16 16 0 1 1  80 37 z"
+       sodipodi:ry="16"
+       sodipodi:rx="16"
+       sodipodi:cy="37"
+       sodipodi:cx="64"
+       id="path5564"
+       style="color:#000000;fill:#ad7fa8;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible"
+       sodipodi:type="arc" />
+    <g
+       style="display:none"
+       transform="translate(-261.45316,-254.85765)"
+       id="g4489">
+      <rect
+         style="color:#000000;fill:url(#linearGradient5639);fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect4451"
+         width="12"
+         height="12"
+         x="26.5"
+         y="27.5"
+         ry="1.0852587" />
+      <g
+         id="g4467"
+         transform="translate(-2.000047,-2.00005)">
+        <rect
+           transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
+           ry="0"
+           y="-0.29288569"
+           x="44.997532"
+           height="2.0000057"
+           width="9.0000229"
+           id="rect4463"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+        <rect
+           transform="matrix(-0.707107,0.707107,0.707107,0.707107,0,0)"
+           ry="0"
+           y="48.497509"
+           x="-3.7929118"
+           height="2.0000057"
+           width="9.0000229"
+           id="rect4465"
+           style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      </g>
+      <rect
+         ry="0"
+         y="28.5"
+         x="27.5"
+         height="10"
+         width="10"
+         id="rect4479"
+         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ef2929;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    </g>
+    <rect
+       style="color:#000000;fill:url(#linearGradient5654);fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:none;overflow:visible"
+       id="rect4506"
+       width="7"
+       height="7"
+       x="-194.95316"
+       y="-249.35765"
+       ry="1.0852587" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4510"
+       d="M -193.95316,-247.35765 L -192.95316,-248.35765 L -188.95316,-244.35765 L -189.95316,-243.35765 L -193.95316,-247.35765 z "
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:none" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path4512"
+       d="M -192.95316,-243.35765 L -193.95316,-244.35765 L -189.95316,-248.35765 L -188.95316,-247.35765 L -192.95316,-243.35765 z "
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:none" />
+    <g
+       style="display:none"
+       id="g5709"
+       transform="translate(-261.45316,-253.85765)">
+      <rect
+         style="color:#000000;fill:url(#linearGradient5643);fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect5674"
+         width="9.0006361"
+         height="9.0006237"
+         x="70.499382"
+         y="32.499989"
+         ry="0.99253845" />
+      <rect
+         ry="0"
+         y="33.5"
+         x="71.5"
+         height="7"
+         width="7"
+         id="rect5682"
+         style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ef2929;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+      <g
+         id="g5705">
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path5693"
+           d="M 72.5,35.5 L 73.5,34.5 L 77.5,38.5 L 76.5,39.5 L 72.5,35.5 z "
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path5695"
+           d="M 73.5,39.5 L 72.5,38.5 L 76.5,34.5 L 77.5,35.5 L 73.5,39.5 z "
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="pippe"
+     style="display:none">
+    <g
+       style="display:inline"
+       id="g3364"
+       transform="matrix(0.9659258,-0.258819,0.258819,0.9659258,250.90999,86.039858)">
+      <rect
+         ry="0.86008656"
+         rx="0.96564269"
+         y="-77.5"
+         x="1.5"
+         height="21.999998"
+         width="38"
+         id="rect3360"
+         style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         ry="0"
+         rx="0"
+         y="-74.5"
+         x="4.5"
+         height="16"
+         width="32"
+         id="rect3362"
+         style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:#3465a4;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="g3380"
+       transform="matrix(0.9944961,-0.1047742,0.1047742,0.9944961,244.07143,91.503368)">
+      <rect
+         style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect3376"
+         width="38"
+         height="21.999998"
+         x="1.5"
+         y="-77.5"
+         rx="0.96564269"
+         ry="0.86008656" />
+      <rect
+         style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:#3465a4;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect3378"
+         width="32"
+         height="16"
+         x="4.5"
+         y="-74.5"
+         rx="0"
+         ry="0" />
+    </g>
+    <g
+       style="display:inline"
+       id="g3368"
+       transform="matrix(0.9659258,0.2588191,-0.2588191,0.9659258,214.48705,91.115776)">
+      <rect
+         ry="0.86008656"
+         rx="0.96564269"
+         y="-77.5"
+         x="1.5"
+         height="21.999998"
+         width="38"
+         id="rect3370"
+         style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         ry="0"
+         rx="0"
+         y="-74.5"
+         x="4.5"
+         height="16"
+         width="32"
+         id="rect3372"
+         style="opacity:1;fill:#729fcf;fill-opacity:1;stroke:#3465a4;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       style="display:inline"
+       id="g3538"
+       transform="translate(0,-70)">
+      <rect
+         ry="0.86008656"
+         rx="0.96564269"
+         y="-77.5"
+         x="1.5"
+         height="21.999998"
+         width="38"
+         id="rect3346"
+         style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         ry="0"
+         rx="0"
+         y="-76.5"
+         x="2.5"
+         height="20"
+         width="36"
+         id="rect3427"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         id="g3442">
+        <rect
+           style="opacity:1;fill:url(#linearGradient3455);fill-opacity:1;stroke:#729fcf;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3358"
+           width="32"
+           height="16"
+           x="4.5"
+           y="-74.5"
+           rx="0"
+           ry="0" />
+        <path
+           style="fill:url(#linearGradient3415);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3395);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 5,-58.5 C 6.4374991,-66 8.9476793,-63.298522 11.1875,-69.6875 C 12.500716,-68.915662 12.986696,-69.420476 14,-68.5625 C 15.008661,-67.310159 15.472316,-65.331143 16,-63.4375 C 18.902977,-68 19.560828,-62 23.1875,-61.0625 C 27,-62.47312 27.5,-71 29.5,-70 C 30.317656,-70.761636 31.063694,-75.577727 32,-72 C 33,-68 35.664333,-63.743 36.5,-60 L 36.5,-58.5 L 5,-58.5 z "
+           id="path3387"
+           sodipodi:nodetypes="cccccccccc" />
+        <path
+           style="opacity:0.5249042;fill:url(#radialGradient3440);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+           d="M 5,-74 L 36,-74 L 36,-67 C 19.658484,-70.066748 9.5831815,-65.279102 5,-60 L 5,-74 z "
+           id="rect3429"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <g
+       style="display:inline"
+       id="g3529"
+       transform="translate(0,-70)">
+      <rect
+         ry="0.86008656"
+         rx="0.96564269"
+         y="-107.5"
+         x="1.5"
+         height="21.999998"
+         width="38"
+         id="rect3447"
+         style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         ry="0"
+         rx="0"
+         y="-106.5"
+         x="2.5"
+         height="20"
+         width="36"
+         id="rect3449"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         id="g3523">
+        <rect
+           ry="0"
+           rx="0"
+           y="-104.5"
+           x="4.5"
+           height="16"
+           width="32"
+           id="rect3451"
+           style="opacity:1;fill:url(#linearGradient3519);fill-opacity:1;stroke:#f57900;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <rect
+           style="opacity:1;fill:url(#radialGradient3499);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect3483"
+           width="8"
+           height="8"
+           x="13"
+           y="-98" />
+        <path
+           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 4.5,-89 C 6.2654963,-90.895317 7.2341619,-91.121361 11.8125,-92.8125 C 14.329963,-90.71539 17.444278,-89.559204 20.375,-91.25 C 24.028079,-93.656706 26.31287,-91.058804 29.8125,-93.875 C 31.411842,-92.979167 32.567613,-92.020833 36.5,-91 L 36.5,-88.5 L 4.5,-88.5 L 4.5,-89 z "
+           id="path3521"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path3457"
+           d="M 5,-104 L 36,-104 L 36,-97 C 19.658484,-100.06675 9.5831815,-95.279102 5,-90 L 5,-104 z "
+           style="opacity:0.75478929;fill:url(#radialGradient3459);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       style="display:inline"
+       id="g3713"
+       transform="translate(0,-70)">
+      <rect
+         ry="0.86008656"
+         rx="0.96564269"
+         y="-77.5"
+         x="41.5"
+         height="21.999998"
+         width="38"
+         id="rect3637"
+         style="fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         ry="0"
+         rx="0"
+         y="-76.5"
+         x="42.5"
+         height="20"
+         width="36"
+         id="rect3639"
+         style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         ry="0"
+         rx="0"
+         y="-74.5"
+         x="44.5"
+         height="16"
+         width="32"
+         id="rect3643"
+         style="fill:url(#linearGradient3680);fill-opacity:1;stroke:#729fcf;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path3647"
+         d="M 45,-74 L 76,-74 L 76,-67 C 59.658484,-70.066748 49.583182,-65.279102 45,-60 L 45,-74 z "
+         style="opacity:0.5249042;fill:url(#radialGradient3672);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="rect3682"
+         d="M 44.5,-63.4375 C 52.611108,-65.715279 64.468464,-66.119935 76.5,-66.4375 L 76.5,-58.5 L 44.5,-58.5 L 44.5,-63.4375 z "
+         style="fill:url(#linearGradient3711);fill-opacity:1;stroke:url(#linearGradient3703);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.9943689"
+       inkscape:original="M 19.6875 10 C 19.144701 10.002558 18.669166 10.373642 18.46875 10.9375 L 17 15 L 9.53125 15 C 7.579648 15 6 16.579648 6 18.53125 L 6 33.46875 C 6 35.420352 7.579648 37 9.53125 37 L 38.46875 37 C 40.420352 37 42 35.420352 42 33.46875 L 42 18.53125 C 42 16.579648 40.420352 15 38.46875 15 L 30.96875 15 L 29.53125 10.9375 C 29.330834 10.373643 28.824049 10.002557 28.28125 10 L 19.6875 10 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3579"
+       d="M 19.6875,8 C 18.241255,8.0068156 17.035105,9.0395257 16.59375,10.28125 L 15.59375,13 L 9.53125,13 C 6.503472,13 4,15.503472 4,18.53125 L 4,33.46875 C 4,36.496528 6.503472,39 9.53125,39 L 38.46875,39 C 41.496528,39 44,36.496528 44,33.46875 L 44,18.53125 C 44,15.503472 41.496528,13 38.46875,13 L 32.375,13 L 31.40625,10.28125 C 30.942984,8.9778834 29.727142,8.0068113 28.28125,8 L 19.6875,8 z "
+       transform="translate(0,-90)" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 19.6875 10 C 19.144701 10.002558 18.669166 10.373642 18.46875 10.9375 L 17 15 L 9.53125 15 C 7.579648 15 6 16.579648 6 18.53125 L 6 33.46875 C 6 35.420352 7.579648 37 9.53125 37 L 38.46875 37 C 40.420352 37 42 35.420352 42 33.46875 L 42 18.53125 C 42 16.579648 40.420352 15 38.46875 15 L 30.96875 15 L 29.53125 10.9375 C 29.330834 10.373643 28.824049 10.002557 28.28125 10 L 19.6875 10 z "
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3577"
+       d="M 19.6875,9 C 18.691702,9.0046928 17.852476,9.6900019 17.53125,10.59375 L 16.3125,14 L 9.53125,14 C 7.0400407,14 5,16.040041 5,18.53125 L 5,33.46875 C 5,35.959959 7.0400407,38 9.53125,38 L 38.46875,38 C 40.959959,38 43,35.959959 43,33.46875 L 43,18.53125 C 43,16.040041 40.959959,14 38.46875,14 L 31.6875,14 L 30.46875,10.59375 C 30.136538,9.6590942 29.27687,9.0046901 28.28125,9 L 19.6875,9 z "
+       transform="translate(0,-90)" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.486136"
+       inkscape:original="M 19.1875 14 L 16 22 L 32 22 L 28.8125 14 L 19.1875 14 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3514"
+       d="M 19.1875,12.5 C 18.580777,12.502557 18.036519,12.873642 17.8125,13.4375 L 14.625,21.4375 C 14.431656,21.897197 14.481746,22.423221 14.758376,22.838166 C 15.035006,23.253111 15.501301,23.501664 16,23.5 L 32,23.5 C 32.498699,23.501664 32.964994,23.253111 33.241624,22.838166 C 33.518254,22.423221 33.568344,21.897197 33.375,21.4375 L 30.1875,13.4375 C 29.963481,12.873642 29.419223,12.502557 28.8125,12.5 L 19.1875,12.5 z "
+       transform="matrix(0.8946398,0,0,1,2.5198955,-92.500008)" />
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="rect2528"
+       width="36"
+       height="22"
+       x="6"
+       y="-75"
+       rx="3.5227478"
+       ry="3.5227478" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3499"
+       sodipodi:cx="22.5"
+       sodipodi:cy="25.75"
+       sodipodi:rx="5.5"
+       sodipodi:ry="4.75"
+       d="M 28 25.75 A 5.5 4.75 0 1 1  17,25.75 A 5.5 4.75 0 1 1  28 25.75 z"
+       transform="matrix(1.2727273,0,0,1.4736842,-4.6363649,-101.94737)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3501"
+       sodipodi:cx="22.5"
+       sodipodi:cy="25.75"
+       sodipodi:rx="5.5"
+       sodipodi:ry="4.75"
+       d="M 28 25.75 A 5.5 4.75 0 1 1  17,25.75 A 5.5 4.75 0 1 1  28 25.75 z"
+       transform="matrix(0.9090911,0,0,1.0526319,3.5454479,-91.105273)" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="rect3506"
+       width="4"
+       height="3"
+       x="23"
+       y="-78"
+       rx="1.0852478"
+       ry="1.0852478" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3508"
+       sodipodi:cx="20"
+       sodipodi:cy="16"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="M 21 16 A 1 1 0 1 1  19,16 A 1 1 0 1 1  21 16 z"
+       transform="translate(1,-92)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3516"
+       sodipodi:cx="20"
+       sodipodi:cy="16"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="M 21 16 A 1 1 0 1 1  19,16 A 1 1 0 1 1  21 16 z"
+       transform="matrix(-3,0,0,-3,84,-16)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3523"
+       sodipodi:cx="20"
+       sodipodi:cy="16"
+       sodipodi:rx="1"
+       sodipodi:ry="1"
+       d="M 21 16 A 1 1 0 1 1  19,16 A 1 1 0 1 1  21 16 z"
+       transform="matrix(-3,0,0,-3,85,-15)" />
+    <g
+       style="display:inline"
+       id="g3544"
+       transform="translate(0,-90)">
+      <path
+         transform="matrix(1.2727273,0,0,1.4736842,-4.6363649,-11.947368)"
+         d="M 28 25.75 A 5.5 4.75 0 1 1  17,25.75 A 5.5 4.75 0 1 1  28 25.75 z"
+         sodipodi:ry="4.75"
+         sodipodi:rx="5.5"
+         sodipodi:cy="25.75"
+         sodipodi:cx="22.5"
+         id="path3551"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.9090911,0,0,1.0526319,3.5454479,-1.1052727)"
+         d="M 28 25.75 A 5.5 4.75 0 1 1  17,25.75 A 5.5 4.75 0 1 1  28 25.75 z"
+         sodipodi:ry="4.75"
+         sodipodi:rx="5.5"
+         sodipodi:cy="25.75"
+         sodipodi:cx="22.5"
+         id="path3553"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <rect
+         ry="1.0852478"
+         rx="1.0852478"
+         y="12"
+         x="23"
+         height="3"
+         width="4"
+         id="rect3555"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         transform="translate(1,-2)"
+         d="M 21 16 A 1 1 0 1 1  19,16 A 1 1 0 1 1  21 16 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="16"
+         sodipodi:cx="20"
+         id="path3557"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(-3,0,0,-3,84,74)"
+         d="M 21 16 A 1 1 0 1 1  19,16 A 1 1 0 1 1  21 16 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="16"
+         sodipodi:cx="20"
+         id="path3559"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(-3,0,0,-3,85,75)"
+         d="M 21 16 A 1 1 0 1 1  19,16 A 1 1 0 1 1  21 16 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="16"
+         sodipodi:cx="20"
+         id="path3561"
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.9943689"
+       inkscape:original="M 19.6875 10 C 19.144701 10.002558 18.669166 10.373642 18.46875 10.9375 L 17 15 L 9.53125 15 C 7.579648 15 6 16.579648 6 18.53125 L 6 33.46875 C 6 35.420352 7.579648 37 9.53125 37 L 38.46875 37 C 40.420352 37 42 35.420352 42 33.46875 L 42 18.53125 C 42 16.579648 40.420352 15 38.46875 15 L 30.96875 15 L 29.53125 10.9375 C 29.330834 10.373643 28.824049 10.002557 28.28125 10 L 19.6875 10 z "
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3587"
+       d="M 19.6875,8 C 18.241255,8.0068156 17.035105,9.0395257 16.59375,10.28125 L 15.59375,13 L 9.53125,13 C 6.503472,13 4,15.503472 4,18.53125 L 4,33.46875 C 4,36.496528 6.503472,39 9.53125,39 L 38.46875,39 C 41.496528,39 44,36.496528 44,33.46875 L 44,18.53125 C 44,15.503472 41.496528,13 38.46875,13 L 32.375,13 L 31.40625,10.28125 C 30.942984,8.9778834 29.727142,8.0068113 28.28125,8 L 19.6875,8 z "
+       transform="translate(50,-90)" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 19.6875 10 C 19.144701 10.002558 18.669166 10.373642 18.46875 10.9375 L 17 15 L 9.53125 15 C 7.579648 15 6 16.579648 6 18.53125 L 6 33.46875 C 6 35.420352 7.579648 37 9.53125 37 L 38.46875 37 C 40.420352 37 42 35.420352 42 33.46875 L 42 18.53125 C 42 16.579648 40.420352 15 38.46875 15 L 30.96875 15 L 29.53125 10.9375 C 29.330834 10.373643 28.824049 10.002557 28.28125 10 L 19.6875 10 z "
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3589"
+       d="M 19.6875,9 C 18.691702,9.0046928 17.852476,9.6900019 17.53125,10.59375 L 16.3125,14 L 9.53125,14 C 7.0400407,14 5,16.040041 5,18.53125 L 5,33.46875 C 5,35.959959 7.0400407,38 9.53125,38 L 38.46875,38 C 40.959959,38 43,35.959959 43,33.46875 L 43,18.53125 C 43,16.040041 40.959959,14 38.46875,14 L 31.6875,14 L 30.46875,10.59375 C 30.136538,9.6590942 29.27687,9.0046901 28.28125,9 L 19.6875,9 z "
+       transform="translate(50,-90)" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       d="M 69.6875,-80 C 69.1447,-79.997442 68.669166,-79.626358 68.46875,-79.0625 L 67,-75 L 59.53125,-75 C 57.579648,-75 56,-73.420352 56,-71.46875 L 56,-56.53125 C 56,-54.579648 57.579648,-53 59.53125,-53 L 88.46875,-53 C 90.420352,-53 92,-54.579648 92,-56.53125 L 92,-71.46875 C 92,-73.420352 90.420355,-75 88.46875,-75 L 80.96875,-75 L 79.53125,-79.0625 C 79.330836,-79.626357 78.824049,-79.997443 78.28125,-80 L 69.6875,-80 z "
+       id="path3592" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1.5"
+       inkscape:original="M 69.6875 10 C 69.1447 10.002558 68.669166 10.373642 68.46875 10.9375 L 67 15 L 59.53125 15 C 57.579648 15 56 16.579648 56 18.53125 L 56 33.46875 C 56 35.420352 57.579648 37 59.53125 37 L 88.46875 37 C 90.420352 37 92 35.420352 92 33.46875 L 92 18.53125 C 92 16.579648 90.420355 15 88.46875 15 L 80.96875 15 L 79.53125 10.9375 C 79.330836 10.373643 78.824049 10.002557 78.28125 10 L 69.6875 10 z "
+       style="fill:url(#radialGradient3538);fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3635"
+       d="M 69.6875,8.5 C 68.465203,8.5057602 67.44413,9.3638083 67.0625,10.4375 L 65.96875,13.5 L 59.53125,13.5 C 56.770237,13.5 54.5,15.770237 54.5,18.53125 L 54.5,33.46875 C 54.5,36.229763 56.770237,38.5 59.53125,38.5 L 88.46875,38.5 C 91.229763,38.5 93.5,36.229763 93.5,33.46875 L 93.5,18.53125 C 93.5,15.770239 91.229765,13.5 88.46875,13.5 L 82.03125,13.5 L 80.9375,10.4375 C 80.539392,9.317438 79.503281,8.5057567 78.28125,8.5 L 69.6875,8.5 z "
+       transform="translate(50,-90)" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       d="M 124.09375,-78 C 123.49252,-78 123,-77.507477 123,-76.90625 L 123,-76.09375 C 123,-75.492523 123.49252,-75 124.09375,-75 L 125.90625,-75 C 126.50748,-75 127,-75.492523 127,-76.09375 L 127,-76.90625 C 127,-77.507477 126.50748,-78 125.90625,-78 L 124.09375,-78 z M 121,-77 C 120.448,-77 120,-76.552 120,-76 C 120,-75.448 120.448,-75 121,-75 C 121.552,-75 122,-75.448 122,-76 C 122,-76.552 121.552,-77 121,-77 z "
+       id="path3596"
+       sodipodi:nodetypes="ccccccccccsssc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="0.50563109"
+       inkscape:original="M 69.6875 10 C 69.1447 10.002558 68.669166 10.373642 68.46875 10.9375 L 67 15 L 59.53125 15 C 57.579648 15 56 16.579648 56 18.53125 L 56 33.46875 C 56 35.420352 57.579648 37 59.53125 37 L 88.46875 37 C 90.420352 37 92 35.420352 92 33.46875 L 92 18.53125 C 92 16.579648 90.420355 15 88.46875 15 L 80.96875 15 L 79.53125 10.9375 C 79.330836 10.373643 78.824049 10.002557 78.28125 10 L 69.6875 10 z "
+       style="opacity:0.58620689;fill:none;fill-opacity:1;stroke:url(#linearGradient3550);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3637"
+       d="M 69.6875,9.5 C 68.91565,9.5036374 68.261501,10.045533 68,10.78125 L 66.65625,14.5 L 59.53125,14.5 C 57.306806,14.5 55.5,16.306806 55.5,18.53125 L 55.5,33.46875 C 55.5,35.693194 57.306806,37.5 59.53125,37.5 L 88.46875,37.5 C 90.693194,37.5 92.5,35.693194 92.5,33.46875 L 92.5,18.53125 C 92.5,16.306806 90.693197,14.5 88.46875,14.5 L 81.3125,14.5 L 80,10.78125 C 79.732946,10.029903 79.053009,9.5036356 78.28125,9.5 L 69.6875,9.5 z "
+       transform="translate(50,-90)" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       d="M 124,-70 C 120.136,-70 117,-66.864 117,-63 C 117,-59.136 120.136,-56 124,-56 C 127.864,-56 131,-59.136 131,-63 C 131,-66.864 127.864,-70 124,-70 z M 124,-68 C 126.76,-68.000001 129,-65.760001 129,-63 C 129,-60.239999 126.76,-58 124,-58 C 121.24,-58 119,-60.239999 119,-63 C 119,-65.76 121.24,-68 124,-68 z M 124,-66 C 122.344,-66 121,-64.656 121,-63 C 121,-61.915742 121.57484,-60.964589 122.4375,-60.4375 C 122.15956,-60.892389 122,-61.428258 122,-62 C 122,-63.656 123.344,-65 125,-65 C 125.57174,-65 126.10761,-64.840441 126.5625,-64.5625 C 126.03541,-65.425156 125.08426,-66 124,-66 z "
+       id="path3530"
+       sodipodi:nodetypes="csssccsssccscsscc" />
+    <g
+       style="display:inline"
+       id="g3781">
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path3732"
+         d="M 90.757605,6.0410041 L 85.017139,9.2013149 L 85.017139,32.113568 L 90.757605,36.458996 L 105.55916,34.483801 L 105.55916,7.6211595 L 90.757605,6.0410041 z "
+         style="fill:#f0cf9c;fill-opacity:1;stroke:#c17d11;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline" />
+      <path
+         style="opacity:1;fill:#e9b96e;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         d="M 91.152644,6.4854228 L 91.152644,36.014577 L 105.16412,34.138142 L 105.16412,7.9915084 L 91.152644,6.4854228 z "
+         id="path3734"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         transform="translate(61,0)"
+         d="M 29.90625,7 L 24.96875,9.71875 L 24.96875,31.65625 L 30,35.46875 L 43.625,33.65625 L 43.625,8.46875 L 29.90625,7 z "
+         id="path3771"
+         style="opacity:0.48659004;fill:none;fill-opacity:1;stroke:url(#linearGradient3779);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+         inkscape:original="M 29.75 6.03125 L 24.03125 9.1875 L 24.03125 32.125 L 29.75 36.46875 L 44.5625 34.46875 L 44.5625 7.625 L 29.75 6.03125 z "
+         inkscape:radius="-0.93552941"
+         sodipodi:type="inkscape:offset" />
+      <g
+         transform="matrix(0.8397685,0,0,1,66.798262,2)"
+         id="g3764">
+        <path
+           sodipodi:type="arc"
+           style="fill:#babdb6;fill-opacity:1;stroke:#888a85;stroke-width:1.4984448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3736"
+           sodipodi:cx="34"
+           sodipodi:cy="30"
+           sodipodi:rx="8"
+           sodipodi:ry="8"
+           d="M 42 30 A 8 8 0 1 1  26,30 A 8 8 0 1 1  42 30 z"
+           transform="matrix(0.716008,0,0,0.7406978,13.511631,3.1521667)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#babdb6;fill-opacity:1;stroke:#888a85;stroke-width:3.68314815;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3738"
+           sodipodi:cx="34"
+           sodipodi:cy="30"
+           sodipodi:rx="8"
+           sodipodi:ry="8"
+           d="M 42 30 A 8 8 0 1 1  26,30 A 8 8 0 1 1  42 30 z"
+           transform="matrix(0.2962791,0,0,0.2962791,27.584892,6.6087566)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:#babdb6;fill-opacity:1;stroke:#888a85;stroke-width:3.68314815;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+           id="path3740"
+           sodipodi:cx="34"
+           sodipodi:cy="30"
+           sodipodi:rx="8"
+           sodipodi:ry="8"
+           d="M 42 30 A 8 8 0 1 1  26,30 A 8 8 0 1 1  42 30 z"
+           transform="matrix(0.2962791,0,0,0.2962791,27.584892,0.288135)" />
+      </g>
+    </g>
+    <path
+       style="fill:#888a85;fill-opacity:1;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       d="M 132,3 L 152,5 L 152,39 L 132,42 L 132,3 z "
+       id="path3701"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#888a85;fill-opacity:1;stroke:#555753;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       d="M 126.34146,7 L 132,3 L 132,42 L 126.34146,36 L 126.34146,7 z "
+       id="path3703"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#e9b96e;fill-opacity:1;stroke:#888a85;stroke-width:5.33333349;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3716"
+       sodipodi:cx="34"
+       sodipodi:cy="30"
+       sodipodi:rx="8"
+       sodipodi:ry="8"
+       d="M 42 30 A 8 8 0 1 1  26,30 A 8 8 0 1 1  42 30 z"
+       transform="matrix(-0.1875,0,0,0.1875,27.874999,-36.625001)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#radialGradient3830);fill-opacity:1;stroke:url(#radialGradient4854);stroke-width:2.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3826"
+       sodipodi:cx="34"
+       sodipodi:cy="30"
+       sodipodi:rx="8"
+       sodipodi:ry="8"
+       d="M 42 30 A 8 8 0 1 1  26,30 A 8 8 0 1 1  42 30 z"
+       transform="matrix(-0.4999999,0,0,0.4999999,38.499995,-38.499996)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#radialGradient3832);fill-opacity:1;stroke:none;stroke-width:1.10182261;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path3828"
+       sodipodi:cx="34"
+       sodipodi:cy="30"
+       sodipodi:rx="8"
+       sodipodi:ry="8"
+       d="M 42 30 A 8 8 0 1 1  26,30 A 8 8 0 1 1  42 30 z"
+       transform="matrix(-0.1875,0,0,0.1875,28.375,-29.125)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.4291188;fill:none;fill-opacity:1;stroke:url(#linearGradient4846);stroke-width:2.66666818;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
+       id="path4838"
+       sodipodi:cx="34"
+       sodipodi:cy="30"
+       sodipodi:rx="8"
+       sodipodi:ry="8"
+       d="M 42 30 A 8 8 0 1 1  26,30 A 8 8 0 1 1  42 30 z"
+       transform="matrix(-0.3749998,0,0,0.3749998,34.249992,-34.749993)" />
+    <path
+       sodipodi:nodetypes="ccc"
+       id="path4429"
+       d="M -227.95316,-141.35765 C -219.45316,-133.85765 -222.95316,-140.85765 -219.95316,-140.85765 C -213.45316,-140.85765 -222.45316,-136.35765 -213.45316,-136.35765"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5868);stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.4556962;color:#000000;fill:url(#radialGradient5783);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path3945"
+       sodipodi:cx="12.75"
+       sodipodi:cy="38.700001"
+       sodipodi:rx="13.75"
+       sodipodi:ry="3.8"
+       d="M 26.5 38.700001 A 13.75 3.8 0 1 1  -1,38.700001 A 13.75 3.8 0 1 1  26.5 38.700001 z"
+       transform="matrix(1.163637,0,0,1.052631,-252.28952,-258.59448)" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       id="rect3521"
+       d="M -249.45316,-247.35765 L -250.95316,-242.85765 L -250.95316,-216.35765 L -223.95316,-216.35765 L -223.95316,-242.85765 L -225.45316,-247.35765 L -249.45316,-247.35765 z "
+       style="color:#000000;fill:url(#radialGradient5864);fill-opacity:1;fill-rule:evenodd;stroke:#c17d11;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <rect
+       y="-242.85765"
+       x="-250.45316"
+       height="26"
+       width="26"
+       id="rect3773"
+       style="color:#000000;fill:url(#linearGradient5861);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
+       id="path3726"
+       d="M -237.70316,-239.85765 C -239.64315,-239.80848 -241.43979,-239.17421 -242.95316,-238.17015 C -243.31997,-238.59356 -243.84941,-238.85765 -244.45316,-238.85765 C -244.48766,-238.85765 -244.5405,-238.8568 -244.57816,-238.85765 C -244.60615,-238.85785 -244.64671,-238.86021 -244.67191,-238.85765 C -245.68002,-238.75517 -246.45316,-237.89265 -246.45316,-236.85765 C -246.45316,-236.2539 -246.18907,-235.72446 -245.76566,-235.35765 C -246.81405,-233.77747 -247.45316,-231.89564 -247.45316,-229.85765 C -247.45316,-227.82397 -246.84124,-225.93582 -245.79691,-224.35765 C -246.20973,-223.98812 -246.45316,-223.45601 -246.45316,-222.85765 C -246.45316,-221.75365 -245.55716,-220.85765 -244.45316,-220.85765 C -243.84941,-220.85765 -243.31997,-221.12174 -242.95316,-221.54515 C -241.37298,-220.49676 -239.49115,-219.85765 -237.45316,-219.85765 C -235.41517,-219.85765 -233.53334,-220.49676 -231.95316,-221.54515 C -231.58635,-221.12174 -231.05691,-220.85765 -230.45316,-220.85765 C -229.34916,-220.85765 -228.45316,-221.75365 -228.45316,-222.85765 C -228.45316,-223.4614 -228.71725,-223.99084 -229.14066,-224.35765 C -228.09227,-225.93783 -227.45316,-227.81966 -227.45316,-229.85765 C -227.45316,-231.89564 -228.09227,-233.77747 -229.14066,-235.35765 C -228.71725,-235.72446 -228.45316,-236.2539 -228.45316,-236.85765 C -228.45316,-237.96165 -229.34916,-238.85765 -230.45316,-238.85765 C -230.48766,-238.85765 -230.5405,-238.8568 -230.57816,-238.85765 C -230.60615,-238.85785 -230.64671,-238.86021 -230.67191,-238.85765 C -231.17596,-238.80641 -231.63386,-238.55921 -231.95316,-238.2014 C -231.95985,-238.20583 -231.97771,-238.19699 -231.98441,-238.2014 C -233.55854,-239.23762 -235.4281,-239.85765 -237.45316,-239.85765 C -237.53933,-239.85765 -237.61751,-239.85982 -237.70316,-239.85765 z "
+       style="color:#000000;fill:url(#radialGradient5856);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5858);stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="ccsssscscsscscsscscsssssssc"
+       id="path3507"
+       d="M -237.70316,-239.85765 C -239.64315,-239.80848 -241.43979,-239.17421 -242.95316,-238.17015 C -243.31997,-238.59356 -243.84941,-238.85765 -244.45316,-238.85765 C -244.48766,-238.85765 -244.5405,-238.8568 -244.57816,-238.85765 C -244.60615,-238.85785 -244.64671,-238.86021 -244.67191,-238.85765 C -245.68002,-238.75517 -246.45316,-237.89265 -246.45316,-236.85765 C -246.45316,-236.2539 -246.18907,-235.72446 -245.76566,-235.35765 C -246.81405,-233.77747 -247.45316,-231.89564 -247.45316,-229.85765 C -247.45316,-227.82397 -246.84124,-225.93582 -245.79691,-224.35765 C -246.20973,-223.98812 -246.45316,-223.45601 -246.45316,-222.85765 C -246.45316,-221.75365 -245.55716,-220.85765 -244.45316,-220.85765 C -243.84941,-220.85765 -243.31997,-221.12174 -242.95316,-221.54515 C -241.37298,-220.49676 -239.49115,-219.85765 -237.45316,-219.85765 C -235.41517,-219.85765 -233.53334,-220.49676 -231.95316,-221.54515 C -231.58635,-221.12174 -231.05691,-220.85765 -230.45316,-220.85765 C -229.34916,-220.85765 -228.45316,-221.75365 -228.45316,-222.85765 C -228.45316,-223.4614 -228.71725,-223.99084 -229.14066,-224.35765 C -228.09227,-225.93783 -227.45316,-227.81966 -227.45316,-229.85765 C -227.45316,-231.89564 -228.09227,-233.77747 -229.14066,-235.35765 C -228.71725,-235.72446 -228.45316,-236.2539 -228.45316,-236.85765 C -228.45316,-237.96165 -229.34916,-238.85765 -230.45316,-238.85765 C -230.48766,-238.85765 -230.5405,-238.8568 -230.57816,-238.85765 C -230.60615,-238.85785 -230.64671,-238.86021 -230.67191,-238.85765 C -231.17596,-238.80641 -231.63386,-238.55921 -231.95316,-238.2014 C -231.95985,-238.20583 -231.97771,-238.19699 -231.98441,-238.2014 C -233.55854,-239.23762 -235.4281,-239.85765 -237.45316,-239.85765 C -237.53933,-239.85765 -237.61751,-239.85982 -237.70316,-239.85765 z "
+       style="color:#000000;fill:url(#radialGradient5853);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09104455;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       transform="matrix(0.911415,0,0,0.911415,-245.99175,-238.40809)"
+       d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
+       sodipodi:ry="9.375"
+       sodipodi:rx="9.375"
+       sodipodi:cy="9.375"
+       sodipodi:cx="9.375"
+       id="path3636"
+       style="color:#000000;fill:url(#radialGradient5795);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5797);stroke-width:1.03981137;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(0.32,0,0,0.32,-240.45316,-232.85765)"
+       d="M 18.75 9.375 A 9.375 9.375 0 1 1  0,9.375 A 9.375 9.375 0 1 1  18.75 9.375 z"
+       sodipodi:ry="9.375"
+       sodipodi:rx="9.375"
+       sodipodi:cy="9.375"
+       sodipodi:cx="9.375"
+       id="path3519"
+       style="color:#000000;fill:url(#radialGradient5799);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:6.57905483;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="translate(-246.45316,-253.85765)"
+       d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
+       sodipodi:ry="0.5"
+       sodipodi:rx="0.5"
+       sodipodi:cy="16.5"
+       sodipodi:cx="16.5"
+       id="path3720"
+       style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       transform="translate(-246.45316,-158.85765)"
+       d="M 17 16.5 A 0.5 0.5 0 1 1  16,16.5 A 0.5 0.5 0 1 1  17 16.5 z"
+       sodipodi:ry="0.5"
+       sodipodi:rx="0.5"
+       sodipodi:cy="16.5"
+       sodipodi:cx="16.5"
+       id="path5383"
+       style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccc"
+       id="path3812"
+       d="M -249.10941,-246.85765 L -250.45316,-242.85765 L -250.45316,-242.79515 L -250.45316,-216.85765 L -224.45316,-216.85765 L -224.45316,-242.79515 L -224.45316,-242.85765 L -225.79691,-246.85765 L -249.10941,-246.85765 z M -248.35941,-245.85765 L -226.54691,-245.85765 L -225.45316,-242.5764 L -225.45316,-217.85765 L -249.45316,-217.85765 L -249.45316,-242.5764 L -248.35941,-245.85765 z "
+       style="color:#000000;fill:#f5dfbd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path3792"
+       d="M -249.95316,-242.35765 L -224.9947,-242.35765 L -224.9947,-242.35765 L -224.9947,-242.35765"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5843);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <path
+       transform="translate(-240.45316,-253.85765)"
+       d="M 14 13.5 A 0.5 0.5 0 1 1  13,13.5 A 0.5 0.5 0 1 1  14 13.5 z"
+       sodipodi:ry="0.5"
+       sodipodi:rx="0.5"
+       sodipodi:cy="13.5"
+       sodipodi:cx="13.5"
+       id="path4415"
+       style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc" />
+    <path
+       id="path3515"
+       d="M -238.23441,-253.85765 C -243.13899,-253.70215 -247.65428,-252.0635 -251.39066,-249.3889 L -237.45316,-229.85765 L -216.23441,-241.10765 C -220.26686,-248.69786 -228.26443,-253.85765 -237.45316,-253.85765 C -237.71191,-253.85765 -237.97763,-253.86579 -238.23441,-253.85765 z M -237.45316,-229.85765 L -227.04691,-208.23265 L -227.01566,-208.23265 C -218.98633,-212.1155 -213.45316,-220.346 -213.45316,-229.85765 C -213.45316,-233.09649 -214.10102,-236.19407 -215.26566,-239.0139 L -237.45316,-229.85765 z M -237.45316,-229.85765 L -253.98441,-212.4514 C -249.67974,-208.36081 -243.85567,-205.85765 -237.45316,-205.85765 C -235.08819,-205.85765 -232.79958,-206.18808 -230.64066,-206.8264 L -237.45316,-229.85765 z M -237.45316,-229.85765 L -255.89066,-245.23265 C -259.37044,-241.06758 -261.45316,-235.7054 -261.45316,-229.85765 C -261.45316,-223.86293 -259.24755,-218.37779 -255.60941,-214.17015 L -237.45316,-229.85765 z "
+       style="color:#000000;fill:url(#radialGradient5770);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.39974412;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <g
+       style="fill-opacity:1;stroke:url(#linearGradient5726);display:inline"
+       id="g4352"
+       transform="translate(-261.45316,-253.85765)">
+      <path
+         style="opacity:0.52509652;fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5728);stroke-width:0.50000006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 14.5,37.5 L 24,24"
+         id="path4326"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="opacity:0.52509652;fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5730);stroke-width:0.50000006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 3.4999996,35.5 L 24,24"
+         id="path4328"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="opacity:0.52509652;fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5732);stroke-width:0.50000006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 13,34 L 24,24"
+         id="path4330"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       style="fill-opacity:1;stroke:url(#linearGradient5734);display:inline"
+       id="g4404"
+       transform="translate(-261.45316,-253.85765)">
+      <path
+         style="opacity:0.52509652;fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5736);stroke-width:0.49999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 40,13 L 23.999999,24"
+         id="path4369"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="opacity:0.52509652;fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5738);stroke-width:0.49999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 44,22 L 23.999999,24"
+         id="path4371"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="opacity:0.52509652;fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5740);stroke-width:0.49999997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 42,17.5 L 23.999999,24"
+         id="path4373"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       id="path3513"
+       d="M -238.23441,-249.85765 C -242.27234,-249.70401 -245.99711,-248.34439 -249.07816,-246.1389 L -237.45316,-229.85765 L -219.76566,-239.23265 C -223.12659,-245.55604 -229.7972,-249.85765 -237.45316,-249.85765 C -237.71191,-249.85765 -237.97803,-249.86741 -238.23441,-249.85765 z M -237.45316,-229.85765 L -228.76566,-211.85765 C -222.08044,-215.09553 -217.45316,-221.93559 -217.45316,-229.85765 C -217.45316,-232.55794 -217.98177,-235.13191 -218.95316,-237.48265 L -237.45316,-229.85765 z M -237.45316,-229.85765 L -251.23441,-215.35765 C -247.64676,-211.94642 -242.79071,-209.85765 -237.45316,-209.85765 C -235.47956,-209.85765 -233.56701,-210.13677 -231.76566,-210.67015 L -237.45316,-229.85765 z M -237.45316,-229.85765 L -252.79691,-242.67015 C -255.69673,-239.19926 -257.45316,-234.73078 -257.45316,-229.85765 C -257.45316,-224.85515 -255.61744,-220.27217 -252.57816,-216.7639 L -237.45316,-229.85765 z "
+       style="color:#000000;fill:url(#radialGradient5721);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.48148614;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <g
+       transform="matrix(-0.965926,0.258819,-0.258819,-0.965926,-207.93749,-212.33753)"
+       style="opacity:0.52509652;fill-opacity:1;stroke:url(#linearGradient5693);display:inline"
+       id="g4308">
+      <path
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5695);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 39.585011,33.921308 L 23.975406,24.562348"
+         id="path4310"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5697);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 27.397624,44.631934 L 23.975406,24.562348"
+         id="path4312"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5699);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 32.719506,38.293358 L 23.975406,24.562348"
+         id="path4314"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <path
+       id="path3511"
+       d="M -238.07816,-245.85765 C -241.31534,-245.73447 -244.29782,-244.62867 -246.76566,-242.85765 L -237.45316,-229.85765 L -223.29691,-237.35765 C -225.98463,-242.41965 -231.32596,-245.85765 -237.45316,-245.85765 C -237.66016,-245.85765 -237.87306,-245.86545 -238.07816,-245.85765 z M -237.45316,-229.85765 L -230.51566,-215.4514 C -225.15334,-218.03647 -221.45316,-223.50965 -221.45316,-229.85765 C -221.45316,-232.0208 -221.89281,-234.06875 -222.67191,-235.9514 L -237.45316,-229.85765 z M -237.45316,-229.85765 L -248.48441,-218.2639 C -245.61272,-215.5259 -241.73116,-213.85765 -237.45316,-213.85765 C -235.87651,-213.85765 -234.36119,-214.08836 -232.92191,-214.5139 L -237.45316,-229.85765 z M -237.45316,-229.85765 L -249.73441,-240.10765 C -252.05427,-237.33094 -253.45316,-233.75615 -253.45316,-229.85765 C -253.45316,-225.85565 -251.97834,-222.19551 -249.54691,-219.3889 L -237.45316,-229.85765 z "
+       style="color:#000000;fill:url(#radialGradient5688);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60878164;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+    <g
+       style="opacity:0.52509652;fill-opacity:1;stroke:url(#linearGradient5664);display:inline"
+       id="g4166"
+       transform="translate(-261.45316,-253.85765)">
+      <path
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5666);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 36,35.5 L 24,24"
+         id="path4160"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5669);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 25.5,40.5 L 24,24"
+         id="path4162"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#888a85;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5671);stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         d="M 29.5,36.5 L 24,24"
+         id="path4164"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</svg>

Added: gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/playlist.svg
===================================================================
--- gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/playlist.svg	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/hicolor/scalable/places/playlist.svg	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg5498"
+   sodipodi:version="0.32"
+   inkscape:version="0.44+devel"
+   sodipodi:docbase="/home/andreas/project/misc icons/48x48"
+   sodipodi:docname="playlist.svg"
+   inkscape:export-filename="/home/andreas/project/misc icons/48x48/playlist.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0"
+   sodipodi:modified="true">
+  <defs
+     id="defs5500">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient2098"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2096"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3688">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop3690" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop3692" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3688"
+       id="radialGradient2094"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop3710" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1"
+         style="stop-color:#8a8a8a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient259"
+       id="radialGradient6713"
+       cx="12.388335"
+       cy="11.003756"
+       fx="12.388335"
+       fy="11.003756"
+       r="8.000001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.6416043,-1.2539689e-3,0,10.203752,-74.285569,-78.532731)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15662"
+       id="linearGradient11805"
+       x1="3.0272272"
+       y1="3.9004979"
+       x2="14.008917"
+       y2="13.631191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6923073,0,0,2.8461519,2.4615401,1.2307687)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="41.543508"
+     inkscape:cy="26.246397"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1674"
+     inkscape:window-height="969"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     width="48px"
+     height="48px" />
+  <metadata
+     id="metadata5503">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g2043"
+       inkscape:label="Shadow"
+       transform="matrix(1.1499995,0,0,1.0000009,-3.6000003,-1.0000139)"
+       style="opacity:0.60869565">
+      <g
+         style="display:inline"
+         id="g2036"
+         inkscape:label="Shadow">
+        <g
+           id="g3712"
+           style="opacity:0.4"
+           transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+          <rect
+             y="40"
+             x="38"
+             height="7"
+             width="5"
+             id="rect2801"
+             style="opacity:1;fill:url(#radialGradient2094);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <rect
+             transform="scale(-1,-1)"
+             y="-47"
+             x="-10"
+             height="7"
+             width="5"
+             id="rect3696"
+             style="opacity:1;fill:url(#radialGradient2096);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <rect
+             y="40"
+             x="10"
+             height="7.0000005"
+             width="28"
+             id="rect3700"
+             style="opacity:1;fill:url(#linearGradient2098);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        </g>
+      </g>
+    </g>
+    <rect
+       style="fill:url(#radialGradient6713);fill-opacity:1;stroke:#a0a0a0;stroke-width:1.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect5506"
+       width="37"
+       height="39"
+       x="5.5"
+       y="4.5"
+       rx="1.257208"
+       ry="1.2047055" />
+    <rect
+       style="opacity:0.25;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect11851"
+       width="38"
+       height="10"
+       x="5"
+       y="14"
+       rx="0"
+       ry="0" />
+    <path
+       style="opacity:0.2;fill:#555753;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 5,34 L 43,34 L 43,41.72911 C 42.939831,42.940362 43.059955,43.957007 40.542212,44 L 7.242447,44 C 5.9273405,44 5,43.908843 5,41.792936 L 5,34 z "
+       id="rect5525"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#73d216;fill-opacity:1;stroke:#4e9a06;stroke-width:0.5484944;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6726"
+       sodipodi:cx="4.953423"
+       sodipodi:cy="10.60061"
+       sodipodi:rx="2.118345"
+       sodipodi:ry="1.7042325"
+       d="M 7.071768 10.60061 A 2.118345 1.7042325 0 1 1  2.835078,10.60061 A 2.118345 1.7042325 0 1 1  7.071768 10.60061 z"
+       transform="matrix(1.8882666,0,0,1.7603232,5.146617,13.839501)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 18.5,32.137949 L 18.5,14.719774 L 36.5,14.719774 L 36.5,32.019422"
+       id="path6730"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="opacity:1;fill:#73d216;fill-opacity:1;stroke:#4e9a06;stroke-width:0.99999928;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect6732"
+       width="18"
+       height="6"
+       x="18.5"
+       y="12.499999" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#73d216;fill-opacity:1;stroke:#4e9a06;stroke-width:0.54849452;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path6734"
+       sodipodi:cx="4.953423"
+       sodipodi:cy="10.60061"
+       sodipodi:rx="2.118345"
+       sodipodi:ry="1.7042325"
+       d="M 7.071768 10.60061 A 2.118345 1.7042325 0 1 1  2.835078,10.60061 A 2.118345 1.7042325 0 1 1  7.071768 10.60061 z"
+       transform="matrix(1.8882663,0,0,1.7603231,23.146618,13.839501)" />
+    <rect
+       style="opacity:0.8;fill:none;fill-opacity:1;stroke:url(#linearGradient11805);stroke-width:0.99999988;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect8485"
+       width="35"
+       height="37"
+       x="6.4999995"
+       y="5.5"
+       rx="0.1910916"
+       ry="0.19109163" />
+    <rect
+       style="opacity:0.25;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect4942"
+       width="16"
+       height="3.999999"
+       x="19.5"
+       y="13.500001" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.25;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5929"
+       sodipodi:cx="8.203125"
+       sodipodi:cy="20.296875"
+       sodipodi:rx="0.328125"
+       sodipodi:ry="0.140625"
+       d="M 8.53125 20.296875 A 0.328125 0.140625 0 1 1  7.875,20.296875 A 0.328125 0.140625 0 1 1  8.53125 20.296875 z"
+       transform="matrix(6.0952364,0,0,10.66665,-36.999987,-184.99966)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.25;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5931"
+       sodipodi:cx="8.203125"
+       sodipodi:cy="20.296875"
+       sodipodi:rx="0.328125"
+       sodipodi:ry="0.140625"
+       d="M 8.53125 20.296875 A 0.328125 0.140625 0 1 1  7.875,20.296875 A 0.328125 0.140625 0 1 1  8.53125 20.296875 z"
+       transform="matrix(6.0952383,0,0,10.666659,-19.000002,-184.99984)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.25;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.77568847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4943"
+       sodipodi:cx="4.953423"
+       sodipodi:cy="10.60061"
+       sodipodi:rx="2.118345"
+       sodipodi:ry="1.7042325"
+       d="M 7.071768 10.60061 A 2.118345 1.7042325 0 1 1  2.835078,10.60061 A 2.118345 1.7042325 0 1 1  7.071768 10.60061 z"
+       transform="matrix(1.4161996,0,0,1.1735487,25.484965,20.059668)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.25;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.77568847;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5914"
+       sodipodi:cx="4.953423"
+       sodipodi:cy="10.60061"
+       sodipodi:rx="2.118345"
+       sodipodi:ry="1.7042325"
+       d="M 7.071768 10.60061 A 2.118345 1.7042325 0 1 1  2.835078,10.60061 A 2.118345 1.7042325 0 1 1  7.071768 10.60061 z"
+       transform="matrix(1.4161996,0,0,1.1735487,7.4849638,20.059668)" />
+  </g>
+</svg>

Added: gtkpod/branches/upstream/current/data/icons/scalable/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/icons/scalable/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/scalable/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,4 @@
+appicondir = $(datadir)/icons/hicolor/scalable/apps
+appicon_DATA = gtkpod.svg
+
+EXTRA_DIST = $(appicon_DATA)

Added: gtkpod/branches/upstream/current/data/icons/scalable/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/icons/scalable/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/scalable/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,400 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/icons/scalable
+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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+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/scalable/apps
+appicon_DATA = gtkpod.svg
+EXTRA_DIST = $(appicon_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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/scalable/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/icons/scalable/Makefile
+.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)
+	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=$(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=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(appicondir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(appicondir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	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
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-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 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.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/icons/scalable/gtkpod.svg
===================================================================
--- gtkpod/branches/upstream/current/data/icons/scalable/gtkpod.svg	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/icons/scalable/gtkpod.svg	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,3914 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48.000000px"
+   height="48.000000px"
+   id="svg1306"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docbase="/files/projects/gtkpod/svn/gtkpod/data/icons/scalable"
+   sodipodi:docname="gtkpod.svg"
+   inkscape:export-filename="/home/rcollier/Desktop/ipods.png"
+   inkscape:export-xdpi="90.000000"
+   inkscape:export-ydpi="90.000000"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1308">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3185"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.201878,0,36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13518">
+      <stop
+         style="stop-color: rgb(83, 165, 215); stop-opacity: 1;"
+         offset="0"
+         id="stop13520" />
+      <stop
+         style="stop-color: rgb(83, 165, 215); stop-opacity: 0;"
+         offset="1"
+         id="stop13522" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13530">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop13532" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop13534" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient5981"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4307">
+      <stop
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 1;"
+         offset="0"
+         id="stop4309" />
+      <stop
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 0;"
+         offset="1"
+         id="stop4311" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4275">
+      <stop
+         style="stop-color: rgb(204, 0, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop4277" />
+      <stop
+         style="stop-color: rgb(204, 0, 0); stop-opacity: 0;"
+         offset="1"
+         id="stop4279" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4267">
+      <stop
+         style="stop-color: rgb(157, 176, 41); stop-opacity: 1;"
+         offset="0"
+         id="stop4269" />
+      <stop
+         style="stop-color: rgb(157, 176, 41); stop-opacity: 0;"
+         offset="1"
+         id="stop4271" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4243">
+      <stop
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 1;"
+         offset="0"
+         id="stop4245" />
+      <stop
+         style="stop-color: rgb(136, 138, 133); stop-opacity: 0;"
+         offset="1"
+         id="stop4247" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4227">
+      <stop
+         style="stop-color: rgb(46, 52, 54); stop-opacity: 1;"
+         offset="0"
+         id="stop4229" />
+      <stop
+         style="stop-color: rgb(46, 52, 54); stop-opacity: 0;"
+         offset="1"
+         id="stop4231" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4141">
+      <stop
+         style="stop-color: rgb(99, 99, 99); stop-opacity: 1;"
+         offset="0"
+         id="stop4143" />
+      <stop
+         style="stop-color: rgb(99, 99, 99); stop-opacity: 0;"
+         offset="1"
+         id="stop4145" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3554">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop3556" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop3558" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7774">
+      <stop
+         style="stop-color: rgb(114, 126, 10); stop-opacity: 1;"
+         offset="0.0000000"
+         id="stop7776" />
+      <stop
+         id="stop7778"
+         offset="0.10000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.88000000"
+         id="stop7780" />
+      <stop
+         style="stop-color: rgb(114, 126, 10); stop-opacity: 1;"
+         offset="1.0000000"
+         id="stop7782" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7764">
+      <stop
+         style="stop-color: rgb(164, 0, 0); stop-opacity: 1;"
+         offset="0.0000000"
+         id="stop7766" />
+      <stop
+         id="stop7768"
+         offset="0.10000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.88000000"
+         id="stop7770" />
+      <stop
+         style="stop-color: rgb(164, 0, 0); stop-opacity: 1;"
+         offset="1.0000000"
+         id="stop7772" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7754">
+      <stop
+         style="stop-color: rgb(32, 74, 135); stop-opacity: 1;"
+         offset="0.0000000"
+         id="stop7756" />
+      <stop
+         id="stop7758"
+         offset="0.10000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.88000000"
+         id="stop7760" />
+      <stop
+         style="stop-color: rgb(32, 74, 135); stop-opacity: 1;"
+         offset="1.0000000"
+         id="stop7762" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7744">
+      <stop
+         style="stop-color: rgb(85, 87, 83); stop-opacity: 1;"
+         offset="0.0000000"
+         id="stop7746" />
+      <stop
+         id="stop7748"
+         offset="0.10000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.88000000"
+         id="stop7750" />
+      <stop
+         style="stop-color: rgb(85, 87, 83); stop-opacity: 1;"
+         offset="1.0000000"
+         id="stop7752" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7175">
+      <stop
+         id="stop7177"
+         offset="0.0000000"
+         style="stop-color: rgb(114, 126, 10); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.10000000"
+         id="stop7179" />
+      <stop
+         id="stop7181"
+         offset="0.88000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         id="stop7183"
+         offset="1.0000000"
+         style="stop-color: rgb(114, 126, 10); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7165">
+      <stop
+         id="stop7167"
+         offset="0.0000000"
+         style="stop-color: rgb(164, 0, 0); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.10000000"
+         id="stop7169" />
+      <stop
+         id="stop7171"
+         offset="0.88000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         id="stop7173"
+         offset="1.0000000"
+         style="stop-color: rgb(164, 0, 0); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7155">
+      <stop
+         id="stop7157"
+         offset="0.0000000"
+         style="stop-color: rgb(32, 74, 135); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.10000000"
+         id="stop7159" />
+      <stop
+         id="stop7161"
+         offset="0.88000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         id="stop7163"
+         offset="1.0000000"
+         style="stop-color: rgb(32, 74, 135); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7145">
+      <stop
+         id="stop7147"
+         offset="0.0000000"
+         style="stop-color: rgb(143, 89, 2); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.10000000"
+         id="stop7149" />
+      <stop
+         id="stop7151"
+         offset="0.88000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         id="stop7153"
+         offset="1.0000000"
+         style="stop-color: rgb(143, 89, 2); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4114">
+      <stop
+         style="stop-color: rgb(170, 170, 170); stop-opacity: 1;"
+         offset="0"
+         id="stop4116" />
+      <stop
+         style="stop-color: rgb(170, 170, 170); stop-opacity: 0;"
+         offset="1"
+         id="stop4118" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3088">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop3090" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop3092" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3066">
+      <stop
+         style="stop-color: rgb(141, 141, 141); stop-opacity: 1;"
+         offset="0"
+         id="stop3068" />
+      <stop
+         style="stop-color: rgb(141, 141, 141); stop-opacity: 0;"
+         offset="1"
+         id="stop3070" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3056">
+      <stop
+         style="stop-color: rgb(141, 141, 141); stop-opacity: 1;"
+         offset="0"
+         id="stop3058" />
+      <stop
+         style="stop-color: rgb(141, 141, 141); stop-opacity: 0;"
+         offset="1"
+         id="stop3060" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient25396">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop25398" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop25400" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient25370">
+      <stop
+         style="stop-color: rgb(146, 146, 146); stop-opacity: 1;"
+         offset="0"
+         id="stop25372" />
+      <stop
+         style="stop-color: rgb(146, 146, 146); stop-opacity: 0;"
+         offset="1"
+         id="stop25374" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient24579">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop24581" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop24583" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient19995">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop19997" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop19999" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient19198">
+      <stop
+         style="stop-color: rgb(214, 214, 212); stop-opacity: 1;"
+         offset="0"
+         id="stop19200" />
+      <stop
+         style="stop-color: rgb(214, 214, 212); stop-opacity: 0;"
+         offset="1"
+         id="stop19202" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13288">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop13290" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop13292" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10936">
+      <stop
+         style="stop-color: rgb(45, 88, 155); stop-opacity: 1;"
+         offset="0"
+         id="stop10938" />
+      <stop
+         style="stop-color: rgb(227, 235, 247); stop-opacity: 1;"
+         offset="1.0000000"
+         id="stop10940" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10924">
+      <stop
+         style="stop-color: rgb(239, 239, 239); stop-opacity: 1;"
+         offset="0"
+         id="stop10926" />
+      <stop
+         style="stop-color: rgb(239, 239, 239); stop-opacity: 0;"
+         offset="1"
+         id="stop10928" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8734">
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop8736" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="1"
+         id="stop8738" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5485">
+      <stop
+         style="stop-color: rgb(221, 221, 221); stop-opacity: 1;"
+         offset="0"
+         id="stop5487" />
+      <stop
+         style="stop-color: rgb(221, 221, 221); stop-opacity: 0;"
+         offset="1"
+         id="stop5489" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5453">
+      <stop
+         style="stop-color: rgb(10, 0, 0); stop-opacity: 0.587629;"
+         offset="0.0000000"
+         id="stop5455" />
+      <stop
+         id="stop5461"
+         offset="0.10000000"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="0.88000000"
+         id="stop5465" />
+      <stop
+         style="stop-color: rgb(10, 0, 0); stop-opacity: 0.588235;"
+         offset="1.0000000"
+         id="stop5457" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8943">
+      <stop
+         style="stop-color: rgb(190, 190, 190); stop-opacity: 1;"
+         offset="0"
+         id="stop8945" />
+      <stop
+         style="stop-color: rgb(190, 190, 190); stop-opacity: 0;"
+         offset="1"
+         id="stop8947" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8929">
+      <stop
+         style="stop-color: rgb(217, 218, 220); stop-opacity: 1;"
+         offset="0"
+         id="stop8931" />
+      <stop
+         style="stop-color: rgb(217, 218, 220); stop-opacity: 0;"
+         offset="1"
+         id="stop8933" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2924">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop2926" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;"
+         offset="1"
+         id="stop2928" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5919">
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop5921" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="1"
+         id="stop5923" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9203">
+      <stop
+         style="stop-color: rgb(249, 249, 249); stop-opacity: 1;"
+         offset="0"
+         id="stop9205" />
+      <stop
+         style="stop-color: rgb(242, 242, 242); stop-opacity: 1;"
+         offset="1.0000000"
+         id="stop9207" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6962">
+      <stop
+         style="stop-color: rgb(113, 113, 113); stop-opacity: 1;"
+         offset="0"
+         id="stop6964" />
+      <stop
+         style="stop-color: rgb(131, 131, 131); stop-opacity: 0;"
+         offset="1"
+         id="stop6966" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2248">
+      <stop
+         style="stop-color: rgb(192, 192, 192); stop-opacity: 1;"
+         offset="0"
+         id="stop2250" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="1"
+         id="stop2252" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4226">
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 1;"
+         offset="0"
+         id="stop4228" />
+      <stop
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;"
+         offset="1"
+         id="stop4230" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4226"
+       id="radialGradient4232"
+       cx="25.812500"
+       cy="42.000000"
+       fx="25.812500"
+       fy="42.000000"
+       r="8.5625000"
+       gradientTransform="matrix(1, 0, 0, 0.715328, -1.26288e-15, 11.9562)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient12304"
+       gradientUnits="userSpaceOnUse"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024"
+       gradientTransform="translate(-403.455, 13.0544)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient2939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, 3.92134e-15, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2392"
+       id="linearGradient2398"
+       x1="27.308506"
+       y1="20.227215"
+       x2="27.238144"
+       y2="27.352215"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.184, 0, 33.975)"
+       r="22.097088"
+       fy="41.636040"
+       fx="24.218407"
+       cy="41.636040"
+       cx="24.218407"
+       id="radialGradient12135"
+       xlink:href="#linearGradient12129"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(1.21138, 0, 0, 1.21138, -2.02143, 0.172946)"
+       y2="36.0328"
+       x2="31.0813"
+       y1="3.7319"
+       x1="12.4873"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient16280"
+       xlink:href="#aigrd1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="22.5769"
+       x2="21.9168"
+       y1="30.3413"
+       x1="21.877"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient16277"
+       xlink:href="#aigrd2"
+       inkscape:collect="always"
+       gradientTransform="matrix(1.11046, 0, 0, 1.11824, -0.223961, 1.61786)" />
+    <linearGradient
+       y2="7.1091"
+       x2="21.9326"
+       y1="24.6274"
+       x1="21.9326"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient16270"
+       xlink:href="#aigrd3"
+       inkscape:collect="always"
+       gradientTransform="matrix(1.09899, 0, 0, 1.1067, 0.0277488, 1.96815)" />
+    <linearGradient
+       id="aigrd3"
+       gradientUnits="userSpaceOnUse"
+       x1="21.9326"
+       y1="24.6274"
+       x2="21.9326"
+       y2="7.1091"
+       style="stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;">
+      <stop
+         offset="0"
+         style="stop-color: rgb(208, 214, 229); stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;"
+         id="stop16199" />
+      <stop
+         offset="1"
+         style="stop-color: rgb(9, 58, 128); stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;"
+         id="stop16201" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd2"
+       gradientUnits="userSpaceOnUse"
+       x1="21.877"
+       y1="30.3413"
+       x2="21.9168"
+       y2="22.5769"
+       style="stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;">
+      <stop
+         offset="0.0000000"
+         style="stop-color: rgb(94, 79, 7); stop-opacity: 1;"
+         id="stop16184" />
+      <stop
+         offset="1.0000000"
+         style="stop-color: rgb(52, 138, 49); stop-opacity: 1;"
+         id="stop16186" />
+    </linearGradient>
+    <linearGradient
+       id="aigrd1"
+       gradientUnits="userSpaceOnUse"
+       x1="12.4873"
+       y1="3.7319"
+       x2="31.0813"
+       y2="36.0328"
+       style="stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;">
+      <stop
+         offset="0"
+         style="stop-color: rgb(210, 210, 210); stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;"
+         id="stop16177" />
+      <stop
+         offset="1"
+         style="stop-color: rgb(237, 237, 237); stroke-dasharray: none; stroke-miterlimit: 4; stroke-width: 1.21667;"
+         id="stop16179" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12129"
+       inkscape:collect="always">
+      <stop
+         id="stop12131"
+         offset="0"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 1;" />
+      <stop
+         id="stop12133"
+         offset="1"
+         style="stop-color: rgb(0, 0, 0); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2392">
+      <stop
+         style="stop-color: rgb(113, 91, 38); stop-opacity: 1;"
+         offset="0.0000000"
+         id="stop2394" />
+      <stop
+         style="stop-color: rgb(49, 39, 16); stop-opacity: 1;"
+         offset="1.0000000"
+         id="stop2396" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient7271"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.70823, 0, 0, 1.262, -416.384, -178.72)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient7335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.783486, 0, 0, 1, -36.9787, 52.7525)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8929"
+       id="linearGradient8937"
+       x1="-13.656000"
+       y1="75.510872"
+       x2="-20.240932"
+       y2="65.832352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8943"
+       id="linearGradient8949"
+       x1="-22.822500"
+       y1="68.130447"
+       x2="-14.875132"
+       y2="68.130447"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient9751"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.783486, 0, 0, 1, -36.9787, 52.7525)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8929"
+       id="linearGradient9776"
+       gradientUnits="userSpaceOnUse"
+       x1="-13.656000"
+       y1="75.510872"
+       x2="-20.240932"
+       y2="65.832352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8943"
+       id="linearGradient9778"
+       gradientUnits="userSpaceOnUse"
+       x1="-22.822500"
+       y1="68.130447"
+       x2="-14.875132"
+       y2="68.130447" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient2166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient2170"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.38239e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8734"
+       id="radialGradient11229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.339901, 4.03011e-14, -12.9132)"
+       cx="-164.31250"
+       cy="-19.562500"
+       fx="-164.31250"
+       fy="-19.562500"
+       r="12.687500" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="radialGradient11231"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08784, 0.843258, -0.612654, 0.790351, 24.2914, 183.346)"
+       cx="-215.24026"
+       cy="8.7893066"
+       fx="-215.24026"
+       fy="8.7893066"
+       r="3.2040777" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5453"
+       id="linearGradient11233"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.752486, 0, 0, 0.764968, -129.697, -91.311)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient11235"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.775165, 0, 0, 0.779522, -164.209, -66.7926)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient11327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8734"
+       id="radialGradient11329"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.339901, 1.95261e-14, -12.9132)"
+       cx="-164.31250"
+       cy="-19.562500"
+       fx="-164.31250"
+       fy="-19.562500"
+       r="12.687500" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5453"
+       id="linearGradient11333"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.748646, 0, 0, 0.764968, -219.991, -91.9931)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient11335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.764215, 0, 0, 0.779522, -255.401, -67.3643)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8734"
+       id="radialGradient11429"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.339901, 3.26692e-14, -12.9132)"
+       cx="-164.31250"
+       cy="-19.562500"
+       fx="-164.31250"
+       fy="-19.562500"
+       r="12.687500" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="radialGradient11431"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08784, 0.843258, -0.612654, 0.790351, 24.2914, 183.346)"
+       cx="-215.24026"
+       cy="8.7893066"
+       fx="-215.24026"
+       fy="8.7893066"
+       r="3.2040777" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5453"
+       id="linearGradient11433"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.752486, 0, 0, 0.764968, -35.3305, -90.2085)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient11435"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.775165, 0, 0, 0.779522, -69.8431, -65.69)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8734"
+       id="radialGradient11529"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.339901, 1.45149e-14, -12.9132)"
+       cx="-164.31250"
+       cy="-19.562500"
+       fx="-164.31250"
+       fy="-19.562500"
+       r="12.687500" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="radialGradient11531"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08784, 0.843258, -0.612654, 0.790351, 24.2914, 183.346)"
+       cx="-215.24026"
+       cy="8.7893066"
+       fx="-215.24026"
+       fy="8.7893066"
+       r="3.2040777" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5453"
+       id="linearGradient11533"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.752486, 0, 0, 0.764968, -83.0098, -90.484)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient11535"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.775165, 0, 0, 0.779522, -117.522, -65.9657)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8734"
+       id="radialGradient12355"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.339901, 3.24541e-14, -12.9132)"
+       cx="-164.31250"
+       cy="-19.562500"
+       fx="-164.31250"
+       fy="-19.562500"
+       r="12.687500" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="radialGradient12357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08784, 0.843258, -0.612654, 0.790351, 24.2914, 183.346)"
+       cx="-215.24026"
+       cy="8.7893066"
+       fx="-215.24026"
+       fy="8.7893066"
+       r="3.2040777" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5453"
+       id="linearGradient12359"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.752486, 0, 0, 0.764968, -173.965, -91.8633)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient12361"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.775165, 0, 0, 0.779522, -208.478, -67.3449)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient12535"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient12537"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.99182e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13288"
+       id="linearGradient13294"
+       x1="-321.33310"
+       y1="-53.248569"
+       x2="-295.32266"
+       y2="-9.0610695"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.11295, 0, 0, 1.15356, 13.7126, -110.563)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient15483"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -3.06859e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient15487"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -3.67686e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient15907"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -3.07665e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13288"
+       id="linearGradient15909"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.11295, 0, 0, 1.15356, 33.1228, -184.036)"
+       x1="-321.33310"
+       y1="-53.248569"
+       x2="-295.32266"
+       y2="-9.0610695" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient16071"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.09805e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19198"
+       id="linearGradient19204"
+       x1="-462.03079"
+       y1="-216.85661"
+       x2="-443.46924"
+       y2="-204.17659"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(180.639, 255.631)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19198"
+       id="linearGradient19206"
+       x1="-458.00912"
+       y1="-206.95709"
+       x2="-452.35226"
+       y2="-197.33253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(180.639, 255.631)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19995"
+       id="linearGradient20001"
+       x1="-454.64041"
+       y1="-246.35371"
+       x2="-452.14810"
+       y2="-243.47842"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient22201"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -2.24342e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient23841"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient23851"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient24579"
+       id="linearGradient24585"
+       x1="-300.04407"
+       y1="32.677853"
+       x2="-281.19888"
+       y2="49.294865"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.3848, -0.707107)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient25348"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient25352"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient25356"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient25360"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient25364"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25370"
+       id="linearGradient25376"
+       x1="-295.45397"
+       y1="61.900581"
+       x2="-285.35447"
+       y2="61.900581"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.3848, -0.707107)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25402"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25406"
+       gradientUnits="userSpaceOnUse"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451"
+       gradientTransform="translate(9.43714e-06, 2.92344)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25410"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.0800749, 5.92697)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25414"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.0800506, 9.0907)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25436"
+       gradientUnits="userSpaceOnUse"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25438"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(9.43714e-06, 2.92344)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25440"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.0800749, 5.92697)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25442"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.0800506, 9.0907)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25454"
+       gradientUnits="userSpaceOnUse"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25456"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(9.43714e-06, 2.92344)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25458"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.0800749, 5.92697)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25460"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.0800506, 9.0907)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25462"
+       gradientUnits="userSpaceOnUse"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25464"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(9.43714e-06, 2.92344)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.0800749, 5.92697)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient25396"
+       id="linearGradient25468"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.0800506, 9.0907)"
+       x1="-290.94226"
+       y1="48.080093"
+       x2="-290.78210"
+       y2="50.082451" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3056"
+       id="linearGradient3062"
+       x1="-454.62939"
+       y1="-212.70671"
+       x2="-450.64621"
+       y2="-209.19533"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3066"
+       id="linearGradient3072"
+       x1="-450.47763"
+       y1="-207.90897"
+       x2="-454.32587"
+       y2="-211.44472"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3088"
+       id="linearGradient3094"
+       x1="-252.81038"
+       y1="115.17856"
+       x2="-251.20390"
+       y2="117.83466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5.53977, -1.99763)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3088"
+       id="linearGradient3098"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(520.169, -142.893)"
+       x1="-252.16348"
+       y1="115.78169"
+       x2="-252.29054"
+       y2="118.12593" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3377"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -3.58888e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13288"
+       id="linearGradient3379"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.11295, 0, 0, 1.15356, 34.1666, -110.545)"
+       x1="-321.33310"
+       y1="-53.248569"
+       x2="-295.32266"
+       y2="-9.0610695" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3384"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3037"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3043"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3238"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -3.69199e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient3242"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.70823, 0, 0, 1.262, -416.453, -251.859)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3244"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient3521"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient3537"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient3553"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient3569"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient3585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3905"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -2.86154e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient3907"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3973"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient4013"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient4064"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient4104"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4114"
+       id="linearGradient4120"
+       x1="22.125528"
+       y1="20.934155"
+       x2="41.189976"
+       y2="47.416740"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient5013"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient5069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient5125"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient6961"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.66106e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8929"
+       id="linearGradient6973"
+       gradientUnits="userSpaceOnUse"
+       x1="-13.656000"
+       y1="75.510872"
+       x2="-20.240932"
+       y2="65.832352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient7003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 366.127, 39.9424)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient7013"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, 1.83009e-14, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7035"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient7053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.17695e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient7055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.38733, 0, 0, 1.02465, -8.60985, -1.09346)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7764"
+       id="linearGradient7067"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 401.069, 15.5343)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient7095"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -8.90087e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7396"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient7488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -8.56135e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient7490"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 310.068, 39.9424)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7492"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7754"
+       id="linearGradient7494"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 345.011, 15.5343)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7496"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient7572"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -8.80924e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient7574"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 198.127, 39.9424)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7576"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7744"
+       id="linearGradient7578"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 233.07, 15.5343)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7580"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient7652"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -8.87297e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient7654"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 254.127, 39.9424)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7656"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7145"
+       id="linearGradient7658"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 289.069, 15.5343)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7660"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient7733"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -9.21131e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient7735"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 422.127, 39.9424)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7737"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7774"
+       id="linearGradient7739"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 457.07, 15.5343)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient7741"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient8134"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.13394e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient8136"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 142.118, 39.9424)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8138"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7764"
+       id="linearGradient8140"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 177.06, 15.5343)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8142"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient8144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.07433e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient8146"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 142.118, 39.9424)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8148"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7754"
+       id="linearGradient8150"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 177.06, 15.5343)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8152"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient8154"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -9.63522e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient8156"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 142.118, 39.9586)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8158"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7744"
+       id="linearGradient8160"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 177.061, 15.5505)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8162"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient8164"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.04308e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient8166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 142.106, 39.9586)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8168"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7145"
+       id="linearGradient8170"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 177.048, 15.5505)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8172"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient8174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.20204e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient8176"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 142.118, 39.9424)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8178"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7774"
+       id="linearGradient8180"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 177.06, 15.5343)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient8182"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8240"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8284"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8423"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8485"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8547"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient8609"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.24258e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient9263"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient9265"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 366.127, -16.0703)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9267"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7764"
+       id="linearGradient9269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 401.07, -40.4784)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9271"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9273"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.17097e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient9275"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient9277"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 310.069, -16.0703)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9279"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7754"
+       id="linearGradient9281"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 345.011, -40.4784)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9283"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9285"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.00152e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient9287"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient9289"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 198.127, -16.0703)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9291"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7744"
+       id="linearGradient9293"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 233.07, -40.4784)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9295"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9297"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.07148e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient9299"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient9301"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 254.127, -16.0703)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9303"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7145"
+       id="linearGradient9305"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 289.07, -40.4784)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9307"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9309"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.32306e-12, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient9311"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10924"
+       id="linearGradient9313"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.743403, 0, 0, 0.776658, 422.128, -16.0703)"
+       x1="-171.66670"
+       y1="-46.437500"
+       x2="-132.63971"
+       y2="31.094299" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9315"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7774"
+       id="linearGradient9317"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.730619, 0, 0, 0.767032, 457.07, -40.4784)"
+       spreadMethod="pad"
+       x1="-223.18059"
+       y1="9.7278442"
+       x2="-194.25365"
+       y2="9.7278442" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9319"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9945"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -3.40756e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9947"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.01026e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9949"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -5.25594e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient9951"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2118, 0, 0, 0.895257, 108.073, -168.02)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13288"
+       id="linearGradient9953"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.789519, 0, 0, 0.818328, 434.918, -120.293)"
+       x1="-321.33310"
+       y1="-53.248569"
+       x2="-295.32266"
+       y2="-9.0610695" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13288"
+       id="linearGradient9955"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.789519, 0, 0, 0.818328, 492.207, -121.22)"
+       x1="-321.33310"
+       y1="-53.248569"
+       x2="-295.32266"
+       y2="-9.0610695" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9957"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9959"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient9961"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2118, 0, 0, 0.895257, 49.694, -167.959)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9963"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient9965"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient9967"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -5.09524e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient10269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -3.13639e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient10271"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.0471e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient10273"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -5.21675e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient10275"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2118, 0, 0, 0.895257, 108.073, -224.588)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13288"
+       id="linearGradient10277"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.789519, 0, 0, 0.818328, 434.918, -176.861)"
+       x1="-321.33310"
+       y1="-53.248569"
+       x2="-295.32266"
+       y2="-9.0610695" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13288"
+       id="linearGradient10279"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.789519, 0, 0, 0.818328, 492.208, -177.789)"
+       x1="-321.33310"
+       y1="-53.248569"
+       x2="-295.32266"
+       y2="-9.0610695" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient10281"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient10283"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient10285"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2118, 0, 0, 0.895257, 49.6941, -224.527)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient10287"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient10289"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient10291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -5.15325e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient2862"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient2902"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient2904"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient2950"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient2971"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient2717"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient2787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.55773e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient2789"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.38733, 0, 0, 1.02465, -8.60991, -1.09345)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient2791"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient2808"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.6517e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3554"
+       id="linearGradient3560"
+       x1="181.02138"
+       y1="-52.362705"
+       x2="203.62500"
+       y2="-12.425205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-168.011, 55.9832)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3630"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.97192e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3554"
+       id="linearGradient3632"
+       gradientUnits="userSpaceOnUse"
+       x1="181.02138"
+       y1="-52.362705"
+       x2="203.62500"
+       y2="-12.425205"
+       gradientTransform="translate(56, 5.45078e-07)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3704"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3708"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3984"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.28768e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient3986"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.38733, 0, 0, 1.02465, 47.3459, -114.077)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3988"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.93122e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient3992"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.38733, 0, 0, 1.02465, 103.356, -114.064)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient3994"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3996"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -5.16638e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3554"
+       id="linearGradient3998"
+       gradientUnits="userSpaceOnUse"
+       x1="181.02138"
+       y1="-52.362705"
+       x2="203.62500"
+       y2="-12.425205"
+       gradientTransform="translate(-0.0442861, -56.9876)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient4000"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -5.76018e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3554"
+       id="linearGradient4002"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(55.9557, -56.9876)"
+       x1="181.02138"
+       y1="-52.362705"
+       x2="203.62500"
+       y2="-12.425205" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient4004"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5485"
+       id="linearGradient4006"
+       gradientUnits="userSpaceOnUse"
+       x1="-210.71640"
+       y1="16.861975"
+       x2="-215.08304"
+       y2="8.6301003" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4068"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4130"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4192"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4254"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient3555"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.832553, 0, 0, 0.998481, 60.432, -170.002)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3609"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -1.80303e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient3611"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.832553, 0, 0, 0.998481, 60.425, -226.977)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8929"
+       id="linearGradient3613"
+       gradientUnits="userSpaceOnUse"
+       x1="-13.656000"
+       y1="75.510872"
+       x2="-20.240932"
+       y2="65.832352" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.91004e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient3670"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.999362, 0, 0, 1.00048, 114.008, -170.009)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3741"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.53409e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient3743"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.999362, 0, 0, 1.00048, 114.017, -227.007)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3811"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.93391e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient3883"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, -4.76141e-13, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19198"
+       id="linearGradient3959"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.797456, 0, 0, 0.742875, 609.547, 18.2398)"
+       x1="-458.00912"
+       y1="-206.95709"
+       x2="-452.35226"
+       y2="-197.33253" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3056"
+       id="linearGradient4021"
+       gradientUnits="userSpaceOnUse"
+       x1="-454.62939"
+       y1="-212.70671"
+       x2="-450.64621"
+       y2="-209.19533" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3066"
+       id="linearGradient4023"
+       gradientUnits="userSpaceOnUse"
+       x1="-450.47763"
+       y1="-207.90897"
+       x2="-454.32587"
+       y2="-211.44472" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4141"
+       id="linearGradient4147"
+       x1="-456.22388"
+       y1="-244.17062"
+       x2="-451.31165"
+       y2="-244.87511"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19198"
+       id="linearGradient4197"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.79936, 0, 0, 0.747188, 610.427, 19.1325)"
+       x1="-462.03079"
+       y1="-216.85661"
+       x2="-443.46924"
+       y2="-204.17659" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4227"
+       id="linearGradient4233"
+       x1="247.10906"
+       y1="-138.39033"
+       x2="249.82786"
+       y2="-138.39033"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4243"
+       id="linearGradient4249"
+       x1="248.84767"
+       y1="-124.09965"
+       x2="248.86223"
+       y2="-128.60747"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.858948, 0, 0, 0.586269, 35.0526, -52.0729)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4267"
+       id="linearGradient4273"
+       x1="191.13173"
+       y1="-188.64658"
+       x2="189.64017"
+       y2="-192.71288"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4275"
+       id="linearGradient4281"
+       x1="-284.96951"
+       y1="-77.512611"
+       x2="-284.24194"
+       y2="-80.599586"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4307"
+       id="linearGradient4313"
+       x1="248.41544"
+       y1="-124.22470"
+       x2="248.41544"
+       y2="-125.99247"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.859423, 0, 0, 0.632454, 35.0039, -46.2864)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5919"
+       id="radialGradient4438"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1, 0, 0, 0.201878, 3.34555e-14, 36.0378)"
+       cx="30.428225"
+       cy="45.153286"
+       fx="30.428225"
+       fy="45.153286"
+       r="13.474453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19198"
+       id="linearGradient4440"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.79936, 0, 0, 0.747188, 610.427, -37.8647)"
+       x1="-462.03079"
+       y1="-216.85661"
+       x2="-443.46924"
+       y2="-204.17659" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19198"
+       id="linearGradient4442"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.797456, 0, 0, 0.742875, 609.547, -38.7575)"
+       x1="-458.00912"
+       y1="-206.95709"
+       x2="-452.35226"
+       y2="-197.33253" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4141"
+       id="linearGradient4444"
+       gradientUnits="userSpaceOnUse"
+       x1="-456.22388"
+       y1="-244.17062"
+       x2="-451.31165"
+       y2="-244.87511" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4267"
+       id="linearGradient4446"
+       gradientUnits="userSpaceOnUse"
+       x1="191.13173"
+       y1="-188.64658"
+       x2="189.64017"
+       y2="-192.71288"
+       gradientTransform="translate(-17.0142, -55.7039)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4275"
+       id="linearGradient4448"
+       gradientUnits="userSpaceOnUse"
+       x1="-284.96951"
+       y1="-77.512611"
+       x2="-284.24194"
+       y2="-80.599586"
+       gradientTransform="translate(-17.0872, -55.7263)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3056"
+       id="linearGradient4450"
+       gradientUnits="userSpaceOnUse"
+       x1="-454.62939"
+       y1="-212.70671"
+       x2="-450.64621"
+       y2="-209.19533" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4227"
+       id="linearGradient4454"
+       gradientUnits="userSpaceOnUse"
+       x1="247.10906"
+       y1="-138.39033"
+       x2="249.82786"
+       y2="-138.39033" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3066"
+       id="linearGradient4456"
+       gradientUnits="userSpaceOnUse"
+       x1="-450.47763"
+       y1="-207.90897"
+       x2="-454.32587"
+       y2="-211.44472" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4227"
+       id="linearGradient4458"
+       gradientUnits="userSpaceOnUse"
+       x1="247.10906"
+       y1="-138.39033"
+       x2="249.82786"
+       y2="-138.39033" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4520"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4582"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4644"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4706"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2924"
+       id="radialGradient4768"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.49507, 0.0454727, -0.0130094, 0.999915, -25.4207, -0.463789)"
+       cx="10.268794"
+       cy="37.354755"
+       fx="10.268794"
+       fy="37.354755"
+       r="2.1875000" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13530"
+       id="radialGradient3266"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.820482,0.376973,-0.408818,-0.889792,48.8674,14.022)"
+       cx="18.326235"
+       cy="11.038991"
+       fx="18.326235"
+       fy="11.038991"
+       r="10.000004" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13518"
+       id="radialGradient3269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.04421,-0.201262,0.206213,1.0699,-6.5356,29.7293)"
+       cx="33.314503"
+       cy="-11.196130"
+       fx="33.314503"
+       fy="-11.196130"
+       r="10.000004" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9203"
+       id="linearGradient3276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.38733,0,0,1.02465,-8.5992,-1.0936)"
+       x1="23.505463"
+       y1="4.9350243"
+       x2="28.011971"
+       y2="42.185024" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.29411765"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="16.060729"
+     inkscape:cy="5.951247"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="912"
+     inkscape:window-x="0"
+     inkscape:window-y="49"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     gridspacingx="1.0000000px"
+     gridspacingy="1.0000000px"
+     showborder="true" />
+  <metadata
+     id="metadata1311">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Portable Media - iPod Video</dc:title>
+        <dc:date>November 2005</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Ryan Collier (pseudo)</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:publisher>
+          <cc:Agent>
+            <dc:title>http://www.tango-project.org</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:source>http://www.pseudocode.org</dc:source>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>device</rdf:li>
+            <rdf:li>media</rdf:li>
+            <rdf:li>ipod</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     style="display: inline;">
+    <g
+       style="fill: rgb(162, 166, 167); fill-opacity: 1; display: inline;"
+       id="g6589"
+       transform="matrix(1.31576, 0, 0, 1.31576, -7.3476, -8.55345)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.45;fill:url(#radialGradient3185);fill-opacity:1;stroke:none;stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="path3119"
+       sodipodi:cx="30.428225"
+       sodipodi:cy="45.153286"
+       sodipodi:rx="13.474453"
+       sodipodi:ry="2.7201946"
+       d="M 43.902678 45.153286 A 13.474453 2.7201946 0 1 1  16.953772,45.153286 A 13.474453 2.7201946 0 1 1  43.902678 45.153286 z"
+       transform="matrix(0.964789,0,0,1.82752,-5.3462,-40.473)" />
+    <rect
+       style="fill:url(#linearGradient3276);fill-opacity:1;stroke:#aaaaaa;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect3121"
+       width="24.990034"
+       height="41.991062"
+       x="11.515622"
+       y="2.4999554"
+       rx="1.6250007"
+       ry="1.6250018" />
+    <rect
+       ry="0.62500048"
+       rx="0.62500024"
+       y="3.5033667"
+       x="12.521359"
+       height="39.984226"
+       width="22.978622"
+       id="rect3123"
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <rect
+       style="fill:#2e3436;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect3125"
+       width="20.997429"
+       height="14.995066"
+       x="13.499982"
+       y="5.4830918"
+       rx="0.52014625"
+       ry="0.56434155" />
+    <path
+       id="path16203"
+       d="M 13.998789,6.013536 L 34.050039,6.013536 L 34.050039,20.013536 L 13.998789,20.013536 L 13.998789,6.013536 z "
+       style="fill:#2c5084;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.21667004;stroke-miterlimit:4;display:inline" />
+    <rect
+       y="5.9830918"
+       x="14.999982"
+       height="1"
+       width="1"
+       id="rect11893"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.63320005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
+    <path
+       id="path12056"
+       d="M 13.948729,5.983091 L 33.999979,5.983091 L 33.999979,19.983091 L 13.948729,19.983091 L 13.948729,5.983091 z "
+       style="fill:url(#radialGradient3269);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.21667004;stroke-miterlimit:4;display:inline" />
+    <path
+       id="path13526"
+       d="M 13.948729,5.983091 L 33.999979,5.983091 L 33.999979,19.983091 L 13.948729,19.983091 L 13.948729,5.983091 z "
+       style="fill:url(#radialGradient3266);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.21667004;stroke-miterlimit:4;display:inline" />
+    <path
+       style="opacity:0.37912101;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+       d="M 12.000139,4.1886 C 11.987749,3.6494 12.667119,3.00626 13.306319,2.9891 C 14.039399,2.96813 34.876939,3.00878 34.876939,3.00878 C 34.876939,3.00878 36.155989,3.20719 35.984079,4.59429 C 30.591959,7.705219 20.658729,18.65669 22.482619,22.30188 C 28.265889,33.86021 12.011749,42.3614 12.011749,42.3614 C 12.011749,42.3614 12.026799,6.015229 12.000139,4.1886 z "
+       id="path3145"
+       sodipodi:nodetypes="ccccscc" />
+    <g
+       style="display:inline"
+       id="g5960"
+       transform="matrix(0.888298,0,0,0.888298,3.565,3.5413)">
+      <path
+         transform="matrix(1.24937,0,0,1.24937,-9.51081,-1.399)"
+         d="M 33.234019 26.742603 A 7.2036505 7.2036505 0 1 1  18.826718,26.742603 A 7.2036505 7.2036505 0 1 1  33.234019 26.742603 z"
+         sodipodi:ry="7.2036505"
+         sodipodi:rx="7.2036505"
+         sodipodi:cy="26.742603"
+         sodipodi:cx="26.030369"
+         id="path3147"
+         style="opacity:1;fill:#d7d7d7;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <text
+         transform="scale(0.976851,1.0237)"
+         sodipodi:linespacing="125%"
+         id="text3149"
+         y="24.415001"
+         x="21.389"
+         style="font-size:1.30157995px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"
+         xml:space="preserve"><tspan
+           y="24.415001"
+           x="21.389"
+           id="tspan3151"
+           sodipodi:role="line">MENU</tspan></text>
+      <g
+         transform="matrix(-1.75519,0,0,1.56,66.8946,-13.9977)"
+         id="g3153"
+         style="display:inline">
+        <g
+           id="g3155"
+           style="fill:#ffffff;fill-opacity:1">
+          <path
+             transform="matrix(0.314794,-0.435197,0.44667,0.307983,21.2183,34.7608)"
+             d="M 17.25,6.28125 L 16.738712,6.0451923 L 16.227424,5.8091345 L 16.6875,5.484375 L 17.147576,5.1596154 L 17.198788,5.7204327 L 17.25,6.28125 z "
+             inkscape:randomized="0"
+             inkscape:rounded="0"
+             inkscape:flatsided="false"
+             sodipodi:arg2="2.0033309"
+             sodipodi:arg1="0.95613337"
+             sodipodi:r2="0.3251352"
+             sodipodi:r1="0.6502704"
+             sodipodi:cy="5.75"
+             sodipodi:cx="16.875"
+             sodipodi:sides="3"
+             id="path3157"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+             sodipodi:type="star" />
+          <path
+             transform="matrix(0.314794,-0.435197,0.44667,0.307983,20.7183,34.7608)"
+             d="M 17.25,6.28125 L 16.738712,6.0451923 L 16.227424,5.8091345 L 16.6875,5.484375 L 17.147576,5.1596154 L 17.198788,5.7204327 L 17.25,6.28125 z "
+             inkscape:randomized="0"
+             inkscape:rounded="0"
+             inkscape:flatsided="false"
+             sodipodi:arg2="2.0033309"
+             sodipodi:arg1="0.95613337"
+             sodipodi:r2="0.3251352"
+             sodipodi:r1="0.6502704"
+             sodipodi:cy="5.75"
+             sodipodi:cx="16.875"
+             sodipodi:sides="3"
+             id="path3159"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+             sodipodi:type="star" />
+        </g>
+        <rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect3161"
+           width="0.10496103"
+           height="0.60214609"
+           x="29.455418"
+           y="28.891544"
+           ry="0" />
+      </g>
+      <g
+         transform="matrix(1.75516,0,0,1.66931,-20.8725,-17.2218)"
+         id="g3163"
+         style="display:inline">
+        <g
+           id="g3165"
+           style="fill:#ffffff;fill-opacity:1">
+          <path
+             transform="matrix(0.314794,-0.435197,0.44667,0.307983,21.2183,34.7608)"
+             d="M 17.25,6.28125 L 16.738712,6.0451923 L 16.227424,5.8091345 L 16.6875,5.484375 L 17.147576,5.1596154 L 17.198788,5.7204327 L 17.25,6.28125 z "
+             inkscape:randomized="0"
+             inkscape:rounded="0"
+             inkscape:flatsided="false"
+             sodipodi:arg2="2.0033309"
+             sodipodi:arg1="0.95613337"
+             sodipodi:r2="0.3251352"
+             sodipodi:r1="0.6502704"
+             sodipodi:cy="5.75"
+             sodipodi:cx="16.875"
+             sodipodi:sides="3"
+             id="path3167"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+             sodipodi:type="star" />
+          <path
+             transform="matrix(0.314794,-0.435197,0.44667,0.307983,20.7183,34.7608)"
+             d="M 17.25,6.28125 L 16.738712,6.0451923 L 16.227424,5.8091345 L 16.6875,5.484375 L 17.147576,5.1596154 L 17.198788,5.7204327 L 17.25,6.28125 z "
+             inkscape:randomized="0"
+             inkscape:rounded="0"
+             inkscape:flatsided="false"
+             sodipodi:arg2="2.0033309"
+             sodipodi:arg1="0.95613337"
+             sodipodi:r2="0.3251352"
+             sodipodi:r1="0.6502704"
+             sodipodi:cy="5.75"
+             sodipodi:cx="16.875"
+             sodipodi:sides="3"
+             id="path3169"
+             style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+             sodipodi:type="star" />
+        </g>
+        <rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect3171"
+           width="0.10496103"
+           height="0.60214609"
+           x="29.455418"
+           y="28.891544"
+           ry="0" />
+      </g>
+      <g
+         transform="matrix(1.38984,0,0,1.12466,-10.5085,7.89965e-2)"
+         id="g3173"
+         style="display:inline">
+        <path
+           sodipodi:type="star"
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="path3175"
+           sodipodi:sides="3"
+           sodipodi:cx="16.875"
+           sodipodi:cy="5.75"
+           sodipodi:r1="0.6502704"
+           sodipodi:r2="0.3251352"
+           sodipodi:arg1="0.95613337"
+           sodipodi:arg2="2.0033309"
+           inkscape:flatsided="false"
+           inkscape:rounded="0"
+           inkscape:randomized="0"
+           d="M 17.25,6.28125 L 16.738712,6.0451923 L 16.227424,5.8091345 L 16.6875,5.484375 L 17.147576,5.1596154 L 17.198788,5.7204327 L 17.25,6.28125 z "
+           transform="matrix(0.461555,-0.638092,0.654914,0.451569,12.1041,43.2297)" />
+        <rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect3177"
+           width="0.15389533"
+           height="0.88287503"
+           x="24.306477"
+           y="34.624207"
+           ry="0" />
+        <rect
+           style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+           id="rect3179"
+           width="0.15389533"
+           height="0.88287503"
+           x="24.682838"
+           y="34.620716"
+           ry="0" />
+      </g>
+      <path
+         transform="matrix(1.10345,0,0,1.10294,-4.95488,1.924)"
+         d="M 28.0625 27.28125 A 2.71875 2.71875 0 1 1  22.625,27.28125 A 2.71875 2.71875 0 1 1  28.0625 27.28125 z"
+         sodipodi:ry="2.71875"
+         sodipodi:rx="2.71875"
+         sodipodi:cy="27.28125"
+         sodipodi:cx="25.34375"
+         id="path3181"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.900949,0,0,0.899367,216.227,23.6015)"
+         d="M -211.24815 9.3521948 A 3.2040777 3.2040777 0 1 1  -217.6563,9.3521948 A 3.2040777 3.2040777 0 1 1  -211.24815 9.3521948 z"
+         sodipodi:ry="3.2040777"
+         sodipodi:rx="3.2040777"
+         sodipodi:cy="9.3521948"
+         sodipodi:cx="-214.45222"
+         id="path3183"
+         style="opacity:0.83516505;fill:url(#linearGradient5981);fill-opacity:1;stroke:#c2c2c2;stroke-width:0.295775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="fill:#000000;display:inline"
+       d="M 25.961159,19.923089 C 25.965189,19.7188 25.908709,18.663879 26.911679,17.347215 C 27.338069,16.787469 27.882559,16.779909 26.736999,15.883002 C 26.400259,15.619353 26.913089,15.08106 27.062389,14.824482 C 27.452749,14.153632 25.720449,14.205127 25.285529,13.999237 C 24.780199,13.760015 24.729109,13.572017 24.946299,13.101313 C 25.026339,12.765968 24.783079,12.495801 25.026609,12.468021 C 25.385859,12.427041 25.758439,12.286138 25.085689,11.6631 C 24.971349,11.557214 25.414559,11.412387 25.224469,11.092109 C 24.678779,10.827664 24.727569,10.755367 24.767979,10.677014 C 24.853209,10.511744 24.928049,10.157217 25.964599,9.0895178 C 26.052499,8.6986078 26.421949,8.057611 27.427399,7.699112 C 27.301389,7.46823 27.239939,6.887525 28.321499,7.024033 C 29.733109,7.202197 31.554999,7.547551 31.917069,8.487398 C 32.168379,9.1397288 32.115069,11.204183 31.821759,12.178958 C 31.404349,13.566121 31.501709,13.807205 32.784849,14.563839 L 33.973819,15.224502 C 33.973819,15.224502 34.046019,19.974503 33.950509,19.974299 C 33.253239,19.972812 32.423959,19.956128 30.061439,19.956128 L 25.961159,19.923089 z M 16.777919,19.983091 C 16.803759,17.698093 16.730569,12.004352 16.782499,11.904367 C 16.856269,11.76234 17.043429,11.322316 17.168409,11.119458 C 16.939069,10.972998 15.356029,10.499717 15.272529,10.449091 C 14.764999,10.225209 14.915579,8.9422818 16.156459,9.3916528 C 18.587239,10.271938 21.482329,11.299076 21.510269,11.281718 C 22.099519,10.915604 23.469209,11.475219 22.726609,12.706992 C 22.187229,13.601674 21.032579,12.830185 20.946569,12.353373 C 20.926829,12.243938 19.780099,11.909819 18.967949,11.637775 C 18.932999,11.626068 18.039609,11.671363 17.797929,12.114053 C 17.711829,12.27178 17.811539,17.49285 17.794329,19.974799 C 16.952779,19.976207 17.453989,19.971573 16.777919,19.983091 z "
+       id="path13597"
+       sodipodi:nodetypes="csssscsscsccsssccscccsccsssssscc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Picture" />
+</svg>

Added: gtkpod/branches/upstream/current/data/man/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/data/man/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/man/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,3 @@
+man_MANS = gtkpod.1
+
+EXTRA_DIST = $(man_MANS)

Added: gtkpod/branches/upstream/current/data/man/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/data/man/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/man/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,426 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = data/man
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/gtkpod.1.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 = gtkpod.1
+SOURCES =
+DIST_SOURCES =
+man1dir = $(mandir)/man1
+am__installdirs = "$(DESTDIR)$(man1dir)"
+NROFF = nroff
+MANS = $(man_MANS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+man_MANS = gtkpod.1
+EXTRA_DIST = $(man_MANS)
+all: all-am
+
+.SUFFIXES:
+$(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/man/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  data/man/Makefile
+.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
+gtkpod.1: $(top_builddir)/config.status $(srcdir)/gtkpod.1.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-man1: $(man1_MANS) $(man_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+	  else file=$$i; fi; \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+	for i in $$l2; do \
+	  case "$$i" in \
+	    *.1*) list="$$list $$i" ;; \
+	  esac; \
+	done; \
+	for i in $$list; do \
+	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+	  case "$$ext" in \
+	    1*) ;; \
+	    *) ext='1' ;; \
+	  esac; \
+	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(man1dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man: install-man1
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-man
+
+uninstall-man: uninstall-man1
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-man1 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-man uninstall-man1
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/data/man/gtkpod.1
===================================================================
--- gtkpod/branches/upstream/current/data/man/gtkpod.1	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/man/gtkpod.1	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,219 @@
+.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "GTKPOD 1"
+.TH GTKPOD 1 "2009-01-04" "gtkpod 0.99.14" "gtkpod Manual"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+gtkpod \- GTK2 based software for managing songs and playlists on an Apple iPod
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBgtkpod\fR [\fB\-h\fR] [\fB\-m\fR \fIpath\fR] [\fB\-p\fR \fIfilename\fR] [\fB\-\-hash\fR \fIfilename\fR]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+This manual page briefly describes the gtkpod command.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+\&\fBgtkpod\fR supports the following options:
+.IP "\fB\-h\fR, \fB\-\-help\fR" 4
+.IX Item "-h, --help"
+Displays the help message.
+.IP "\fB\-m\fR, \fB\-\-mountpoint\fR \fIpath\fR" 4
+.IX Item "-m, --mountpoint path"
+Define the mountpoint of your iPod.
+.IP "\fB\-p\fR \fIfilename\fR" 4
+.IX Item "-p filename"
+Increment playcount for file \fIfilename\fR by one.
+.IP "\fB\-\-hash\fR \fIfilename\fR" 4
+.IX Item "--hash filename"
+Print gtkpod hash for file \fIfilename\fR.
+.SH "FILES"
+.IX Header "FILES"
+.IP "\fI~/.gtkpod/prefs\fR" 4
+.IX Item "~/.gtkpod/prefs"
+Per user configuration file. Should normally only updated through
+the program itself.
+.IP "\fI/etc/gtkpod/prefs\fR" 4
+.IX Item "/etc/gtkpod/prefs"
+Global configuration file. Used if no configuration file exist for the user
+starting gtkpod.
+.IP "\fI~/.gtkpod/gtkpod.in\fR" 4
+.IX Item "~/.gtkpod/gtkpod.in"
+If this file exists, gtkpod will try to execute it at startup
+This is done before attempting to mount the iPod directory (optional)
+or read the iTunesDB (optional).
+.IP "\fI~/.gtkpod/gtkpod.out\fR" 4
+.IX Item "~/.gtkpod/gtkpod.out"
+If this file exists, gtkpod will try to execute it while exiting the
+program. This is done after attempting to unmount the iPod directory
+(optional) and sending the \*(L"eject\*(R" command to the iPod (optional).
+.IP "\fI/etc/gtkpod/gtkpod.in\fR, \fI/etc/gtkpod/gtkpod.out\fR" 4
+.IX Item "/etc/gtkpod/gtkpod.in, /etc/gtkpod/gtkpod.out"
+Used instead of the per user scripts if the former ones don't exist
+and these do.
+.IP "\fI~/.gtkpod/gtkpod.load\fR" 4
+.IX Item "~/.gtkpod/gtkpod.load"
+If this file exists, gtkpod will execute it before loading the contents of
+an iPod with the iPod's mountpoint as the only command line argument. Put
+any commands needed to access the iPod here, for example if you need to
+mount the iPod manually.
+.IP "\fI~/.gtkpod/gtkpod.eject\fR" 4
+.IX Item "~/.gtkpod/gtkpod.eject"
+If this file exists, gtkpod will execute it when ejecting an iPod with the
+the iPod's mountpoint as the only command line argument. Put any commands
+you want to execute after gtkpod has written the changes to the iPod here.
+For example:
+.Sp
+sudo eject \f(CW$1\fR
+.Sp
+gtkpod will not attempt to do any magic of it's own to mount/unmount/eject
+the iPod.
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+.Vb 4
+\& Jorg Schuler <jcsjcs at users.sourceforge.net>
+\& Corey Donohoe <atmos at atmos.org>
+\& Adrian Ulrich <pab at blinkenlights.ch>
+\& and others
+.Ve
+.PP
+This manpage was written by Frank Lichtenheld.
+.SH "COPYRIGHT AND LICENSE"
+.IX Header "COPYRIGHT AND LICENSE"
+This program is free software; you can redistribute it and/or modify
+it under the terms of the \s-1GNU\s0 General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.

Added: gtkpod/branches/upstream/current/data/man/gtkpod.1.in
===================================================================
--- gtkpod/branches/upstream/current/data/man/gtkpod.1.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/data/man/gtkpod.1.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,219 @@
+.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.07)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "GTKPOD 1"
+.TH GTKPOD 1 "2009-01-04" "gtkpod @VERSION@" "gtkpod Manual"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+gtkpod \- GTK2 based software for managing songs and playlists on an Apple iPod
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBgtkpod\fR [\fB\-h\fR] [\fB\-m\fR \fIpath\fR] [\fB\-p\fR \fIfilename\fR] [\fB\-\-hash\fR \fIfilename\fR]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+This manual page briefly describes the gtkpod command.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+\&\fBgtkpod\fR supports the following options:
+.IP "\fB\-h\fR, \fB\-\-help\fR" 4
+.IX Item "-h, --help"
+Displays the help message.
+.IP "\fB\-m\fR, \fB\-\-mountpoint\fR \fIpath\fR" 4
+.IX Item "-m, --mountpoint path"
+Define the mountpoint of your iPod.
+.IP "\fB\-p\fR \fIfilename\fR" 4
+.IX Item "-p filename"
+Increment playcount for file \fIfilename\fR by one.
+.IP "\fB\-\-hash\fR \fIfilename\fR" 4
+.IX Item "--hash filename"
+Print gtkpod hash for file \fIfilename\fR.
+.SH "FILES"
+.IX Header "FILES"
+.IP "\fI~/.gtkpod/prefs\fR" 4
+.IX Item "~/.gtkpod/prefs"
+Per user configuration file. Should normally only updated through
+the program itself.
+.IP "\fI/etc/gtkpod/prefs\fR" 4
+.IX Item "/etc/gtkpod/prefs"
+Global configuration file. Used if no configuration file exist for the user
+starting gtkpod.
+.IP "\fI~/.gtkpod/gtkpod.in\fR" 4
+.IX Item "~/.gtkpod/gtkpod.in"
+If this file exists, gtkpod will try to execute it at startup
+This is done before attempting to mount the iPod directory (optional)
+or read the iTunesDB (optional).
+.IP "\fI~/.gtkpod/gtkpod.out\fR" 4
+.IX Item "~/.gtkpod/gtkpod.out"
+If this file exists, gtkpod will try to execute it while exiting the
+program. This is done after attempting to unmount the iPod directory
+(optional) and sending the \*(L"eject\*(R" command to the iPod (optional).
+.IP "\fI/etc/gtkpod/gtkpod.in\fR, \fI/etc/gtkpod/gtkpod.out\fR" 4
+.IX Item "/etc/gtkpod/gtkpod.in, /etc/gtkpod/gtkpod.out"
+Used instead of the per user scripts if the former ones don't exist
+and these do.
+.IP "\fI~/.gtkpod/gtkpod.load\fR" 4
+.IX Item "~/.gtkpod/gtkpod.load"
+If this file exists, gtkpod will execute it before loading the contents of
+an iPod with the iPod's mountpoint as the only command line argument. Put
+any commands needed to access the iPod here, for example if you need to
+mount the iPod manually.
+.IP "\fI~/.gtkpod/gtkpod.eject\fR" 4
+.IX Item "~/.gtkpod/gtkpod.eject"
+If this file exists, gtkpod will execute it when ejecting an iPod with the
+the iPod's mountpoint as the only command line argument. Put any commands
+you want to execute after gtkpod has written the changes to the iPod here.
+For example:
+.Sp
+sudo eject \f(CW$1\fR
+.Sp
+gtkpod will not attempt to do any magic of it's own to mount/unmount/eject
+the iPod.
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+.Vb 4
+\& Jorg Schuler <jcsjcs at users.sourceforge.net>
+\& Corey Donohoe <atmos at atmos.org>
+\& Adrian Ulrich <pab at blinkenlights.ch>
+\& and others
+.Ve
+.PP
+This manpage was written by Frank Lichtenheld.
+.SH "COPYRIGHT AND LICENSE"
+.IX Header "COPYRIGHT AND LICENSE"
+This program is free software; you can redistribute it and/or modify
+it under the terms of the \s-1GNU\s0 General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.

Added: gtkpod/branches/upstream/current/data/photo-toolbar-album.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/photo-toolbar-album.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/data/photo-toolbar-photos.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/data/photo-toolbar-photos.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: gtkpod/branches/upstream/current/data/tunes_playlist_icon-48.png
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/depcomp
===================================================================
--- gtkpod/branches/upstream/current/depcomp	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/depcomp	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2006-10-15.18
+scriptversion=2007-03-29.01
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
 # Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -215,34 +215,39 @@
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  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.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile

Added: gtkpod/branches/upstream/current/doc/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/doc/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,32 @@
+## File created by the gnome-build tools
+
+SUBDIRS = figures
+
+docdir = $(pkgdatadir)/doc
+doc_DATA = \
+	gtkpod.xml \
+	adding-cover-art-from-a-browser.html \
+	adding-files-and-folders.html \
+	advanced-features.html \
+	copying-content-to-the-ipod.html \
+	cover-art.html \
+	exporting-files-from-the-ipod.html \
+	getting-started.html \
+	gtkpod.html \
+	gtkpod-info.html \
+	hooking-up-the-ipod.html \
+	ipod-and-content.html \
+	ipod-file-recovery.html \
+	layout-of-gtkpod.html \
+	managing-playlists.html \
+	playcounts-and-ratings.html \
+	playlists-podcasts-and-photos.html \
+	setting-ipod-properties.html \
+	the-sysinfo-file.html \
+	troubleshooting-faq.html \
+	view-and-edit-track-details.html
+
+EXTRA_DIST = $(doc_DATA)
+
+update-docs:
+		xsltproc /usr/share/xml/gnome/xslt/docbook/html/db2html.xsl gtkpod.xml > gtkpod.html

Added: gtkpod/branches/upstream/current/doc/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/doc/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,583 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = doc
+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)$(docdir)"
+docDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(doc_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@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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 = $(pkgdatadir)/doc
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = figures
+doc_DATA = \
+	gtkpod.xml \
+	adding-cover-art-from-a-browser.html \
+	adding-files-and-folders.html \
+	advanced-features.html \
+	copying-content-to-the-ipod.html \
+	cover-art.html \
+	exporting-files-from-the-ipod.html \
+	getting-started.html \
+	gtkpod.html \
+	gtkpod-info.html \
+	hooking-up-the-ipod.html \
+	ipod-and-content.html \
+	ipod-file-recovery.html \
+	layout-of-gtkpod.html \
+	managing-playlists.html \
+	playcounts-and-ratings.html \
+	playlists-podcasts-and-photos.html \
+	setting-ipod-properties.html \
+	the-sysinfo-file.html \
+	troubleshooting-faq.html \
+	view-and-edit-track-details.html
+
+EXTRA_DIST = $(doc_DATA)
+all: all-recursive
+
+.SUFFIXES:
+$(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  doc/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  doc/Makefile
+.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-docDATA: $(doc_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+	@list='$(doc_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	done
+
+uninstall-docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(doc_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	done
+
+# 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,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (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):
+	@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 \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(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)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { 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 \
+	  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 || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	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)
+	tags=; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    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" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(docdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-docDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-docDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+	install-strip
+
+.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-docDATA \
+	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-docDATA
+
+
+update-docs:
+		xsltproc /usr/share/xml/gnome/xslt/docbook/html/db2html.xsl gtkpod.xml > gtkpod.html
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/doc/adding-cover-art-from-a-browser.html
===================================================================
--- gtkpod/branches/upstream/current/doc/adding-cover-art-from-a-browser.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/adding-cover-art-from-a-browser.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,560 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Adding cover art from a browser</title>
+<link rel="previous" href="cover-art.html" title="Cover art">
+<link rel="next" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="cover-art.html" title="Cover art">Cover art</a></td>
+<td class="navbar-next"><a class="navbar-next" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li>
+<a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a><div class="autotoc"><ul>
+<li><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></li>
+<li><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></li>
+<li><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></li>
+<li><a class="xref" href="cover-art.html" title="Cover art">Cover art</a></li>
+<li>Adding cover art from a browser</li>
+<li><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></li>
+<li><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="adding-cover-art-from-a-browser"></a><div class="header"><h1 class="sect1 title"><span class="title">Adding cover art from a browser</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+</ul>
+<p class="para block block-first">Unlike other applications, cover art in gtkpod is not hidden away in a "difficult to find" image cache. In fact, cover art files, for a local database, can be located anywhere on the filesystem.
+            </p>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.5.1. </span><a class="xref" href="adding-cover-art-from-a-browser.html#setting-image-on-track-import" title="Setting Image on Track Import">Setting Image on Track Import</a>
+</li>
+<li>
+<span class="label">2.5.2. </span><a class="xref" href="adding-cover-art-from-a-browser.html#setting-image-on-existing-album" title="Setting Image on Existing Album">Setting Image on Existing Album</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="setting-image-on-track-import"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="setting-image-on-track-import-title"></a><span class="label">2.5.1. </span>Setting Image on Track Import</span></h2></div>
+<p class="para block block-first">Locating the image file in the same directory as the tracks gives the additional benefit that gtkpod will analyse the image upon track import and set the image as the album's cover artwork. It is Important to ensure the image's filename corresponds to at least one of the image filename templates entered in the Preferences window.
+                </p>
+</div>
+<div class="division sect2">
+<a name="setting-image-on-existing-album"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="setting-image-on-existing-album-title"></a><span class="label">2.5.2. </span>Setting Image on Existing Album</span></h2></div>
+<p class="para block block-first">
+                    The use of the popup menu to select a cover art file from the filesystem has been documented <span class="filename">Cover Art|here</span>. It is also possible to download a cover art image file from the internet and drag n drop it into gtkpod.
+                </p>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.5.2.1. </span><a class="xref" href="adding-cover-art-from-a-browser.html#drag-and-#-three-nine-n-drop-using-firefox" title="Drag 'n Drop Using Firefox">Drag 'n Drop Using Firefox</a>
+</li>
+<li>
+<span class="label">2.5.2.2. </span><a class="xref" href="adding-cover-art-from-a-browser.html#drag-and-#-three-nine-n-drop-using-konqueror" title="Drag 'n Drop Using Konqueror">Drag 'n Drop Using Konqueror</a>
+</li>
+</ul></div>
+<div class="division sect3">
+<a name="drag-and-#-three-nine-n-drop-using-firefox"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="drag-and-#-three-nine-n-drop-using-firefox-title"></a><span class="label">2.5.2.1. </span>Drag 'n Drop Using Firefox</span></h3></div>
+<div class="block list orderedlist"><ol class="orderedlist">
+<li class="li-first">
+                            <span class="para">Locate the preferred image and display it in firefox.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">Ensure the url of the image ends with ".jpg" or ".JPG" (other file extensions could be supported if demand warrants it).
+                            </span>
+                        </li>
+<li>
+                            <span class="para">Drag the image from Firefox and drop it onto the Cover Art Display's centre/main cover image. The main cover image should be displaying the album which requires the new cover.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">If a cover already exists with the same filename then gtkpod will ask whether the existing image be overwritten or the new image be named something else.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">The image will be downloaded from the url location, saved in the album's directory on the filesystem and applied to each track belonging to that album.
+                            </span>
+                        </li>
+</ol></div>
+</div>
+<div class="division sect3">
+<a name="drag-and-#-three-nine-n-drop-using-konqueror"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="drag-and-#-three-nine-n-drop-using-konqueror-title"></a><span class="label">2.5.2.2. </span>Drag 'n Drop Using Konqueror</span></h3></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                            <span class="para">A limitation of the dnd in Firefox is that only the url can be used to get at the image file. Thus, the page must be displaying just the image and gtkpod must redownload the image internally (using curl and the image url).
+                            </span>
+                        </li>
+<li>
+                            <span class="para">Konqueror offers the additional functionality that the image file can be extracted directly from its cache. This has the benefits of avoiding the internal curl download and that the url is not restricted to those ending in ".jpg"
+                            </span>
+                        </li>
+<li>
+                            <span class="para">
+                                The importance of the latter benefit concerns websites that do not offer the direct download of cover art images. 
+                                <a class="ulink" href="http://www.allcdcovers.com" title="http://www.allcdcovers.com">http://www.allcdcovers.com</a>
+                                is one such site, where its images are displayed in the browser but the image url cannot be used a second time to download the same image. Thus, allcdcovers.com cannot be used as a download dnd source in Firefox. However, in Konqueror, simply open a full image from allcdcovers then just drag 'n drop into gtkpod.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">Maybe Firefox will do this some day too..
+                            </span>
+                        </li>
+</ul></div>
+</div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="cover-art.html" title="Cover art">Cover art</a></td>
+<td class="navbar-next"><a class="navbar-next" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/adding-files-and-folders.html
===================================================================
--- gtkpod/branches/upstream/current/doc/adding-files-and-folders.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/adding-files-and-folders.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,594 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Adding files and folders</title>
+<link rel="previous" href="layout-of-gtkpod.html" title="Layout of gtkpod">
+<link rel="next" href="view-and-edit-track-details.html" title="View and edit track details">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></td>
+<td class="navbar-next"><a class="navbar-next" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li>
+<a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a><div class="autotoc"><ul>
+<li><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></li>
+<li>Adding files and folders</li>
+<li><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></li>
+<li><a class="xref" href="cover-art.html" title="Cover art">Cover art</a></li>
+<li><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></li>
+<li><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></li>
+<li><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="adding-files-and-folders"></a><div class="header"><h1 class="sect1 title"><span class="title">Adding files and folders</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+</ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.2.1. </span><a class="xref" href="adding-files-and-folders.html#getting-tracks-into-gtkpod" title="Getting Tracks into gtkpod">Getting Tracks into gtkpod</a>
+</li>
+<li>
+<span class="label">2.2.2. </span><a class="xref" href="adding-files-and-folders.html#dragging-and-dropping" title="Dragging and Dropping">Dragging and Dropping</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="getting-tracks-into-gtkpod"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="getting-tracks-into-gtkpod-title"></a><span class="label">2.2.1. </span>Getting Tracks into gtkpod</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <p class="para block block-first">You can add individual tracks, entire directories recursively, or existing playlists using "Add Files". A file selection dialogue will appear. By default existing tracks (same full filename) will be skipped.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">You can add directories recursively using "Add Dirs". A directory selection dialogue will appear.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">You can add existing playlists using "Add Playlists"
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">You can delete tracks by marking them and pressing the "Ctrl-d" . If you delete tracks from the master playlist (the topmost playlist, called "gtkpod" by default). You can also delete tracks by selecting them, and using "Delete Track" in the Edit menu or from the context menu.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">You can update ID3 tags of selected tracks in gtkpod from the mp3 file by pressing "Ctrl-u" or choose "Update track info from file" in the Edit menu or from the context menu.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">You can rename ID3 tags by editing the fields in gtkpod. You can change an entire group of ID3 tags by editing an entry in the sort tab (or mark several tracks and edit the first).
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">You can specify which tags to display in the preferences window.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">You can specify (in the prefs window) if the ID3 tags of the corresponding mp3 file(s) should also be updated.
+                            <div class=" block figure block-first block-indent">
+<div class="block block-first title title-formal"><span class="title"><span class="label"><span style="font-style: italic; ">Figure 2-2</span> </span>The Add Folders dialog</span></div>
+<div class="figure-inner">
+                                
+                                <div class="mediaobject"><img src="figures/add-folders.png"></div>
+                            </div>
+</div>
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Can add music and video files invidually using Add Files.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Can add directories of music and video file using Add Directories.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">
+                            The files are imported into the selected <a class="link" href="layout-of-gtkpod.html#what-is-a-repository-question" title="What is a Repository?">repository.</a> If the selected repository is an iPod then the files will be copied directly onto it.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">
+                            See <a class="link" href=".html#supported-file-types" title="">Supported File Types</a> for types of files that can be imported.
+                        </p>
+                        <p class="para block">Note: gtkpod is an iPod management tool. Tracks, videos and photographs already need to be on the computer filesystem before they can be imported. If adding a CD is the requirement then it needs to be ripped first. Have a look at:
+                            <div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                                    <span class="para">
+                                        <a class="ulink" href="http://nostatic.org/grip/" title="http://nostatic.org/grip/">http://nostatic.org/grip/</a>
+                                    </span>
+                                </li>
+<li>
+                                    <span class="para">
+                                        <a class="ulink" href="http://live.gnome.org/SoundJuicer" title="http://live.gnome.org/SoundJuicer">http://live.gnome.org/SoundJuicer</a>
+                                    </span>
+                                </li>
+<li>
+                                    <span class="para">
+                                        <a class="ulink" href="http://docs.kde.org/stable/en/kdemultimedia/kaudiocreator/index.html" title="http://docs.kde.org/stable/en/kdemultimedia/kaudiocreator/index.html">http://docs.kde.org/stable/en/kdemultimedia/kaudiocreator/index.html</a>
+                                    </span>
+                                </li>
+</ul></div>
+                        </p>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="dragging-and-dropping"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="dragging-and-dropping-title"></a><span class="label">2.2.2. </span>Dragging and Dropping</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Once imported tracks can be dragged around gtkpod, including inbetween repositories, playlists, filter tabs and the track display pane.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">
+                            A drop <span class="emphasis">onto</span> an existing playlist will add the tracks to that playlist.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">
+                            A drop <span class="emphasis">between</span> two existing playlists or behind the last playlist will create a new playlist to which the tracks are added.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">The default action for the drop is either move or copy as appears appropriate (e.g. playlists are moved within a database ('local' or 'iPod/Shuffle'), but copied when dragged across different databases). The applicable action is displayed within the drag icon and can be changed by pressing the control key during the drop.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></td>
+<td class="navbar-next"><a class="navbar-next" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/advanced-features.html
===================================================================
--- gtkpod/branches/upstream/current/doc/advanced-features.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/advanced-features.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,473 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Advanced features</title>
+<link rel="previous" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">
+<link rel="next" href="exporting-files-from-the-ipod.html" title="Exporting files from the iPod">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">Playlists, podcasts and photos</a></td>
+<td class="navbar-next"><a class="navbar-next" href="exporting-files-from-the-ipod.html" title="Exporting files from the iPod">Exporting files from the iPod</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li>Advanced features<div class="autotoc"><ul><li><a class="xref" href="exporting-files-from-the-ipod.html" title="Exporting files from the iPod">Exporting files from the iPod</a></li></ul></div>
+</li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division chapter">
+<a name="advanced-features"></a><div class="header"><h1 class="chapter title"><span class="title">Advanced features</span></h1></div>
+<ul class="linktrail"><li class="linktrail linktrail-only"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li></ul>
+<div class="autotoc"><ul><li>
+<span class="label">4.1. </span><a class="xref" href="exporting-files-from-the-ipod.html" title="Exporting files from the iPod">Exporting files from the iPod</a>
+</li></ul></div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">Playlists, podcasts and photos</a></td>
+<td class="navbar-next"><a class="navbar-next" href="exporting-files-from-the-ipod.html" title="Exporting files from the iPod">Exporting files from the iPod</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/copying-content-to-the-ipod.html
===================================================================
--- gtkpod/branches/upstream/current/doc/copying-content-to-the-ipod.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/copying-content-to-the-ipod.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,545 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Copying content to the iPod</title>
+<link rel="previous" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">
+<link rel="next" href="playcounts-and-ratings.html" title="Playcounts and ratings">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></td>
+<td class="navbar-next"><a class="navbar-next" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li>
+<a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a><div class="autotoc"><ul>
+<li><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></li>
+<li><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></li>
+<li><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></li>
+<li><a class="xref" href="cover-art.html" title="Cover art">Cover art</a></li>
+<li><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></li>
+<li>Copying content to the iPod</li>
+<li><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="copying-content-to-the-ipod"></a><div class="header"><h1 class="sect1 title"><span class="title">Copying content to the iPod</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+</ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.6.1. </span><a class="xref" href="copying-content-to-the-ipod.html#getting-tracks-onto-the-ipod" title="Getting Tracks onto the iPod">Getting Tracks onto the iPod</a>
+</li>
+<li>
+<span class="label">2.6.2. </span><a class="xref" href="copying-content-to-the-ipod.html#playlists" title="Playlists">Playlists</a>
+</li>
+<li>
+<span class="label">2.6.3. </span><a class="xref" href="copying-content-to-the-ipod.html#save-changes" title="Save Changes">Save Changes</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="getting-tracks-onto-the-ipod"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="getting-tracks-onto-the-ipod-title"></a><span class="label">2.6.1. </span>Getting Tracks onto the iPod</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Tracks can be imported directly to an iPod by ensuring the latter is the selected repository before clicking Add Files or Add Directories.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Normally though, tracks will already have been imported into the Local repository. To copy them onto the iPod simply select the tracks in the Track Window and drag them onto the iPod repository icon.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">To copy a whole album, selected the album in one of the sort tabs and drag that onto the iPod repository.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="playlists"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="playlists-title"></a><span class="label">2.6.2. </span>Playlists</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Use playlists to group together a set of tracks. Simply create a new playlist in the Local repository then drag n drop the tracks onto it.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Tracks are not actually copied into a playlist so should a track be deleted then it will be deleted from all playlists.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Drag n drop a playlist onto the iPod repository icon to copy it and all its tracks to the iPod. The playlist will be available in the Playlist section of the iPod's control system as well as all tracks being copied to the iPod.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="save-changes"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="save-changes-title"></a><span class="label">2.6.3. </span>Save Changes</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">
+                            At any change to a repository, eg. track addition, deletion, edit ..., a change has occurred that requires a database save. To highlight this, the name of the repository is changed to italics, ie. Local -&gt; <span class="emphasis">Local</span>. This shows the repository requires saving.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Should gtkpod be closed prior to any saving then a dialog is displayed informing that data changes will be lost if a save is not performed.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Clicking the "Save Changes" button will save all changes made to all of the repositories. This is the point where tracks are actually copied to the iPod and the iPod database updated. Only after a save is performed will the tracks copied to the iPod, be playable on the iPod.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></td>
+<td class="navbar-next"><a class="navbar-next" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/cover-art.html
===================================================================
--- gtkpod/branches/upstream/current/doc/cover-art.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/cover-art.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,605 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Cover art</title>
+<link rel="previous" href="view-and-edit-track-details.html" title="View and edit track details">
+<link rel="next" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></td>
+<td class="navbar-next"><a class="navbar-next" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li>
+<a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a><div class="autotoc"><ul>
+<li><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></li>
+<li><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></li>
+<li><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></li>
+<li>Cover art</li>
+<li><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></li>
+<li><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></li>
+<li><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="cover-art"></a><div class="header"><h1 class="sect1 title"><span class="title">Cover art</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+</ul>
+<p class="para block block-first">Cover art is a visual element of your gtkpod music collection. It changes the black and white database of artists and title names back into something related to the physical CDs and DVDs that have been imported.
+            </p>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.4.1. </span><a class="xref" href="cover-art.html#coverart-display" title="CoverArt Display">CoverArt Display</a>
+</li>
+<li>
+<span class="label">2.4.2. </span><a class="xref" href="cover-art.html#coverart-popup-menu" title="CoverArt Popup Menu">CoverArt Popup Menu</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="coverart-display"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="coverart-display-title"></a><span class="label">2.4.1. </span>CoverArt Display</span></h2></div>
+<p class="para block block-first">The display consists of 9 covers displayed at any one time. The entire album collection can be cycled through from one end to another. The main image is slighly larger and lacking in "shine" for viewing clarity.
+                </p>
+<p class="para block">
+                    <div class=" block figure block-first block-indent">
+<div class="block block-first title title-formal"><span class="title"><span class="label"><span style="font-style: italic; ">Figure 2-4</span> </span>Cover art display</span></div>
+<div class="figure-inner">
+                        
+                        <div class="mediaobject"><img src="figures/coverart.png"></div>
+                    </div>
+</div>
+                </p>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Use the scrollbar to quickly slide back and forth over the album collection.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Use the scrollbar buttons to more precisely step through each album.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Click on the main album cover image (one at the front and in the centre) once to display just the album's tracks in the right pane of gtkpod
+                        </span>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="coverart-popup-menu"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="coverart-popup-menu-title"></a><span class="label">2.4.2. </span>CoverArt Popup Menu</span></h2></div>
+<p class="para block block-first">
+                    <div class=" block figure block-first block-indent">
+<div class="block block-first title title-formal"><span class="title"><span class="label"><span style="font-style: italic; ">Figure 2-5</span> </span>Cover art popup menu</span></div>
+<div class="figure-inner">
+                        
+                        <div class="mediaobject"><img src="figures/cover-popupmenu.png"></div>
+                    </div>
+</div>
+                </p>
+<div class="block list itemizedlist"><ul class="itemizedlist"><li class="li-first">
+                        <p class="para block block-first">Right-click on the main album cover image to display the popup menu with 3 options:</p>
+                        <div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                                <span class="para">Select Cover From File
+                                </span>
+                            </li>
+<li>
+                                <span class="para">View Full Size Artwork
+                                </span>
+                            </li>
+<li>
+                                <span class="para">Edit Track Details
+                                </span>
+                            </li>
+</ul></div>
+                    </li></ul></div>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.4.2.1. </span><a class="xref" href="cover-art.html#select-cover-from-file" title="Select Cover From File">Select Cover From File</a>
+</li>
+<li>
+<span class="label">2.4.2.2. </span><a class="xref" href="cover-art.html#view-full-size-artwork" title="View Full Size Artwork">View Full Size Artwork</a>
+</li>
+<li>
+<span class="label">2.4.2.3. </span><a class="xref" href="cover-art.html#edit-track-details-coverart" title="Edit Track Details">Edit Track Details</a>
+</li>
+</ul></div>
+<div class="division sect3">
+<a name="select-cover-from-file"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="select-cover-from-file-title"></a><span class="label">2.4.2.1. </span>Select Cover From File</span></h3></div>
+<p class="para block block-first">
+                        <div class=" block figure block-first block-indent">
+<div class="block block-first title title-formal"><span class="title"><span class="label"><span style="font-style: italic; ">Figure 2-6</span> </span>Select cover from file</span></div>
+<div class="figure-inner">
+                            
+                            <div class="mediaobject"><img src="figures/cover-setfromfile.png"></div>
+                        </div>
+</div>
+                    </p>
+<div class="block list itemizedlist"><ul class="itemizedlist"><li class="li-first">
+                            <span class="para">Selecting this option displays a file chooser dialog. Select the preferred image file and click OK. The album cover changes to a scaled version of the new image, while all the tracks in the album have their artwork path modified to the path of the preferred image.
+                            </span>
+                        </li></ul></div>
+</div>
+<div class="division sect3">
+<a name="view-full-size-artwork"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="view-full-size-artwork-title"></a><span class="label">2.4.2.2. </span>View Full Size Artwork</span></h3></div>
+<p class="para block block-first">
+                        <div class=" block figure block-first block-indent">
+<div class="block block-first title title-formal"><span class="title"><span class="label"><span style="font-style: italic; ">Figure 2-7</span> </span>View full size artwork</span></div>
+<div class="figure-inner">
+                            
+                            <div class="mediaobject"><img src="figures/cover-fullsize.png"></div>
+                        </div>
+</div>
+                    </p>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                            <span class="para">Selecting this options opens a dialog displaying the cover image. The image is either its true size of the biggest size it can be while still fitting on the desktop. Its true resolution is displayed underneath in the format width x height.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">The dialog is modal so must be closed before moving on. The OK button closes the dialog.
+                            </span>
+                        </li>
+</ul></div>
+</div>
+<div class="division sect3">
+<a name="edit-track-details-coverart"></a><div class="header"><h3 class="sect3 title"><span class="title"><span class="label">2.4.2.3. </span>Edit Track Details</span></h3></div>
+<div class="block list itemizedlist"><ul class="itemizedlist"><li class="li-first">
+                            <span class="para">This provides a shortcut to the "Edit Track Details" dialog for editing the ID3 tag information for all tracks belonging to the album displayed.
+                            </span>
+                        </li></ul></div>
+</div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></td>
+<td class="navbar-next"><a class="navbar-next" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/exporting-files-from-the-ipod.html
===================================================================
--- gtkpod/branches/upstream/current/doc/exporting-files-from-the-ipod.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/exporting-files-from-the-ipod.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,495 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Exporting files from the iPod</title>
+<link rel="previous" href="advanced-features.html" title="Advanced features">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="advanced-features.html" title="Advanced features">Advanced features</a></td>
+<td class="navbar-next"></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li>
+<a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a><div class="autotoc"><ul><li>Exporting files from the iPod</li></ul></div>
+</li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="exporting-files-from-the-ipod"></a><div class="header"><h1 class="sect1 title"><span class="title">Exporting files from the iPod</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul>
+<div class="autotoc"><ul><li>
+<span class="label">4.1.1. </span><a class="xref" href="exporting-files-from-the-ipod.html#copying-from-the-ipod" title="Copying from the iPod">Copying from the iPod</a>
+</li></ul></div>
+<div class="division sect2">
+<a name="copying-from-the-ipod"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="copying-from-the-ipod-title"></a><span class="label">4.1.1. </span>Copying from the iPod</span></h2></div>
+<p class="para block block-first">Unlike other iPod management applications, it is possible to copy tracks resident on the iPod back onto a PC, using gtkpod.
+                </p>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Mark the tracks you want to export and select "Export Tracks from Database" from the file menu (or use the context sensitive menu).
+                        </span>
+                    </li>
+<li>
+                        <span class="para">A file selection dialog window appears and you can choose the directory you'd like the selected files to be written to.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">You can specify the output filename in the prefs dialog by specifying a template (e.g. "%A/%a - %t"). You can specify multiple templates for different file formats by separating them by a semicolon (e.g. "%A/%a - %t.mp3;%t.wav"). See the tooltip in the preferences window for a list of identifiers.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="advanced-features.html" title="Advanced features">Advanced features</a></td>
+<td class="navbar-next"></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/figures/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/doc/figures/Makefile.am	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/figures/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,12 @@
+figuresdir = $(pkgdatadir)/doc/figures
+
+figures_DATA = \
+	add-folders.png \
+	cover-fullsize.png \
+	cover-popupmenu.png \
+	cover-setfromfile.png \
+	coverart.png \
+	edit-track-details.png \
+	gtkpod.png
+	
+EXTRA_DIST = $(figures_DATA)

Added: gtkpod/branches/upstream/current/doc/figures/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/doc/figures/Makefile.in	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/figures/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,408 @@
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = doc/figures
+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)$(figuresdir)"
+figuresDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(figures_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+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@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+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@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+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@
+LIBGPOD_CFLAGS = @LIBGPOD_CFLAGS@
+LIBGPOD_LIBS = @LIBGPOD_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MOUNT = @MOUNT@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+UMOUNT = @UMOUNT@
+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__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@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+figuresdir = $(pkgdatadir)/doc/figures
+figures_DATA = \
+	add-folders.png \
+	cover-fullsize.png \
+	cover-popupmenu.png \
+	cover-setfromfile.png \
+	coverart.png \
+	edit-track-details.png \
+	gtkpod.png
+
+EXTRA_DIST = $(figures_DATA)
+all: all-am
+
+.SUFFIXES:
+$(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  doc/figures/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  doc/figures/Makefile
+.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-figuresDATA: $(figures_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(figuresdir)" || $(MKDIR_P) "$(DESTDIR)$(figuresdir)"
+	@list='$(figures_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(figuresDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(figuresdir)/$$f'"; \
+	  $(figuresDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(figuresdir)/$$f"; \
+	done
+
+uninstall-figuresDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(figures_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(figuresdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(figuresdir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@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; \
+	  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; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(figuresdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-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."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-figuresDATA
+
+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
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-figuresDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	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-figuresDATA 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-figuresDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Added: gtkpod/branches/upstream/current/doc/figures/add-folders.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/doc/figures/add-folders.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/doc/figures/cover-fullsize.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/doc/figures/cover-fullsize.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/doc/figures/cover-popupmenu.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/doc/figures/cover-popupmenu.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/doc/figures/cover-setfromfile.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/doc/figures/cover-setfromfile.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/doc/figures/coverart.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/doc/figures/coverart.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/doc/figures/edit-track-details.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/doc/figures/edit-track-details.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/doc/figures/gtkpod.png
===================================================================
(Binary files differ)


Property changes on: gtkpod/branches/upstream/current/doc/figures/gtkpod.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: gtkpod/branches/upstream/current/doc/getting-started.html
===================================================================
--- gtkpod/branches/upstream/current/doc/getting-started.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/getting-started.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,493 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Getting started</title>
+<link rel="previous" href="gtkpod.html" title="The gtkpod Manual">
+<link rel="next" href="hooking-up-the-ipod.html" title="Hooking up the iPod">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></td>
+<td class="navbar-next"><a class="navbar-next" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li>Getting started<div class="autotoc"><ul>
+<li><a class="xref" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></li>
+<li><a class="xref" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></li>
+<li><a class="xref" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></li>
+<li><a class="xref" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></li>
+<li><a class="xref" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division chapter">
+<a name="getting-started"></a><div class="header"><h1 class="chapter title"><span class="title">Getting started</span></h1></div>
+<ul class="linktrail"><li class="linktrail linktrail-only"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li></ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">1.1. </span><a class="xref" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a>
+</li>
+<li>
+<span class="label">1.2. </span><a class="xref" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a>
+</li>
+<li>
+<span class="label">1.3. </span><a class="xref" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a>
+</li>
+<li>
+<span class="label">1.4. </span><a class="xref" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a>
+</li>
+<li>
+<span class="label">1.5. </span><a class="xref" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a>
+</li>
+</ul></div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></td>
+<td class="navbar-next"><a class="navbar-next" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/gtkpod-info.html
===================================================================
--- gtkpod/branches/upstream/current/doc/gtkpod-info.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/gtkpod-info.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,486 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>The gtkpod Manual</title>
+<link rel="next" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"></td>
+<td class="navbar-next"><a class="navbar-next" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li>About This Document</li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division bookinfo">
+<a name="bookinfo"></a><div class="header">
+<h1 class="title">The gtkpod Manual</h1>
+<h2 class="subtitle">This is the user manual for gtkpod, a GTK+ iPod manager.</h2>
+</div>
+<div class="division">
+<h2 class="title copyright">Copyright</h2>
+<div class="block block-first"><dl class="dl-compact"><dt class="copyright">Copyright © <span class="year">2007</span>  <span class="holder">gtkpod wiki contributors</span>
+</dt></dl></div>
+</div>
+<div class="division legalnotice">
+            <h2 class="title legalnotice">Legal Notices</h2>
+            <p class="para block block-first">
+                Permission is granted to copy, distribute and/or modify this
+                document under the terms of the GNU Free Documentation
+                License (GFDL), Version 1.2 or any later version published
+                by the Free Software Foundation with no Invariant Sections,
+                no Front-Cover Texts, and no Back-Cover Texts.  You can find
+                a copy of the GFDL at this <a class="ulink" href="ghelp:fdl" title="ghelp:fdl">link</a> or in the file COPYING-DOCS
+                distributed with this manual.
+            </p>
+        </div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"></td>
+<td class="navbar-next"><a class="navbar-next" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/gtkpod.html
===================================================================
--- gtkpod/branches/upstream/current/doc/gtkpod.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/gtkpod.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,525 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>The gtkpod Manual</title>
+<link rel="previous" href="gtkpod-info.html" title="">
+<link rel="next" href="getting-started.html" title="Getting started">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="gtkpod-info.html" title="About This Document">About This Document</a></td>
+<td class="navbar-next"><a class="navbar-next" href="getting-started.html" title="Getting started">Getting started</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>The gtkpod Manual<div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division book">
+<a name="gtkpod"></a><div class="header">
+<h1 class="book title"><span class="title">The gtkpod Manual</span></h1>
+<h2 class="book subtitle">This is the user manual for gtkpod, a GTK+ iPod manager.</h2>
+</div>
+<div class="autotoc"><ul>
+<li>
+<span class="label">1. </span><a class="xref" href="getting-started.html" title="Getting started">Getting started</a><div class="autotoc"><ul>
+<li>
+<span class="label">1.1. </span><a class="xref" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a>
+</li>
+<li>
+<span class="label">1.2. </span><a class="xref" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a>
+</li>
+<li>
+<span class="label">1.3. </span><a class="xref" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a>
+</li>
+<li>
+<span class="label">1.4. </span><a class="xref" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a>
+</li>
+<li>
+<span class="label">1.5. </span><a class="xref" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a>
+</li>
+</ul></div>
+</li>
+<li>
+<span class="label">2. </span><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a><div class="autotoc"><ul>
+<li>
+<span class="label">2.1. </span><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a>
+</li>
+<li>
+<span class="label">2.2. </span><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a>
+</li>
+<li>
+<span class="label">2.3. </span><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a>
+</li>
+<li>
+<span class="label">2.4. </span><a class="xref" href="cover-art.html" title="Cover art">Cover art</a>
+</li>
+<li>
+<span class="label">2.5. </span><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a>
+</li>
+<li>
+<span class="label">2.6. </span><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a>
+</li>
+<li>
+<span class="label">2.7. </span><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a>
+</li>
+</ul></div>
+</li>
+<li>
+<span class="label">3. </span><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a><div class="autotoc"><ul><li>
+<span class="label">3.1. </span><a class="xref" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">Playlists, podcasts and photos</a>
+</li></ul></div>
+</li>
+<li>
+<span class="label">4. </span><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a><div class="autotoc"><ul><li>
+<span class="label">4.1. </span><a class="xref" href="exporting-files-from-the-ipod.html" title="Exporting files from the iPod">Exporting files from the iPod</a>
+</li></ul></div>
+</li>
+</ul></div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="gtkpod-info.html" title="About This Document">About This Document</a></td>
+<td class="navbar-next"><a class="navbar-next" href="getting-started.html" title="Getting started">Getting started</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/gtkpod.xml
===================================================================
--- gtkpod/branches/upstream/current/doc/gtkpod.xml	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/gtkpod.xml	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,1333 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<book id="gtkpod">
+    <bookinfo>
+        <title>The gtkpod Manual</title>
+        <abstract role="description">
+            This is the user manual for gtkpod, a GTK+ iPod manager.
+        </abstract>
+        <subtitle>This is the user manual for gtkpod, a GTK+ iPod manager.</subtitle>
+        <copyright>
+            <year>2007</year>
+            <holder>gtkpod wiki contributors</holder>
+        </copyright>
+        <legalnotice>
+            <title>Legal Notices</title>
+            <para>
+                Permission is granted to copy, distribute and/or modify this
+                document under the terms of the GNU Free Documentation
+                License (GFDL), Version 1.2 or any later version published
+                by the Free Software Foundation with no Invariant Sections,
+                no Front-Cover Texts, and no Back-Cover Texts.  You can find
+                a copy of the GFDL at this <ulink type="help"
+					url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
+                distributed with this manual.
+            </para>
+        </legalnotice>
+    </bookinfo>
+    <chapter id="getting-started">
+        <title>Getting started</title>
+        <sect1 id="hooking-up-the-ipod">
+            <title>Hooking up the iPod</title>
+            <sect2>
+                <title>Introduction</title>
+                <para>The iPod has largely been an USB device yet there are older models of iPods that used IEEE1394/ / firewire for their connection interface. Historically, it took something of an effort for linux to recognise the iPod model correctly. However, this situation has greatly improved in recent times where it is now possible to simply plug the iPod into a USB port and have your distro recognise it straight off.</para>
+                <para>gtkpod first and foremost relies on the successful mounting of a recognised iPod. Thus, if the iPod cannot be mounted then gtkpod is NOT going to do it for you! Thus, before firing up gtkpod make sure you can see the filesystem of your iPod at its desginated mount point, eg. /mnt/ipod.</para>
+            </sect2>
+            <sect2>
+                <title>Using udev</title><para>For linux distros installed with hal and udev, plugging an ipod in and mounting it becomes a trivial exercise. A device node will normally be created under /dev, eg. /dev/sdc.</para><para>Using udev rules it is possible to "play" and refine this device node to reflect personal requirements. For example, including these udev rules will allow 2 ipods to be loaded at the same time without interfering with one another:</para><programlisting>
+                    <![CDATA[#80GB IPOD
+SUBSYSTEMS=="usb", ATTRS{serial}=="000A2700XXXXXXXX", KERNEL=="sd?2", \
+NAME="80gbipod", MODE="0664", OPTIONS="last_rule"
+ 
+#4GB IPOD NANO
+SUBSYSTEMS=="usb", ATTRS{serial}=="000A2700YYYYYYYY", KERNEL=="sd?2", \
+NAME="4gbnano", MODE="0664", OPTIONS="last_rule"]]>
+                </programlisting>
+                <para>By including the test against the serial number it is possible to uniquely identify an individual iPod and load it appropriately.</para>
+            </sect2>
+            <sect2>
+                <title>Mounting</title>
+                <para>
+                    The result of this is that the ipod will be located on a device node and this can be mounted manually using the command (performed as root):
+                </para>
+                <programlisting>mount /dev/sdc2 /mnt/ipod</programlisting>
+                <para>This assumes an iPod is loaded onto the device /dev/sdc and that it is a 2 partition model. It seems that post-2006, iPods have become 1-partition items.</para>
+                <para>However, it should be noted that moden window managers such as gnome and kde take on the responsibility of managing connected devices. Thus, the result of connecting an iPod will be an icon on the desktop which will either be mounted automatically or can be mounted by the user with a click of the mouse on a popup menu.</para>
+            </sect2>
+            <sect2>
+                <title>Environment variables</title>
+                <para>
+                    The following environment variables can be set if needed:
+                    <itemizedlist>
+                        <listitem>
+                            IPOD_MOUNTPOINT: Defines the mountpoint of the iPod. This overwrites the value stored in the preferences, but is overwritten by the command line argument "-m" or "--mountpoint".
+                        </listitem>
+                        <listitem>
+                            GTKPOD_DF_COMMAND: Only used on systems without statvfs(). Defines the "df" command to be used for probing the free space on the iPod including command line arguments. Default is "df -k -P". On some systems it may be necessary to remove the "-P" option. The mount point is added to this command line automatically. You can switch off calls to df by setting this environment variable to an empty string.
+                        </listitem>
+                    </itemizedlist>
+                </para>
+            </sect2>
+        </sect1>
+        <sect1 id="setting-ipod-properties">
+            <title>Setting iPod properties</title>
+            <sect2 id='preferences-file'>
+                <title id='preferences-file-title'>Preferences File</title>
+                <para>On startup gtkpod will read the preferences from ~/.gtkpod/prefs (or /etc/gtkpod/prefs if the former doesn't exist). The file is created if preferences are changed using the Preference window.
+                </para>
+            </sect2>
+            <sect2 id='changing-preferences'>
+                <title id='changing-preferences-title'>Changing Preferences</title>
+                <para>Preferences can be changed by opending the Preference window. This is displayed by clicking on Edit > Edit Preferences or hitting Ctrl+P.
+                </para>
+            </sect2>
+            <sect2 id='duplicate-detection'>
+                <title id='duplicate-detection-title'>Duplicate Detection</title>
+                <para>You can instruct gtkpod (in the prefs window) to use file-size-dependent SHA1 checksums to prevent the same file from being copied to your iPod twice.
+                </para>
+                <para>If a duplicate is detected, gtkpod will print out the the filenames of the duplicate files. If the filename of the already existing file is not available (it is not stored in the iTunes database, see "Extended Information File" below), other available information of the track is printed.
+                </para>
+            </sect2>
+            <sect2 id='extended-information-file'>
+                <title>Extended Information File</title>
+                <para>Some (I believe) essential information is not stored in Apple's iTunes database. You can therefore instruct gtkpod to write an additional file (iTunesDB.ext) with extended information. For each track it stores
+                    <itemizedlist>
+                        <listitem>
+                            <para>SHA1 hash
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>filename in the locale's encoding
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>filename in UTF8 encoding
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>hostname where the file was added (not used for anything yet)
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>filename of an associated converted file (for example an .mp3 for a .flac file)
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>if the file is present in the local database a reference to there
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>in order for playcounts to work on the local database as well
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>last modification time
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>the charset used for the file when adding it
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </para>
+                <para>
+                    Since the extended information file is only valid with the corresponding standard iTunes database, a checksum of the iTunes database is also stored in the extended information file. 
+                </para>
+                <para>Using an extended information file will considerably speed up the import of an existing iTunes database when using duplicate detection,
+                    since the SHA1 checksums do not have to be re-calculated. 
+                </para>
+                <para>Using an extended information file will also allow modification of ID3 tags in the track files after the initial import, because the full
+                    filenames are still available. 
+                </para>
+            </sect2>
+            <sect2 id='encoding-of-id-three-tags-op-charsets-cp'>
+                <title id='encoding-of-id-three-tags-op-charsets-cp-title'>Encoding of ID3 tags (charsets)</title>
+                <para>If you use correctly written unicode ID3V2 tags you don't have to worry about the charset setting. Otherwise you must specify the charset to be used for representing ID3 tags in the preferences menu. The default is "System Charset", which is the charset associated with the locale gtkpod is running under. If your tags are stored in a different encoding, you should set it appropriately.
+                </para>
+                <para>Please note that if necessary you can change the charset each time you add files or directories: the iTunesDB itself is using UTF16, so once tags are imported correctly, changing the charset has no influence.
+                </para>
+                <para>If you chose "Japanese (automatic detection)", gtkpod will try to determine if the string is in ISO-2022-JP, Shift_JIS, or EUC-JP (Hankaku Katakana (1-byte Katakana) may not be recognized correctly -- specify the correct encoding if you run into this problem). The actual encoding used for the ID tags will be stored and will be used when writing tags or doing updates/syncs. Check the "Use selected charset also when updating or syncing tracks" and "Use selected charset when writing tags" options if you want to specify a particular character set when writing or updating/syncing. The default charset is "EUC-JP" -- it will be used when the charset cannot be autodetected, as well as when writing tags if a specific charset could not be determined before.
+                </para>
+                <para>gtkpod will recognize ID3V2 tags encoded in unicode automatically and ignore your charset setting when necessary.
+                </para>
+            </sect2>
+            <sect2 id='extracting-tag-information-from-the-filename'>
+                <title id='extracting-tag-information-from-the-filename-title'>Extracting tag information from the filename</title>
+                <para>Tags can also be extracted from the filename if you activate the option 'Use this template to parse filename for tag information' and supply a template that explains how the filenames are constructed.
+                </para>
+                <para>For filenames like
+                    <filename>code</filename> 
+                    music/new/latin1/alan_jackson - drive/01 drive_for_daddy_gene.mp3 
+                    <filename>code</filename> 
+                    you could use 
+                    <filename>code</filename> 
+                    %a - %A/%T %*.mp3 
+                    <filename>code</filename> 
+                    to extract artist, album, track number and title. 
+                </para>
+                <para>The following character sequences are supported:
+                    <itemizedlist>
+                        <listitem>
+                            <para>%t: title
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%a: artist
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%A: album
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%c: composer
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%t: title
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%g: genre
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%T: track number
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%C: CD number
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%*: placeholder, ignore data
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>%%: the character '%'
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </para>
+                <para>
+                    You cannot supply a template like "%a%t.mp3" because gtkpod would not know how to separate artist and title. "%a_%t.mp3" would be correct, if artist and title are separated by an underscore. You can also omit the trailing ".mp3" if you want the template to apply to all files instead of only to mp3 files. 
+                </para>
+            </sect2>
+            <sect2 id='startup-and-shutdown-scripts'>
+                <title id='startup-and-shutdown-scripts-title'>Startup and Shutdown Scripts</title>
+                <para>During startup and after reading the preferences file, gtkpod will try to execute
+                    <programlisting>~/.gtkpod/gtkpod.in or /etc/gtkpod/gtkpod.in</programlisting> 
+                    Just before exiting the program, gtkpod will try to execute 
+                    <programlisting>~/.gtkpod/gtkpod.out or /etc/gtkpod/gtkpod.out</programlisting> 
+                    Thus, extra arguments can be entered into these scripts and gtkpod will run them. An example of this could be uploading data to last.fm. 
+                </para>
+            </sect2>
+        </sect1>
+        <sect1 id="troubleshooting-faq">
+            <title>Troubleshooting FAQ</title>
+            <sect2 id='contents:'>
+                <title id='contents:-title'>Contents:</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>My iPhone or iTouch doesnt have a USB connection. How can I mount it on my linux box?
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>My iPod is an iPhone, iTouch, Classic or nano3g. My tunes show up in gtkpod but I see nothing on the iPod when I eject?
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Installed libmp4v2 or libgpod from source to /usr/local/lib, but gtkpod is unable to locate libmp4.so.0 or libgpod.so.0
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Files copied to gtkpod but they don't appear in the database (0.80, Tony Williams)
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Filenames on the iPod appear in DOS 8.3 format and syncing to the iPod is not working as expected.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>./autogen.sh does not work
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>The following error message is displayed when accessing the device (Markus Gaugusch, Justin Thiessen):
+                        </para>
+                        <programlisting><![CDATA[** ieee1394: sbp2: aborting sbp2 command
+** Test Unit Ready 00 00 00 00 00]]>
+                        </programlisting>
+                    </listitem>
+                    <listitem>
+                        <para>The following error message is displayed when accessing the device (Ingo Reimann)
+                        </para>
+                        <programlisting><![CDATA[** usb-storage: Attempting to get CSW...
+** usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes
+** usb-storage: Status code -75; transferred 0/13
+]]>
+                        </programlisting>
+                    </listitem>
+                    <listitem>
+                        <para>When connecting an iPod via USB to a 2.6 kernel machine the iPod will be recognized but not work correctly. In /var/log/messages you'll see the a bunch of "Buffer I/O error on device sd?" when connecting the iPod (Jonas Bergler, Kevin Venkiteswaran)
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>SHUFFLE won't play music after reformatting (Mark Davis)
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Calendar entries mixed up
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>m4a files created by faac cannot be added by gtkpod (gentoo)
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>gtkpod crashes when reading the iTunesDB (Fedora)
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Problems connecting the iPod to Solaris/SPARC
+                        </para>
+                    </listitem>
+                </itemizedlist>
+                
+                <para>My iPhone or iTouch doesnt have a USB connection. How can I mount it on my linux box?
+                </para>
+                <para>Solution:
+                </para>
+                <para>The iPhone or iTouch, at present has to be mounted using sshfs.
+                </para>
+                
+                <para>My iPod is an iPhone, iTouch, Classic or Nano3g. My tunes show up in gtkpod but I see nothing on the iPod when I eject?
+                </para>
+                <para>Solution:
+                </para>
+                <para>This is to do with requiring your iPod model number in a sysinfo file located on the iPod. Please see here for details.
+                </para>
+                
+                <para>Installed libmp4v2 or libgpod from source to /usr/local/lib, but gtkpod is unable to locate libmp4.so.0 or libgpod.so.0?
+                </para>
+                <para>Solution:
+                </para>
+                <para>If you install to /usr/local/lib please don't forget to add the path to LD_LIBRARY_PATH:
+                </para>
+                <programlisting><![CDATA[LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+export LD_LIBRARY_PATH]]>
+                </programlisting>
+                <para>You can add those lines to your ~/.bashrc or add it globally to
+                    /etc/profile. 
+                </para>
+                
+                <para>Files copied to gtkpod but they don't appear in the database (0.80, Tony Williams)?
+                </para>
+                <para>I'm having a problem that I wonder if you've seen. I've setup gtkpod. launch it and add files. I can hear the ipod harddrive spin up. If I go onto the ipod directly I can see the space being used and can even see the new files on the ipod. However the ipod interface doesn't show the new files and gtkpod keeps telling me that there are orphaned files.
+                </para>
+                <para>Solution:
+                </para>
+                <para>I finally figured out the problem. In my fstab I had the filesystem set to 'auto' and it was mounting as msdos instead of vfat. I specified vfat in fstab and voila! I'm a happy happy man.
+                </para>
+                
+                <para>Filenames on the iPod appear in DOS 8.3 format and syncing to the iPod is not working as expected?
+                </para>
+                <para>Solution:
+                    You need to specify "vfat" as file system type. How to do that depends on which way you use to mount the iPod -- see the README file for more details. 
+                </para>
+                
+                <para>./autogen.sh does not work?
+                </para>
+                <para>Solution:
+                </para>
+                <para>A ubuntu user has reported that he had to set
+                </para>
+                <programlisting>ACLOCAL_FLAGS=" -I /usr/share/aclocal/"
+                </programlisting>
+                <para>in order to get ./autogen.sh to work.
+                </para>
+                
+                <para>The following error message is displayed when accessing the device:
+                </para>
+                <programlisting><![CDATA[ieee1394: sbp2: aborting sbp2 command
+Test Unit Ready 00 00 00 00 00 ]]>
+                </programlisting>
+                <para>Solution:
+                </para>
+                <para>(Markus Gaugusch):
+                    It is possible that hotplug and the "sg" support are not working well together. Try disabling "sg" support in the kernel configuration or 
+                    unload the "sg" module if you are using modules. 
+                </para>
+                <para>(Justin Thiessen):
+                    Forcing the sbp2 module to serialized I/O seems (so far) to have solved the problem. 
+                </para>
+                <para>Ref.:
+                    <itemizedlist>
+                        <listitem>
+                            http://www.netzwerk-aktiv.com/pub/doc/newsletters/linux1394-user/html/1676.html 
+                        </listitem>
+                        <listitem>
+                            http://www.ubuntuforums.org/printthread.php?t=6678 
+                        </listitem>
+                        <listitem>
+                            http://66.102.7.104/search?q=cache:Xh_gu43y6w8J:themikecam.com/newmikecam/blog/index.php/geek/2005/+ipod+serialize_io&amp;hl=en 
+                        </listitem>
+                    </itemizedlist>
+                </para>
+                <para>Looks like the driver is going to be set to default to serialized I/O in kernel 2.6.14, anyways.
+                </para>
+                <para>http://linuxtoday.com/developer/2005093001026NWKNDV
+                </para>
+                
+                <para>The following error message is displayed when accessing the device
+                </para>
+                <programlisting>
+                    <![CDATA[usb-storage: Attempting to get CSW...
+usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes 
+usb-storage: Status code -75; transferred 0/13 ]]>
+                </programlisting>
+                <para>Solution (by Ingo Reimann):
+                </para>
+                <para>I tried to use an iPod Mini with my nforce2-Board, kernel 2.6.14/2.6.15 debian sid and got messages like [above] in dmesg. /dev/sda appeared, but fdisk -l did not show anything
+                </para>
+                <para>The solution, that i found in a discussion on http://kerneltrap.org/node/3844 was to unload ehci_hcd.
+                </para>
+                
+                <para>When connecting an iPod via USB to a 2.6 kernel machine the iPod wil be recognized but not work correctly. In /var/log/messages you'll see the a bunch of "Buffer I/O error on device sd?" when connecting the iPod (Jonas Bergler, Kevin Venkiteswaran)
+                </para>
+                <para>Solution (by "jeffmock"):
+                </para>
+                <para>Disable CONFIG_EFI_PARTITION (File Systems -> Partition Types -> Advanced Partition Selection -> EFI GUID Partition support) in your kernel configuration, recompile.
+                    Details can be found at http://www.linuxquestions.org/questions/showthread.php?postid=1197015#post1197015 
+                </para>
+                <para>Excerpt:
+                </para>
+                <para>"This problem could potentially happen with both 2.4 and 2.6 kernels."
+                </para>
+                <para>A longer story follows and perhaps someone can come up with a more sensible solution for the long run.
+                </para>
+                <para>The iPod looks like a removable disk drive to the host computer. When it is attached to the computer, the mini iPod reports a capacity of 7999488 512-byte sectors (or about 4GB). This turns out to be wrong for whatever reason. The mini iPod only really has 7999376 sectors and it exaggerates by 112 sectors. The other quality of the iPod is that if the computer attempts to read a sector greater than the actual capacity but less than the reported capacity, the iPod will dutifully report an I/O error, but it won't respond to any future requests until you unplug/plug the iPod."
+                </para>
+                <para>I followed the kernel recompile instructions for distro, disabled only the CONFIG_EFI_PARTITION option, and things ran perfectly for me afterwards. As indicated above, hopefully a better long-term solution will emerge soon."
+                </para>
+                <para>(Jorg Schuler: it seems a patch was introduced in kernel version 2.6.10: "&lt;phil at ipom.com&gt; [PATCH] USB Storage: Add unusual_devs entry for iPod This patch adds an unusual_devs.h entry for the Apple iPod as it reports one too many sectors. The patch was submitted by Avi Kivity &lt;avi at argo.co.il&gt; and re-diffed by me.")
+                </para>
+                
+                <para>SHUFFLE won't play music after reformatting
+                </para>
+                <para>Solution (by Mark Davis):
+                </para>
+                <para>The SHUFFLE seems to care about the volume name which has to be "IPOD". Try to format as (replace /dev/sda1 with the appropriate device file for your SHUFFLE!):
+                </para>
+                <programlisting>mkdosfs -F32 -n IPOD /dev/sda1
+                </programlisting>
+                
+                <para>Calendar entries mixed up?
+                </para>
+                <para>Solution:
+                </para>
+                <para>The iPod does not appear to like times specified in UTC (indicated by a trailing 'Z'). KOrganizer seems to do this. If you know how to work around it let me know.
+                </para>
+                
+                <para>m4a files created by faac cannot be added by gtkpod (gentoo)?
+                </para>
+                <para>Solution:
+                </para>
+                <para>There appear to be some versions of faac that do not create 'good' m4a files. The problem could be solved under gentoo by using version 1.24.
+                    In order to make error tracking easier, more detailled error messages are displayed when tracks could not be added for any reason starting with version 0.91-CVS of gtkpod. 
+                </para>
+                
+                <para>gtkpod crashes when reading the iTunesDB (Fedora)
+                </para>
+                <para>Solution:
+                </para>
+                <para>It appears that crashes were observed with kernel version 2.6.11-1.35_FC3. An upgrade to 2.6.12-1.1376_FC3 got rid of the problem. This was with gtkpod-0.94.0 and Athlon64 3000+.
+                </para>
+                <para>After updating the firmware of a 1st-gen iPod nano**, crashes are also observed with Fedora Core 5, kernel 2.6.20-1.2320.fc5, gtkpod 0.99.4 (which worked with the previous firmware). Downloading, building, and installing gtkpod 0.99.10 and libgpod 0.6.0 solved the problem.
+                </para>
+                
+                <para>Problems connecting the iPod to Solaris/SPARC
+                </para>
+                <para>Solution:
+                </para>
+                <para>Current (as of 2006/03/30) versions of the Solaris pcfs SPARC driver have a bug where the correct filesystem/partition layout may not be
+                    recognized, and this is true for iPods. This prevents the iPod partition from being mounted on Solaris SPARC. In order to work 
+                    around this, one must prevent pcfs from detecting the first FAT32 filesystem, forcing it to move on to the second one. This can be done 
+                    by changing the filesystem identifier like so: 
+                </para>
+                <programlisting>
+                    <![CDATA[# dd if=/dev/rdsk/c3t0d0s2 of=/tmp/ipod.orig count=1
+# cp /tmp/ipod.orig /tmp/ipod.modified <edit /tmp/ipod.modified and change the first occurance of "FAT32" (at offset 0x52 for me) to something else like "CAT32">
+# dd if=/tmp/ipod.modified of=/dev/rdsk/c3t0d0s2 count=1]]>
+                </programlisting>
+            </sect2>
+        </sect1>
+        <sect1 id="the-sysinfo-file">
+            <title>The sysinfo file</title>
+            <para>Starting with the 2007 generation of iPods, libgpod needs an additional configuration step to correctly modify the iPod content. libgpod
+                needs to know the so-called iPod "firewire id", otherwise the iPod won't recognize what libgpod wrote to it and will behave as if it's empty. 
+            </para>
+            
+            <sect2 id='the-iphone-and-itouch'>
+                <title id='the-iphone-and-itouch-title'>The iPhone and iTouch</title>
+                <sect3 id='global-assumptions-and-scope-of-this-tutorial'>
+                    <title id='global-assumptions-and-scope-of-this-tutorial-title'>Global Assumptions and Scope of this Tutorial</title>
+                    <para>touch_ip -- denotes the IP address that is assigned to your iPod Touch
+                        (e.g. 192.168.0.27). 
+                    </para>
+                    <para>touch_mnt -- denotes the mount point to your iPod Touch (i.e. the
+                        directory the iPod is mounted on). 
+                    </para>
+                    <para>To make effective use of the following you have to jailbreak your iPod Touch first (in order to access it via SSH). This document won't go into detail on this topic. One possibility to do this using a computer that runs Microsoft Windows (XP) can be found at:
+                    </para>
+                    <para>http://iphone.cricblogs.com/one-click-ipod-touch-jailbreak-for-windows-by-msbasher/
+                    </para>
+                </sect3>
+                <sect3 id='compiling-libgpod-and-gtkpod-op-subversion-versions-cp'>
+                    <title id='compiling-libgpod-and-gtkpod-op-subversion-versions-cp-title'>Compiling libgpod &amp; gtkpod (subversion versions)</title>
+                    <para>
+                        Install and compile libgpod and gtkpod from subversion. See <filename>Compiling and Installing|here</filename> for details.
+                    </para>
+                    <para>Configure libgpod. The '--prefix' option will make sure that is not installed globally but locally within your home directory (note: replace '~' by the absolute path to your home directory):
+                    </para>
+                    <programlisting>~/libgpod$ ./autogen.sh --prefix=~/local
+                    </programlisting>
+                    <para>Otherwise make sure all dependencies are met ('gtk-doc' is a candidate likely to be missing, proper version of automake is another).
+                    </para>
+                    <para>Repeat this process for gtkpod ('PKG_CONFIG_PATH' make sure it builds on the freshly compiled version of libgpod; again, replace '~' by absolute path to your home directory):
+                    </para>
+                    <programlisting>~/gtkpod$ PKG_CONFIG_PATH=~/local/lib/pkgconfig ./autogen.sh --prefix=~/local
+                    </programlisting>
+                    <programlisting>~/gtkpod$ make &amp;&amp; make install
+                    </programlisting>
+                    <para>Assuming that everything went well you should be able to start gtkpod:
+                    </para>
+                    <programlisting>~$ LD_LIBRARY_PATH=~/local/lib ~/local/bin/gtkpod
+                    </programlisting>
+                    <para>You won't be able to fully use it at this point so close it for now.
+                    </para>
+                </sect3>
+                <sect3 id='determining-the-firewire-guid'>
+                    <title id='determining-the-firewire-guid-title'>Determining the Firewire GUID</title>
+                    <para>Connect your iPod Touch via USB (to your Linux machine) and issue the command:
+                    </para>
+                    <programlisting>sudo lsusb -v | grep -i iSerial
+                    </programlisting>
+                    <para>This should print something similar to this:
+                    </para>
+                    <programlisting><![CDATA[iSerial 3 fd98145617c113dc15ab151601001ff12354b139
+[ ... ] ]]>
+                    </programlisting>
+                    <para>The first 16 characters constitute the FirewireGUID, i.e. in this example the FwGUID is:
+                    </para>
+                    <programlisting>fd98 1456 17c1 13dc
+                    </programlisting>
+                </sect3>
+                <sect3 id='making-libgpod-aware-of-the-firewire-guid'>
+                    <title id='making-libgpod-aware-of-the-firewire-guid-title'>Making libgpod Aware of the Firewire GUID</title>
+                    <para>Mount your iPod Touch via:
+                    </para>
+                    <programlisting>sudo sshfs root at touch_ip:Media touch_mnt/ -o allow_other
+                    </programlisting>
+                    <para>Go to the directory 'iTunes_Control' and create (if it does not already exist) a directory named 'Device':
+                    </para>
+                    <programlisting><![CDATA[~/touch_mnt/iTunesControl$ mkdir Device; cd Device
+~/touch_mnt/iTunesControl/Device$ echo "FirewireGuid: 0xfd98145617c113dc" > SysInfo ]]>
+                    </programlisting>
+                    <para>Test if libgpod is able to retrieve the FWGUID by changing into the 'tests' subdirectory of libgpod's source directory and runnning:
+                    </para>
+                    <programlisting>./test-firewire-id touch_mnt/
+                    </programlisting>
+                </sect3>
+                <sect3 id='gtkpod-revisited'>
+                    <title id='gtkpod-revisited-title'>gtkpod Revisited</title>
+                    <para>With your iPod Touch still mounted start up gtkpod once more:
+                    </para>
+                    <programlisting>~$ LD_LIBRARY_PATH=~/local/lib ~/local/bin/gtkpod
+                    </programlisting>
+                    <para>You should now be able to sync songs to your iPod Touch. After syncing is complete go into "Music" on your iPod Touch: The songs you have just synced won't show up at this point. To make them appear press and hold the "Home"-Button until the springboard is reloaded. Going to "Music" now will show your music.
+                    </para>
+                    <para>Don't forget to unmount it after you're completely done.
+                    </para>
+                    <para>Tutorial compiled by staciemonroe (tobias kreisel gmail com)
+                    </para>
+                    
+                </sect3>
+            </sect2>
+            <sect2 id='the-classic-and-nano-three-g'>
+                <title id='the-classic-and-nano-three-g-title'>The Classic and Nano3g</title>
+                <para>There are two ways to set up the iPod to make libgpod able to find its firewire id.
+                </para>
+                <para>The 1st one is mostly automated. First, make sure you have libsgutils installed before running configure/autogen.sh. If you built libgpod without it, install it and run configure/make/make install. You should now have an ipod-read-sysinfo-extended tool available. Run it with the iPod device path (eg /dev/sda) and the iPod mount point (eg /mnt/ipod) as arguments. This may require root privileges. ipod-read-sysinfo-extended will read an XMLfile from the iPod and write it as /mnt/ipod/iPod_Control/Device/SysInfoExtended. See http://ipodlinux.org/Device_Information for more details about the method used.
+                </para>
+                <para>Having that file is enough for libgpod to figure out the iPod firewire id.
+                </para>
+                <para>The 2nd method requires more manual intervention. First, you need to get your firewire id manually. To do that, run "sudo lsusb -v | grep -i Serial" (without the "") with your iPod plugged in, this should print a 16 character long string like 00A1234567891231. For an iPod Touch, this number will be much longer than 16 characters, the firewire ID is constituted by the first 16 characters. Once you have that number, create/edit /mnt/ipod/iPod_Control/Device/SysInfo (if your iPod is mounted at /mnt/ipod). Add to that file the line below:
+                </para>
+                <programlisting>FirewireGuid: 0xffffffffffffffff
+                </programlisting>
+                <para>(replace ffffffffffffffff with the string you obtained at the previous step and don't forget the trailing 0x before the string)
+                </para>
+                <para>Save that file, and you should be all set. Be careful when using apps which lets you manually specify which iPod model you own, they may overwrite that file when you do that. So if after doing that libgpod still seems to write invalid content to the iPod, double-check the content of that SysInfo file to make sure the FirewireGuid line you added isn't gone. If that happens, read it to the end of the file, and make sure libgpod rewrite the iPod content.
+                </para>
+                <para>Once that is done, if you compiled libgpod from source, you can test that libgpod can find the firewire ID on your iPod by running
+                </para>
+                <programlisting>libgpod/tests/test-firewire-id /ipod/mount/point
+                </programlisting>
+            </sect2>
+        </sect1>
+        <sect1 id="ipod-file-recovery">
+            <title>iPod file recovery</title>
+            <sect2 id='checking-ipod-and-#-three-nine-s-files'>
+                <title id='checking-ipod-and-#-three-nine-s-files-title'>Checking iPod's Files</title>
+                <para>For whatever reason -- it may happen that tracks are present in your iTunesDB that are no longer present on the iPod (dangling tracks), or
+                    that tracks are on the iPod but not in the iTunesDB (orphaned tracks). The function "Checking iPod's Files" under the "File" menu will identify both types and take the following actions: 
+                </para>
+                <sect3 id='orphaned-tracks'>
+                    <title id='orphaned-tracks-title'>Orphaned tracks</title>
+                    <para>A new playlist "[Orphaned]" will be created with all orphaned tracks in it. The only exception are orphaned tracks that would become duplicates (if duplicate detection is activated). Those are marked for deletion with the next sync.
+                    </para>
+                </sect3>
+                <sect3 id='dangling-tracks'>
+                    <title id='dangling-tracks-title'>Dangling tracks</title>
+                    <para>These tracks will be marked for deletion with the next sync unless the original PC file is still available. In that case you can have them restored with the next sync.
+                    </para>
+                </sect3>
+            </sect2>
+            <sect2 id='restoring-yourthe-ipod-after-file-system-error-eq-eq-after-a-file-system-error'>
+                <title id='restoring-yourthe-ipod-after-file-system-error-eq-eq-after-a-file-system-error-title'>After a File System Error</title>
+                <para>If iPod's file system gets corrupted and you need to reformat your iPod, there is a way to restore the contents semi-automatically if you have been using the "write extended information file" (iTunesDB.ext) options:
+                    <itemizedlist>
+                        <listitem>
+                            <para>If the directory structure on the iPod doesn't exist yet, load the iPod in gtkpod and have it created for you. Then unload the iPod again.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>Copy your backup files in .gtkpod/ (usually iTunesDB and iTunesDB.ext) to your iPod (usually &lt;mountpoint&gt;/iPod_Control/iTunes/
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>On the iPod the files must be named iTunesDB and iTunesDB.ext.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>Load the iPod in gtkpod.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>Select the iPod repository and start "Check iPod's files" from the File menu.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>Unload the iPod (or save changes).
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </para>
+                <para>
+                    This should restore your iPod to what it was before, provided you didn't move or remove any of the original tracks on your harddrive, and the charset information was stored correctly. 
+                </para>
+            </sect2>
+        </sect1>
+    </chapter>
+    <chapter id="ipod-and-content">
+        <title>iPod and content</title>
+        <sect1 id="layout-of-gtkpod">
+            <title>Layout of gtkpod</title>
+            <para>
+                <figure>
+                    <title>Typical layout of gtkpod</title>
+                    <mediaobject>
+                        <imageobject>
+                            <imagedata fileref="figures/gtkpod.png"/>
+                        </imageobject>
+                    </mediaobject>
+                </figure>
+            </para>
+            <sect2 id='what-is-a-repository-question'>
+                <title id='what-is-a-repository-question-title'>What is a Repository?</title>
+                <para>The left hand pane in gtkpod displays all the repositories that have been created. A repository is (like it implies) a collection of all music tracks, videos and photographs imported into it. They are associated together by a binary XML database file that is the same format as the one that sits on an iPod.
+                </para>
+                <para>By default, gtkpod creates a Local repository and a Podcast Repository. These sit on the computer with gtkpod (they can be found under the ~/.gtkpod directory). By having a local repository, it is possible to import tracks into gtkpod without needing to copy them straight to an iPod. This means that if the cover art, for example, needs to be changed then tracks can be managed without even having the iPod plugged in.
+                </para>
+                <para>Of course, gtkpod is pointless without accessing an iPod. In the same pane as the local repository, new iPod repositories can be created. These repositories related to iPods by model and mount point. Normally, one repository is sufficient but as you can see below, it is possible to set up multiple iPod repositories on the same computer.
+                </para>
+            </sect2>
+            <sect2 id='repository-pane'>
+                <title id='repository-pane-title'>Repository Pane</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>Below each repository, available playlists are listed along with a podcast playlist.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Under iPods that support photographs, a special dynamic node is created that, when clicked, invokes the photo management tool. This allows straight addition of photos to the iPod as well as management of photo albums on the iPod. **Note:** this photo node cannot be deleted!! There is no point trying as it is created by gtkpod for the sole purpose of displaying the photo management tool.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='menus-and-toolbar'>
+                <title id='menus-and-toolbar-title'>Menus and Toolbar</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>Menus across the top provide alternative access to the most frequently used functions.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Toolbar provides the following actions:
+                            <itemizedlist>
+                                <listitem>
+                                    <para>Load iPod(s) -> used for manually mounting any iPods already set up in gtkpod
+                                    </para>
+                                </listitem>
+                                <listitem>
+                                    <para>Save Changes -> vital button! The Save All function that save any changes made to loaded iPods or the local database.
+                                    </para>
+                                </listitem>
+                                <listitem>
+                                    <para>Files -> Add individual music files to the selected repository.
+                                    </para>
+                                </listitem>
+                                <listitem>
+                                    <para>Dirs -> Add any music files located in the selected directories to the selected repository.
+                                    </para>
+                                </listitem>
+                                <listitem>
+                                    <para>Playlist -> Add a playlist file to the selected repository.
+                                    </para>
+                                </listitem>
+                                <listitem>
+                                    <para>New PL -> Create a new playlist on the selected repository.
+                                    </para>
+                                </listitem>
+                            </itemizedlist>
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='filter-tabs'>
+                <title id='filter-tabs-title'>Filter Tabs</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>The two notebooks above the track display are called "Filter Tabs".
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>They allow you to filter which tracks are displayed.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>If you edit an entry in the filter tab, the corresponding entry in all associated tracks will be updated as well. When writing the tags to disk as well, updating of a large number of tracks may take a while.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>So in the image above, choosing "Alice Cooper" on the first filter tab and "Trash" on the second filter tab will only display the tracks from that most excellent of albums (no dissenting opinions required! ;-) ).
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Obviously, these filters can be altered to suit. Selecting ALL on a sort tab effectively removes the filter and displays all tracks.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='track-window'>
+                <title id='track-window-title'>Track Window</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>Displays all tracks residing in the selected repository and conforming to the selected filters.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>The columns can be sorted and are interchangeable.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='cover-art-display'>
+                <title id='cover-art-display-title'>Cover Art Display</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>Displays the cover art of all albums stored in the repository.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>If no cover art exists for an album then the default "?" image is displayed.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            See <link linkend="cover-art">the Cover Art section</link> for more information.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+        </sect1>
+        <sect1 id="adding-files-and-folders">
+            <title>Adding files and folders</title>
+            <sect2 id='getting-tracks-into-gtkpod'>
+                <title id='getting-tracks-into-gtkpod-title'>Getting Tracks into gtkpod</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>You can add individual tracks, entire directories recursively, or existing playlists using "Add Files". A file selection dialogue will appear. By default existing tracks (same full filename) will be skipped.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can add directories recursively using "Add Dirs". A directory selection dialogue will appear.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can add existing playlists using "Add Playlists"
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can delete tracks by marking them and pressing the "Ctrl-d" . If you delete tracks from the master playlist (the topmost playlist, called "gtkpod" by default). You can also delete tracks by selecting them, and using "Delete Track" in the Edit menu or from the context menu.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can update ID3 tags of selected tracks in gtkpod from the mp3 file by pressing "Ctrl-u" or choose "Update track info from file" in the Edit menu or from the context menu.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can rename ID3 tags by editing the fields in gtkpod. You can change an entire group of ID3 tags by editing an entry in the sort tab (or mark several tracks and edit the first).
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can specify which tags to display in the preferences window.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can specify (in the prefs window) if the ID3 tags of the corresponding mp3 file(s) should also be updated.
+                            <figure>
+                                <title>The Add Folders dialog</title>
+                                <mediaobject>
+                                    <imageobject>
+                                        <imagedata fileref="figures/add-folders.png"/>
+                                    </imageobject>
+                                </mediaobject>
+                            </figure>
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Can add music and video files invidually using Add Files.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Can add directories of music and video file using Add Directories.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            The files are imported into the selected <link linkend="what-is-a-repository-question">repository.</link> If the selected repository is an iPod then the files will be copied directly onto it.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            See <link linkend="supported-file-types">Supported File Types</link> for types of files that can be imported.
+                        </para>
+                        <para>Note: gtkpod is an iPod management tool. Tracks, videos and photographs already need to be on the computer filesystem before they can be imported. If adding a CD is the requirement then it needs to be ripped first. Have a look at:
+                            <itemizedlist>
+                                <listitem>
+                                    <para>
+                                        <ulink url='http://nostatic.org/grip/'>
+                                            <citetitle>grip</citetitle>
+                                        </ulink>
+                                    </para>
+                                </listitem>
+                                <listitem>
+                                    <para>
+                                        <ulink url='http://live.gnome.org/SoundJuicer'>
+                                            <citetitle>Sound Juicer</citetitle>
+                                        </ulink>
+                                    </para>
+                                </listitem>
+                                <listitem>
+                                    <para>
+                                        <ulink url='http://docs.kde.org/stable/en/kdemultimedia/kaudiocreator/index.html'>
+                                            <citetitle>kaudiocreator</citetitle>
+                                        </ulink>
+                                    </para>
+                                </listitem>
+                            </itemizedlist>
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='dragging-and-dropping'>
+                <title id='dragging-and-dropping-title'>Dragging and Dropping</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>Once imported tracks can be dragged around gtkpod, including inbetween repositories, playlists, filter tabs and the track display pane.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            A drop <emphasis role="italic">onto</emphasis> an existing playlist will add the tracks to that playlist.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>
+                            A drop <emphasis role="italic">between</emphasis> two existing playlists or behind the last playlist will create a new playlist to which the tracks are added.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>The default action for the drop is either move or copy as appears appropriate (e.g. playlists are moved within a database ('local' or 'iPod/Shuffle'), but copied when dragged across different databases). The applicable action is displayed within the drag icon and can be changed by pressing the control key during the drop.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+        </sect1>
+        <sect1 id="view-and-edit-track-details">
+            <title>View and edit track details</title>
+            <sect2 id='edit-track-details'>
+                <title id='edit-track-details-title'>Edit Track Details</title>
+                <para>The Edit Track Details window can be displayed from a couple places.</para>
+                <itemizedlist>
+                    <listitem>
+                        <para>Select a track from the Track window, right-click and select "Edit Track Details" from the popup.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Make a selection in any of the categories, eg. Album, Genre, and right-clicking "Edit Track Details will display the window and allow all tracks in that category to be edited.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Right-clicking "Edit Track Details" from the popup menu on the CoverArt Display displays the window , allowing all tracks belonging to the album to be edited.
+                        </para>
+                        <para>
+                            <figure>
+                                <title>The Edit Track Details dialog</title>
+                                <mediaobject>
+                                    <imageobject>
+                                        <imagedata fileref="figures/edit-track-details.png"/>
+                                    </imageobject>
+                                </mediaobject>
+                            </figure>
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>The window allows multiple tracks to be edited at the same time. By selecting the "Change all Tracks Simulaneously" check box **BEFORE** making any edits, all the selected tracks can be updated with the new information.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>The coverart can be dragged n dropped on from a web browser in the same way as the Cover Art Display. However, dropping a new cover onto this window will update the cover art of the tracks and not the album! This is an important distinction as it is possible to have different cover art for tracks in the same album! (why anyone would but its possible)!
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='refresh-op-update-cp-track-info-from-file'>
+                <title id='refresh-op-update-cp-track-info-from-file-title'>Refresh (Update) Track Info From File</title>
+                <para>
+                    If you have changed the ID3 tags of your original file, you can update the ID3 tags stored in gtkpod without removing and re-adding the track. Simply select the track to be updated and press "Ctrl-u" or choose "Update Track Info From File" from the Edit menu. Since gtkpod needs to know the filename of the track, the "Extended Information File" (see <link linkend="extended-information-file">here</link>) is needed.
+                </para>
+                <para>"Update" will also re-read the replay-gain tags from disk, if available, and set the soundcheck field. If no replay-gain tag is available, the soundcheck field will be erased. You can also select entries in the filter tab or entire playlists for refresh.
+                </para>
+            </sect2>
+            <sect2 id='synchronize-with-directories'>
+                <title id='synchronize-with-directories-title'>Synchronize with Directories</title>
+                <para>If you have added files to directories or changed files in directories you have previously added tracks from, you can use the "Synchronize Dirs" utility to update your iTunesDB.
+                </para>
+                <para>"Synchronize with Dir(s)" will use the selected tracks to make a list of directories to update, so you should activate the "Write Extended Information" option in the export section of the Preferences dialogue.
+                </para>
+                <para>It will then add all non-existing tracks in those directories and update all existing tracks. The tracks are also added to the currently selected playlist, if they aren't already a member.
+                </para>
+                <para>Tracks that have been removed from the directory will only be removed from the iTunesDB if this option is checked in the option dialogue.
+                </para>
+                <para>For best results you should also activate duplicate detection. This avoids unnecessary copying of unchanged tracks.
+                </para>
+            </sect2>
+            <sect2 id='volume-normalization'>
+                <title id='volume-normalization-title'>Volume Normalization</title>
+                <para>There are two fields in the iTunes Database (iTunesDB) that allow for the adjustment of the volume of an individual track:</para>
+                <itemizedlist>
+                    <listitem>
+                        <para>the volume field (a signed integer)</para>
+                    </listitem>
+                    <listitem>
+                        <para>the soundcheck field (in dB).
+                        </para>
+                    </listitem>
+                </itemizedlist>
+                <para>
+                    The volume is always active, whereas the soundcheck field is only active when you select 'soundcheck' on the iPod. Further, the soundcheck field only affects the earphone output but not the line output of the iPod. 
+                </para>
+                <para>
+                    gtkpod will set the soundcheck according to the replay-gain tag set in your mp3 file. Newer versions of 'lame' automatically include the replay-gain tag when encoding. In that case the soundcheck field will be filled in when you first import a track. 
+                </para>
+                <para>If no replay-gain tag is set, you can use the function 'Normalize Volume' to call mp3gain (mp3gain.sourceforge.net) to calculate the gain and write a replay-gain tag. Since this procedure is very time consuming, it is not done automatically during import. You need to install mp3gain in the default path or set the full path in the 'Tools' section of the preferences dialog. If the iPod is connected, the tag is written to the file stored on the iPod.
+                </para>
+                <para>At this time "album gain" functionality is not supported. "Album gain" means that the volume of all tracks of one album is adjusted by the same gain, such that the relative volume level remains the same. It is planned to realize this in one of the next versions.
+                </para>
+                <para>Also, please be aware that tracks are not normalized on a 'per playlist' fashion. If a track is normalized, it's normalized in all playlists it is a member of.
+                </para>
+                <para>Once the replay-gain tag has been read, it is stored in the extended information file 'iTunesDB.ext'. When you call 'Normalize volume' again, the stored value will be used to re-populate the soundcheck field. Use 'Update Track' to re-read the tag from the file.
+                </para>
+            </sect2>
+        </sect1>
+        <sect1 id="cover-art">
+            <title>Cover art</title>
+            <para>Cover art is a visual element of your gtkpod music collection. It changes the black and white database of artists and title names back into something related to the physical CDs and DVDs that have been imported.
+            </para>
+            <sect2 id='coverart-display'>
+                <title id='coverart-display-title'>CoverArt Display</title>
+                <para>The display consists of 9 covers displayed at any one time. The entire album collection can be cycled through from one end to another. The main image is slighly larger and lacking in "shine" for viewing clarity.
+                </para>
+                <para>
+                    <figure>
+                        <title>Cover art display</title>
+                        <mediaobject>
+                            <imageobject>
+                                <imagedata fileref="figures/coverart.png"/>
+                            </imageobject>
+                        </mediaobject>
+                    </figure>
+                </para>
+                <itemizedlist>
+                    <listitem>
+                        <para>Use the scrollbar to quickly slide back and forth over the album collection.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Use the scrollbar buttons to more precisely step through each album.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Click on the main album cover image (one at the front and in the centre) once to display just the album's tracks in the right pane of gtkpod
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='coverart-popup-menu'>
+                <title id='coverart-popup-menu-title'>CoverArt Popup Menu</title>
+                <para>
+                    <figure>
+                        <title>Cover art popup menu</title>
+                        <mediaobject>
+                            <imageobject>
+                                <imagedata fileref="figures/cover-popupmenu.png"/>
+                            </imageobject>
+                        </mediaobject>
+                    </figure>
+                </para>
+                <itemizedlist>
+                    <listitem>
+                        <para>Right-click on the main album cover image to display the popup menu with 3 options:</para>
+                        <itemizedlist>
+                            <listitem>
+                                <para>Select Cover From File
+                                </para>
+                            </listitem>
+                            <listitem>
+                                <para>View Full Size Artwork
+                                </para>
+                            </listitem>
+                            <listitem>
+                                <para>Edit Track Details
+                                </para>
+                            </listitem>
+                        </itemizedlist>
+                    </listitem>
+                </itemizedlist>
+                <sect3 id='select-cover-from-file'>
+                    <title id='select-cover-from-file-title'>Select Cover From File</title>
+                    <para>
+                        <figure>
+                            <title>Select cover from file</title>
+                            <mediaobject>
+                                <imageobject>
+                                    <imagedata fileref="figures/cover-setfromfile.png"/>
+                                </imageobject>
+                            </mediaobject>
+                        </figure>
+                    </para>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Selecting this option displays a file chooser dialog. Select the preferred image file and click OK. The album cover changes to a scaled version of the new image, while all the tracks in the album have their artwork path modified to the path of the preferred image.
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </sect3>
+                <sect3 id='view-full-size-artwork'>
+                    <title id='view-full-size-artwork-title'>View Full Size Artwork</title>
+                    <para>
+                        <figure>
+                            <title>View full size artwork</title>
+                            <mediaobject>
+                                <imageobject>
+                                    <imagedata fileref="figures/cover-fullsize.png"/>
+                                </imageobject>
+                            </mediaobject>
+                        </figure>
+                    </para>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Selecting this options opens a dialog displaying the cover image. The image is either its true size of the biggest size it can be while still fitting on the desktop. Its true resolution is displayed underneath in the format width x height.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>The dialog is modal so must be closed before moving on. The OK button closes the dialog.
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </sect3>
+                <sect3 id='edit-track-details-coverart'>
+                    <title>Edit Track Details</title>
+                    <itemizedlist>
+                        <listitem>
+                            <para>This provides a shortcut to the "Edit Track Details" dialog for editing the ID3 tag information for all tracks belonging to the album displayed.
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </sect3>
+            </sect2>
+        </sect1>
+        <sect1 id="adding-cover-art-from-a-browser">
+            <title>Adding cover art from a browser</title>
+            <para>Unlike other applications, cover art in gtkpod is not hidden away in a "difficult to find" image cache. In fact, cover art files, for a local database, can be located anywhere on the filesystem.
+            </para>
+            <sect2 id='setting-image-on-track-import'>
+                <title id='setting-image-on-track-import-title'>Setting Image on Track Import</title>
+                <para>Locating the image file in the same directory as the tracks gives the additional benefit that gtkpod will analyse the image upon track import and set the image as the album's cover artwork. It is Important to ensure the image's filename corresponds to at least one of the image filename templates entered in the Preferences window.
+                </para>
+            </sect2>
+            <sect2 id='setting-image-on-existing-album'>
+                <title id='setting-image-on-existing-album-title'>Setting Image on Existing Album</title>
+                <para>
+                    The use of the popup menu to select a cover art file from the filesystem has been documented <filename>Cover Art|here</filename>. It is also possible to download a cover art image file from the internet and drag n drop it into gtkpod.
+                </para>
+                <sect3 id='drag-and-#-three-nine-n-drop-using-firefox'>
+                    <title id='drag-and-#-three-nine-n-drop-using-firefox-title'>Drag 'n Drop Using Firefox</title>
+                    <orderedlist>
+                        <listitem>
+                            <para>Locate the preferred image and display it in firefox.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>Ensure the url of the image ends with ".jpg" or ".JPG" (other file extensions could be supported if demand warrants it).
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>Drag the image from Firefox and drop it onto the Cover Art Display's centre/main cover image. The main cover image should be displaying the album which requires the new cover.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>If a cover already exists with the same filename then gtkpod will ask whether the existing image be overwritten or the new image be named something else.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>The image will be downloaded from the url location, saved in the album's directory on the filesystem and applied to each track belonging to that album.
+                            </para>
+                        </listitem>
+                    </orderedlist>
+                </sect3>
+                <sect3 id='drag-and-#-three-nine-n-drop-using-konqueror'>
+                    <title id='drag-and-#-three-nine-n-drop-using-konqueror-title'>Drag 'n Drop Using Konqueror</title>
+                    <itemizedlist>
+                        <listitem>
+                            <para>A limitation of the dnd in Firefox is that only the url can be used to get at the image file. Thus, the page must be displaying just the image and gtkpod must redownload the image internally (using curl and the image url).
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>Konqueror offers the additional functionality that the image file can be extracted directly from its cache. This has the benefits of avoiding the internal curl download and that the url is not restricted to those ending in ".jpg"
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>
+                                The importance of the latter benefit concerns websites that do not offer the direct download of cover art images. 
+                                <ulink url='http://www.allcdcovers.com'>
+                                    <citetitle>allcdcovers.com</citetitle>
+                                </ulink>
+                                is one such site, where its images are displayed in the browser but the image url cannot be used a second time to download the same image. Thus, allcdcovers.com cannot be used as a download dnd source in Firefox. However, in Konqueror, simply open a full image from allcdcovers then just drag 'n drop into gtkpod.
+                            </para>
+                        </listitem>
+                        <listitem>
+                            <para>Maybe Firefox will do this some day too..
+                            </para>
+                        </listitem>
+                    </itemizedlist>
+                </sect3>
+            </sect2>
+        </sect1>
+        <sect1 id="copying-content-to-the-ipod">
+            <title>Copying content to the iPod</title>
+            <sect2 id='getting-tracks-onto-the-ipod'>
+                <title id='getting-tracks-onto-the-ipod-title'>Getting Tracks onto the iPod</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>Tracks can be imported directly to an iPod by ensuring the latter is the selected repository before clicking Add Files or Add Directories.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Normally though, tracks will already have been imported into the Local repository. To copy them onto the iPod simply select the tracks in the Track Window and drag them onto the iPod repository icon.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>To copy a whole album, selected the album in one of the sort tabs and drag that onto the iPod repository.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='playlists'>
+                <title id='playlists-title'>Playlists</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>Use playlists to group together a set of tracks. Simply create a new playlist in the Local repository then drag n drop the tracks onto it.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Tracks are not actually copied into a playlist so should a track be deleted then it will be deleted from all playlists.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Drag n drop a playlist onto the iPod repository icon to copy it and all its tracks to the iPod. The playlist will be available in the Playlist section of the iPod's control system as well as all tracks being copied to the iPod.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='save-changes'>
+                <title id='save-changes-title'>Save Changes</title>
+                <itemizedlist>
+                    <listitem>
+                        <para>
+                            At any change to a repository, eg. track addition, deletion, edit ..., a change has occurred that requires a database save. To highlight this, the name of the repository is changed to italics, ie. Local -> <emphasis role="italic">Local</emphasis>. This shows the repository requires saving.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Should gtkpod be closed prior to any saving then a dialog is displayed informing that data changes will be lost if a save is not performed.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Clicking the "Save Changes" button will save all changes made to all of the repositories. This is the point where tracks are actually copied to the iPod and the iPod database updated. Only after a save is performed will the tracks copied to the iPod, be playable on the iPod.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+        </sect1>
+        <sect1 id="playcounts-and-ratings">
+            <title>Playcounts and ratings</title>
+            <para>Whenever a track is played completely on the iPod (firmware version 1.3 or higher) a counter in the "Play Counts" file will be increased by one. The same file also contains the rating set with the 3rd generation (and later) iPods. This file appears to be deleted whenever the iPod resets itself, e.g. because the iPod is disconnected from the computer. Therefore, be careful! Charging the iPod seems to do no harm.
+            </para>
+            <para>When gtkpod is started, it will also read this file and incorporate the information into the iTunesDB that can be written back to the iPod. There have been several requests to also register playcounts when playing a track on the local machine. This is possible by calling gtkpod as
+            </para>
+            <programlisting>gtkpod -p &lt;filename&gt;</programlisting>
+            <para>If gtkpod is already running, the playcount of that track there will be increased by one. If gtkpod is not already running, the playcount will be registered in ~/.gtkpod/offline_playcount. This file will be read the next time you import the iTunesDB from your iPod, and the playcounts will be updated accordingly.
+            </para>
+            <para>Please note that if you start several instances of gtkpod, only the first instance will register playcounts through "gtkpod -p".
+            </para>
+            <para>Now all that is required is to tell your favorite player to call gtkpod with the filename of the played track.
+            </para>
+            <para>For xmms this is possible as of July 18th, 2004 (CVS version). Versions before that (including 1.2.10) only allow you to have an external program called at the beginning of a track. Our patch allows to have an external program called also at the end of a track.
+            </para>
+            <para>In each case you will need to activate the "General Plugin" called "song_change" and configure it to call 'gtkpod -p "%f"'.
+            </para>
+        </sect1>
+    </chapter>
+    <chapter id="managing-playlists">
+        <title>Managing playlists</title>
+        <sect1 id="playlists-podcasts-and-photos">
+            <title>Playlists, podcasts and photos</title>
+            <sect2 id='playlists-ppp'>
+                <title>Playlists</title>
+                <para>Playlists reside under the iPod repository node in the left hand pane of gtkpod. Clicking on them will display the tracks associated with them, effectively filtering the other gtkpod panes. You can ...
+                </para>
+                <itemizedlist>
+                    <listitem>
+                        <para>create playlists with the &lt;New Playlist&gt; button on the toolbar or pressing "Ctrl-n" in the playlist listview.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>create playlists by adding an existing playlist file with &lt;Add file&gt; or &lt;Add playlist&gt;.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>add tracks to playlists by marking the tracks you want to add, and then dragging them onto the playlist.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>rename playlists.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>delete playlists by selecting the desired playlist and pressing "Ctrl-D", or by selecting "Delete Playlist" from the Edit menu.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+            <sect2 id='podcasts'>
+                <title id='podcasts-title'>Podcasts</title>
+                <para>
+                    You have to download podcasts using a third party tool like 
+                    <ulink url='http://linc.homeunix.org:8080/scripts/bashpodder/'>
+                        <citetitle>bashpodder</citetitle>
+                    </ulink>
+                    or 
+                    <ulink url='http://perli.net/projekte/gpodder/%29'>
+                        <citetitle>gpodder</citetitle>
+                    </ulink>
+                    .
+                </para>
+                <para>Podcasts should be added directly into the 'Podcasts' playlist of the iPod repository, for example by selecting the Podcasts playlist before manually adding files/directories. Podcasts will then appear only in the Podcasts section on the iPod. If you add podcasts to the main playlist 'gtkpod/iPod' or any other iPod playlist first and then drag them over to the Podcasts playlist, the podcasts will appear in the Podcasts section on the iPod, as well as in the normal music section.
+                </para>
+                <para>The podcast 'repository' is a local repository (like 'Local') where you can keep all local podcasts. No mechanism exists to automatically synchronize the iPod repository with the Podcast repository at this time. You have to drag the podcasts over manually.
+                </para>
+            </sect2>
+            <sect2 id='photos'>
+                <title id='photos-title'>Photos</title>
+                <para>
+                    If your ipod supports photos then a special dynamic playlist is created in the playlist tree. <emphasis role="bold">YOU CANNOT DELETE IT!</emphasis> Indeed when clicking on it all the usual track related ipod functions are disabled or removed.
+                </para>
+                <itemizedlist>
+                    <listitem>
+                        <para>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.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>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.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>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.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>Removing an image from the Photo Library will delete it completely from the ipod.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can select a set of images from a selected album (inc. the Photo Library) and drag n drop them into another album.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>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.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+        </sect1>
+    </chapter>
+    <chapter id="advanced-features">
+        <title>Advanced features</title>
+        <sect1 id="exporting-files-from-the-ipod">
+            <title>Exporting files from the iPod</title>
+            <sect2 id='copying-from-the-ipod'>
+                <title id='copying-from-the-ipod-title'>Copying from the iPod</title>
+                <para>Unlike other iPod management applications, it is possible to copy tracks resident on the iPod back onto a PC, using gtkpod.
+                </para>
+                <itemizedlist>
+                    <listitem>
+                        <para>Mark the tracks you want to export and select "Export Tracks from Database" from the file menu (or use the context sensitive menu).
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>A file selection dialog window appears and you can choose the directory you'd like the selected files to be written to.
+                        </para>
+                    </listitem>
+                    <listitem>
+                        <para>You can specify the output filename in the prefs dialog by specifying a template (e.g. "%A/%a - %t"). You can specify multiple templates for different file formats by separating them by a semicolon (e.g. "%A/%a - %t.mp3;%t.wav"). See the tooltip in the preferences window for a list of identifiers.
+                        </para>
+                    </listitem>
+                </itemizedlist>
+            </sect2>
+        </sect1>
+    </chapter>
+</book>

Added: gtkpod/branches/upstream/current/doc/hooking-up-the-ipod.html
===================================================================
--- gtkpod/branches/upstream/current/doc/hooking-up-the-ipod.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/hooking-up-the-ipod.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,536 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Hooking up the iPod</title>
+<link rel="previous" href="getting-started.html" title="Getting started">
+<link rel="next" href="setting-ipod-properties.html" title="Setting iPod properties">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="getting-started.html" title="Getting started">Getting started</a></td>
+<td class="navbar-next"><a class="navbar-next" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li>
+<a class="xref" href="getting-started.html" title="Getting started">Getting started</a><div class="autotoc"><ul>
+<li>Hooking up the iPod</li>
+<li><a class="xref" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></li>
+<li><a class="xref" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></li>
+<li><a class="xref" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></li>
+<li><a class="xref" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="hooking-up-the-ipod"></a><div class="header"><h1 class="sect1 title"><span class="title">Hooking up the iPod</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="getting-started.html" title="Getting started">Getting started</a></li>
+</ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">1.1.1. </span><a class="xref" href="hooking-up-the-ipod.html#" title="Introduction">Introduction</a>
+</li>
+<li>
+<span class="label">1.1.2. </span><a class="xref" href="hooking-up-the-ipod.html#" title="Using udev">Using udev</a>
+</li>
+<li>
+<span class="label">1.1.3. </span><a class="xref" href="hooking-up-the-ipod.html#" title="Mounting">Mounting</a>
+</li>
+<li>
+<span class="label">1.1.4. </span><a class="xref" href="hooking-up-the-ipod.html#" title="Environment variables">Environment variables</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<div class="header"><h2 class="sect2 title"><span class="title"><span class="label">1.1.1. </span>Introduction</span></h2></div>
+<p class="para block block-first">The iPod has largely been an USB device yet there are older models of iPods that used IEEE1394/ / firewire for their connection interface. Historically, it took something of an effort for linux to recognise the iPod model correctly. However, this situation has greatly improved in recent times where it is now possible to simply plug the iPod into a USB port and have your distro recognise it straight off.</p>
+<p class="para block">gtkpod first and foremost relies on the successful mounting of a recognised iPod. Thus, if the iPod cannot be mounted then gtkpod is NOT going to do it for you! Thus, before firing up gtkpod make sure you can see the filesystem of your iPod at its desginated mount point, eg. /mnt/ipod.</p>
+</div>
+<div class="division sect2">
+<div class="header"><h2 class="sect2 title"><span class="title"><span class="label">1.1.2. </span>Using udev</span></h2></div>
+<p class="para block block-first">For linux distros installed with hal and udev, plugging an ipod in and mounting it becomes a trivial exercise. A device node will normally be created under /dev, eg. /dev/sdc.</p>
+<p class="para block">Using udev rules it is possible to "play" and refine this device node to reflect personal requirements. For example, including these udev rules will allow 2 ipods to be loaded at the same time without interfering with one another:</p>
+<div class=" block programlisting block-indent"><pre class="programlisting">                    #80GB IPOD
+SUBSYSTEMS=="usb", ATTRS{serial}=="000A2700XXXXXXXX", KERNEL=="sd?2", \
+NAME="80gbipod", MODE="0664", OPTIONS="last_rule"
+ 
+#4GB IPOD NANO
+SUBSYSTEMS=="usb", ATTRS{serial}=="000A2700YYYYYYYY", KERNEL=="sd?2", \
+NAME="4gbnano", MODE="0664", OPTIONS="last_rule"
+                </pre></div>
+<p class="para block">By including the test against the serial number it is possible to uniquely identify an individual iPod and load it appropriately.</p>
+</div>
+<div class="division sect2">
+<div class="header"><h2 class="sect2 title"><span class="title"><span class="label">1.1.3. </span>Mounting</span></h2></div>
+<p class="para block block-first">
+                    The result of this is that the ipod will be located on a device node and this can be mounted manually using the command (performed as root):
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">mount /dev/sdc2 /mnt/ipod</pre></div>
+<p class="para block">This assumes an iPod is loaded onto the device /dev/sdc and that it is a 2 partition model. It seems that post-2006, iPods have become 1-partition items.</p>
+<p class="para block">However, it should be noted that moden window managers such as gnome and kde take on the responsibility of managing connected devices. Thus, the result of connecting an iPod will be an icon on the desktop which will either be mounted automatically or can be mounted by the user with a click of the mouse on a popup menu.</p>
+</div>
+<div class="division sect2">
+<div class="header"><h2 class="sect2 title"><span class="title"><span class="label">1.1.4. </span>Environment variables</span></h2></div>
+<p class="para block block-first">
+                    The following environment variables can be set if needed:
+                    <div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                            IPOD_MOUNTPOINT: Defines the mountpoint of the iPod. This overwrites the value stored in the preferences, but is overwritten by the command line argument "-m" or "--mountpoint".
+                        </li>
+<li>
+                            GTKPOD_DF_COMMAND: Only used on systems without statvfs(). Defines the "df" command to be used for probing the free space on the iPod including command line arguments. Default is "df -k -P". On some systems it may be necessary to remove the "-P" option. The mount point is added to this command line automatically. You can switch off calls to df by setting this environment variable to an empty string.
+                        </li>
+</ul></div>
+                </p>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="getting-started.html" title="Getting started">Getting started</a></td>
+<td class="navbar-next"><a class="navbar-next" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/ipod-and-content.html
===================================================================
--- gtkpod/branches/upstream/current/doc/ipod-and-content.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/ipod-and-content.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,501 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>iPod and content</title>
+<link rel="previous" href="ipod-file-recovery.html" title="iPod file recovery">
+<link rel="next" href="layout-of-gtkpod.html" title="Layout of gtkpod">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></td>
+<td class="navbar-next"><a class="navbar-next" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li>iPod and content<div class="autotoc"><ul>
+<li><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></li>
+<li><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></li>
+<li><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></li>
+<li><a class="xref" href="cover-art.html" title="Cover art">Cover art</a></li>
+<li><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></li>
+<li><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></li>
+<li><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division chapter">
+<a name="ipod-and-content"></a><div class="header"><h1 class="chapter title"><span class="title">iPod and content</span></h1></div>
+<ul class="linktrail"><li class="linktrail linktrail-only"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li></ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.1. </span><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a>
+</li>
+<li>
+<span class="label">2.2. </span><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a>
+</li>
+<li>
+<span class="label">2.3. </span><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a>
+</li>
+<li>
+<span class="label">2.4. </span><a class="xref" href="cover-art.html" title="Cover art">Cover art</a>
+</li>
+<li>
+<span class="label">2.5. </span><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a>
+</li>
+<li>
+<span class="label">2.6. </span><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a>
+</li>
+<li>
+<span class="label">2.7. </span><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a>
+</li>
+</ul></div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></td>
+<td class="navbar-next"><a class="navbar-next" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/ipod-file-recovery.html
===================================================================
--- gtkpod/branches/upstream/current/doc/ipod-file-recovery.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/ipod-file-recovery.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,546 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>iPod file recovery</title>
+<link rel="previous" href="the-sysinfo-file.html" title="The sysinfo file">
+<link rel="next" href="ipod-and-content.html" title="iPod and content">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></td>
+<td class="navbar-next"><a class="navbar-next" href="ipod-and-content.html" title="iPod and content">iPod and content</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li>
+<a class="xref" href="getting-started.html" title="Getting started">Getting started</a><div class="autotoc"><ul>
+<li><a class="xref" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></li>
+<li><a class="xref" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></li>
+<li><a class="xref" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></li>
+<li><a class="xref" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></li>
+<li>iPod file recovery</li>
+</ul></div>
+</li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="ipod-file-recovery"></a><div class="header"><h1 class="sect1 title"><span class="title">iPod file recovery</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="getting-started.html" title="Getting started">Getting started</a></li>
+</ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">1.5.1. </span><a class="xref" href="ipod-file-recovery.html#checking-ipod-and-#-three-nine-s-files" title="Checking iPod's Files">Checking iPod's Files</a>
+</li>
+<li>
+<span class="label">1.5.2. </span><a class="xref" href="ipod-file-recovery.html#restoring-yourthe-ipod-after-file-system-error-eq-eq-after-a-file-system-error" title="After a File System Error">After a File System Error</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="checking-ipod-and-#-three-nine-s-files"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="checking-ipod-and-#-three-nine-s-files-title"></a><span class="label">1.5.1. </span>Checking iPod's Files</span></h2></div>
+<p class="para block block-first">For whatever reason -- it may happen that tracks are present in your iTunesDB that are no longer present on the iPod (dangling tracks), or
+                    that tracks are on the iPod but not in the iTunesDB (orphaned tracks). The function "Checking iPod's Files" under the "File" menu will identify both types and take the following actions: 
+                </p>
+<div class="autotoc"><ul>
+<li>
+<span class="label">1.5.1.1. </span><a class="xref" href="ipod-file-recovery.html#orphaned-tracks" title="Orphaned tracks">Orphaned tracks</a>
+</li>
+<li>
+<span class="label">1.5.1.2. </span><a class="xref" href="ipod-file-recovery.html#dangling-tracks" title="Dangling tracks">Dangling tracks</a>
+</li>
+</ul></div>
+<div class="division sect3">
+<a name="orphaned-tracks"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="orphaned-tracks-title"></a><span class="label">1.5.1.1. </span>Orphaned tracks</span></h3></div>
+<p class="para block block-first">A new playlist "[Orphaned]" will be created with all orphaned tracks in it. The only exception are orphaned tracks that would become duplicates (if duplicate detection is activated). Those are marked for deletion with the next sync.
+                    </p>
+</div>
+<div class="division sect3">
+<a name="dangling-tracks"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="dangling-tracks-title"></a><span class="label">1.5.1.2. </span>Dangling tracks</span></h3></div>
+<p class="para block block-first">These tracks will be marked for deletion with the next sync unless the original PC file is still available. In that case you can have them restored with the next sync.
+                    </p>
+</div>
+</div>
+<div class="division sect2">
+<a name="restoring-yourthe-ipod-after-file-system-error-eq-eq-after-a-file-system-error"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="restoring-yourthe-ipod-after-file-system-error-eq-eq-after-a-file-system-error-title"></a><span class="label">1.5.2. </span>After a File System Error</span></h2></div>
+<p class="para block block-first">If iPod's file system gets corrupted and you need to reformat your iPod, there is a way to restore the contents semi-automatically if you have been using the "write extended information file" (iTunesDB.ext) options:
+                    <div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                            <span class="para">If the directory structure on the iPod doesn't exist yet, load the iPod in gtkpod and have it created for you. Then unload the iPod again.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">Copy your backup files in .gtkpod/ (usually iTunesDB and iTunesDB.ext) to your iPod (usually &lt;mountpoint&gt;/iPod_Control/iTunes/
+                            </span>
+                        </li>
+<li>
+                            <span class="para">On the iPod the files must be named iTunesDB and iTunesDB.ext.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">Load the iPod in gtkpod.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">Select the iPod repository and start "Check iPod's files" from the File menu.
+                            </span>
+                        </li>
+<li>
+                            <span class="para">Unload the iPod (or save changes).
+                            </span>
+                        </li>
+</ul></div>
+                </p>
+<p class="para block">
+                    This should restore your iPod to what it was before, provided you didn't move or remove any of the original tracks on your harddrive, and the charset information was stored correctly. 
+                </p>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></td>
+<td class="navbar-next"><a class="navbar-next" href="ipod-and-content.html" title="iPod and content">iPod and content</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/layout-of-gtkpod.html
===================================================================
--- gtkpod/branches/upstream/current/doc/layout-of-gtkpod.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/layout-of-gtkpod.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,628 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Layout of gtkpod</title>
+<link rel="previous" href="ipod-and-content.html" title="iPod and content">
+<link rel="next" href="adding-files-and-folders.html" title="Adding files and folders">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="ipod-and-content.html" title="iPod and content">iPod and content</a></td>
+<td class="navbar-next"><a class="navbar-next" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li>
+<a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a><div class="autotoc"><ul>
+<li>Layout of gtkpod</li>
+<li><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></li>
+<li><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></li>
+<li><a class="xref" href="cover-art.html" title="Cover art">Cover art</a></li>
+<li><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></li>
+<li><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></li>
+<li><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="layout-of-gtkpod"></a><div class="header"><h1 class="sect1 title"><span class="title">Layout of gtkpod</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+</ul>
+<p class="para block block-first">
+                <div class=" block figure block-first block-indent">
+<div class="block block-first title title-formal"><span class="title"><span class="label"><span style="font-style: italic; ">Figure 2-1</span> </span>Typical layout of gtkpod</span></div>
+<div class="figure-inner">
+                    
+                    <div class="mediaobject"><img src="figures/gtkpod.png"></div>
+                </div>
+</div>
+            </p>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.1.1. </span><a class="xref" href="layout-of-gtkpod.html#what-is-a-repository-question" title="What is a Repository?">What is a Repository?</a>
+</li>
+<li>
+<span class="label">2.1.2. </span><a class="xref" href="layout-of-gtkpod.html#repository-pane" title="Repository Pane">Repository Pane</a>
+</li>
+<li>
+<span class="label">2.1.3. </span><a class="xref" href="layout-of-gtkpod.html#menus-and-toolbar" title="Menus and Toolbar">Menus and Toolbar</a>
+</li>
+<li>
+<span class="label">2.1.4. </span><a class="xref" href="layout-of-gtkpod.html#filter-tabs" title="Filter Tabs">Filter Tabs</a>
+</li>
+<li>
+<span class="label">2.1.5. </span><a class="xref" href="layout-of-gtkpod.html#track-window" title="Track Window">Track Window</a>
+</li>
+<li>
+<span class="label">2.1.6. </span><a class="xref" href="layout-of-gtkpod.html#cover-art-display" title="Cover Art Display">Cover Art Display</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="what-is-a-repository-question"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="what-is-a-repository-question-title"></a><span class="label">2.1.1. </span>What is a Repository?</span></h2></div>
+<p class="para block block-first">The left hand pane in gtkpod displays all the repositories that have been created. A repository is (like it implies) a collection of all music tracks, videos and photographs imported into it. They are associated together by a binary XML database file that is the same format as the one that sits on an iPod.
+                </p>
+<p class="para block">By default, gtkpod creates a Local repository and a Podcast Repository. These sit on the computer with gtkpod (they can be found under the ~/.gtkpod directory). By having a local repository, it is possible to import tracks into gtkpod without needing to copy them straight to an iPod. This means that if the cover art, for example, needs to be changed then tracks can be managed without even having the iPod plugged in.
+                </p>
+<p class="para block">Of course, gtkpod is pointless without accessing an iPod. In the same pane as the local repository, new iPod repositories can be created. These repositories related to iPods by model and mount point. Normally, one repository is sufficient but as you can see below, it is possible to set up multiple iPod repositories on the same computer.
+                </p>
+</div>
+<div class="division sect2">
+<a name="repository-pane"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="repository-pane-title"></a><span class="label">2.1.2. </span>Repository Pane</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Below each repository, available playlists are listed along with a podcast playlist.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Under iPods that support photographs, a special dynamic node is created that, when clicked, invokes the photo management tool. This allows straight addition of photos to the iPod as well as management of photo albums on the iPod. **Note:** this photo node cannot be deleted!! There is no point trying as it is created by gtkpod for the sole purpose of displaying the photo management tool.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="menus-and-toolbar"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="menus-and-toolbar-title"></a><span class="label">2.1.3. </span>Menus and Toolbar</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Menus across the top provide alternative access to the most frequently used functions.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Toolbar provides the following actions:
+                            <div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                                    <span class="para">Load iPod(s) -&gt; used for manually mounting any iPods already set up in gtkpod
+                                    </span>
+                                </li>
+<li>
+                                    <span class="para">Save Changes -&gt; vital button! The Save All function that save any changes made to loaded iPods or the local database.
+                                    </span>
+                                </li>
+<li>
+                                    <span class="para">Files -&gt; Add individual music files to the selected repository.
+                                    </span>
+                                </li>
+<li>
+                                    <span class="para">Dirs -&gt; Add any music files located in the selected directories to the selected repository.
+                                    </span>
+                                </li>
+<li>
+                                    <span class="para">Playlist -&gt; Add a playlist file to the selected repository.
+                                    </span>
+                                </li>
+<li>
+                                    <span class="para">New PL -&gt; Create a new playlist on the selected repository.
+                                    </span>
+                                </li>
+</ul></div>
+                        </span>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="filter-tabs"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="filter-tabs-title"></a><span class="label">2.1.4. </span>Filter Tabs</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">The two notebooks above the track display are called "Filter Tabs".
+                        </span>
+                    </li>
+<li>
+                        <span class="para">They allow you to filter which tracks are displayed.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">If you edit an entry in the filter tab, the corresponding entry in all associated tracks will be updated as well. When writing the tags to disk as well, updating of a large number of tracks may take a while.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">So in the image above, choosing "Alice Cooper" on the first filter tab and "Trash" on the second filter tab will only display the tracks from that most excellent of albums (no dissenting opinions required! ;-) ).
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Obviously, these filters can be altered to suit. Selecting ALL on a sort tab effectively removes the filter and displays all tracks.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="track-window"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="track-window-title"></a><span class="label">2.1.5. </span>Track Window</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Displays all tracks residing in the selected repository and conforming to the selected filters.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">The columns can be sorted and are interchangeable.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="cover-art-display"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="cover-art-display-title"></a><span class="label">2.1.6. </span>Cover Art Display</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">Displays the cover art of all albums stored in the repository.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">If no cover art exists for an album then the default "?" image is displayed.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">
+                            See <a class="link" href="cover-art.html" title="Cover art">the Cover Art section</a> for more information.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="ipod-and-content.html" title="iPod and content">iPod and content</a></td>
+<td class="navbar-next"><a class="navbar-next" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/managing-playlists.html
===================================================================
--- gtkpod/branches/upstream/current/doc/managing-playlists.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/managing-playlists.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,473 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Managing playlists</title>
+<link rel="previous" href="playcounts-and-ratings.html" title="Playcounts and ratings">
+<link rel="next" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></td>
+<td class="navbar-next"><a class="navbar-next" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">Playlists, podcasts and photos</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li>Managing playlists<div class="autotoc"><ul><li><a class="xref" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">Playlists, podcasts and photos</a></li></ul></div>
+</li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division chapter">
+<a name="managing-playlists"></a><div class="header"><h1 class="chapter title"><span class="title">Managing playlists</span></h1></div>
+<ul class="linktrail"><li class="linktrail linktrail-only"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li></ul>
+<div class="autotoc"><ul><li>
+<span class="label">3.1. </span><a class="xref" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">Playlists, podcasts and photos</a>
+</li></ul></div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></td>
+<td class="navbar-next"><a class="navbar-next" href="playlists-podcasts-and-photos.html" title="Playlists, podcasts and photos">Playlists, podcasts and photos</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/playcounts-and-ratings.html
===================================================================
--- gtkpod/branches/upstream/current/doc/playcounts-and-ratings.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/playcounts-and-ratings.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,497 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Playcounts and ratings</title>
+<link rel="previous" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">
+<link rel="next" href="managing-playlists.html" title="Managing playlists">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></td>
+<td class="navbar-next"><a class="navbar-next" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li>
+<a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a><div class="autotoc"><ul>
+<li><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></li>
+<li><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></li>
+<li><a class="xref" href="view-and-edit-track-details.html" title="View and edit track details">View and edit track details</a></li>
+<li><a class="xref" href="cover-art.html" title="Cover art">Cover art</a></li>
+<li><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></li>
+<li><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></li>
+<li>Playcounts and ratings</li>
+</ul></div>
+</li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="playcounts-and-ratings"></a><div class="header"><h1 class="sect1 title"><span class="title">Playcounts and ratings</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+</ul>
+<p class="para block block-first">Whenever a track is played completely on the iPod (firmware version 1.3 or higher) a counter in the "Play Counts" file will be increased by one. The same file also contains the rating set with the 3rd generation (and later) iPods. This file appears to be deleted whenever the iPod resets itself, e.g. because the iPod is disconnected from the computer. Therefore, be careful! Charging the iPod seems to do no harm.
+            </p>
+<p class="para block">When gtkpod is started, it will also read this file and incorporate the information into the iTunesDB that can be written back to the iPod. There have been several requests to also register playcounts when playing a track on the local machine. This is possible by calling gtkpod as
+            </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">gtkpod -p &lt;filename&gt;</pre></div>
+<p class="para block">If gtkpod is already running, the playcount of that track there will be increased by one. If gtkpod is not already running, the playcount will be registered in ~/.gtkpod/offline_playcount. This file will be read the next time you import the iTunesDB from your iPod, and the playcounts will be updated accordingly.
+            </p>
+<p class="para block">Please note that if you start several instances of gtkpod, only the first instance will register playcounts through "gtkpod -p".
+            </p>
+<p class="para block">Now all that is required is to tell your favorite player to call gtkpod with the filename of the played track.
+            </p>
+<p class="para block">For xmms this is possible as of July 18th, 2004 (CVS version). Versions before that (including 1.2.10) only allow you to have an external program called at the beginning of a track. Our patch allows to have an external program called also at the end of a track.
+            </p>
+<p class="para block">In each case you will need to activate the "General Plugin" called "song_change" and configure it to call 'gtkpod -p "%f"'.
+            </p>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></td>
+<td class="navbar-next"><a class="navbar-next" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/playlists-podcasts-and-photos.html
===================================================================
--- gtkpod/branches/upstream/current/doc/playlists-podcasts-and-photos.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/playlists-podcasts-and-photos.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,558 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Playlists, podcasts and photos</title>
+<link rel="previous" href="managing-playlists.html" title="Managing playlists">
+<link rel="next" href="advanced-features.html" title="Advanced features">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></td>
+<td class="navbar-next"><a class="navbar-next" href="advanced-features.html" title="Advanced features">Advanced features</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li>
+<a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a><div class="autotoc"><ul><li>Playlists, podcasts and photos</li></ul></div>
+</li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="playlists-podcasts-and-photos"></a><div class="header"><h1 class="sect1 title"><span class="title">Playlists, podcasts and photos</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+</ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">3.1.1. </span><a class="xref" href="playlists-podcasts-and-photos.html#playlists-ppp" title="Playlists">Playlists</a>
+</li>
+<li>
+<span class="label">3.1.2. </span><a class="xref" href="playlists-podcasts-and-photos.html#podcasts" title="Podcasts">Podcasts</a>
+</li>
+<li>
+<span class="label">3.1.3. </span><a class="xref" href="playlists-podcasts-and-photos.html#photos" title="Photos">Photos</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="playlists-ppp"></a><div class="header"><h2 class="sect2 title"><span class="title"><span class="label">3.1.1. </span>Playlists</span></h2></div>
+<p class="para block block-first">Playlists reside under the iPod repository node in the left hand pane of gtkpod. Clicking on them will display the tracks associated with them, effectively filtering the other gtkpod panes. You can ...
+                </p>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">create playlists with the &lt;New Playlist&gt; button on the toolbar or pressing "Ctrl-n" in the playlist listview.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">create playlists by adding an existing playlist file with &lt;Add file&gt; or &lt;Add playlist&gt;.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">add tracks to playlists by marking the tracks you want to add, and then dragging them onto the playlist.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">rename playlists.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">delete playlists by selecting the desired playlist and pressing "Ctrl-D", or by selecting "Delete Playlist" from the Edit menu.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="podcasts"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="podcasts-title"></a><span class="label">3.1.2. </span>Podcasts</span></h2></div>
+<p class="para block block-first">
+                    You have to download podcasts using a third party tool like 
+                    <a class="ulink" href="http://linc.homeunix.org:8080/scripts/bashpodder/" title="http://linc.homeunix.org:8080/scripts/bashpodder/">http://linc.homeunix.org:8080/scripts/bashpodder/</a>
+                    or 
+                    <a class="ulink" href="http://perli.net/projekte/gpodder/%29" title="http://perli.net/projekte/gpodder/%29">http://perli.net/projekte/gpodder/%29</a>
+                    .
+                </p>
+<p class="para block">Podcasts should be added directly into the 'Podcasts' playlist of the iPod repository, for example by selecting the Podcasts playlist before manually adding files/directories. Podcasts will then appear only in the Podcasts section on the iPod. If you add podcasts to the main playlist 'gtkpod/iPod' or any other iPod playlist first and then drag them over to the Podcasts playlist, the podcasts will appear in the Podcasts section on the iPod, as well as in the normal music section.
+                </p>
+<p class="para block">The podcast 'repository' is a local repository (like 'Local') where you can keep all local podcasts. No mechanism exists to automatically synchronize the iPod repository with the Podcast repository at this time. You have to drag the podcasts over manually.
+                </p>
+</div>
+<div class="division sect2">
+<a name="photos"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="photos-title"></a><span class="label">3.1.3. </span>Photos</span></h2></div>
+<p class="para block block-first">
+                    If your ipod supports photos then a special dynamic playlist is created in the playlist tree. <span class="emphasis emphasis-bold">YOU CANNOT DELETE IT!</span> Indeed when clicking on it all the usual track related ipod functions are disabled or removed.
+                </p>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">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.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">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.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">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.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">Removing an image from the Photo Library will delete it completely from the ipod.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">You can select a set of images from a selected album (inc. the Photo Library) and drag n drop them into another album.
+                        </span>
+                    </li>
+<li>
+                        <span class="para">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.
+                        </span>
+                    </li>
+</ul></div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></td>
+<td class="navbar-next"><a class="navbar-next" href="advanced-features.html" title="Advanced features">Advanced features</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/setting-ipod-properties.html
===================================================================
--- gtkpod/branches/upstream/current/doc/setting-ipod-properties.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/setting-ipod-properties.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,654 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Setting iPod properties</title>
+<link rel="previous" href="hooking-up-the-ipod.html" title="Hooking up the iPod">
+<link rel="next" href="troubleshooting-faq.html" title="Troubleshooting FAQ">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></td>
+<td class="navbar-next"><a class="navbar-next" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li>
+<a class="xref" href="getting-started.html" title="Getting started">Getting started</a><div class="autotoc"><ul>
+<li><a class="xref" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></li>
+<li>Setting iPod properties</li>
+<li><a class="xref" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></li>
+<li><a class="xref" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></li>
+<li><a class="xref" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="setting-ipod-properties"></a><div class="header"><h1 class="sect1 title"><span class="title">Setting iPod properties</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="getting-started.html" title="Getting started">Getting started</a></li>
+</ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">1.2.1. </span><a class="xref" href="setting-ipod-properties.html#preferences-file" title="Preferences File">Preferences File</a>
+</li>
+<li>
+<span class="label">1.2.2. </span><a class="xref" href="setting-ipod-properties.html#changing-preferences" title="Changing Preferences">Changing Preferences</a>
+</li>
+<li>
+<span class="label">1.2.3. </span><a class="xref" href="setting-ipod-properties.html#duplicate-detection" title="Duplicate Detection">Duplicate Detection</a>
+</li>
+<li>
+<span class="label">1.2.4. </span><a class="xref" href="setting-ipod-properties.html#extended-information-file" title="Extended Information File">Extended Information File</a>
+</li>
+<li>
+<span class="label">1.2.5. </span><a class="xref" href="setting-ipod-properties.html#encoding-of-id-three-tags-op-charsets-cp" title="Encoding of ID3 tags (charsets)">Encoding of ID3 tags (charsets)</a>
+</li>
+<li>
+<span class="label">1.2.6. </span><a class="xref" href="setting-ipod-properties.html#extracting-tag-information-from-the-filename" title="Extracting tag information from the filename">Extracting tag information from the filename</a>
+</li>
+<li>
+<span class="label">1.2.7. </span><a class="xref" href="setting-ipod-properties.html#startup-and-shutdown-scripts" title="Startup and Shutdown Scripts">Startup and Shutdown Scripts</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="preferences-file"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="preferences-file-title"></a><span class="label">1.2.1. </span>Preferences File</span></h2></div>
+<p class="para block block-first">On startup gtkpod will read the preferences from ~/.gtkpod/prefs (or /etc/gtkpod/prefs if the former doesn't exist). The file is created if preferences are changed using the Preference window.
+                </p>
+</div>
+<div class="division sect2">
+<a name="changing-preferences"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="changing-preferences-title"></a><span class="label">1.2.2. </span>Changing Preferences</span></h2></div>
+<p class="para block block-first">Preferences can be changed by opending the Preference window. This is displayed by clicking on Edit &gt; Edit Preferences or hitting Ctrl+P.
+                </p>
+</div>
+<div class="division sect2">
+<a name="duplicate-detection"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="duplicate-detection-title"></a><span class="label">1.2.3. </span>Duplicate Detection</span></h2></div>
+<p class="para block block-first">You can instruct gtkpod (in the prefs window) to use file-size-dependent SHA1 checksums to prevent the same file from being copied to your iPod twice.
+                </p>
+<p class="para block">If a duplicate is detected, gtkpod will print out the the filenames of the duplicate files. If the filename of the already existing file is not available (it is not stored in the iTunes database, see "Extended Information File" below), other available information of the track is printed.
+                </p>
+</div>
+<div class="division sect2">
+<a name="extended-information-file"></a><div class="header"><h2 class="sect2 title"><span class="title"><span class="label">1.2.4. </span>Extended Information File</span></h2></div>
+<p class="para block block-first">Some (I believe) essential information is not stored in Apple's iTunes database. You can therefore instruct gtkpod to write an additional file (iTunesDB.ext) with extended information. For each track it stores
+                    <div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                            <span class="para">SHA1 hash
+                            </span>
+                        </li>
+<li>
+                            <span class="para">filename in the locale's encoding
+                            </span>
+                        </li>
+<li>
+                            <span class="para">filename in UTF8 encoding
+                            </span>
+                        </li>
+<li>
+                            <span class="para">hostname where the file was added (not used for anything yet)
+                            </span>
+                        </li>
+<li>
+                            <span class="para">filename of an associated converted file (for example an .mp3 for a .flac file)
+                            </span>
+                        </li>
+<li>
+                            <span class="para">if the file is present in the local database a reference to there
+                            </span>
+                        </li>
+<li>
+                            <span class="para">in order for playcounts to work on the local database as well
+                            </span>
+                        </li>
+<li>
+                            <span class="para">last modification time
+                            </span>
+                        </li>
+<li>
+                            <span class="para">the charset used for the file when adding it
+                            </span>
+                        </li>
+</ul></div>
+                </p>
+<p class="para block">
+                    Since the extended information file is only valid with the corresponding standard iTunes database, a checksum of the iTunes database is also stored in the extended information file. 
+                </p>
+<p class="para block">Using an extended information file will considerably speed up the import of an existing iTunes database when using duplicate detection,
+                    since the SHA1 checksums do not have to be re-calculated. 
+                </p>
+<p class="para block">Using an extended information file will also allow modification of ID3 tags in the track files after the initial import, because the full
+                    filenames are still available. 
+                </p>
+</div>
+<div class="division sect2">
+<a name="encoding-of-id-three-tags-op-charsets-cp"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="encoding-of-id-three-tags-op-charsets-cp-title"></a><span class="label">1.2.5. </span>Encoding of ID3 tags (charsets)</span></h2></div>
+<p class="para block block-first">If you use correctly written unicode ID3V2 tags you don't have to worry about the charset setting. Otherwise you must specify the charset to be used for representing ID3 tags in the preferences menu. The default is "System Charset", which is the charset associated with the locale gtkpod is running under. If your tags are stored in a different encoding, you should set it appropriately.
+                </p>
+<p class="para block">Please note that if necessary you can change the charset each time you add files or directories: the iTunesDB itself is using UTF16, so once tags are imported correctly, changing the charset has no influence.
+                </p>
+<p class="para block">If you chose "Japanese (automatic detection)", gtkpod will try to determine if the string is in ISO-2022-JP, Shift_JIS, or EUC-JP (Hankaku Katakana (1-byte Katakana) may not be recognized correctly -- specify the correct encoding if you run into this problem). The actual encoding used for the ID tags will be stored and will be used when writing tags or doing updates/syncs. Check the "Use selected charset also when updating or syncing tracks" and "Use selected charset when writing tags" options if you want to specify a particular character set when writing or updating/syncing. The default charset is "EUC-JP" -- it will be used when the charset cannot be autodetected, as well as when writing tags if a specific charset could not be determined before.
+                </p>
+<p class="para block">gtkpod will recognize ID3V2 tags encoded in unicode automatically and ignore your charset setting when necessary.
+                </p>
+</div>
+<div class="division sect2">
+<a name="extracting-tag-information-from-the-filename"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="extracting-tag-information-from-the-filename-title"></a><span class="label">1.2.6. </span>Extracting tag information from the filename</span></h2></div>
+<p class="para block block-first">Tags can also be extracted from the filename if you activate the option 'Use this template to parse filename for tag information' and supply a template that explains how the filenames are constructed.
+                </p>
+<p class="para block">For filenames like
+                    <span class="filename">code</span> 
+                    music/new/latin1/alan_jackson - drive/01 drive_for_daddy_gene.mp3 
+                    <span class="filename">code</span> 
+                    you could use 
+                    <span class="filename">code</span> 
+                    %a - %A/%T %*.mp3 
+                    <span class="filename">code</span> 
+                    to extract artist, album, track number and title. 
+                </p>
+<p class="para block">The following character sequences are supported:
+                    <div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                            <span class="para">%t: title
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%a: artist
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%A: album
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%c: composer
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%t: title
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%g: genre
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%T: track number
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%C: CD number
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%*: placeholder, ignore data
+                            </span>
+                        </li>
+<li>
+                            <span class="para">%%: the character '%'
+                            </span>
+                        </li>
+</ul></div>
+                </p>
+<p class="para block">
+                    You cannot supply a template like "%a%t.mp3" because gtkpod would not know how to separate artist and title. "%a_%t.mp3" would be correct, if artist and title are separated by an underscore. You can also omit the trailing ".mp3" if you want the template to apply to all files instead of only to mp3 files. 
+                </p>
+</div>
+<div class="division sect2">
+<a name="startup-and-shutdown-scripts"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="startup-and-shutdown-scripts-title"></a><span class="label">1.2.7. </span>Startup and Shutdown Scripts</span></h2></div>
+<p class="para block block-first">During startup and after reading the preferences file, gtkpod will try to execute
+                    <div class=" block programlisting block-indent block-first"><pre class="programlisting">~/.gtkpod/gtkpod.in or /etc/gtkpod/gtkpod.in</pre></div> 
+                    Just before exiting the program, gtkpod will try to execute 
+                    <div class=" block programlisting block-indent"><pre class="programlisting">~/.gtkpod/gtkpod.out or /etc/gtkpod/gtkpod.out</pre></div> 
+                    Thus, extra arguments can be entered into these scripts and gtkpod will run them. An example of this could be uploading data to last.fm. 
+                </p>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></td>
+<td class="navbar-next"><a class="navbar-next" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/the-sysinfo-file.html
===================================================================
--- gtkpod/branches/upstream/current/doc/the-sysinfo-file.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/the-sysinfo-file.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,614 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>The sysinfo file</title>
+<link rel="previous" href="troubleshooting-faq.html" title="Troubleshooting FAQ">
+<link rel="next" href="ipod-file-recovery.html" title="iPod file recovery">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></td>
+<td class="navbar-next"><a class="navbar-next" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li>
+<a class="xref" href="getting-started.html" title="Getting started">Getting started</a><div class="autotoc"><ul>
+<li><a class="xref" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></li>
+<li><a class="xref" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></li>
+<li><a class="xref" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></li>
+<li>The sysinfo file</li>
+<li><a class="xref" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="the-sysinfo-file"></a><div class="header"><h1 class="sect1 title"><span class="title">The sysinfo file</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="getting-started.html" title="Getting started">Getting started</a></li>
+</ul>
+<p class="para block block-first">Starting with the 2007 generation of iPods, libgpod needs an additional configuration step to correctly modify the iPod content. libgpod
+                needs to know the so-called iPod "firewire id", otherwise the iPod won't recognize what libgpod wrote to it and will behave as if it's empty. 
+            </p>
+<div class="autotoc"><ul>
+<li>
+<span class="label">1.4.1. </span><a class="xref" href="the-sysinfo-file.html#the-iphone-and-itouch" title="The iPhone and iTouch">The iPhone and iTouch</a>
+</li>
+<li>
+<span class="label">1.4.2. </span><a class="xref" href="the-sysinfo-file.html#the-classic-and-nano-three-g" title="The Classic and Nano3g">The Classic and Nano3g</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="the-iphone-and-itouch"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="the-iphone-and-itouch-title"></a><span class="label">1.4.1. </span>The iPhone and iTouch</span></h2></div>
+<div class="autotoc"><ul>
+<li>
+<span class="label">1.4.1.1. </span><a class="xref" href="the-sysinfo-file.html#global-assumptions-and-scope-of-this-tutorial" title="Global Assumptions and Scope of this Tutorial">Global Assumptions and Scope of this Tutorial</a>
+</li>
+<li>
+<span class="label">1.4.1.2. </span><a class="xref" href="the-sysinfo-file.html#compiling-libgpod-and-gtkpod-op-subversion-versions-cp" title="Compiling libgpod &amp; gtkpod (subversion versions)">Compiling libgpod &amp; gtkpod (subversion versions)</a>
+</li>
+<li>
+<span class="label">1.4.1.3. </span><a class="xref" href="the-sysinfo-file.html#determining-the-firewire-guid" title="Determining the Firewire GUID">Determining the Firewire GUID</a>
+</li>
+<li>
+<span class="label">1.4.1.4. </span><a class="xref" href="the-sysinfo-file.html#making-libgpod-aware-of-the-firewire-guid" title="Making libgpod Aware of the Firewire GUID">Making libgpod Aware of the Firewire GUID</a>
+</li>
+<li>
+<span class="label">1.4.1.5. </span><a class="xref" href="the-sysinfo-file.html#gtkpod-revisited" title="gtkpod Revisited">gtkpod Revisited</a>
+</li>
+</ul></div>
+<div class="division sect3">
+<a name="global-assumptions-and-scope-of-this-tutorial"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="global-assumptions-and-scope-of-this-tutorial-title"></a><span class="label">1.4.1.1. </span>Global Assumptions and Scope of this Tutorial</span></h3></div>
+<p class="para block block-first">touch_ip -- denotes the IP address that is assigned to your iPod Touch
+                        (e.g. 192.168.0.27). 
+                    </p>
+<p class="para block">touch_mnt -- denotes the mount point to your iPod Touch (i.e. the
+                        directory the iPod is mounted on). 
+                    </p>
+<p class="para block">To make effective use of the following you have to jailbreak your iPod Touch first (in order to access it via SSH). This document won't go into detail on this topic. One possibility to do this using a computer that runs Microsoft Windows (XP) can be found at:
+                    </p>
+<p class="para block">http://iphone.cricblogs.com/one-click-ipod-touch-jailbreak-for-windows-by-msbasher/
+                    </p>
+</div>
+<div class="division sect3">
+<a name="compiling-libgpod-and-gtkpod-op-subversion-versions-cp"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="compiling-libgpod-and-gtkpod-op-subversion-versions-cp-title"></a><span class="label">1.4.1.2. </span>Compiling libgpod &amp; gtkpod (subversion versions)</span></h3></div>
+<p class="para block block-first">
+                        Install and compile libgpod and gtkpod from subversion. See <span class="filename">Compiling and Installing|here</span> for details.
+                    </p>
+<p class="para block">Configure libgpod. The '--prefix' option will make sure that is not installed globally but locally within your home directory (note: replace '~' by the absolute path to your home directory):
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">~/libgpod$ ./autogen.sh --prefix=~/local
+                    </pre></div>
+<p class="para block">Otherwise make sure all dependencies are met ('gtk-doc' is a candidate likely to be missing, proper version of automake is another).
+                    </p>
+<p class="para block">Repeat this process for gtkpod ('PKG_CONFIG_PATH' make sure it builds on the freshly compiled version of libgpod; again, replace '~' by absolute path to your home directory):
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">~/gtkpod$ PKG_CONFIG_PATH=~/local/lib/pkgconfig ./autogen.sh --prefix=~/local
+                    </pre></div>
+<div class=" block programlisting block-indent"><pre class="programlisting">~/gtkpod$ make &amp;&amp; make install
+                    </pre></div>
+<p class="para block">Assuming that everything went well you should be able to start gtkpod:
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">~$ LD_LIBRARY_PATH=~/local/lib ~/local/bin/gtkpod
+                    </pre></div>
+<p class="para block">You won't be able to fully use it at this point so close it for now.
+                    </p>
+</div>
+<div class="division sect3">
+<a name="determining-the-firewire-guid"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="determining-the-firewire-guid-title"></a><span class="label">1.4.1.3. </span>Determining the Firewire GUID</span></h3></div>
+<p class="para block block-first">Connect your iPod Touch via USB (to your Linux machine) and issue the command:
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">sudo lsusb -v | grep -i iSerial
+                    </pre></div>
+<p class="para block">This should print something similar to this:
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">iSerial 3 fd98145617c113dc15ab151601001ff12354b139
+[ ... ] 
+                    </pre></div>
+<p class="para block">The first 16 characters constitute the FirewireGUID, i.e. in this example the FwGUID is:
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">fd98 1456 17c1 13dc
+                    </pre></div>
+</div>
+<div class="division sect3">
+<a name="making-libgpod-aware-of-the-firewire-guid"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="making-libgpod-aware-of-the-firewire-guid-title"></a><span class="label">1.4.1.4. </span>Making libgpod Aware of the Firewire GUID</span></h3></div>
+<p class="para block block-first">Mount your iPod Touch via:
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">sudo sshfs root at touch_ip:Media touch_mnt/ -o allow_other
+                    </pre></div>
+<p class="para block">Go to the directory 'iTunes_Control' and create (if it does not already exist) a directory named 'Device':
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">~/touch_mnt/iTunesControl$ mkdir Device; cd Device
+~/touch_mnt/iTunesControl/Device$ echo "FirewireGuid: 0xfd98145617c113dc" &gt; SysInfo 
+                    </pre></div>
+<p class="para block">Test if libgpod is able to retrieve the FWGUID by changing into the 'tests' subdirectory of libgpod's source directory and runnning:
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">./test-firewire-id touch_mnt/
+                    </pre></div>
+</div>
+<div class="division sect3">
+<a name="gtkpod-revisited"></a><div class="header"><h3 class="sect3 title"><span class="title"><a name="gtkpod-revisited-title"></a><span class="label">1.4.1.5. </span>gtkpod Revisited</span></h3></div>
+<p class="para block block-first">With your iPod Touch still mounted start up gtkpod once more:
+                    </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">~$ LD_LIBRARY_PATH=~/local/lib ~/local/bin/gtkpod
+                    </pre></div>
+<p class="para block">You should now be able to sync songs to your iPod Touch. After syncing is complete go into "Music" on your iPod Touch: The songs you have just synced won't show up at this point. To make them appear press and hold the "Home"-Button until the springboard is reloaded. Going to "Music" now will show your music.
+                    </p>
+<p class="para block">Don't forget to unmount it after you're completely done.
+                    </p>
+<p class="para block">Tutorial compiled by staciemonroe (tobias kreisel gmail com)
+                    </p>
+</div>
+</div>
+<div class="division sect2">
+<a name="the-classic-and-nano-three-g"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="the-classic-and-nano-three-g-title"></a><span class="label">1.4.2. </span>The Classic and Nano3g</span></h2></div>
+<p class="para block block-first">There are two ways to set up the iPod to make libgpod able to find its firewire id.
+                </p>
+<p class="para block">The 1st one is mostly automated. First, make sure you have libsgutils installed before running configure/autogen.sh. If you built libgpod without it, install it and run configure/make/make install. You should now have an ipod-read-sysinfo-extended tool available. Run it with the iPod device path (eg /dev/sda) and the iPod mount point (eg /mnt/ipod) as arguments. This may require root privileges. ipod-read-sysinfo-extended will read an XMLfile from the iPod and write it as /mnt/ipod/iPod_Control/Device/SysInfoExtended. See http://ipodlinux.org/Device_Information for more details about the method used.
+                </p>
+<p class="para block">Having that file is enough for libgpod to figure out the iPod firewire id.
+                </p>
+<p class="para block">The 2nd method requires more manual intervention. First, you need to get your firewire id manually. To do that, run "sudo lsusb -v | grep -i Serial" (without the "") with your iPod plugged in, this should print a 16 character long string like 00A1234567891231. For an iPod Touch, this number will be much longer than 16 characters, the firewire ID is constituted by the first 16 characters. Once you have that number, create/edit /mnt/ipod/iPod_Control/Device/SysInfo (if your iPod is mounted at /mnt/ipod). Add to that file the line below:
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">FirewireGuid: 0xffffffffffffffff
+                </pre></div>
+<p class="para block">(replace ffffffffffffffff with the string you obtained at the previous step and don't forget the trailing 0x before the string)
+                </p>
+<p class="para block">Save that file, and you should be all set. Be careful when using apps which lets you manually specify which iPod model you own, they may overwrite that file when you do that. So if after doing that libgpod still seems to write invalid content to the iPod, double-check the content of that SysInfo file to make sure the FirewireGuid line you added isn't gone. If that happens, read it to the end of the file, and make sure libgpod rewrite the iPod content.
+                </p>
+<p class="para block">Once that is done, if you compiled libgpod from source, you can test that libgpod can find the firewire ID on your iPod by running
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">libgpod/tests/test-firewire-id /ipod/mount/point
+                </pre></div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="troubleshooting-faq.html" title="Troubleshooting FAQ">Troubleshooting FAQ</a></td>
+<td class="navbar-next"><a class="navbar-next" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/troubleshooting-faq.html
===================================================================
--- gtkpod/branches/upstream/current/doc/troubleshooting-faq.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/troubleshooting-faq.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,703 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Troubleshooting FAQ</title>
+<link rel="previous" href="setting-ipod-properties.html" title="Setting iPod properties">
+<link rel="next" href="the-sysinfo-file.html" title="The sysinfo file">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></td>
+<td class="navbar-next"><a class="navbar-next" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li>
+<a class="xref" href="getting-started.html" title="Getting started">Getting started</a><div class="autotoc"><ul>
+<li><a class="xref" href="hooking-up-the-ipod.html" title="Hooking up the iPod">Hooking up the iPod</a></li>
+<li><a class="xref" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></li>
+<li>Troubleshooting FAQ</li>
+<li><a class="xref" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></li>
+<li><a class="xref" href="ipod-file-recovery.html" title="iPod file recovery">iPod file recovery</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="troubleshooting-faq"></a><div class="header"><h1 class="sect1 title"><span class="title">Troubleshooting FAQ</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="getting-started.html" title="Getting started">Getting started</a></li>
+</ul>
+<div class="autotoc"><ul><li>
+<span class="label">1.3.1. </span><a class="xref" href="troubleshooting-faq.html#contents:" title="Contents:">Contents:</a>
+</li></ul></div>
+<div class="division sect2">
+<a name="contents:"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="contents:-title"></a><span class="label">1.3.1. </span>Contents:</span></h2></div>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <p class="para block block-first">My iPhone or iTouch doesnt have a USB connection. How can I mount it on my linux box?
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">My iPod is an iPhone, iTouch, Classic or nano3g. My tunes show up in gtkpod but I see nothing on the iPod when I eject?
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Installed libmp4v2 or libgpod from source to /usr/local/lib, but gtkpod is unable to locate libmp4.so.0 or libgpod.so.0
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Files copied to gtkpod but they don't appear in the database (0.80, Tony Williams)
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Filenames on the iPod appear in DOS 8.3 format and syncing to the iPod is not working as expected.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">./autogen.sh does not work
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">The following error message is displayed when accessing the device (Markus Gaugusch, Justin Thiessen):
+                        </p>
+                        <div class=" block programlisting block-indent"><pre class="programlisting">** ieee1394: sbp2: aborting sbp2 command
+** Test Unit Ready 00 00 00 00 00
+                        </pre></div>
+                    </li>
+<li>
+                        <p class="para block block-first">The following error message is displayed when accessing the device (Ingo Reimann)
+                        </p>
+                        <div class=" block programlisting block-indent"><pre class="programlisting">** usb-storage: Attempting to get CSW...
+** usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes
+** usb-storage: Status code -75; transferred 0/13
+
+                        </pre></div>
+                    </li>
+<li>
+                        <p class="para block block-first">When connecting an iPod via USB to a 2.6 kernel machine the iPod will be recognized but not work correctly. In /var/log/messages you'll see the a bunch of "Buffer I/O error on device sd?" when connecting the iPod (Jonas Bergler, Kevin Venkiteswaran)
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">SHUFFLE won't play music after reformatting (Mark Davis)
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Calendar entries mixed up
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">m4a files created by faac cannot be added by gtkpod (gentoo)
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">gtkpod crashes when reading the iTunesDB (Fedora)
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Problems connecting the iPod to Solaris/SPARC
+                        </p>
+                    </li>
+</ul></div>
+<p class="para block">My iPhone or iTouch doesnt have a USB connection. How can I mount it on my linux box?
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">The iPhone or iTouch, at present has to be mounted using sshfs.
+                </p>
+<p class="para block">My iPod is an iPhone, iTouch, Classic or Nano3g. My tunes show up in gtkpod but I see nothing on the iPod when I eject?
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">This is to do with requiring your iPod model number in a sysinfo file located on the iPod. Please see here for details.
+                </p>
+<p class="para block">Installed libmp4v2 or libgpod from source to /usr/local/lib, but gtkpod is unable to locate libmp4.so.0 or libgpod.so.0?
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">If you install to /usr/local/lib please don't forget to add the path to LD_LIBRARY_PATH:
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+export LD_LIBRARY_PATH
+                </pre></div>
+<p class="para block">You can add those lines to your ~/.bashrc or add it globally to
+                    /etc/profile. 
+                </p>
+<p class="para block">Files copied to gtkpod but they don't appear in the database (0.80, Tony Williams)?
+                </p>
+<p class="para block">I'm having a problem that I wonder if you've seen. I've setup gtkpod. launch it and add files. I can hear the ipod harddrive spin up. If I go onto the ipod directly I can see the space being used and can even see the new files on the ipod. However the ipod interface doesn't show the new files and gtkpod keeps telling me that there are orphaned files.
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">I finally figured out the problem. In my fstab I had the filesystem set to 'auto' and it was mounting as msdos instead of vfat. I specified vfat in fstab and voila! I'm a happy happy man.
+                </p>
+<p class="para block">Filenames on the iPod appear in DOS 8.3 format and syncing to the iPod is not working as expected?
+                </p>
+<p class="para block">Solution:
+                    You need to specify "vfat" as file system type. How to do that depends on which way you use to mount the iPod -- see the README file for more details. 
+                </p>
+<p class="para block">./autogen.sh does not work?
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">A ubuntu user has reported that he had to set
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">ACLOCAL_FLAGS=" -I /usr/share/aclocal/"
+                </pre></div>
+<p class="para block">in order to get ./autogen.sh to work.
+                </p>
+<p class="para block">The following error message is displayed when accessing the device:
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">ieee1394: sbp2: aborting sbp2 command
+Test Unit Ready 00 00 00 00 00 
+                </pre></div>
+<p class="para block">Solution:
+                </p>
+<p class="para block">(Markus Gaugusch):
+                    It is possible that hotplug and the "sg" support are not working well together. Try disabling "sg" support in the kernel configuration or 
+                    unload the "sg" module if you are using modules. 
+                </p>
+<p class="para block">(Justin Thiessen):
+                    Forcing the sbp2 module to serialized I/O seems (so far) to have solved the problem. 
+                </p>
+<p class="para block">Ref.:
+                    <div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                            http://www.netzwerk-aktiv.com/pub/doc/newsletters/linux1394-user/html/1676.html 
+                        </li>
+<li>
+                            http://www.ubuntuforums.org/printthread.php?t=6678 
+                        </li>
+<li>
+                            http://66.102.7.104/search?q=cache:Xh_gu43y6w8J:themikecam.com/newmikecam/blog/index.php/geek/2005/+ipod+serialize_io&amp;hl=en 
+                        </li>
+</ul></div>
+                </p>
+<p class="para block">Looks like the driver is going to be set to default to serialized I/O in kernel 2.6.14, anyways.
+                </p>
+<p class="para block">http://linuxtoday.com/developer/2005093001026NWKNDV
+                </p>
+<p class="para block">The following error message is displayed when accessing the device
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">                    usb-storage: Attempting to get CSW...
+usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes 
+usb-storage: Status code -75; transferred 0/13 
+                </pre></div>
+<p class="para block">Solution (by Ingo Reimann):
+                </p>
+<p class="para block">I tried to use an iPod Mini with my nforce2-Board, kernel 2.6.14/2.6.15 debian sid and got messages like [above] in dmesg. /dev/sda appeared, but fdisk -l did not show anything
+                </p>
+<p class="para block">The solution, that i found in a discussion on http://kerneltrap.org/node/3844 was to unload ehci_hcd.
+                </p>
+<p class="para block">When connecting an iPod via USB to a 2.6 kernel machine the iPod wil be recognized but not work correctly. In /var/log/messages you'll see the a bunch of "Buffer I/O error on device sd?" when connecting the iPod (Jonas Bergler, Kevin Venkiteswaran)
+                </p>
+<p class="para block">Solution (by "jeffmock"):
+                </p>
+<p class="para block">Disable CONFIG_EFI_PARTITION (File Systems -&gt; Partition Types -&gt; Advanced Partition Selection -&gt; EFI GUID Partition support) in your kernel configuration, recompile.
+                    Details can be found at http://www.linuxquestions.org/questions/showthread.php?postid=1197015#post1197015 
+                </p>
+<p class="para block">Excerpt:
+                </p>
+<p class="para block">"This problem could potentially happen with both 2.4 and 2.6 kernels."
+                </p>
+<p class="para block">A longer story follows and perhaps someone can come up with a more sensible solution for the long run.
+                </p>
+<p class="para block">The iPod looks like a removable disk drive to the host computer. When it is attached to the computer, the mini iPod reports a capacity of 7999488 512-byte sectors (or about 4GB). This turns out to be wrong for whatever reason. The mini iPod only really has 7999376 sectors and it exaggerates by 112 sectors. The other quality of the iPod is that if the computer attempts to read a sector greater than the actual capacity but less than the reported capacity, the iPod will dutifully report an I/O error, but it won't respond to any future requests until you unplug/plug the iPod."
+                </p>
+<p class="para block">I followed the kernel recompile instructions for distro, disabled only the CONFIG_EFI_PARTITION option, and things ran perfectly for me afterwards. As indicated above, hopefully a better long-term solution will emerge soon."
+                </p>
+<p class="para block">(Jorg Schuler: it seems a patch was introduced in kernel version 2.6.10: "&lt;phil at ipom.com&gt; [PATCH] USB Storage: Add unusual_devs entry for iPod This patch adds an unusual_devs.h entry for the Apple iPod as it reports one too many sectors. The patch was submitted by Avi Kivity &lt;avi at argo.co.il&gt; and re-diffed by me.")
+                </p>
+<p class="para block">SHUFFLE won't play music after reformatting
+                </p>
+<p class="para block">Solution (by Mark Davis):
+                </p>
+<p class="para block">The SHUFFLE seems to care about the volume name which has to be "IPOD". Try to format as (replace /dev/sda1 with the appropriate device file for your SHUFFLE!):
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">mkdosfs -F32 -n IPOD /dev/sda1
+                </pre></div>
+<p class="para block">Calendar entries mixed up?
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">The iPod does not appear to like times specified in UTC (indicated by a trailing 'Z'). KOrganizer seems to do this. If you know how to work around it let me know.
+                </p>
+<p class="para block">m4a files created by faac cannot be added by gtkpod (gentoo)?
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">There appear to be some versions of faac that do not create 'good' m4a files. The problem could be solved under gentoo by using version 1.24.
+                    In order to make error tracking easier, more detailled error messages are displayed when tracks could not be added for any reason starting with version 0.91-CVS of gtkpod. 
+                </p>
+<p class="para block">gtkpod crashes when reading the iTunesDB (Fedora)
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">It appears that crashes were observed with kernel version 2.6.11-1.35_FC3. An upgrade to 2.6.12-1.1376_FC3 got rid of the problem. This was with gtkpod-0.94.0 and Athlon64 3000+.
+                </p>
+<p class="para block">After updating the firmware of a 1st-gen iPod nano**, crashes are also observed with Fedora Core 5, kernel 2.6.20-1.2320.fc5, gtkpod 0.99.4 (which worked with the previous firmware). Downloading, building, and installing gtkpod 0.99.10 and libgpod 0.6.0 solved the problem.
+                </p>
+<p class="para block">Problems connecting the iPod to Solaris/SPARC
+                </p>
+<p class="para block">Solution:
+                </p>
+<p class="para block">Current (as of 2006/03/30) versions of the Solaris pcfs SPARC driver have a bug where the correct filesystem/partition layout may not be
+                    recognized, and this is true for iPods. This prevents the iPod partition from being mounted on Solaris SPARC. In order to work 
+                    around this, one must prevent pcfs from detecting the first FAT32 filesystem, forcing it to move on to the second one. This can be done 
+                    by changing the filesystem identifier like so: 
+                </p>
+<div class=" block programlisting block-indent"><pre class="programlisting">                    # dd if=/dev/rdsk/c3t0d0s2 of=/tmp/ipod.orig count=1
+# cp /tmp/ipod.orig /tmp/ipod.modified &lt;edit /tmp/ipod.modified and change the first occurance of "FAT32" (at offset 0x52 for me) to something else like "CAT32"&gt;
+# dd if=/tmp/ipod.modified of=/dev/rdsk/c3t0d0s2 count=1
+                </pre></div>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="setting-ipod-properties.html" title="Setting iPod properties">Setting iPod properties</a></td>
+<td class="navbar-next"><a class="navbar-next" href="the-sysinfo-file.html" title="The sysinfo file">The sysinfo file</a></td>
+</tr></table></div>
+</body>
+</html>

Added: gtkpod/branches/upstream/current/doc/view-and-edit-track-details.html
===================================================================
--- gtkpod/branches/upstream/current/doc/view-and-edit-track-details.html	                        (rev 0)
+++ gtkpod/branches/upstream/current/doc/view-and-edit-track-details.html	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,579 @@
+<html xmlns:set="http://exslt.org/sets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>View and edit track details</title>
+<link rel="previous" href="adding-files-and-folders.html" title="Adding files and folders">
+<link rel="next" href="cover-art.html" title="Cover art">
+<link rel="top" href="gtkpod.html" title="The gtkpod Manual">
+<style type="text/css">
+
+html { height: 100%; }
+body {
+  margin: 0px; padding: 12px;
+  background-color: #f9f9f6;
+  min-height: 100%;
+  direction: ltr;
+}
+div, p, pre, blockquote { margin: 0; padding: 0; }
+p img { vertical-align: middle; }
+sub { font-size: 0.83em; }
+sub sub { font-size: 1em; }
+sup { font-size: 0.83em; }
+sup sup { font-size: 1em; }
+table { border-collapse: collapse; }
+table.table-pgwide { width: 100%; }
+td { vertical-align: top; }
+td { padding: 0.2em 0.83em 0.2em 0.83em; }
+th { padding: 0 0.83em 0 0.83em; }
+tr.tr-shade {
+  background-color: #f9f9f6;
+}
+td.td-colsep { border-right: solid 1px; }
+td.td-rowsep { border-bottom: solid 1px; }
+thead { border-top: solid 2px; border-bottom: solid 2px; }
+tfoot { border-top: solid 2px; border-bottom: solid 2px; }
+div.body {
+  padding: 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.body-sidebar {
+  
+  margin-right: 13em;
+}
+div.division div.division { margin-top: 1.72em; }
+div.division div.division div.division { margin-top: 1.44em; }
+div.header {
+  margin: 0;
+  color: #3f3f3f;
+  border-bottom: solid 1px #e0e0df;
+}
+h1, h2, h3, h4, h5, h6, h7 {
+  margin: 0; padding: 0;
+  color: #3f3f3f;
+}
+h1.title { font-size: 1.72em; }
+h2.title { font-size: 1.44em; }
+h3.title { font-size: 1.2em; }
+h4.title, h5.title, h6.title, h7.title { font-size: 1em; }
+.block { margin-top: 1em; }
+.block .block-first { margin-top: 0; }
+.block-indent {
+  
+  margin-left: 1.72em;
+  
+  margin-right: 1em;
+}
+.block-indent .block-indent { margin-left: 0em; margin-right: 0em; }
+td .block-indent  { margin-left: 0em; margin-right: 0em; }
+dd .block-indent  { margin-left: 0em; margin-right: 0em; }
+.block-verbatim { white-space: pre; }
+div.title {
+  margin-bottom: 0.2em;
+  font-weight: bold;
+  color: #3f3f3f;
+}
+div.title-formal { padding-left: 0.2em; padding-right: 0.2em; }
+div.title-formal .label { font-weight: normal; }
+a {
+  color: #1f609f;
+  text-decoration: none;
+}
+a:hover { text-decoration: underline; }
+a:visited { color: #9f1f6f; }
+ul, ol, dl { margin: 0; padding: 0; }
+li {
+  margin-top: 1em;
+  
+  margin-left: 2.4em;
+  
+  padding: 0;
+}
+li.li-first { margin-top: 0; }
+dt { margin: 1em 0 0 0; }
+dt.dt-first { margin: 0; }
+dd {
+  
+  margin-left: 1.72em;
+  margin-top: 0.5em;
+}
+dl.dl-compact dt { margin-top: 0; }
+dl.dl-compact dd { margin-top: 0; margin-bottom: 0; }
+
+
+ul.linktrail {
+  display: block;
+  margin: 0.2em 0 0 0;
+  
+  text-align: right;
+}
+li.linktrail { display: inline; margin: 0; padding: 0; }
+
+li.linktrail::before {
+  content: '  /  ';
+  color: #3f3f3f;
+}
+
+li.linktrail-first::before, li.linktrail-only::before { content: ''; }
+
+
+div.navbar {
+  padding: 0.5em 1em 0.5em 1em;
+  max-width: 60em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.navbar-top { margin-bottom: 1em; }
+div.navbar-bottom { margin-top: 1em; clear: both; }
+div.navbar img { border: 0; vertical-align: -0.4em; }
+table.navbar { width: 100%; margin: 0; border: none; }
+table.navbar td { padding: 0; border: none; }
+td.navbar-next {
+  
+  text-align: right;
+}
+a.navbar-prev::before {
+  
+  content: '◀  ';
+  color: #3f3f3f;
+}
+a.navbar-next::after {
+  
+  content: '  ▶';
+  color: #3f3f3f;
+}
+
+
+div.sidebar {
+  
+  float: right;
+  padding: 0; margin: 0; width: 12em;
+}
+div.sidenav {
+  padding: 0.5em 1em 0 1em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.sidenav div.autotoc {
+  background-color: #ffffff;
+  border: none; padding: 0; margin: 0;
+}
+div.sidenav div.autotoc div.autotoc { margin-top: 0.5em; }
+div.sidenav div.autotoc li { margin-bottom: 0.5em; }
+div.sidenav div.autotoc div.autotoc div.autotoc {
+  
+  margin-left: 1em;
+  margin-top: 0;
+}
+div.sidenav div.autotoc div.autotoc div.autotoc li { margin-bottom: 0; }
+
+
+div.autotoc {
+  
+  display: table;
+  margin-top: 1em;
+  
+  margin-left: 1.72em;
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: #f0f9ff;
+  border: solid 1px #c0c9ff;
+}
+div.autotoc ul { margin: 0; padding: 0; }
+div.autotoc li { list-style-type: none; margin: 0; }
+div.autotoc div.autotoc-title { margin-bottom: 0.5em; }
+div.autotoc div.autotoc { border: none; padding: 0; margin-top: 0; margin-bottom: 0.5em; }
+div.autotoc div.autotoc div.autotoc { margin-bottom: 0; }
+
+
+span.bibliolabel {
+  color: #3f3f3f;
+}
+
+
+div.admonition {
+  padding: 0.5em 1em 0.5em 1em;
+  
+  padding-left: 60px;
+  min-height: 48px;
+  border: solid 1px #e0e0df;
+  background-color: #fffff0;
+  
+  background-position: 6px 0.5em;
+  background-repeat: no-repeat;
+}
+div.caution {
+  background-image: url("admon-caution.png");
+}
+div.important {
+  background-image: url("admon-important.png");
+}
+div.note {
+  background-image: url("admon-note.png");
+}
+div.note-bug {
+  background-image: url("admon-bug.png");
+}
+div.tip {
+  background-image: url("admon-tip.png");
+}
+div.warning {
+  background-image: url("admon-warning.png");
+}
+div.blockquote {
+  
+  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-repeat: no-repeat;
+  
+  background-position: top left;
+  padding: 0.5em;
+  
+  padding-left: 4em;
+}
+div.attribution {
+  margin-top: 0.5em;
+  color: #3f3f3f;
+}
+div.attribution::before {
+  
+  content: '― ';
+}
+div.epigraph {
+  
+  text-align: right;
+  
+  margin-left: 20%;
+  
+  margin-right: 0;
+  color: #3f3f3f;
+}
+div.figure, div.informalfigure {
+  
+  display: table;
+  padding: 0.5em;
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.figure-inner, div.informalfigure-inner {
+  padding: 0.5em;
+  background-color: #ffffff;
+  border: solid 1px #e0e0df;
+}
+div.caption { margin-top: 0.5em; }
+div.programlisting {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border: solid 1px #e0e0df;
+}
+div.screen .prompt {
+  color: #3f3f3f;
+}
+div.screen .userinput {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+pre.linenumbering {
+  color: #3f3f3f;
+  margin: 0;
+  
+  padding-right: 1em;
+  
+  float: left;
+  
+  text-align: right;
+}
+
+
+
+dl.index dt { margin-top: 0; }
+dl.index dd { margin-top: 0; margin-bottom: 0; }
+dl.indexdiv dt { margin-top: 0; }
+dl.indexdiv dd { margin-top: 0; margin-bottom: 0; }
+dl.setindex dt { margin-top: 0; }
+dl.setindex dd { margin-top: 0; margin-bottom: 0; }
+div.list div.title-formal span.title {
+  border-bottom: solid 1px #e0e0df;
+}
+div.simplelist {
+  
+  margin-left: 1.72em;
+}
+div.simplelist table { margin-left: 0; border: none; }
+div.simplelist td {
+  padding: 0.5em;
+  border-left: solid 1px #e0e0df;
+}
+div.simplelist td.td-first {
+  
+  padding-left: 0;
+  
+  border-left: 0;
+}
+div.synopsis {
+  padding: 0.5em;
+  
+  background-color: #f9f9f6;
+  border-top: solid 2px #c0c9ff;
+  border-bottom: solid 2px #c0c9ff;
+}
+div.synopsis div.synopsis {
+  padding: 0;
+  border: none;
+}
+div.synopsis div.block { margin-top: 0.2em; }
+div.synopsis div.block-first { margin-top: 0; }
+
+
+span.accel { text-decoration: underline; }
+span.acronym { font-family: sans-serif; }
+span.application { font-style: italic; }
+span.classname, span.exceptionname, span.interfacename { font-family: monospace; }
+span.code {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.code { border: none; padding: 0; }
+span.command {
+  font-family: monospace;
+  border: solid 1px #e0e0df;
+  
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+pre span.command { border: none; padding: 0; }
+span.computeroutput { font-family: monospace; }
+
+span.constant { font-family: monospace; }
+span.database { font-family: monospace; }
+span.email { font-family: monospace; }
+span.emphasis { font-style: italic; }
+span.emphasis-bold { font-style: normal; font-weight: bold; }
+span.envar { font-family: monospace; }
+
+span.filename { font-family: monospace; }
+span.firstterm { font-style: italic; }
+span.foreignphrase { font-style: italic; }
+span.function { font-family: monospace; }
+
+dt.glossterm span.glossterm { font-style: normal; }
+
+
+span.glossterm { font-style: italic; }
+
+span.guibutton, span.guilabel, span.guimenu, span.guimenuitem, span.guisubmenu, span.interface {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.keycap {
+  font-weight: bold;
+  color: #3f3f3f;
+}
+span.lineannotation { font-style: italic; }
+span.literal { font-family: monospace; }
+span.markup  { font-family: monospace; }
+span.medialabel { font-style: italic; }
+span.methodname { font-family: monospace; }
+span.ooclass, span.ooexception, span.oointerface { font-family: monospace; }
+span.option { font-family: monospace; }
+span.parameter { font-family: monospace; }
+span.paramdef span.parameter { font-style: italic; }
+span.prompt { font-family: monospace; }
+span.property { font-family: monospace; }
+span.replaceable  { font-style: italic; }
+span.returnvalue { font-family: monospace; }
+span.sgmltag { font-family: monospace; }
+span.structfield, span.structname { font-family: monospace; }
+span.symbol { font-family: monospace; }
+span.systemitem { font-family: monospace; }
+span.token { font-family: monospace; }
+span.type { font-family: monospace; }
+span.uri { font-family: monospace; }
+span.userinput { font-family: monospace; }
+span.varname { font-family: monospace; }
+span.wordasword { font-style: italic; }
+
+
+
+div.footnotes { font-style: italic; font-size: 0.8em; }
+div.footnote { margin-top: 1.44em; }
+span.footnote-number { display: inline; padding-right: 0.83em; }
+span.footnote-number + p { display: inline; }
+a.footnote { text-decoration: none; font-size: 0.8em; }
+a.footnote-ref { text-decoration: none; }
+
+span.co {
+  margin-left: 0.2em; margin-right: 0.2em;
+  padding-left: 0.4em; padding-right: 0.4em;
+  border: solid 1px #000000;
+  -moz-border-radius: 8px;
+  background-color: #000000;
+  color: #FFFFFF;
+  font-size: 8px;
+}
+span.co:hover {
+  border-color: #333333;
+  background-color: #333333;
+  color: #FFFFFF;
+}
+span.co a { text-decoration: none; }
+span.co a:hover { text-decoration: none; }
+
+div.cmdsynopsis { font-family: monospace; }
+
+dt.question { margin-left: 0em; }
+dt.question div.label { float: left; }
+dd + dt.question { margin-top: 1em; }
+dd.answer {
+  margin-top: 1em;
+  margin-left: 2em;
+  margin-right: 1em;
+}
+dd.answer div.label { float: left; }
+</style>
+</head>
+<body>
+<div class="navbar navbar-top"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></td>
+<td class="navbar-next"><a class="navbar-next" href="cover-art.html" title="Cover art">Cover art</a></td>
+</tr></table></div>
+<div class="sidebar"><div class="sidenav"><div class="autotoc"><ul>
+<li><a href="gtkpod-info.html" title="About This Document">About This Document</a></li>
+<li>
+<a class="xref" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a><div class="autotoc"><ul>
+<li><a class="xref" href="getting-started.html" title="Getting started">Getting started</a></li>
+<li>
+<a class="xref" href="ipod-and-content.html" title="iPod and content">iPod and content</a><div class="autotoc"><ul>
+<li><a class="xref" href="layout-of-gtkpod.html" title="Layout of gtkpod">Layout of gtkpod</a></li>
+<li><a class="xref" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></li>
+<li>View and edit track details</li>
+<li><a class="xref" href="cover-art.html" title="Cover art">Cover art</a></li>
+<li><a class="xref" href="adding-cover-art-from-a-browser.html" title="Adding cover art from a browser">Adding cover art from a browser</a></li>
+<li><a class="xref" href="copying-content-to-the-ipod.html" title="Copying content to the iPod">Copying content to the iPod</a></li>
+<li><a class="xref" href="playcounts-and-ratings.html" title="Playcounts and ratings">Playcounts and ratings</a></li>
+</ul></div>
+</li>
+<li><a class="xref" href="managing-playlists.html" title="Managing playlists">Managing playlists</a></li>
+<li><a class="xref" href="advanced-features.html" title="Advanced features">Advanced features</a></li>
+</ul></div>
+</li>
+</ul></div></div></div>
+<div class="body body-sidebar"><div class="division sect1">
+<a name="view-and-edit-track-details"></a><div class="header"><h1 class="sect1 title"><span class="title">View and edit track details</span></h1></div>
+<ul class="linktrail">
+<li class="linktrail linktrail-first"><a class="linktrail" href="gtkpod.html" title="The gtkpod Manual">The gtkpod Manual</a></li>
+<li class="linktrail linktrail-last"><a class="linktrail" href="ipod-and-content.html" title="iPod and content">iPod and content</a></li>
+</ul>
+<div class="autotoc"><ul>
+<li>
+<span class="label">2.3.1. </span><a class="xref" href="view-and-edit-track-details.html#edit-track-details" title="Edit Track Details">Edit Track Details</a>
+</li>
+<li>
+<span class="label">2.3.2. </span><a class="xref" href="view-and-edit-track-details.html#refresh-op-update-cp-track-info-from-file" title="Refresh (Update) Track Info From File">Refresh (Update) Track Info From File</a>
+</li>
+<li>
+<span class="label">2.3.3. </span><a class="xref" href="view-and-edit-track-details.html#synchronize-with-directories" title="Synchronize with Directories">Synchronize with Directories</a>
+</li>
+<li>
+<span class="label">2.3.4. </span><a class="xref" href="view-and-edit-track-details.html#volume-normalization" title="Volume Normalization">Volume Normalization</a>
+</li>
+</ul></div>
+<div class="division sect2">
+<a name="edit-track-details"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="edit-track-details-title"></a><span class="label">2.3.1. </span>Edit Track Details</span></h2></div>
+<p class="para block block-first">The Edit Track Details window can be displayed from a couple places.</p>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <p class="para block block-first">Select a track from the Track window, right-click and select "Edit Track Details" from the popup.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Make a selection in any of the categories, eg. Album, Genre, and right-clicking "Edit Track Details will display the window and allow all tracks in that category to be edited.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">Right-clicking "Edit Track Details" from the popup menu on the CoverArt Display displays the window , allowing all tracks belonging to the album to be edited.
+                        </p>
+                        <p class="para block">
+                            <div class=" block figure block-first block-indent">
+<div class="block block-first title title-formal"><span class="title"><span class="label"><span style="font-style: italic; ">Figure 2-3</span> </span>The Edit Track Details dialog</span></div>
+<div class="figure-inner">
+                                
+                                <div class="mediaobject"><img src="figures/edit-track-details.png"></div>
+                            </div>
+</div>
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">The window allows multiple tracks to be edited at the same time. By selecting the "Change all Tracks Simulaneously" check box **BEFORE** making any edits, all the selected tracks can be updated with the new information.
+                        </p>
+                    </li>
+<li>
+                        <p class="para block block-first">The coverart can be dragged n dropped on from a web browser in the same way as the Cover Art Display. However, dropping a new cover onto this window will update the cover art of the tracks and not the album! This is an important distinction as it is possible to have different cover art for tracks in the same album! (why anyone would but its possible)!
+                        </p>
+                    </li>
+</ul></div>
+</div>
+<div class="division sect2">
+<a name="refresh-op-update-cp-track-info-from-file"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="refresh-op-update-cp-track-info-from-file-title"></a><span class="label">2.3.2. </span>Refresh (Update) Track Info From File</span></h2></div>
+<p class="para block block-first">
+                    If you have changed the ID3 tags of your original file, you can update the ID3 tags stored in gtkpod without removing and re-adding the track. Simply select the track to be updated and press "Ctrl-u" or choose "Update Track Info From File" from the Edit menu. Since gtkpod needs to know the filename of the track, the "Extended Information File" (see <a class="link" href="setting-ipod-properties.html#extended-information-file" title="Extended Information File">here</a>) is needed.
+                </p>
+<p class="para block">"Update" will also re-read the replay-gain tags from disk, if available, and set the soundcheck field. If no replay-gain tag is available, the soundcheck field will be erased. You can also select entries in the filter tab or entire playlists for refresh.
+                </p>
+</div>
+<div class="division sect2">
+<a name="synchronize-with-directories"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="synchronize-with-directories-title"></a><span class="label">2.3.3. </span>Synchronize with Directories</span></h2></div>
+<p class="para block block-first">If you have added files to directories or changed files in directories you have previously added tracks from, you can use the "Synchronize Dirs" utility to update your iTunesDB.
+                </p>
+<p class="para block">"Synchronize with Dir(s)" will use the selected tracks to make a list of directories to update, so you should activate the "Write Extended Information" option in the export section of the Preferences dialogue.
+                </p>
+<p class="para block">It will then add all non-existing tracks in those directories and update all existing tracks. The tracks are also added to the currently selected playlist, if they aren't already a member.
+                </p>
+<p class="para block">Tracks that have been removed from the directory will only be removed from the iTunesDB if this option is checked in the option dialogue.
+                </p>
+<p class="para block">For best results you should also activate duplicate detection. This avoids unnecessary copying of unchanged tracks.
+                </p>
+</div>
+<div class="division sect2">
+<a name="volume-normalization"></a><div class="header"><h2 class="sect2 title"><span class="title"><a name="volume-normalization-title"></a><span class="label">2.3.4. </span>Volume Normalization</span></h2></div>
+<p class="para block block-first">There are two fields in the iTunes Database (iTunesDB) that allow for the adjustment of the volume of an individual track:</p>
+<div class="block list itemizedlist"><ul class="itemizedlist">
+<li class="li-first">
+                        <span class="para">the volume field (a signed integer)</span>
+                    </li>
+<li>
+                        <span class="para">the soundcheck field (in dB).
+                        </span>
+                    </li>
+</ul></div>
+<p class="para block">
+                    The volume is always active, whereas the soundcheck field is only active when you select 'soundcheck' on the iPod. Further, the soundcheck field only affects the earphone output but not the line output of the iPod. 
+                </p>
+<p class="para block">
+                    gtkpod will set the soundcheck according to the replay-gain tag set in your mp3 file. Newer versions of 'lame' automatically include the replay-gain tag when encoding. In that case the soundcheck field will be filled in when you first import a track. 
+                </p>
+<p class="para block">If no replay-gain tag is set, you can use the function 'Normalize Volume' to call mp3gain (mp3gain.sourceforge.net) to calculate the gain and write a replay-gain tag. Since this procedure is very time consuming, it is not done automatically during import. You need to install mp3gain in the default path or set the full path in the 'Tools' section of the preferences dialog. If the iPod is connected, the tag is written to the file stored on the iPod.
+                </p>
+<p class="para block">At this time "album gain" functionality is not supported. "Album gain" means that the volume of all tracks of one album is adjusted by the same gain, such that the relative volume level remains the same. It is planned to realize this in one of the next versions.
+                </p>
+<p class="para block">Also, please be aware that tracks are not normalized on a 'per playlist' fashion. If a track is normalized, it's normalized in all playlists it is a member of.
+                </p>
+<p class="para block">Once the replay-gain tag has been read, it is stored in the extended information file 'iTunesDB.ext'. When you call 'Normalize volume' again, the stored value will be used to re-populate the soundcheck field. Use 'Update Track' to re-read the tag from the file.
+                </p>
+</div>
+</div></div>
+<div class="navbar navbar-bottom"><table class="navbar"><tr>
+<td class="navbar-prev"><a class="navbar-prev" href="adding-files-and-folders.html" title="Adding files and folders">Adding files and folders</a></td>
+<td class="navbar-next"><a class="navbar-next" href="cover-art.html" title="Cover art">Cover art</a></td>
+</tr></table></div>
+</body>
+</html>

Modified: gtkpod/branches/upstream/current/install-sh
===================================================================
--- gtkpod/branches/upstream/current/install-sh	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/install-sh	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
 if test -z "$doit"; then
   doit_exec=exec
 else
@@ -58,34 +58,49 @@
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
 
-posix_glob=
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
+chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
-chgrpcmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
 stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@
 In the 4th, create DIRECTORIES.
 
 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.
+     --help     display this help and exit.
+     --version  display version info and exit.
 
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -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.
+
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
 while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -C) copy_on_change=true;;
 
+    -d) dir_arg=true;;
+
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-        shift
-        shift
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
-        continue;;
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -t) dst_arg=$2
+	shift;;
 
-    -T) no_target_directory=true
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
@@ -165,21 +170,22 @@
 
     *)  break;;
   esac
+  shift
 done
 
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; 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
+    if test -n "$dst_arg"; then
       # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
+      set fnord "$@" "$dst_arg"
       shift # fnord
     fi
     shift # arg
-    dstarg=$arg
+    dst_arg=$arg
   done
 fi
 
@@ -224,7 +230,7 @@
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # 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
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
       dstdir=$dst
@@ -378,26 +384,19 @@
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-	/*) prefix=/ ;;
-	-*) prefix=./ ;;
-	*)  prefix= ;;
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
       esac
 
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
+      eval "$initialize_posix_glob"
 
       oIFS=$IFS
       IFS=/
-      $posix_glob && set -f
+      $posix_glob set -f
       set fnord $dstdir
       shift
-      $posix_glob && set +f
+      $posix_glob set +f
       IFS=$oIFS
 
       prefixes=
@@ -459,42 +458,55 @@
     # 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"; } &&
+    { 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.
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
 
-	   # 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
-	   } &&
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
 
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # 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.
+	{
+	  test ! -f "$dst" ||
+	  $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
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
     trap '' 0
   fi
 done

Modified: gtkpod/branches/upstream/current/intltool-extract.in
===================================================================
--- gtkpod/branches/upstream/current/intltool-extract.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/intltool-extract.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -32,7 +32,7 @@
 ## Release information
 my $PROGRAM      = "intltool-extract";
 my $PACKAGE      = "intltool";
-my $VERSION      = "0.36.2";
+my $VERSION      = "0.37.1";
 
 ## Loaded modules
 use strict; 
@@ -161,7 +161,8 @@
       --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/quoted"
+                    "gettext/scheme", "gettext/xml", "gettext/quoted",
+                    "gettext/quotedxml"
   -l, --local       Writes output into current working directory
                     (conflicts with --update)
       --update      Writes output into the same directory the source file 
@@ -218,6 +219,7 @@
     &type_schemas  if $gettext_type eq "schemas";
     &type_rfc822deb  if $gettext_type eq "rfc822deb";
     &type_quoted if $gettext_type eq "quoted";
+    &type_quotedxml if $gettext_type eq "quotedxml";
 }
 
 sub entity_decode_minimal
@@ -731,6 +733,18 @@
     }
 }
 
+sub type_quotedxml {
+    while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+        my $message = $1;
+        my $before = $`;
+        $message =~ s/\\\"/\"/g;
+        $message = entity_decode($message);
+        $before =~ s/[^\n]//g;
+        $messages{$message} = [];
+        $loc{$message} = length ($before) + 2;
+    }
+}
+
 sub type_glade {
     ### For translatable Glade XML files ###
 

Modified: gtkpod/branches/upstream/current/intltool-merge.in
===================================================================
--- gtkpod/branches/upstream/current/intltool-merge.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/intltool-merge.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -35,7 +35,7 @@
 ## Release information
 my $PROGRAM = "intltool-merge";
 my $PACKAGE = "intltool";
-my $VERSION = "0.36.2";
+my $VERSION = "0.37.1";
 
 ## Loaded modules
 use strict; 
@@ -61,6 +61,7 @@
 my $SCHEMAS_STYLE_ARG = 0;
 my $RFC822DEB_STYLE_ARG = 0;
 my $QUOTED_STYLE_ARG = 0;
+my $QUOTEDXML_STYLE_ARG = 0;
 my $QUIET_ARG = 0;
 my $PASS_THROUGH_ARG = 0;
 my $UTF8_ARG = 0;
@@ -81,6 +82,7 @@
  "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
  "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
  "quoted-style" => \$QUOTED_STYLE_ARG,
+ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
  "pass-through|p" => \$PASS_THROUGH_ARG,
  "utf8|u" => \$UTF8_ARG,
  "multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -148,7 +150,7 @@
 	&utf8_sanity_check;
 	&preparation;
 	&print_message;
-	&keys_merge_translations;
+        &keys_merge_translations;
 	&finalize;
 } 
 elsif ($DESKTOP_STYLE_ARG && @ARGV > 2) 
@@ -174,12 +176,12 @@
 	&rfc822deb_merge_translations;
 	&finalize;
 } 
-elsif ($QUOTED_STYLE_ARG && @ARGV > 2) 
+elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
 {
 	&utf8_sanity_check;
 	&preparation;
 	&print_message;
-	&quoted_merge_translations;
+	&quoted_merge_translations($QUOTEDXML_STYLE_ARG);
 	&finalize;
 } 
 else 
@@ -219,6 +221,7 @@
   -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
+      --quotedxml-style  includes translations in the quoted xml string style
   -x, --xml-style        includes translations in the standard xml style
 
 Other options:
@@ -292,10 +295,9 @@
             {
                 next if /^#/;
 
-                if (/([-a-zA-Z_ at .]+)\n/)
+                for my $lang (split)
                 {
-                    my $lang = $1;
-
+                    chomp ($lang);
                     my $po_file = $PO_DIR . "/" . $lang . ".po";
                     if (-e $po_file) {
                         $po_files_by_lang{$lang} = $po_file;
@@ -576,6 +578,7 @@
     return "&amp;" if $_ == 38;
     return "&apos;" if $_ == 39;
     return "&lt;" if $_ == 60;
+    return "&gt;" if $_ == 62;
     return chr $_;
 }
 
@@ -1076,43 +1079,74 @@
             close OUTPUT;
             print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
         }
-    } 
-    open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-    binmode (OUTPUT) if $^O eq 'MSWin32';
-    my $tree = readXml($FILE);
-    print_header($FILE, \*OUTPUT);
-    parseTree(\*OUTPUT, $tree);
-    close OUTPUT;
-    print "CREATED $OUTFILE\n" unless $QUIET_ARG;
+        if ( ! -d "C" ) {
+            mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
+        }
+        open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
+        binmode (OUTPUT) if $^O eq 'MSWin32';
+        my $tree = readXml($FILE);
+        print_header($FILE, \*OUTPUT);
+        parseTree(\*OUTPUT, $tree);
+        close OUTPUT;
+        print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
+    } else {
+        open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+        binmode (OUTPUT) if $^O eq 'MSWin32';
+        my $tree = readXml($FILE);
+        print_header($FILE, \*OUTPUT);
+        parseTree(\*OUTPUT, $tree);
+        close OUTPUT;
+        print "CREATED $OUTFILE\n" unless $QUIET_ARG;
+    }
 }
 
-sub keys_merge_translations
+sub keys_merge_translation
 {
-    open INPUT, "<${FILE}" or die;
-    open OUTPUT, ">${OUTFILE}" or die;
+    my ($lang) = @_;
+
+    if ( ! -d $lang && $MULTIPLE_OUTPUT)
+    {
+        mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+    }
+
+    open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
+    open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
     binmode (OUTPUT) if $^O eq 'MSWin32';
 
-    while (<INPUT>) 
+    while (<INPUT>)
     {
-        if (s/^(\s*)_(\w+=(.*))/$1$2/)  
+        if (s/^(\s*)_(\w+=(.*))/$1$2/)
         {
-	    my $string = $3;
+            my $string = $3;
 
-            print OUTPUT;
+            if (!$MULTIPLE_OUTPUT)
+            {
+                print OUTPUT;
 
-	    my $non_translated_line = $_;
+                my $non_translated_line = $_;
 
-            for my $lang (sort keys %po_files_by_lang) 
+                for my $lang (sort keys %po_files_by_lang)
+                {
+                    my $translation = $translations{$lang, $string};
+                    next if !$translation;
+
+                    $_ = $non_translated_line;
+                    s/(\w+)=.*/[$lang]$1=$translation/;
+                    print OUTPUT;
+                }
+            }
+            else
             {
-		my $translation = $translations{$lang, $string};
-                next if !$translation;
+                my $non_translated_line = $_;
+                my $translation = $translations{$lang, $string};
+                $translation = $string if !$translation;
 
                 $_ = $non_translated_line;
-		s/(\w+)=.*/[$lang]$1=$translation/;
+                s/(\w+)=.*/$1=$translation/;
                 print OUTPUT;
             }
-	} 
-        else 
+        }
+        else
         {
             print OUTPUT;
         }
@@ -1120,8 +1154,26 @@
 
     close OUTPUT;
     close INPUT;
+
+    print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
 }
 
+sub keys_merge_translations
+{
+    if ($MULTIPLE_OUTPUT)
+    {
+        for my $lang (sort keys %po_files_by_lang)
+        {
+            keys_merge_translation ($lang);
+        }
+        keys_merge_translation ("C");
+    }
+    else
+    {
+        keys_merge_translation (".");
+    }
+}
+
 sub desktop_merge_translations
 {
     open INPUT, "<${FILE}" or die;
@@ -1415,19 +1467,22 @@
 
 sub quoted_translation
 {
-    my ($lang, $string) = @_;
+    my ($xml_mode, $lang, $string) = @_;
 
+    $string = entity_decode($string) if $xml_mode;
     $string =~ s/\\\"/\"/g;
 
     my $translation = $translations{$lang, $string};
     $translation = $string if !$translation;
-
+    $translation = entity_encode($translation) if $xml_mode;
     $translation =~ s/\"/\\\"/g;
     return $translation
 }
 
 sub quoted_merge_translations
 {
+    my ($xml_mode) = @_;
+
     if (!$MULTIPLE_OUTPUT) {
         print "Quoted only supports Multiple Output.\n";
         exit(1);
@@ -1442,7 +1497,7 @@
         binmode (OUTPUT) if $^O eq 'MSWin32';
         while (<INPUT>) 
         {
-            s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . &quoted_translation($lang, $1) . "\""/ge;
+            s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . &quoted_translation($xml_mode, $lang, $1) . "\""/ge;
             print OUTPUT;
         }
         close OUTPUT;

Modified: gtkpod/branches/upstream/current/intltool-update.in
===================================================================
--- gtkpod/branches/upstream/current/intltool-update.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/intltool-update.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -30,7 +30,7 @@
 
 ## Release information
 my $PROGRAM = "intltool-update";
-my $VERSION = "0.36.2";
+my $VERSION = "0.37.1";
 my $PACKAGE = "intltool";
 
 ## Loaded modules
@@ -334,7 +334,7 @@
 	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/..";
+	}, "$SRCDIR/.." if "$SRCDIR" ne ".";
 
     open POTFILES, $POTFILES_in or die "$PROGRAM:  there's no POTFILES.in!\n";
     @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
@@ -434,8 +434,8 @@
 		last;
 	    }
 
-            ## N_ Q_ and _ are the three macros defined in gi8n.h
-	    if (/[NQ]?_ *\(QUOTEDTEXT/)
+            ## C_ N_ Q_ and _ are the macros defined in gi8n.h
+	    if (/[CNQ]?_ *\(QUOTEDTEXT/)
 	    {
                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
                     ## Remove the first 3 chars and add newline
@@ -777,7 +777,7 @@
     my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
     push @xgettext_argument, $XGETTEXT_KEYWORDS;
     my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
-    push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
+    push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
     push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
     push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
     my $xgettext_command = join ' ', @xgettext_argument;
@@ -1118,6 +1118,8 @@
 	close IN;
     }
 
+    # unwrap lines split with a trailing \
+    $make_source =~  s/\\ $ \n/ /mxg;
     $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
     
     return $keywords;

Modified: gtkpod/branches/upstream/current/po/Makefile.in.in
===================================================================
--- gtkpod/branches/upstream/current/po/Makefile.in.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/Makefile.in.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,10 +1,10 @@
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns at gmail.com>
 #
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
 # but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
 #
 # - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
 #   instead of PACKAGE and to look for po2tbl in ./ not in intl/
@@ -12,7 +12,7 @@
 # - Modified by jacob berkman <jacob at ximian.com> to install
 #   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
 #
-# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
+# - Modified by Rodney Dawes <dobey.pwns at gmail.com> for use with intltool
 #
 # We have the following line for use by intltoolize:
 # INTLTOOL_MAKEFILE

Modified: gtkpod/branches/upstream/current/po/POTFILES.in
===================================================================
--- gtkpod/branches/upstream/current/po/POTFILES.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/POTFILES.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -27,7 +27,9 @@
 src/flacfile.c
 src/getopt1.c
 src/getopt.c
+src/help.c
 src/info.c
+src/infodlg.c
 src/ipod_init.c
 src/main.c
 src/misc.c
@@ -40,9 +42,10 @@
 src/mp4file.c
 src/oggfile.c
 src/prefs.c
-src/prefs_window.c
+src/prefsdlg.c
 src/repository.c
 src/sha1.c
+src/sort_window.c
 src/syncdir.c
 src/tools.c
 src/wavfile.c

Modified: gtkpod/branches/upstream/current/po/de.po
===================================================================
--- gtkpod/branches/upstream/current/po/de.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/de.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,31 +1,33 @@
+# translation of de.po to deutsch
 # German language translation for gtkpod
 # Copyright (C) 2003-2005 Jörg Schuler
 # Jörg Schuler <jcsjcs at users.sourceforge.net>
+#
 # Kai-Ove, 2007.
-#
+# Kai-Ove Pietsch <kaiovepietsch at yahoo.de>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2008-12-09 19:55+0900\n"
+"PO-Revision-Date: 2008-03-30 15:19+0200\n"
+"Last-Translator: Kai-Ove Pietsch <kaiovepietsch at yahoo.de>\n"
+"Language-Team: deutsch <de 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=2; plural=n != 1;\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: ../data/gtkpod.desktop.in.h:1
+msgid "Manage music and video on an Apple iPod"
+msgstr "Verwaltet Musik & Videos auf dem iPod"
+
+#: ../data/gtkpod.desktop.in.h:2 ../data/gtkpod.glade.h:427
 #, fuzzy
-msgid "GtkPod"
-msgstr "gtkpod"
+msgid "gtkpod iPod Manager"
+msgstr "gtkpod Optionen"
 
-#: ../data/gtkpod.desktop.in.h:2
-msgid "Manage music and video on an Apple iPod"
-msgstr ""
-
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
 msgstr ""
@@ -39,370 +41,416 @@
 msgstr "    "
 
 #: ../data/gtkpod.glade.h:3
-msgid "     "
-msgstr "     "
+msgid " <= cts <= "
+msgstr " <= num <= "
 
 #: ../data/gtkpod.glade.h:4
-msgid "      "
-msgstr "     "
+msgid ""
+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
+"finished."
+msgstr ""
+"z.B. 'TT/MM/JJJJ SS:MM < d < TT/MM/JJJJ SS:MM' oder ähnliches. Nach der "
+"Eingabe bitte 'Return' drücken."
 
 #: ../data/gtkpod.glade.h:5
-msgid "   Sort by:"
-msgstr "   Sortieren nach:"
+msgid "(Checked)"
+msgstr "(Gewählt)"
 
 #: ../data/gtkpod.glade.h:6
-msgid " <= cts <= "
-msgstr " <= num <= "
+msgid "0"
+msgstr "0"
 
 #: ../data/gtkpod.glade.h:7
-msgid " Logic: "
-msgstr " Logik:"
+msgid "1"
+msgstr "1"
 
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr "2"
+
 #: ../data/gtkpod.glade.h:9
-#, no-c-format
-msgid "%A"
-msgstr "%A"
+msgid "3"
+msgstr "3"
 
 #: ../data/gtkpod.glade.h:10
-msgid ""
-"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
-"finished."
-msgstr ""
-"z.B. 'TT/MM/JJJJ SS:MM < d < TT/MM/JJJJ SS:MM' oder ähnliches. Nach der "
-"Eingabe bitte 'Return' drücken."
+msgid "4"
+msgstr "4"
 
 #: ../data/gtkpod.glade.h:11
-msgid "'aacgain' executable:"
-msgstr "'aacgain'-Programm:"
+msgid "5"
+msgstr "5"
 
 #: ../data/gtkpod.glade.h:12
-msgid "'mp3gain' executable:"
-msgstr "'mp3gain'-Programm:"
+msgid ":"
+msgstr ":"
 
 #: ../data/gtkpod.glade.h:13
-msgid "(Checked)"
-msgstr "(Gewählt)"
+msgid "<"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:14
-msgid "...as icons"
-msgstr "...als Symbol"
+#, fuzzy
+msgid "<b>Advanced Options</b>"
+msgstr "Weitere Sortieroptionen"
 
 #: ../data/gtkpod.glade.h:15
-msgid "...as text"
-msgstr "...als Text"
+#, fuzzy
+msgid "<b>Ascending</b>"
+msgstr "Aufsteigend"
 
 #: ../data/gtkpod.glade.h:16
-msgid "...both as icons and text"
-msgstr "...als Text und Symbol"
+#, fuzzy
+msgid "<b>Auto Store</b>"
+msgstr "Autom. speichern"
 
 #: ../data/gtkpod.glade.h:17
-msgid "...entry 'All' in sort tab..."
-msgstr " ...Begriff 'Alle' im Sortierungseintrag..."
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>Automatisch generierte Wiedergabelisten</b>"
 
 #: ../data/gtkpod.glade.h:18
-msgid "...master playlist"
-msgstr "...Hauptwiedergabeliste"
+msgid "<b>Available Columns</b>"
+msgstr ""
 
+#: ../data/gtkpod.glade.h:19
+#, fuzzy
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>Cover-Bild</b>"
+
 #: ../data/gtkpod.glade.h:20
-#, no-c-format
-msgid "../%A.jpg"
-msgstr "../%A.jpg"
+#, fuzzy
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>Cover-Bild</b>"
 
 #: ../data/gtkpod.glade.h:21
-msgid "0"
-msgstr "0"
+#, fuzzy
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>Cover-Bild</b>"
 
 #: ../data/gtkpod.glade.h:22
-msgid "1"
-msgstr "1"
+#, fuzzy
+msgid "<b>Cover Art</b>"
+msgstr "<b>Cover-Bild</b>"
 
 #: ../data/gtkpod.glade.h:23
-msgid "2"
-msgstr "2"
+#, fuzzy
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>Sicherheitsabfrage beim Löschen</b>"
 
 #: ../data/gtkpod.glade.h:24
-msgid "3"
-msgstr "3"
+#, fuzzy
+msgid "<b>Descending</b>"
+msgstr "Absteigend"
 
 #: ../data/gtkpod.glade.h:25
-msgid "4"
-msgstr "4"
+#, fuzzy
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>Sicherheitsabfrage beim Löschen</b>"
 
 #: ../data/gtkpod.glade.h:26
-msgid "5"
-msgstr "5"
+#, fuzzy
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>Sortierungseinträge</b>"
 
 #: ../data/gtkpod.glade.h:27
-msgid ":"
-msgstr ":"
+#, fuzzy
+msgid "<b>General Options</b>"
+msgstr "<b>Abgleich</b>"
 
 #: ../data/gtkpod.glade.h:28
-msgid "<"
-msgstr ""
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>---</b>"
 
 #: ../data/gtkpod.glade.h:29
-#, fuzzy
-msgid "<b>Account Information</b>"
-msgstr "<b>Sicherheitsabfrage beim Löschen</b>"
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>Ignoriere oft verwendete Wörter</b>"
 
 #: ../data/gtkpod.glade.h:30
-msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>Hinzufügen/Aktualisieren/Abgleichen</b>"
+#, fuzzy
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>Abgleich</b>"
 
 #: ../data/gtkpod.glade.h:31
 #, fuzzy
-msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Werkzeugleiste</b>"
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>Konteninformation</b>"
 
 #: ../data/gtkpod.glade.h:32
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>Automatisch generierte Wiedergabelisten</b>"
+#, fuzzy
+msgid "<b>Information Messages</b>"
+msgstr "<b>Konteninformation</b>"
 
 #: ../data/gtkpod.glade.h:33
-msgid "<b>Automatically select...</b>"
-msgstr "<b>Wähle automatisch...</b>"
+#, fuzzy
+msgid "<b>Lower Margin</b>"
+msgstr "Untere Grenze"
 
 #: ../data/gtkpod.glade.h:34
-msgid "<b>Calendar/Contacts/Notes</b>"
-msgstr "<b>Kalender/Kontakte/Notizen</b>"
+#, fuzzy
+msgid "<b>None</b>"
+msgstr "<b>---</b>"
 
 #: ../data/gtkpod.glade.h:35
-msgid "<b>Coverart</b>"
-msgstr "<b>Cover-Bild</b>"
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Konvertierung ohne Zwischenspeicherung</b>"
 
 #: ../data/gtkpod.glade.h:36
-msgid "<b>Delete Confirmation</b>"
-msgstr "<b>Sicherheitsabfrage beim Löschen</b>"
+#, fuzzy
+msgid "<b>Playback</b>"
+msgstr "<b>Wiedergabe</b>"
 
 #: ../data/gtkpod.glade.h:37
-msgid "<b>Examples</b>"
-msgstr "<b>Beispiele</b>"
+#, fuzzy
+msgid "<b>Playlist Options</b>"
+msgstr "<b>Wiedergabeliste(n)</b>"
 
 #: ../data/gtkpod.glade.h:38
-msgid "<b>Ignore Frequent Words</b>"
-msgstr "<b>Ignoriere oft verwendete Wörter</b>"
+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:39
-msgid "<b>Misc</b>"
-msgstr "<b>Verschiedenes</b>"
+#, fuzzy
+msgid "<b>Rules</b>"
+msgstr "<b>Beispiele</b>"
 
 #: ../data/gtkpod.glade.h:40
-msgid "<b>Mountpoint and individual repository/playlist options</b>"
-msgstr ""
-"<b>Einhängepunkt u. individuelle Datenbank/Wiedergabeliste Optionen</b>"
+msgid "<b>Sort Order</b>"
+msgstr "<b>Sortier-Reihenfolge</b>"
 
 #: ../data/gtkpod.glade.h:41
-#, fuzzy
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Sicherheitsabfrage beim Löschen</b>"
+msgid "<b>Synchronization</b>"
+msgstr "<b>Abgleich</b>"
 
 #: ../data/gtkpod.glade.h:42
-msgid "<b>Play</b>"
-msgstr "<b>Wiedergabe</b>"
+#, fuzzy
+msgid "<b>Tag Editing</b>"
+msgstr "<b>Bearbeiten von Stücken</b>"
 
 #: ../data/gtkpod.glade.h:43
-msgid "<b>Playlists</b>"
-msgstr "<b>Wiedergabeliste(n)</b>"
+#, fuzzy
+msgid "<b>Tags</b>"
+msgstr "<b>---</b>"
 
 #: ../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>"
+#, fuzzy
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>Werkzeugleiste</b>"
 
 #: ../data/gtkpod.glade.h:45
-msgid "<b>Repositories</b>"
-msgstr "<b>Datenbanken</b>"
+msgid "<b>Tooltips</b>"
+msgstr "<b>Werkzeugtipps</b>"
 
 #: ../data/gtkpod.glade.h:46
-msgid "<b>Sort Order</b>"
-msgstr "<b>Sortier-Reihenfolge</b>"
+#, fuzzy
+msgid "<b>Upper Margin</b>"
+msgstr "Obere Grenze"
 
 #: ../data/gtkpod.glade.h:47
-msgid "<b>Sort Tabs</b>"
-msgstr "<b>Sortierungseinträge</b>"
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>Lautstärkenormalisierung</b>"
 
 #: ../data/gtkpod.glade.h:48
-msgid "<b>Sync</b>"
-msgstr "<b>Abgleichen</b>"
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:49
-msgid "<b>Synchronization</b>"
-msgstr "<b>Abgleich</b>"
+#, fuzzy
+msgid "<b>gtkpod Options</b>"
+msgstr "gtkpod Optionen"
 
 #: ../data/gtkpod.glade.h:50
-msgid "<b>Tag Reading</b>"
-msgstr "<b>Lesen von Tags</b>"
+#, fuzzy
+msgid "<b>mserv Settings</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:51
-msgid "<b>Toolbar</b>"
-msgstr "<b>Werkzeugleiste</b>"
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:52
-msgid "<b>Tooltips</b>"
-msgstr "<b>Werkzeugtipps</b>"
+#, fuzzy
+msgid "<i>aacgain</i> executable:"
+msgstr "'aacgain'-Programm:"
 
 #: ../data/gtkpod.glade.h:53
 #, fuzzy
-msgid "<b>Track Attributes</b>"
-msgstr "<b>Angezeigte Informationen</b>"
+msgid "<i>mp3gain</i> executable:"
+msgstr "'mp3gain'-Programm:"
 
 #: ../data/gtkpod.glade.h:54
-msgid "<b>Track Editing</b>"
-msgstr "<b>Bearbeiten von Stücken</b>"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:55
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>Lautstärkenormalisierung</b>"
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:56
-msgid "<b>mserv</b>"
-msgstr "<b>mserv</b>"
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:57
+#: ../data/gtkpod.glade.h:59
 msgid ">"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:58
-msgid "About gtkpod"
-msgstr "Über gtkpod"
+#: ../data/gtkpod.glade.h:60
+#, fuzzy
+msgid "About unupdated tracks"
+msgstr "Informationen über aktualisierte Stücke anzeigen"
 
-#: ../data/gtkpod.glade.h:59
+#: ../data/gtkpod.glade.h:61
+#, fuzzy
+msgid "About updated tracks"
+msgstr "Informationen über aktualisierte Stücke anzeigen"
+
+#: ../data/gtkpod.glade.h:62
+#, fuzzy
+msgid "Add Column"
+msgstr "_Album hinzufügen"
+
+#: ../data/gtkpod.glade.h:63
 msgid "Add Directories Recursively"
 msgstr "Verzeichnisse rekursiv hinzufügen"
 
-#: ../data/gtkpod.glade.h:60
-#, fuzzy
+#: ../data/gtkpod.glade.h:64
 msgid "Add Files"
-msgstr "_Dateien hinzufügen"
+msgstr "Dateien hinzufügen"
 
-#: ../data/gtkpod.glade.h:61
+#: ../data/gtkpod.glade.h:65
 msgid "Add Files or Directories"
 msgstr "Dateien oder Verzeichnisse hinzufügen."
 
-#: ../data/gtkpod.glade.h:62
-#, fuzzy
+#: ../data/gtkpod.glade.h:66
 msgid "Add Fol_der"
-msgstr "_Dateien hinzufügen"
+msgstr "Or_dner hinzufügen"
 
-#: ../data/gtkpod.glade.h:63
-#, fuzzy
+#: ../data/gtkpod.glade.h:67 ../src/fileselection.c:606
 msgid "Add Folder"
-msgstr "_Dateien hinzufügen"
+msgstr "Ordner hinzufügen"
 
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:68
 msgid "Add Image_s"
-msgstr ""
+msgstr "Bilder hinzufügen"
 
-#: ../data/gtkpod.glade.h:65
-#, fuzzy
+#: ../data/gtkpod.glade.h:69
 msgid "Add Images from a Directory"
-msgstr "Dateien oder Verzeichnisse hinzufügen."
+msgstr "Bilder aus einem Verzeichnis hinzufügen."
 
-#: ../data/gtkpod.glade.h:66
-#, fuzzy
+#: ../data/gtkpod.glade.h:70
 msgid "Add Playlist"
-msgstr "_Wiedergabeliste hinzufügen"
+msgstr "Wiedergabeliste hinzufügen"
 
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:71
 msgid "Add _Files"
-msgstr "_Dateien hinzufügen"
+msgstr "Dateien hinzu_fügen"
 
-#: ../data/gtkpod.glade.h:68
+#: ../data/gtkpod.glade.h:72
 msgid "Add _Playlist"
 msgstr "_Wiedergabeliste hinzufügen"
 
-#: ../data/gtkpod.glade.h:69
-msgid "Add coverart from file using the following template"
+#: ../data/gtkpod.glade.h:73
+#, fuzzy
+msgid "Add cover art using file name template"
 msgstr "Cover-Bild nach folgender Schablone aus Datei einlesen"
 
-#: ../data/gtkpod.glade.h:70
-msgid "Add directories recursively"
-msgstr "Verzeichnisse rekursiv hinzufügen"
+#: ../data/gtkpod.glade.h:74
+msgid ""
+"Add file masks to be excluded from import and synchronization, for example, "
+"<i>*.mp3</i>."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:71
-msgid "Add new repository/iPod"
+#: ../data/gtkpod.glade.h:75
+#, fuzzy
+msgid "Add new repository/iPod..."
 msgstr "Füge Verzeichnis/iPod hinzu"
 
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:76
 msgid "Add playlist from file"
 msgstr "Wiedergabeliste aus Datei hinzufügen"
 
-#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
-#: ../src/display_tracks.c:2103
-msgid "Added"
+#: ../data/gtkpod.glade.h:77
+#, fuzzy
+msgid "Add subfolders recursively"
+msgstr "Verzeichnisse rekursiv hinzufügen"
+
+#: ../data/gtkpod.glade.h:78
+#, fuzzy
+msgid "Added:"
 msgstr "Hinzugefügt"
 
-#: ../data/gtkpod.glade.h:74
-msgid "Advanced Sorting Options"
-msgstr "Weitere Sortieroptionen"
-
 #. 0
-#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2995
 #: ../src/display_spl.c:84 ../src/misc_conversion.c:60
 msgid "Album"
 msgstr "Album"
 
-#: ../data/gtkpod.glade.h:76
-#, fuzzy
+#: ../data/gtkpod.glade.h:80
 msgid "Album Art"
-msgstr "Album"
+msgstr "Albumbild"
 
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:81
 msgid "All (AND)"
 msgstr "Alle (UND)"
 
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:82
 msgid "All Tracks Never Listened To"
-msgstr "Nie gehörte Stücke"
+msgstr "Alle nie gehörte Stücke"
 
-#: ../data/gtkpod.glade.h:79
+#: ../data/gtkpod.glade.h:83
 msgid "All Tracks Played Since Last Time"
 msgstr "Seit dem letzten Mal gespielte Stücke"
 
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:84
 msgid "All Tracks not Listed in any Playlist"
 msgstr "In keiner Wiedergabeliste aufgeführte Stücke"
 
-#: ../data/gtkpod.glade.h:81
-msgid "Also include tracks never played in \"Best Rated\" playlist"
+#: ../data/gtkpod.glade.h:85
+msgid "Allow duplicate files"
 msgstr ""
-"Auch Stücke in die 'am besten' bewertete' Wiedergabeliste aufnehmen, die nie "
-"gespielt wurden"
 
-#: ../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:86
+#, fuzzy
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr ""
+"Gewählte Kodierung auch verwenden, wenn Stücke aktualisiert oder abgeglichen "
+"werden"
 
-#: ../data/gtkpod.glade.h:83
+#: ../data/gtkpod.glade.h:87
+#, fuzzy
+msgid "Also use this encoding when writing tracks"
+msgstr ""
+"Gewählte Kodierung auch verwenden, wenn Stücke aktualisiert oder abgeglichen "
+"werden"
+
+#: ../data/gtkpod.glade.h:88
 msgid "Any (OR)"
 msgstr "Eines (ODER)"
 
-#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
+#: ../data/gtkpod.glade.h:89
+msgid ""
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:92 ../src/display_sorttabs.c:2992
 #: ../src/display_spl.c:85 ../src/misc_conversion.c:61
 msgid "Artist"
 msgstr "Künstler"
 
-#: ../data/gtkpod.glade.h:85
-#, fuzzy
+#: ../data/gtkpod.glade.h:93
 msgid "Artwork Preview"
-msgstr "Pfad zu Bilddateien"
+msgstr "Bildvorschau"
 
-#: ../data/gtkpod.glade.h:86
-msgid ""
-"As a last resort set the following tags to the\n"
-"filename if they are (still) empty:"
+#: ../data/gtkpod.glade.h:94
+msgid "Automatically generate video thumbnails"
 msgstr ""
-"Falls Tags (immer noch) nicht gesetzt sind, die folgenden Tags mit dem "
-"Dateinamen initialisieren:"
 
-#: ../data/gtkpod.glade.h:88
-msgid "Ascending"
-msgstr "Aufsteigend"
-
-#: ../data/gtkpod.glade.h:89
-msgid "Auto Store"
-msgstr "Autom. speichern"
-
-#: ../data/gtkpod.glade.h:90
+#: ../data/gtkpod.glade.h:95
 msgid ""
 "Automatically start displaying tracks that match the criteria entered above. "
 "If not selected, you must press 'Display' to start displaying."
@@ -411,57 +459,54 @@
 "automatisch starten. Wenn diese Option nicht aktiviert ist, müssen Sie "
 "'Anzeige' drücken."
 
-#: ../data/gtkpod.glade.h:91
-msgid "Available:"
+#: ../data/gtkpod.glade.h:96
+msgid "Background color"
 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:93
-msgid "Before removing tracks from the harddisk"
-msgstr "Vor dem vollständigen Löschen auf der Festplatte"
-
-#: ../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:95
-msgid "Before removing tracks from the local database"
-msgstr "Vor dem Entfernen aus der lokalen Datenbank"
-
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:97
 msgid "Best Rated Tracks"
 msgstr "Am besten bewertete Stücke"
 
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:98
+msgid "Bottom"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:99 ../src/prefsdlg.c:588
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:100
 #, fuzzy
-msgid "Cache directory:"
-msgstr "_Verzeichnisse hinzufügen"
+msgid "Browse..."
+msgstr "Durchsuchen"
 
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:101
+#, fuzzy
+msgid "Cache folder:"
+msgstr "Verzeichnis für Zwischenspeicherung:"
+
+#: ../data/gtkpod.glade.h:102
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:103
 msgid "Calendar sync command:"
 msgstr "Befehl zum Abgleich des Kalenders:"
 
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:104
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Automatisch aufrufen, wenn die iTunesDB abgeglichen wird"
 
-#: ../data/gtkpod.glade.h:102
-msgid "Category: "
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:106
+#, fuzzy
+msgid "Category:"
 msgstr "Kategorie: "
 
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:107
 msgid ""
 "Change all tracks\n"
 "simultaneously"
@@ -469,113 +514,160 @@
 "Alle Stücke simultan \n"
 "modifizieren"
 
-#: ../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
+#: ../data/gtkpod.glade.h:109
 msgid "Check for existing files when copying from iPod."
 msgstr "Bei Kopieren vom iPod Überprüfen, ob Datei bereits existiert."
 
-#: ../data/gtkpod.glade.h:108
-msgid "Command for 'Enqueue':"
-msgstr "Befehl für 'Zum Abspielen Vormerken':"
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:109
-msgid "Command for 'Play now':"
+#: ../data/gtkpod.glade.h:111
+#, fuzzy
+msgid "Command for \"Enqueue\":"
+msgstr "Befehl für 'Zum Abspielen vormerken':"
+
+#: ../data/gtkpod.glade.h:112
+#, fuzzy
+msgid "Command for \"Play now\":"
 msgstr "Befehl für 'Jetzt abspielen':"
 
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr ""
+
 #. 5
-#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:114 ../src/display_spl.c:97
 #: ../src/misc_conversion.c:65
 msgid "Composer"
 msgstr "Komponist"
 
-#: ../data/gtkpod.glade.h:111
+#: ../data/gtkpod.glade.h:115
 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:112
-msgid ""
-"Confirm before removing tracks from the iPod or repository\n"
-"when syncing playlists"
+#: ../data/gtkpod.glade.h:116
+#, fuzzy
+msgid "Confirm deletion of playlists or tracks from a playlist"
 msgstr ""
-"Bestätigung vor dem Löschen vom iPod oder Musikverzeichnis beim Abgleichen "
-"der Wiedergabelisten."
+"Vor dem Entfernen von Wiedergabelisten oder Stücken aus einer Wiedergabeliste"
 
-#: ../data/gtkpod.glade.h:114
-msgid "Confirm lists of directories"
+#: ../data/gtkpod.glade.h:117
+msgid "Confirm deletion of tracks during synchronization"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:118
+#, fuzzy
+msgid "Confirm deletion of tracks:"
 msgstr "Liste der Verzeichnisse bestätigen"
 
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:119
 msgid "Contacts sync command:"
 msgstr "Befehl zum Abgleich der Kontakte:"
 
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:120
 msgid "Containing Displayed Tracks"
 msgstr "Aus den angezeigten Stücken"
 
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:121
 msgid "Containing Selected Tracks"
 msgstr "Aus den ausgewählten Stücken"
 
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:122
+#, fuzzy
+msgid "Conversion Preferences"
+msgstr "_Einstellungen ändern"
+
+#: ../data/gtkpod.glade.h:123
 msgid "Conversion Progress Display"
+msgstr "Anzeige Konvertierungsfortschritt"
+
+#: ../data/gtkpod.glade.h:124
+#, fuzzy
+msgid "Conversion Settings..."
+msgstr "_Konvertierungsprotokoll"
+
+#: ../data/gtkpod.glade.h:125
+msgid "Convert AAC (M4A)"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:126
+msgid "Convert FLAC"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:127
+#, fuzzy
+msgid "Convert MP3"
+msgstr "Cover"
+
+#: ../data/gtkpod.glade.h:128
+msgid "Convert Ogg Vorbis"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:129
+#, fuzzy
+msgid "Convert WAV"
+msgstr "Cover"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Convert compatible formats to a single format"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:132
 msgid "Cover"
 msgstr "Cover"
 
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:134
+#, fuzzy
+msgid "Cover art file pattern:"
+msgstr "Cover-Bild existiert bereits"
+
+#: ../data/gtkpod.glade.h:135
 msgid "Create New Playlist"
 msgstr "Neue Wiedergabeliste erstellen"
 
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:136
 msgid "Create Repository"
 msgstr "Erstelle Datenbank "
 
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:137
 msgid "Create _Playlist File"
 msgstr "_Erstelle Datei der Wiedergabeliste"
 
-#: ../data/gtkpod.glade.h:123
-msgid "Credits"
-msgstr "Danksagung"
+#: ../data/gtkpod.glade.h:138
+msgid "Customize..."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:124
-msgid "Currently only rating is supported."
-msgstr "Gegenwärtig wird nur 'Bewertung' unterstützt."
-
-#: ../data/gtkpod.glade.h:125
-msgid "Delete repository"
+#: ../data/gtkpod.glade.h:139
+#, fuzzy
+msgid "Delete Repository"
 msgstr "Datenbank löschen"
 
-#: ../data/gtkpod.glade.h:126
+#: ../data/gtkpod.glade.h:140
 #, fuzzy
-msgid ""
-"Delete tracks that are no longer present from the\n"
-"iPod or repository"
+msgid "Delete missing tracks from the iPod or repository"
 msgstr ""
-"Lösche Stücke, die nicht mehr auf dem iPod oder in der Datenbank vorhanden "
-"sind."
+"Bestätigung vor dem vollständigen Löschen vom iPod oder aus der Datenbank"
 
-#: ../data/gtkpod.glade.h:128
-msgid "Deleted tracks"
-msgstr "Gelöschte Stücke"
+#: ../data/gtkpod.glade.h:141
+#, fuzzy
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "%d Stück wurde aus der Wiedergabeliste '%s' entfernt."
 
-#: ../data/gtkpod.glade.h:129
-msgid "Descending"
-msgstr "Absteigend"
-
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:142
 msgid "Details"
 msgstr "Details"
 
-#: ../data/gtkpod.glade.h:132
+#: ../data/gtkpod.glade.h:144
 #, no-c-format
 msgid ""
 "Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -592,7 +684,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:134
+#: ../data/gtkpod.glade.h:146
 #, no-c-format
 msgid ""
 "Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -610,235 +702,169 @@
 "Dateiname (benötigt 'Erweiterte Informationen'): %o, die aktuelle "
 "Wiedergabeliste: %p, das Zeichen '%': %%."
 
-#: ../data/gtkpod.glade.h:136
-#, no-c-format
+#: ../data/gtkpod.glade.h:147
 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 ""
-"Bestimmt, wie der Dateiname von Stücken gewählt wird, die vom iPod kopiert "
-"werden. Bsp.: '%a/%A/%T - %t.mp3' oder '%o'. Mehrere Schablonen können durch "
-"Semikolons getrennt werden -- gtkpod ermittelt die passende Schablone anhand "
-"des Dateinamensuffix. Künstler: %a, Album: %A, Komponist: %c, Titel: %t, "
-"Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y,  ursprünglicher "
-"Dateiname (benötigt 'Erweiterte Informationen'): %o, ursprünglicher "
-"Dateiname ohne Erweiterung: %O, die aktuelle Wiedergabelist: %p, das Zeichen "
-"'%': %%."
-
-#: ../data/gtkpod.glade.h:137
-msgid ""
 "Directories to sync with are determined from the filenames of the tracks in "
 "the playlist."
 msgstr ""
 "Abzugleichende Verzeichnisse werden aus den Dateinamen der Wiedergabeliste "
 "ermittelt."
 
-#: ../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:148
+#, fuzzy
+msgid "Display"
+msgstr "_Anzeige"
 
-#: ../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:140
+#: ../data/gtkpod.glade.h:149
 msgid "Display conversion log"
-msgstr ""
+msgstr "Zeige Konvertierungsprotokoll"
 
-#: ../data/gtkpod.glade.h:141
-msgid "Display info about detected duplicates"
+#: ../data/gtkpod.glade.h:150
+#, fuzzy
+msgid "Display information about detected duplicate files"
 msgstr "Information über erkannte Duplikate anzeigen"
 
-#: ../data/gtkpod.glade.h:142
-msgid "Display info about non-updated tracks"
-msgstr "Informationen über nicht aktualisierte Stücke anzeigen"
-
-#: ../data/gtkpod.glade.h:143
-msgid "Display info about updated tracks"
-msgstr "Informationen über aktualisierte Stücke anzeigen"
-
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:151
 msgid "Display messages and warnings at startup"
 msgstr "Nachrichten und Warnungen beim Start des Programms anzeigen"
 
-#: ../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:152
+#, fuzzy
+msgid "Display synchronization results"
+msgstr "Zeige Konvertierungsprotokoll"
 
-#: ../data/gtkpod.glade.h:146
-msgid "Display toolbar..."
-msgstr "Werkzeugleiste anzeigen..."
-
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:153
 msgid "Display tooltips in main window"
 msgstr "Werkzeugtipps im Hauptfenster anzeigen"
 
-#: ../data/gtkpod.glade.h:148
-msgid "Display tooltips in prefs window"
-msgstr "Werkzeugtipps im Fenster 'Einstellungen' anzeigen"
-
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:154
 msgid "Display tracks that match the criteria entered above."
 msgstr "Stücke anzeigen, welche die oben genannten Kriterien erfüllen."
 
-#: ../data/gtkpod.glade.h:150
-msgid ""
-"Displayed\n"
-"Tracks"
-msgstr ""
-"Angezeigte\n"
-"Stücke"
-
-#: ../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:154
+#: ../data/gtkpod.glade.h:155
 msgid "Don't automatically sync on startup"
 msgstr "Beim Start nicht automatisch abgleichen"
 
-#: ../data/gtkpod.glade.h:155
-#, fuzzy
-msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+#: ../data/gtkpod.glade.h:156
+msgid "Dummy\n"
 msgstr ""
-"Die Duplikat-Erkennung basiert auf einem (modifizierten) md5-Hash über die "
-"Dateien."
 
-#: ../data/gtkpod.glade.h:156
-msgid "Edit Repository/iPod Options"
-msgstr "_Ändere Verzeichnis / iPod Optionen"
-
-#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:664
 msgid "Edit Smart Playlist"
 msgstr "Intelligente Wiedergabeliste editieren"
 
-#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:751
 msgid "Edit Track Details"
-msgstr "_Bearbeite Stücke"
+msgstr "Bearbeite Stücke"
 
-#: ../data/gtkpod.glade.h:159
-msgid "Edit _Preferences"
-msgstr "_Einstellungen ändern"
-
 #: ../data/gtkpod.glade.h:160
-msgid "Effective free space"
-msgstr "Effektiv freier Platz"
-
-#: ../data/gtkpod.glade.h:161
 msgid "Empty Playlist"
 msgstr "Wiedergabeliste leeren"
 
+#: ../data/gtkpod.glade.h:161
+#, fuzzy
+msgid "Encoding Preferences"
+msgstr "_Einstellungen ändern"
+
 #: ../data/gtkpod.glade.h:162
-msgid "Exclude file mask(s)"
-msgstr "Schließe Dateimaske(n) aus"
+#, fuzzy
+msgid "Encoding..."
+msgstr "kopiere..."
 
 #: ../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."
+msgid "Excluded files..."
+msgstr "Schließe Dateimaske(n) aus"
 
 #: ../data/gtkpod.glade.h:164
-msgid "File size"
-msgstr "Dateigröße"
+msgid "Exclusions List"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:165
-msgid "File size (deleted)"
-msgstr "Dateigröße (gelöscht)"
+msgid "Expand columns beyond the track list width"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:166
-msgid "File size (non-transferred)"
-msgstr "Dateigröße (nicht übertragen)"
+msgid "Export can be continued at a later time if canceled."
+msgstr "Der Export kann später fortgesetzt werden, falls er abgebrochen wird."
 
 #: ../data/gtkpod.glade.h:167
-msgid "Filename Format: "
-msgstr "Format für Dateinamen: "
+msgid "Feedback"
+msgstr ""
 
 #: ../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 ""
-"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"
+msgid "Filename Parse Preferences"
+msgstr "_Einstellungen ändern"
 
 #: ../data/gtkpod.glade.h:169
 #, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
-msgstr "Versuche zuerst <i>folder.jpg</i>, dann <i>&lt;Künstler&gt;.jpg</i>"
+msgid "Filename format: "
+msgstr "Format für Dateinamen: "
 
 #: ../data/gtkpod.glade.h:170
-msgid "Flac with :"
-msgstr ""
+#, fuzzy
+msgid "Filename parse pattern:"
+msgstr "Format für Dateinamen: "
 
+#: ../data/gtkpod.glade.h:171
+#, fuzzy
+msgid "Filter tab:"
+msgstr "Dateityp"
+
 #: ../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 ""
-"'xmms %s', z.B., löscht die aktuelle Wiedergabeliste von xmms, fügt die "
-"ausgewählten Stücke hinzu und beginnt mit der Wiedergabe."
+#, fuzzy
+msgid "Filter tabs"
+msgstr "Dateigröße"
 
+#: ../data/gtkpod.glade.h:173
+#, fuzzy
+msgid "Filter:"
+msgstr "_Datei"
+
 #: ../data/gtkpod.glade.h:174
-#, no-c-format
+#, fuzzy
 msgid ""
-"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
-"current playlist."
+"Find orphan files (files with no track info in DB) and dangling tracks "
+"(tracks with no corresponding files on iPod)"
 msgstr ""
-"'xmms -e %s', z.B., fügt die ausgewählten Stücke zur aktuellen "
-"Wiedergabeliste von xmms hinzu."
+"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:175 ../src/display_sorttabs.c:2985
-#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
-msgid "Genre"
-msgstr "Genre"
+#: ../data/gtkpod.glade.h:175
+#, fuzzy
+msgid "From the hard disk"
+msgstr "Auf der Festplatte löschen"
 
 #: ../data/gtkpod.glade.h:176
-msgid "Group artists on compilation CDs"
-msgstr "Künstler auf Sampler-CDs gruppieren"
+#, fuzzy
+msgid "From the iPod"
+msgstr "Vom iPod entfernen "
 
 #: ../data/gtkpod.glade.h:177
 #, 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)."
+msgid "From the local database"
+msgstr "Lokale Datenbank"
+
+#: ../data/gtkpod.glade.h:178 ../src/display_spl.c:182 ../src/info.c:794
+msgid "GB"
+msgstr "GB"
+
+#: ../data/gtkpod.glade.h:179 ../src/display_sorttabs.c:2998
+#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../data/gtkpod.glade.h:180
+msgid "Get Help _Online"
 msgstr ""
-"Diese Option wird dringend empfohlen, um einen schnelleren Import der "
-"iTunesDB bei eingeschalteter Duplikatenerkennung zu erreichen. Da außerdem "
-"die Originaldateinamen gespeichert werden, können Tag-Änderungen in die "
-"Originaldatei übernommen werden und es ist sogar möglich, den Inhalt Ihres "
-"iPods im Falle eines Dateisystemschadens (Neuformatierung des iPods) zu "
-"rekonstruieren (dazu müssen die 'transferred=' Einträge in der gesicherten "
-"Datenbank auf '0' gesetzt und 'offline' eingelesen werden)."
 
-#: ../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
+#, fuzzy
+msgid "Group artist filter tab by compilation CDs"
+msgstr "Künstler auf Sampler-CDs gruppieren"
 
-#: ../data/gtkpod.glade.h:179
+#: ../data/gtkpod.glade.h:182
 msgid ""
 "If available, the local copy of the track is referenced in the playlist. "
 "Otherwise the file on the iPod is used."
@@ -846,39 +872,15 @@
 "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: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:181
+#: ../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 ""
 "Wenn diese Option aktiviert ist, wird beim Sortieren die Groß-/"
-"Kleinschreibung beachtet. Mit den meisten Zeichensätzen funktioniert diese "
-"Funktion jedoch nicht wie gewünscht."
+"Kleinschreibung beachtet. Mit den meisten Zeichensätzen funktioniert dies "
+"jedoch nicht wie gewünscht."
 
-#: ../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 ""
-"Wenn der Dateiname (inkl. Pfad) eines bereits eingelesenen Stückes identisch "
-"ist mit dem Namen eines neu einzulesenden Stückes, dann erlaubt diese Option "
-"Ihnen, das alte Stück zu überschreiben. Normalerweise wird das Einlesen des "
-"Stückes einfach übersprungen. Wenn sich die Datei nicht geändert hat und Sie "
-"die Option 'Mehrfaches Einlesen von Stücken verhindern' aktiviert haben, "
-"wird das Einlesen ebenfalls übersprungen."
-
-#: ../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:184
 msgid ""
 "If you check this, information (cover art and meta information) changed for "
@@ -890,28 +892,10 @@
 "kopiert. Bitte mit Vorsicht verwenden."
 
 #: ../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 ""
-"Wenn die Hauptwiedergabeliste nicht automatisch ausgewählt wird, verläuft "
-"der Import der iTunes Datenbank zu Beginn deutlich schneller, da die Anzeige "
-"nicht aktualisiert werden muss."
-
-#: ../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 ""
-"Falls mehrere Stücke in der Stücke-Anzeige ausgewählt sind und ein Tag des "
-"ersten Stückes geändert wird, werden die entsprechenden Tags auch in den "
-"anderen Stücken aktualisiert."
-
-#: ../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:188
+#: ../data/gtkpod.glade.h:186
 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."
@@ -920,6 +904,17 @@
 "'Dargestellte Reihenfolge speichern' im 'Bearbeiten' Menü oder wählen die "
 "Option \"Autom. speichern\" unten aus."
 
+#: ../data/gtkpod.glade.h:187
+#, fuzzy
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr ""
+"Auch nie gespielte Stücke in die \"am besten bewertete\" Wiedergabeliste "
+"aufnehmen"
+
+#: ../data/gtkpod.glade.h:188
+msgid "Info field template:"
+msgstr ""
+
 #: ../data/gtkpod.glade.h:189
 msgid "Initialize iPod"
 msgstr "Initialisiere iPod"
@@ -933,106 +928,100 @@
 "Danach einfügen"
 
 #: ../data/gtkpod.glade.h:192
-msgid "Keeps all compilation CDs grouped together in the artists sort tab."
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
 msgstr ""
-"Alle Sampler-CDs im Filter-Eintrag 'Künstler' als 'Sampler' gruppieren."
 
-#: ../data/gtkpod.glade.h:193
+#: ../data/gtkpod.glade.h:196
 msgid "Live _updating"
 msgstr "Live Akt_ualisierung"
 
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:197
 msgid "Load iPod(s)"
 msgstr "iPod(s) einlesen"
 
-#: ../data/gtkpod.glade.h:195
-msgid "Lower Margin"
-msgstr "Untere Grenze"
+#: ../data/gtkpod.glade.h:198
+#, fuzzy
+msgid "Logic:"
+msgstr " Logik:"
 
-#: ../data/gtkpod.glade.h:196
-msgid "M4A with :"
+#: ../data/gtkpod.glade.h:199
+msgid ""
+"MP3\n"
+"AAC\n"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:197
-msgid "MP3 with :"
+#: ../data/gtkpod.glade.h:202
+msgid "Mass-modify tags when multiple tracks are selected"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:198
-msgid "Match al_l of the following"
-msgstr "Al_le der folgenden Regeln"
-
-#: ../data/gtkpod.glade.h:199
-msgid "Match an_y of the following"
-msgstr "Mindestens _eine der folgenden Regeln"
-
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:203
 msgid "Match only _checked tracks"
 msgstr "Nur ausgewählte Stü_cke einbeziehen"
 
-#: ../data/gtkpod.glade.h:201
-msgid "Maximum number of background threads:"
+#: ../data/gtkpod.glade.h:204
+#, fuzzy
+msgid "Match:"
+msgstr "Pfad:"
+
+#: ../data/gtkpod.glade.h:205
+msgid "Maximum cache size:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:202
-msgid "Maximum size of cache directory (in GB):"
+#: ../data/gtkpod.glade.h:206
+#, fuzzy
+msgid "Maximum threads:"
+msgstr "Maximale Zahl der Hintergrunddienste:"
+
+#: ../data/gtkpod.glade.h:207
+msgid "Metadata"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:208
 msgid "Model:"
 msgstr "Modell:"
 
-#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
-msgid "Modified"
+#: ../data/gtkpod.glade.h:209
+#, fuzzy
+msgid "Modified:"
 msgstr "Modifiziert"
 
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:210
 msgid "Most Recently Played Tracks"
 msgstr "Zuletzt gespielte Stücke"
 
-#: ../data/gtkpod.glade.h:206
-msgid "Move selected attributes to the displayed list"
-msgstr ""
+#: ../data/gtkpod.glade.h:211
+#, fuzzy
+msgid "Music"
+msgstr "Stammverzeichnis für Musik:"
 
-#: ../data/gtkpod.glade.h:207
-msgid "Music Root:"
+#: ../data/gtkpod.glade.h:212
+#, fuzzy
+msgid "Music root:"
 msgstr "Stammverzeichnis für Musik:"
 
-#: ../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 ""
-"Musikdateien können Bilder im 'APIC Tag' enthalten. Dies wird derzeit nur "
-"bei MP3-Dateien unterstützt."
-
-#: ../data/gtkpod.glade.h:209
+#: ../data/gtkpod.glade.h:213
 msgid "Never show this dialogue again"
 msgstr "Diesen Dialog nie wieder zeigen"
 
-#: ../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
+#: ../data/gtkpod.glade.h:214 ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76 ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113 ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448 ../src/misc_playlist.c:450
 msgid "New Playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: ../data/gtkpod.glade.h:211
+#: ../data/gtkpod.glade.h:215
 msgid "No lower margin"
 msgstr "Keine untere Grenze"
 
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:216
 msgid "No upper margin"
 msgstr "Keine obere Grenze"
 
-#: ../data/gtkpod.glade.h:213
-msgid "Non-transferred tracks"
-msgstr "Nicht übertragene Stücke"
-
-#: ../data/gtkpod.glade.h:214
-msgid "None"
-msgstr "Keine"
-
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:217
 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 "
@@ -1050,46 +1039,6 @@
 "eingelesen wurden, haben keine Informationen über den Zeichensatz "
 "gespeichert und der oben spezifizierte Zeichensatz wird verwendet."
 
-#: ../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 ""
-"Normalerweise wird der Zeichensatz, der beim ersten Einlesen spezifiziert "
-"wurde, auch verwendet, um ein Stück zu aktualisieren. Wenn Sie beim ersten "
-"Einlesen einen falschen Zeichensatz angegeben haben und dies nun mittels "
-"'Stücke aktualisieren' korrigieren wollen, müssen Sie diese Option "
-"auswählen. Bitte beachten Sie: die Information über den verwendeten "
-"Zeichensatz wird mit den erweiterten Informationen gespeichert (siehe "
-"'Schreiben der iTunesDB' weiter unten). Stücke, die vor Version 0.51 "
-"eingelesen wurden, haben keine Informationen über den Zeichensatz "
-"gespeichert und der oben spezifizierte Zeichensatz wird verwendet."
-
-#: ../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 ""
-"Normalerweise wird der Zeichensatz, der beim ersten Einlesen des Stückes "
-"angegeben wurde, auch beim Schreiben der ID3-Tags verwendet. Wenn Sie beim "
-"ersten Einlesen einen falschen Zeichensatz angegeben haben, müssen Sie diese "
-"Option zusammen mit dem richtigen Zeichensatz auswählen. Bitte beachten Sie: "
-"Die Information über den verwendeten Zeichensatz wird mit den erweiterten "
-"Informationen gespeichert (siehe 'Schreiben der iTunesDB' auf der 'Eingabe-"
-"Ausgabe' Seite). Stücke, die vor Version 0.51 eingelesen wurden, haben keine "
-"Informationen über den Zeichensatz gespeichert und der auf der 'Eingabe/"
-"Ausgabe'-Seite eingestellte Zeichensatz wird verwendet."
-
 #: ../data/gtkpod.glade.h:218
 msgid ""
 "Normally, if a track is no longer present in the sync directory, it will be "
@@ -1110,385 +1059,316 @@
 "aus der Wiedergabeliste auch Löschen auf dem iPod bedeutet."
 
 #: ../data/gtkpod.glade.h:221
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:222
 msgid "Notes sync command:"
 msgstr "Befehl zum Abgleich der Notizen:"
 
-#: ../data/gtkpod.glade.h:222
-msgid "Number of playlists"
-msgstr "Anzahl der Wiedergabelisten"
-
 #: ../data/gtkpod.glade.h:223
-msgid "Number of tracks"
-msgstr "Anzahl der Stücke"
+#, fuzzy
+msgid "Number of filter tabs:"
+msgstr "A_nzahl der Sortierungseinträge:"
 
 #: ../data/gtkpod.glade.h:224
-msgid "Number of tracks in generated playlists:"
-msgstr "Anzahl der Stücke in generierten Wiedergabelisten:"
+#, fuzzy
+msgid "Number of tracks:"
+msgstr "Anzahl der Stücke"
 
 #: ../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 ""
-"Anzahl der Stücke in den generierten Wiedergabelisten 'Am häufigsten gehörte "
-"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:226
-msgid "Ogg with :"
-msgstr ""
-
-#: ../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:228
+#: ../data/gtkpod.glade.h:226
 msgid "On startup automatically sync with the following directory"
 msgstr "Beim Start automatisch mit folgendem Verzeichnis abgleichen"
 
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically update (Live Playlist)"
 msgstr "Automatische Aktualisierung beim Start"
 
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:228
 msgid "One for each Album"
 msgstr "Eine für jedes Album"
 
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:229
 msgid "One for each Artist"
 msgstr "Eine für jeden Künstler"
 
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:230
 msgid "One for each Composer"
 msgstr "Eine für jeden Komponisten"
 
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:231
 msgid "One for each Genre"
 msgstr "Eine für jedes Genre"
 
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:232
 msgid "One for each Rating"
 msgstr "Eine für jede Bewertung"
 
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:233
 msgid "One for each Year"
 msgstr "Eine für jedes Jahr"
 
-#: ../data/gtkpod.glade.h:236
-msgid "Overwrite tags that are already set"
-msgstr "Tags, die bereits gesetzt sind, überschreiben."
+#: ../data/gtkpod.glade.h:234
+#, fuzzy
+msgid "Overwrite existing tags"
+msgstr "Überschreibe vorhandene Datei: '%s'\n"
 
-#: ../data/gtkpod.glade.h:237
-msgid "Password:"
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:236
 msgid "Path:"
 msgstr "Pfad:"
 
-#: ../data/gtkpod.glade.h:239
-#, fuzzy
+#: ../data/gtkpod.glade.h:237
 msgid "Photo Window"
-msgstr "Info _Fenster"
+msgstr "Foto Fenster"
 
-#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
-msgid "Play time"
-msgstr "Spielzeit"
-
-#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
-#: ../src/misc_conversion.c:77
-msgid "Playcount"
+#: ../data/gtkpod.glade.h:238
+#, fuzzy
+msgid "Playcount:"
 msgstr "Wiedergabezähler"
 
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
-msgid "Played"
+#: ../data/gtkpod.glade.h:239
+#, fuzzy
+msgid "Played:"
 msgstr "Gespielt"
 
-#: ../data/gtkpod.glade.h:243
+#: ../data/gtkpod.glade.h:240
 msgid "Playlist name:"
 msgstr "Name der Wiedergabeliste:"
 
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:241
 msgid "Playlist type:"
 msgstr "Art der Wiedergabeliste:"
 
-#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
+#: ../data/gtkpod.glade.h:242 ../src/display_playlists.c:2397
 msgid "Playlists"
 msgstr "Wiedergabelisten"
 
-#: ../data/gtkpod.glade.h:246
+#: ../data/gtkpod.glade.h:243
 msgid "Please refer to the notice below."
 msgstr "Bitte beachten Sie den Hinweis weiter unten."
 
-#: ../data/gtkpod.glade.h:247
-msgid "Please specify a time interval"
-msgstr "Bitte Zeitintervall angeben"
+#: ../data/gtkpod.glade.h:244
+#, fuzzy
+msgid "Position:"
+msgstr "Sampler"
 
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:245
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../data/gtkpod.glade.h:249
-#, fuzzy
+#: ../data/gtkpod.glade.h:246
 msgid "Progress Information"
-msgstr "Information"
+msgstr "Fortschritt"
 
-#: ../data/gtkpod.glade.h:250
-msgid "R_ename Album"
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:252
+msgid "R_ename Album"
+msgstr "Album umb_enennen"
+
+#: ../data/gtkpod.glade.h:253
 msgid "Random Playlist from Displayed Tracks"
 msgstr "Zufällige aus den angezeigten Stücken"
 
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:254
 msgid "Randomize Current Playlist"
-msgstr "_Aktuelle Wiedergabeliste zufällig sortieren"
+msgstr "Aktuelle Wiedergabeliste zufällig sortieren"
 
-#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
-#: ../src/misc_conversion.c:78
-msgid "Rating"
+#: ../data/gtkpod.glade.h:255
+#, fuzzy
+msgid "Rating:"
 msgstr "Bewertung"
 
-#: ../data/gtkpod.glade.h:254
-msgid "Read coverart from embedded APIC data"
-msgstr "Lese Cover-Bild aus den APIC Daten"
+#: ../data/gtkpod.glade.h:256
+msgid "Read embedded cover art information"
+msgstr ""
 
-#: ../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:257
+msgid "Read embedded tags from music files"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:256
+#: ../data/gtkpod.glade.h:258
+msgid "Report a _Problem"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:259
 #, fuzzy
-msgid "Remove selected attributes from the displayed list"
-msgstr "Ausgewählte Stücke aus der Wiedergabeliste"
+msgid "Report problems when accessing mserv"
+msgstr "Probleme während des Zugriffs auf die mserv Datenbank anzeigen"
 
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:260
+#, fuzzy
+msgid "Repository"
+msgstr "Neue Datenbank "
+
+#: ../data/gtkpod.glade.h:261
 msgid "Repository Options"
-msgstr "Datenbank-Optionen"
+msgstr "Datenbank Optionen"
 
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:262
 msgid "Repository name:"
 msgstr "Datenbankname:"
 
-#: ../data/gtkpod.glade.h:259
+#: ../data/gtkpod.glade.h:263
 msgid "Repository type:"
 msgstr "Datenbanktyp:"
 
-#: ../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
+#, fuzzy
+msgid "Repository/iPod Options"
+msgstr "Ändere Verzeichnis / iPod Optionen"
 
-#: ../data/gtkpod.glade.h:261
-msgid "Rules"
-msgstr "Regeln"
-
-#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
+#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:806
 msgid "Save Changes"
 msgstr "Änderungen sichern"
 
-#: ../data/gtkpod.glade.h:263
-#, fuzzy
-msgid "Scrobble Tracks?"
-msgstr "Ausgewählte _Stücke"
-
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:266
 msgid "Select '-1' for no upper limit."
 msgstr "'-1' wählen für 'keine obere Schranke'."
 
-#: ../data/gtkpod.glade.h:265
+#: ../data/gtkpod.glade.h:267
 msgid "Select '0' for no lower limit."
 msgstr "'0' wählen für 'keine untere Schranke'."
 
-#: ../data/gtkpod.glade.h:266
-msgid ""
-"Selected\n"
-"Playlist"
-msgstr ""
-"Ausgewählte\n"
-"Wiedergabeliste"
-
 #: ../data/gtkpod.glade.h:268
-msgid ""
-"Selected\n"
-"Tracks"
-msgstr ""
-"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"
+msgstr "Gewählter Filter-Eintrag der Datenbank"
 
-#: ../data/gtkpod.glade.h:271
-#, fuzzy
+#: ../data/gtkpod.glade.h:269
 msgid "Selected Filter Tab Entry from Hard Disk"
-msgstr "Ausgewählter Filter-Eintrag der Festplatte"
+msgstr "Gewählter Filter-Eintrag der Festplatte"
 
-#: ../data/gtkpod.glade.h:272
-#, fuzzy
+#: ../data/gtkpod.glade.h:270
 msgid "Selected Filter Tab Entry from Playlist"
-msgstr "Ausgewählter Filter-Eintrag der Wiedergabeliste"
+msgstr "Gewählter Filter-Eintrag der Wiedergabeliste "
 
-#: ../data/gtkpod.glade.h:273
-#, fuzzy
+#: ../data/gtkpod.glade.h:271
 msgid "Selected Filter Tab Entry from iPod"
-msgstr "Ausgewählter Filter-Eintrag vom iPod"
+msgstr "Gewählter Filter-Eintrag des iPod "
 
-#: ../data/gtkpod.glade.h:274
+#: ../data/gtkpod.glade.h:272
 #, 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
+#: ../data/gtkpod.glade.h:273
 #, 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
+#: ../data/gtkpod.glade.h:274
 #, fuzzy
 msgid "Selected Playlist Including Tracks from iPod"
 msgstr "Ausgewählte Wiedergabeliste einschließlich der Stücke vom iPod"
 
-#: ../data/gtkpod.glade.h:277
+#: ../data/gtkpod.glade.h:275
 msgid "Selected Tab _Entry"
 msgstr "Ausgewählter _Eintrag"
 
-#: ../data/gtkpod.glade.h:278
+#: ../data/gtkpod.glade.h:276
 #, fuzzy
 msgid "Selected Tracks from Database"
 msgstr "Ausgewählte Stücke aus der Datenbank"
 
-#: ../data/gtkpod.glade.h:279
+#: ../data/gtkpod.glade.h:277
 #, fuzzy
 msgid "Selected Tracks from Hard Disk"
 msgstr "Ausgewählte Stücke von der Festplatte"
 
-#: ../data/gtkpod.glade.h:280
+#: ../data/gtkpod.glade.h:278
 #, fuzzy
 msgid "Selected Tracks from Playlist"
 msgstr "Ausgewählte Stücke aus der Wiedergabeliste"
 
-#: ../data/gtkpod.glade.h:281
+#: ../data/gtkpod.glade.h:279
 #, fuzzy
 msgid "Selected Tracks from iPod"
 msgstr "Ausgewählte Stücke vom iPod"
 
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:280
 msgid "Selected _Playlist"
 msgstr "Ausgewählte _Wiedergabeliste"
 
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:281
 msgid "Selected _Tracks"
-msgstr "Ausgewählte _Stücke"
+msgstr "Ausgewählte S_tücke"
 
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:282
 msgid "Selected playlist"
 msgstr "Ausgewählte Wiedergabeliste"
 
+#: ../data/gtkpod.glade.h:283
+msgid "Set Cover Art from _File"
+msgstr "Nehme Cover-Bild aus _Datei"
+
+#: ../data/gtkpod.glade.h:284
+msgid "Set still missing tags to file name"
+msgstr ""
+
 #: ../data/gtkpod.glade.h:285
 #, 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'"
+msgid "Settings..."
+msgstr "Breche ab..."
 
 #: ../data/gtkpod.glade.h:286
-#, fuzzy
-msgid "Set Cover Art from _File"
-msgstr "Lege Cover-Bild fest"
+msgid "Show summary of sync result"
+msgstr "Zeige Zusammenfassung nach Abgleich."
 
 #: ../data/gtkpod.glade.h:287
-msgid "Set mountpoint or edit repository options"
-msgstr "Einhängepunkt festlegen oder Datenbank-Optionen editieren"
+#, fuzzy
+msgid "Skip the track"
+msgstr "Ein Stück kopiert"
 
-#: ../data/gtkpod.glade.h:288
-msgid "Set options for Calendar/Contacts/Notes"
-msgstr "Setze Optionen für Kalender/Kontakte/Notizen"
+#: ../data/gtkpod.glade.h:288 ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
+msgid "Smart Playlist"
+msgstr "Intelligente Wiedergabeliste"
 
 #: ../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 ""
-"Benutze 'aacgain -q -k' zur Normalisierung der Lautstärke im Werkzeug-Menü. "
-"Falls gewählt, werden Normalisierungsdaten für m4a und m4b Dateien errechnet "
-"und zu den Musikinformationen hinzugefügt."
+#, fuzzy
+msgid "Sort by:"
+msgstr "   Sortieren nach:"
 
 #: ../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 ""
-"Benutze 'mp3gain -q -k' zur Normalisierung der Lautstärke im Werkzeug-Menü. "
-"Falls gewählt, werden Normalisierungsdaten für mp3 Dateien errechnet und zu "
-"den Musikinformationen hinzugefügt."
-
-#: ../data/gtkpod.glade.h:291
-msgid "Set this to your last.fm password"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:292
-msgid "Set this to your last.fm username"
-msgstr ""
-
-#: ../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:294
-msgid ""
-"Set to 0 to use as many background threads as CPUs are available on your "
-"system."
-msgstr ""
-
-#: ../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:296
-msgid "Show summary of sync result"
-msgstr "Zeige Zusammenfassung nach Abgleich."
-
-#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
-#: ../src/repository.c:1356
-msgid "Smart Playlist"
-msgstr "Intelligente Wiedergabeliste"
-
-#: ../data/gtkpod.glade.h:298
 msgid "Sort tracks according to: "
 msgstr "Sortiere Stücke nach: "
 
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:291
 msgid "Sorting Options"
 msgstr "Sortieroptionen"
 
-#: ../data/gtkpod.glade.h:300
-msgid "Sorting case sensitive"
-msgstr "Beim Sortieren Groß-/Kleinschreibung beachten"
+#: ../data/gtkpod.glade.h:292
+#, fuzzy
+msgid "Sorting..."
+msgstr "Breche ab..."
 
-#: ../data/gtkpod.glade.h:301
-msgid "Sorttab: "
-msgstr "Sortierungseintrag: "
-
-#: ../data/gtkpod.glade.h:302
-msgid "Sorttabs"
-msgstr "Sortierungseinträge"
-
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:293
 msgid "Source:"
 msgstr "Quelle:"
 
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:295
 #, no-c-format
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
@@ -1497,151 +1377,105 @@
 "Geben sie den genauen Pfad einschließlich Kommandozeilenoptionen an. '%i' "
 "wird durch den Einhängepunkt des iPods ersetzt."
 
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:296
 msgid "Specify interval"
 msgstr "Intervall angeben"
 
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:297
 msgid "Start display automatically"
 msgstr "Anzeige automatisch starten"
 
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:298
 msgid "Synchronise Contacts, Calendar and Notes"
 msgstr "Kontakte, Kalender und Notizen abgleichen"
 
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:299
 msgid "Synchronize All"
 msgstr "Alles abgleichen"
 
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:300
 msgid "Synchronize Calendar"
 msgstr "Kalender abgleichen"
 
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:301
 msgid "Synchronize Contacts"
 msgstr "Kontakte abgleichen"
 
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:302
 msgid "Synchronize Notes"
 msgstr "Notizen abgleichen"
 
-#: ../data/gtkpod.glade.h:313
-msgid "Template for info field: "
-msgstr "Schablone für dieses Feld: "
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:304
+msgid "Text color"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:305
 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 ""
-"Die lokale Kopie des Stückes wird in der Wiedergabeliste eingetragen.\n"
+"Die lokale Kopie des Stückes wird in der Wiedergabeliste angezeigt.\n"
 "Falls das Stück lokal nicht verfügbar ist, wird eine Fehlermeldung "
 "ausgegeben."
 
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:306
 msgid ""
 "The output of the background conversion scripts is copied below. Each page "
 "of the notebook corresponds to one background thread."
 msgstr ""
+"Die Ausgabe der Konvertierungsskripte wird unten angezeigt. Jede Seite "
+"entspricht einem Hintergrunddienst."
 
-#: ../data/gtkpod.glade.h:316
-#, fuzzy
-msgid ""
-"The tags are written to the files on your harddrive and on the iPod (if "
-"available)."
-msgstr ""
-"Die Tags werden in die Originaldateien auf der Festplatte und auch auf dem "
-"iPod (falls angeschlossen) geschrieben."
-
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:307
 msgid "The track on the iPod is referenced in the playlist file."
-msgstr "Die Datei auf dem iPod wird in die Wiedergabeliste eingetragen."
+msgstr "Die Datei auf dem iPod wird in der Wiedergabeliste angezeigt."
 
-#: ../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: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 ""
-"Es wird empfohlen, Tags als V2.4 Tags zu schreiben. Allerdings unterstützen "
-"eventuell einige Programme diesen Standard noch nicht. ID3v2.4 verwendet "
-"Unicode, um die Tags zu speichern. Dies bedeutet, dass Sie sich keine "
-"Gedanken mehr über den verwendeten Zeichensatz machen zu brauchen. gtkpod "
-"verwendet UTF8, da dies die Tag-Länge reiner ASCII-Tags nicht verlängert. "
-"ID3v2.4 wird ebenfalls beim Schreiben verwendet, falls die Tags in der Datei "
-"bereits als V2.4 vorliegen."
-
-#: ../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:321
+#: ../data/gtkpod.glade.h:308
 msgid "Time:"
 msgstr "Zeit:"
 
-#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
+#: ../data/gtkpod.glade.h:309 ../src/display_sorttabs.c:3004
 #: ../src/display_spl.c:83 ../src/misc_conversion.c:62
 msgid "Title"
 msgstr "Titel"
 
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:310
 msgid ""
-"Total\n"
-"(iPod)"
+"To fill additional information, <i>gtkpod</i> can use a database provided by "
+"the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, "
+"leave this alone."
 msgstr ""
-"Insgesamt\n"
-"(iPod)"
 
-#: ../data/gtkpod.glade.h:325
-msgid ""
-"Total\n"
-"(local)"
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
 msgstr ""
-"Insgesamt\n"
-"(lokal)"
 
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:312
 msgid "Tracks"
 msgstr "Stücke"
 
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:313
 msgid "Tracks Most Often Listened To"
 msgstr "Am häufigsten gehörte Stücke"
 
-#: ../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:330
+#: ../data/gtkpod.glade.h:314
 msgid "Tracks in Selected Tab _Entry"
 msgstr "Stücke im ausgewählten _Sortierungseintrag"
 
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:315
 msgid "Tracks in Selected _Playlist"
 msgstr "Stücke in ausgewählter _Wiedergabeliste"
 
-#: ../data/gtkpod.glade.h:332
-msgid "Transfer tracks to the iPod in the background"
-msgstr ""
+#: ../data/gtkpod.glade.h:316
+#, fuzzy
+msgid "Transfer tracks in background mode"
+msgstr "Übertrage Stücke zum iPod im Hintergrund"
 
-#: ../data/gtkpod.glade.h:333
-msgid "Translators"
-msgstr "Übersetzer"
-
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:317
 msgid ""
 "Try to load contents of all connected iPods. For each iPod a separate "
 "repository must be set up."
@@ -1649,58 +1483,39 @@
 "Versuche den Inhalt aller angeschlossenen iPods zu laden. Für jeden iPod "
 "muss ein separates Verzeichnis existieren."
 
-#: ../data/gtkpod.glade.h:335
-#, fuzzy
+#: ../data/gtkpod.glade.h:318
 msgid "Undo _Track"
-msgstr "_Stück rückgängig"
+msgstr "S_tück rückgängig"
 
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:319
 msgid "Update _mserv Data from File"
 msgstr "_mserv-Daten aktualisieren"
 
-#: ../data/gtkpod.glade.h:337
-msgid "Update/Sync all playlists now"
+#: ../data/gtkpod.glade.h:320
+#, fuzzy
+msgid "Update information about the existing track"
+msgstr "Probleme während des Zugriffs auf die mserv Datenbank anzeigen"
+
+#: ../data/gtkpod.glade.h:321
+#, fuzzy
+msgid "Update/Sync All Playlists"
 msgstr "Aktualisierung/Abgleich aller Wiedergabelisten jetzt"
 
-#: ../data/gtkpod.glade.h:338
-msgid "Update/Sync playlist now"
+#: ../data/gtkpod.glade.h:322
+#, fuzzy
+msgid "Update/Sync Playlist"
 msgstr "Aktualisierung/Abgleich der Wiedergabeliste jetzt"
 
-#: ../data/gtkpod.glade.h:339
-msgid "Upper margin"
-msgstr "Obere Grenze"
+#: ../data/gtkpod.glade.h:323
+msgid "Use legacy format for MP3 tags"
+msgstr ""
 
-#: ../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:341
-msgid "Use 'Multi-Edit' for tracks selections"
-msgstr "'Multi-Edit' bei markierten Stücken verwenden"
-
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:324
 #, fuzzy
-msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
-msgstr "Benutze <i>&lt;Album&gt;.jpg</i> im übergeordneten Verzeichnis"
-
-#: ../data/gtkpod.glade.h:343
-#, fuzzy
-msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-msgstr "Benutze <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-
-#: ../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: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:346
-msgid "Use mserv database to fill additional information"
+msgid "Use mserv database to fill track information"
 msgstr "Benutze die mserv Datenbank für zusätzliche Informationen"
 
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:325
 msgid ""
 "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
 "for this filename."
@@ -1708,64 +1523,25 @@
 "Gewählten Zeichensatz (Einstellungen/'Hinzufügen/Aktualisieren/Abgleichen')\n"
 "für diesen Dateinamen verwenden."
 
-#: ../data/gtkpod.glade.h:349
-msgid ""
-"Use selected encoding (on the 'General' page)\n"
-"when writing tags"
-msgstr ""
-"Ausgewählte Kodierung (auf der Allgemein-Seite)\n"
-"beim Schreiben von ID3-Tags verwenden"
+#: ../data/gtkpod.glade.h:327
+msgid "Username:"
+msgstr "Benutzername:"
 
-#: ../data/gtkpod.glade.h:351
-#, fuzzy
-msgid "Use selected encoding also when updating or syncing tracks"
+#: ../data/gtkpod.glade.h:328
+msgid "Video Thumbnail Generation"
 msgstr ""
-"Gewählte Kodierung auch verwenden, wenn Stücke aktualisiert oder abgeglichen "
-"werden"
 
-#: ../data/gtkpod.glade.h:352
-msgid "Use this template to parse filename for tag information:"
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
 msgstr ""
-"Diese Schablone verwenden, um aus dem Dateinamen die Tags zu bestimmen:"
 
-#: ../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:354
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: ../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 ""
-"Es kommt selten vor, dass die Titel mehrerer Stücke auf den selben Text "
-"gesetzt werden sollen. Diese Option verhindert möglicherweise unerwünschte "
-"Resultate, insbesondere da noch keine 'Rückgängig'-Funktion existiert."
-
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:330
 #, fuzzy
 msgid "View Full Size"
 msgstr "Dateigröße"
 
-#: ../data/gtkpod.glade.h:357
-msgid "WAV with :"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:331
 msgid ""
-"When adding dirs/files, update information of\n"
-"existing tracks with identical filenames"
-msgstr ""
-"Beim Hinzufügen von Stücken bereits eingeleseneStücke mit demselben "
-"Dateinamen aktualisieren."
-
-#: ../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 "
@@ -1778,11 +1554,11 @@
 "es, einen schnellen Abgleich der Daten auf Ihrer Festplatte mit denen des "
 "iPods vorzunehmen."
 
-#: ../data/gtkpod.glade.h:361
-msgid "When syncing playlists"
-msgstr "Beim Abgleich von Wiedergabelisten"
+#: ../data/gtkpod.glade.h:332
+msgid "When updating tracks, display information:"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:333
 msgid ""
 "Will show a list of tracks removed and a list of tracks newly added or "
 "updated."
@@ -1790,309 +1566,296 @@
 "Zeigt eine Liste von gelöschten, neu hinzugefügten oder aktualisierten "
 "Stücken."
 
-#: ../data/gtkpod.glade.h:363
-msgid "Write ID3 tags to disk when modified in gtkpod"
+#: ../data/gtkpod.glade.h:334
+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:335
+#, fuzzy
+msgid "Write tags to disk when edited"
 msgstr ""
 "ID3 Tags bei Änderungen in gtkpod ebenfalls auf\n"
 "der Festplatte und auf dem iPod ändern"
 
-#: ../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:365
-#, fuzzy
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
 msgid ""
-"Write extended information (PC filenames, SHA1 hashes,\n"
-"encoding...). Recommended."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"Erweiterte Informationen schreiben (PC Dateinamen, MD5-Prüfsummen, "
-"Kodierung). Empfohlen."
 
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:352
+#, no-c-format
 msgid ""
-"You can also use the table headers, but this allows you to sort according to "
-"a column that is not displayed."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"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
+#: ../data/gtkpod.glade.h:371
 msgid "_About gtkpod"
-msgstr "Über gtkpod"
+msgstr "_Über gtkpod"
 
-#: ../data/gtkpod.glade.h:369
-#, fuzzy
+#: ../data/gtkpod.glade.h:372
 msgid "_Add Album"
-msgstr "Album"
+msgstr "_Album hinzufügen"
 
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:373
 msgid "_Add Image"
-msgstr ""
+msgstr "_Bild hinzufügen"
 
-#: ../data/gtkpod.glade.h:371
-#, fuzzy
+#: ../data/gtkpod.glade.h:374
 msgid "_Album"
-msgstr "Album"
+msgstr "_Album"
 
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:375
 msgid "_All Tracks"
 msgstr "_Alle Stücke"
 
-#: ../data/gtkpod.glade.h:373
-msgid "_Arrange Sort Tabs"
+#: ../data/gtkpod.glade.h:376
+#, fuzzy
+msgid "_Arrange Filter Tabs"
 msgstr "_Ordne Sortierungseinträge"
 
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:377
 msgid "_Check iPod's Files"
 msgstr "_Überprüfe iPod Dateien"
 
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:378
+#, fuzzy
+msgid "_Contents"
+msgstr "Kommentar"
+
+#: ../data/gtkpod.glade.h:379
 msgid "_Conversion Log"
-msgstr ""
+msgstr "_Konvertierungsprotokoll"
 
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:380
 msgid "_Create Playlists"
 msgstr "_Erstelle Wiedergabelisten"
 
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:381
 msgid "_Create iPod's Directories"
 msgstr "_iPod-Verzeichnis(se) erstellen"
 
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:382
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:383
 msgid "_Display"
 msgstr "_Anzeige"
 
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:384
 msgid "_Displayed Tracks"
 msgstr "_Angezeigte Stücke"
 
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:385
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../data/gtkpod.glade.h:382
-msgid "_Encoding (ID3, files):"
-msgstr "Kodi_erung (ID3, Dateien):"
-
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:386
 msgid "_Enqueue"
 msgstr "_Vormerken zum Abspielen"
 
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:387
 msgid "_Export Tracks from Database"
-msgstr "E_xport aus der Datenbank"
+msgstr "_Export aus der Datenbank"
 
-#: ../data/gtkpod.glade.h:385
-msgid "_File"
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:389
+#, fuzzy
+msgid "_Filter Bar"
 msgstr "_Datei"
 
-#: ../data/gtkpod.glade.h:386
+#: ../data/gtkpod.glade.h:390
 msgid "_General"
 msgstr "All_gemein"
 
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:391
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../data/gtkpod.glade.h:388
-msgid "_Ignore rules"
-msgstr "_Ignoriere die Regeln"
-
-#: ../data/gtkpod.glade.h:389
-msgid "_Image"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:392
 msgid "_Info Window"
-msgstr "Info _Fenster"
+msgstr "_Info Fenster"
 
-#: ../data/gtkpod.glade.h:391
-msgid "_Last.FM"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:392
-msgid "_Less Sort Tabs"
-msgstr "_Weniger Sortierungseinträge"
-
 #: ../data/gtkpod.glade.h:393
 msgid "_Limit to"
 msgstr "_Begrenzen auf"
 
 #: ../data/gtkpod.glade.h:394
 msgid "_Load iPod(s)"
-msgstr "i_Pod(s) einlesen"
+msgstr "iPod(s) ein_lesen"
 
 #: ../data/gtkpod.glade.h:395
 msgid "_Local"
 msgstr "_Lokal"
 
 #: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:397
 msgid "_M3U"
 msgstr "_M3U"
 
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:398
 msgid "_Misc."
-msgstr ""
+msgstr "_Verschiedenes"
 
-#: ../data/gtkpod.glade.h:398
-msgid "_More Sort Tabs"
+#: ../data/gtkpod.glade.h:399
+#, fuzzy
+msgid "_More Filter Tabs"
 msgstr "_Mehr Sortierungseinträge"
 
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:400
+#, fuzzy
+msgid "_Music"
+msgstr "_Verschiedenes"
+
+#: ../data/gtkpod.glade.h:401
 msgid "_Newly Added Tracks"
 msgstr "_Neu hinzugefügte Stücke"
 
-#: ../data/gtkpod.glade.h:400
+#: ../data/gtkpod.glade.h:402
 msgid "_Normalize Volume"
-msgstr "_Lautstärke normalisieren"
+msgstr "Lautstärke _normalisieren"
 
-#: ../data/gtkpod.glade.h:401
-msgid "_Number of sort tabs:"
-msgstr "A_nzahl der Sortierungseinträge:"
-
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
 msgid "_PLS"
 msgstr "_PLS"
 
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
+#, fuzzy
+msgid "_Photos"
+msgstr "Fotos"
+
+#: ../data/gtkpod.glade.h:405
 msgid "_Play Now"
 msgstr "_Jetzt abspielen"
 
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:406
 msgid "_Podcasts"
 msgstr "_Podcasts"
 
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:407
 msgid "_Prefer Local"
 msgstr "_Bevorzuge lokal"
 
-#: ../data/gtkpod.glade.h:406
-#, fuzzy
+#: ../data/gtkpod.glade.h:408
 msgid "_Remove Album"
-msgstr "Album"
+msgstr "Entfe_rne Album"
 
-#: ../data/gtkpod.glade.h:407
-#, fuzzy
+#: ../data/gtkpod.glade.h:409
 msgid "_Remove Cover Art"
-msgstr "Cover-Bild entfernen"
+msgstr "Entfe_rne Cover-Bild"
 
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:410
 msgid "_Remove Images"
-msgstr ""
+msgstr "Entfe_rne Bilder"
 
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:411
 msgid "_Save Changes"
-msgstr "_Änderungen sichern"
+msgstr "Änderungen _sichern"
 
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:412
 msgid "_Save Displayed Track Order"
-msgstr "_Reihenfolge der angezeigten Stücke speichern"
+msgstr "_Speichere Reihenfolge der Stücke"
 
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:413
 msgid "_Sorting"
 msgstr "_Sortierung"
 
-#: ../data/gtkpod.glade.h:412
-#, fuzzy
+#: ../data/gtkpod.glade.h:414
 msgid "_Synchronize Playlist with Dir(s)"
-msgstr "Wiedergabeliste mit Verzeichnis(sen) abgleichen"
+msgstr "Wiedergabeli_ste mit Verzeichnis(sen) abgleichen"
 
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:415
 msgid "_Toolbar"
-msgstr "Werkzeug_leiste"
+msgstr "Werkzeugleis_te"
 
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:416
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:417
 msgid "_Tooltips"
 msgstr "Werkzeug_tipps"
 
-#: ../data/gtkpod.glade.h:416
-msgid "_Track Info"
-msgstr "_Meta-Infos"
-
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:418
 msgid "_Undo All"
 msgstr "_Alles rückgängig"
 
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:419
 msgid "_Update Tracks from File"
-msgstr "_Stücke aus Datei aktualisieren"
+msgstr "Akt_ualisiere Stücke aus Datei"
 
-#: ../data/gtkpod.glade.h:419
-#, fuzzy
+#: ../data/gtkpod.glade.h:420
 msgid "_Video"
-msgstr "_Ansicht"
+msgstr "_Video"
 
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:421
 msgid "_View"
-msgstr "_Ansicht"
+msgstr "_Vorschau"
 
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:422
+msgid "_Zoom"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:423
 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'."
+#: ../data/gtkpod.glade.h:424
+msgid "checkbutton"
 msgstr ""
-"Künstler: %a, Album: %A, Komponist: %c, Titel: %t, Musikrichtung: %G, Stück-"
-"Nr.: %T, CD-Nr.: %C, Jahr: %Y, Platzhalter: %*, das Zeichen '%': %%. Mehrere "
-"Schablonen können durch ein Semikolon (';') getrennt werden -- die erste, "
-"die auf den Filenamen passt, wird verwendet. Beispiel: '%a - %A/%T %t.mp3;%t."
-"wav'."
 
-#: ../data/gtkpod.glade.h:424
-msgid "folder"
-msgstr "Mappe"
-
 #: ../data/gtkpod.glade.h:425
-msgid "folder.jpg"
-msgstr "folder.jpg"
+msgid "gtk-revert-to-saved"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:427
-#, no-c-format
-msgid "folder.jpg;%a.jpg"
-msgstr "folder.jpg;%a.jpg"
-
-#: ../data/gtkpod.glade.h:428
-msgid "gtkpod"
-msgstr "gtkpod"
-
-#: ../data/gtkpod.glade.h:429
-msgid "gtkpod Info"
+#: ../data/gtkpod.glade.h:426
+#, fuzzy
+msgid "gtkpod Information"
 msgstr "gtkpod Info"
 
-#: ../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 erwartet, dass die Dateinamen und ID3 tags in der Kodierung "
-"vorliegen, die hier angegeben wird. Diese kann natürlich zwischen zwei "
-"Aufrufen von 'Dateien hinzufügen' oder 'Verzeichnisse hinzufügen' geändert "
-"werden. 'Systemzeichensatz' bezeichnet die Standardkodierung der benutzten "
-"Sprache."
-
-#: ../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:433
+#: ../data/gtkpod.glade.h:429
 msgid ""
 "iPod\n"
 "Local Repository (Standard)\n"
@@ -2102,33 +1865,35 @@
 "Lokale Datenbank (Standard)\n"
 "Lokale Datenbank (Podcasts)\n"
 
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:433
 msgid "iPod mountpoint:"
 msgstr "iPod Einhängepunkt:"
 
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:434
 msgid "iTunesDB backup:"
-msgstr "Sicherung iTunes DB:"
+msgstr "Sicherung iTunesDB:"
 
-#: ../data/gtkpod.glade.h:439
-msgid "mserv Root:"
+#: ../data/gtkpod.glade.h:435
+#, fuzzy
+msgid "mserv Preferences"
+msgstr "Einstellungen"
+
+#: ../data/gtkpod.glade.h:436
+#, fuzzy
+msgid "mserv root:"
 msgstr "mserv Stammverzeichnis:"
 
-#: ../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:441 ../src/details.c:1347
+#: ../data/gtkpod.glade.h:437 ../src/details.c:1352
 msgid "n/a"
 msgstr "---"
 
-#: ../data/gtkpod.glade.h:442
+#: ../data/gtkpod.glade.h:438
 msgid "special_sorttab -- Don't translate!"
 msgstr "special_sorttab -- Don't translate!\""
 
 #: ../src/autodetection.c:310
 msgid "Could not initialize GnomeVFS\n"
-msgstr ""
+msgstr "Konnte GnomeVFS nicht initialisieren\n"
 
 #: ../src/autodetection.c:397
 #, c-format
@@ -2136,6 +1901,8 @@
 "Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
 "\n"
 msgstr ""
+"Neu eingehängter iPod unter '%s' konnte von gtkpod nicht geladen werden.\n"
+"\n"
 
 #: ../src/autodetection.c:403
 #, c-format
@@ -2143,11 +1910,12 @@
 "Newly mounted iPod at '%s' appears to be already loaded!\n"
 "\n"
 msgstr ""
+"Neu eingehängter iPod unter '%s' scheint schon geladen zu sein!\n"
+"\n"
 
 #: ../src/autodetection.c:416
-#, fuzzy
 msgid "New iPod"
-msgstr "Neue Wiedergabeliste"
+msgstr "Neuer iPod"
 
 #: ../src/charset.c:53
 msgid "Arabic (IBM-864)"
@@ -2351,290 +2119,286 @@
 
 #. sanity!
 #. check for "System Charset" and return NULL
-#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+#: ../src/charset.c:163 ../src/charset.c:173 ../src/charset.c:232
+#: ../src/charset.c:248 ../src/charset.c:332
 msgid "System Charset"
 msgstr "System-Zeichensatz"
 
 #. we are not the first instance of gtkpod -- the socket is
 #. already being used, so we pass
-#: ../src/clientserver.c:214
+#: ../src/clientserver.c:215
 msgid ""
 "Another instance of gtkpod was detected. Playcount server not started.\n"
 msgstr ""
-"Eine Instanz von gtkpod läuft bereits. Der Playcount-Server wird nicht "
+"Eine Instanz von gtkpod läuft bereits. Der Wiedergabe Server wird nicht "
 "gestartet.\n"
 
-#: ../src/confirmation.c:377
-msgid "Confirmation Dialogue"
-msgstr "Sicherheitsabfrage"
+#: ../src/confirmation.c:389
+#, fuzzy
+msgid "Confirmation"
+msgstr "Information"
 
-#: ../src/context_menus.c:362
+#: ../src/context_menus.c:364
 #, c-format
 msgid "Copied \"%s\" playlist to %s"
-msgstr ""
+msgstr "\"%s\" Wiedergabeliste nach %s kopiert"
 
-#: ../src/context_menus.c:401
+#: ../src/context_menus.c:403
 #, 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:429
+#: ../src/context_menus.c:431
 #, c-format
 msgid "Copied '%s' playlist to '%s' in '%s'"
-msgstr ""
+msgstr "'%s' Wiedergabeliste nach '%s' in '%s' kopiert"
 
-#: ../src/context_menus.c:462
-#, fuzzy, c-format
+#: ../src/context_menus.c:464
+#, 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."
+msgstr[0] "%d Stück nach '%s' in '%s' kopiert"
+msgstr[1] "%d Stücke nach '%s' in '%s' kopiert"
 
-#: ../src/context_menus.c:622 ../src/tools.c:854
+#: ../src/context_menus.c:624 ../src/tools.c:854
 msgid "Play Now"
 msgstr "Jetzt abpielen"
 
-#: ../src/context_menus.c:628 ../src/tools.c:867
+#: ../src/context_menus.c:630 ../src/tools.c:867
 msgid "Enqueue"
 msgstr "Zum Abspielen vormerken"
 
-#: ../src/context_menus.c:634
+#: ../src/context_menus.c:636
 msgid "Copy Tracks to Filesystem"
 msgstr "Kopiere Stücke zum Verzeichnis"
 
-#: ../src/context_menus.c:641 ../src/file_export.c:1085
+#: ../src/context_menus.c:643 ../src/file_export.c:1085
 msgid "Create Playlist File"
-msgstr "_Datei der Wiedergabeliste erstellen"
+msgstr "Datei der Wiedergabeliste erstellen"
 
-#: ../src/context_menus.c:648
+#: ../src/context_menus.c:650
 msgid "Create new Playlist"
 msgstr "Neue Wiedergabeliste erstellen"
 
-#: ../src/context_menus.c:655
+#: ../src/context_menus.c:657
 msgid "Update Tracks from File"
-msgstr "_Aktualisiere Stücke aus der Datei"
+msgstr "Aktualisiere Stücke aus der Datei"
 
-#: ../src/context_menus.c:669
+#: ../src/context_menus.c:671
 msgid "Sync Playlist with Dir(s)"
 msgstr "Wiedergabeliste mit Verzeichnis(sen) abgleichen"
 
-#: ../src/context_menus.c:679
+#: ../src/context_menus.c:681
 msgid "Remove All Tracks from iPod"
 msgstr "Alle Stücke vom iPod entfernen"
 
-#: ../src/context_menus.c:697
+#: ../src/context_menus.c:687 ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr "Ich bin sicher"
+
+#: ../src/context_menus.c:699
 msgid "Remove All Podcasts from iPod"
 msgstr "Alle Podcasts vom iPod entfernen"
 
-#: ../src/context_menus.c:712
+#: ../src/context_menus.c:714
 msgid "Delete Including Tracks"
 msgstr "Löschen inklusive der Stücke"
 
-#: ../src/context_menus.c:720
+#: ../src/context_menus.c:722
 msgid "Delete But Keep Tracks"
 msgstr "Löschen, aber Stücke behalten"
 
-#: ../src/context_menus.c:728
+#: ../src/context_menus.c:730
 msgid "Edit iPod Properties"
-msgstr "iPod Verzeichnisstruktur bearbeiten"
+msgstr "iPod Eigenschaften bearbeiten"
 
-#: ../src/context_menus.c:735
-#, fuzzy
+#: ../src/context_menus.c:737
 msgid "Edit Repository Properties"
-msgstr "iPod Verzeichnisstruktur bearbeiten"
+msgstr "Verzeichnisstruktur bearbeiten"
 
-#: ../src/context_menus.c:742
+#: ../src/context_menus.c:744
 msgid "Edit Playlist Properties"
-msgstr "Editiere Eigenschaften der Wiedergabeliste"
+msgstr "Eigenschaften der Wiedergabeliste bearbeiten"
 
-#: ../src/context_menus.c:770
+#: ../src/context_menus.c:772
 msgid "View Full Size Artwork"
-msgstr ""
+msgstr "Ansicht im Vollbildmodus"
 
-#: ../src/context_menus.c:777
-#, fuzzy
+#: ../src/context_menus.c:779
 msgid "Select Cover From File"
-msgstr "Vom iPod entfernen "
+msgstr "Cover aus Datei wählen"
 
-#: ../src/context_menus.c:790
+#: ../src/context_menus.c:792
 msgid "Load iPod"
 msgstr "iPod einlesen"
 
-#: ../src/context_menus.c:797
+#: ../src/context_menus.c:799
 msgid "Eject iPod"
 msgstr "iPod trennen"
 
-#: ../src/context_menus.c:814
+#: ../src/context_menus.c:816
 msgid "Remove All Tracks from Database"
 msgstr "Alle Stücke aus der Datenbank entfernen"
 
-#: ../src/context_menus.c:829
+#: ../src/context_menus.c:831
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Löschen inklusive der Stücke (Festplatte)"
 
-#: ../src/context_menus.c:837
+#: ../src/context_menus.c:839
 msgid "Delete Including Tracks (Database)"
 msgstr "Löschen inklusive der Stücke (Datenbank)"
 
-#: ../src/context_menus.c:845
+#: ../src/context_menus.c:847
 msgid "Delete From iPod"
 msgstr "Vom iPod entfernen "
 
-#: ../src/context_menus.c:853
+#: ../src/context_menus.c:855
 msgid "Delete From Playlist"
 msgstr "Aus der Wiedergabeliste entfernen"
 
-#: ../src/context_menus.c:861
+#: ../src/context_menus.c:863
 msgid "Delete From Harddisk"
-msgstr "Von der Festplatte löschen"
+msgstr "Auf der Festplatte löschen"
 
-#: ../src/context_menus.c:869
+#: ../src/context_menus.c:871
 msgid "Delete From Database"
 msgstr "Aus der Datenbank entfernen"
 
-#: ../src/context_menus.c:877
+#: ../src/context_menus.c:879
 msgid "Alphabetize"
 msgstr "Alphabetisch sortieren"
 
-#: ../src/context_menus.c:895
-#, fuzzy
+#: ../src/context_menus.c:897
 msgid "Remove Album"
-msgstr "Album"
+msgstr "Album entfernen"
 
-#: ../src/context_menus.c:905
-#, fuzzy
+#: ../src/context_menus.c:907
 msgid "Remove Photo"
-msgstr "Cover-Bild entfernen"
+msgstr "Foto entfernen"
 
-#: ../src/context_menus.c:922
+#: ../src/context_menus.c:924
 msgid "Rename Album"
-msgstr ""
+msgstr "Album umbenennen"
 
-#: ../src/context_menus.c:981 ../src/context_menus.c:1030
-#, fuzzy
+#: ../src/context_menus.c:983 ../src/context_menus.c:1032
 msgid "Copy selected playlist to..."
-msgstr "Ausgewählte Wiedergabeliste"
+msgstr "Kopiere gewählte Wiedergabeliste nach ..."
 
-#: ../src/context_menus.c:1083
-#, fuzzy
+#: ../src/context_menus.c:1085
 msgid "Copy selected track(s) to..."
-msgstr "Gelöschte Stücke"
+msgstr "Kopiere gewählte(s) Stück(e) nach ..."
 
 #: ../src/date_parser.l:269
 #, c-format
 msgid "Date format error: unrecognized character: '%s'\n"
-msgstr "Formatfehler Datum: unbekanntes Zeichen: '%s'\n"
+msgstr "Formatfehler: unbekanntes Zeichen: '%s'\n"
 
 #: ../src/details.c:82
-#, fuzzy
 msgid "Audio/Video"
-msgstr "Stammverzeichnis für Musik:"
+msgstr "Audio/Video"
 
 #: ../src/details.c:83
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
 #: ../src/details.c:84
-#, fuzzy
 msgid "Video"
-msgstr "_Ansicht"
+msgstr "Video"
 
 #: ../src/details.c:85
-#, fuzzy
 msgid "Podcast"
-msgstr "Podcasts"
+msgstr "Podcast"
 
 #: ../src/details.c:86
-#, fuzzy
 msgid "Video Podcast"
-msgstr "Podcasts"
+msgstr "Video Podcast"
 
 #: ../src/details.c:87
 msgid "Audiobook"
-msgstr ""
+msgstr "Hörbuch"
 
 #: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
-#, fuzzy
 msgid "Music Video"
-msgstr "Stammverzeichnis für Musik:"
+msgstr "Musik Video"
 
 #: ../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 ""
+msgstr "Fernsehshow"
 
 #: ../src/details.c:90
-#, fuzzy
 msgid "TV Show & Music Video"
-msgstr "Stammverzeichnis für Musik:"
+msgstr "Fernsehshow u. Musik Video"
 
-#: ../src/details.c:836
+#: ../src/details.c:837
 #, c-format
 msgid "%s (image data corrupted or unreadable)"
-msgstr ""
+msgstr "%s (Daten beschädigt o. unlesbar)"
 
-#: ../src/details.c:973
+#: ../src/details.c:975
 #, c-format
 msgid "Please report unknown mediatype %x\n"
-msgstr ""
+msgstr "Bitte Bericht senden über unbekannten Typ %x\n"
 
-#: ../src/details.c:1418
+#: ../src/details.c:1417
 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 ""
+msgstr "Fehler beim Ablegen des Bildes im Fenster: %s\n"
 
-#: ../src/details.c:1952 ../src/display_coverart.c:2128
+#: ../src/details.c:1952 ../src/display_coverart.c:2297
 msgid "Successfully set new coverart for selected tracks"
-msgstr ""
+msgstr "Neues Cover für gewählte Stücke festgelegt"
 
-#: ../src/display.c:490
-#, c-format
-msgid "<b>Image Dimensions: %s</b>"
-msgstr ""
+#. Set the resolution in the label
+#: ../src/display.c:570
+#, fuzzy, c-format
+msgid "<b>Image Dimensions: %d x %d</b>"
+msgstr "<b>Bildgröße: %s</b>"
 
-#: ../src/display.c:744
+#: ../src/display.c:814
 msgid "Edit selected entry of which sort tab?"
-msgstr "Markierten Begriff aus welchem Sortierungseintrag editieren?"
+msgstr "Markierten Begriff aus welchem Sortierungseintrag bearbeiten?"
 
 #. no entry selected
-#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
+#: ../src/display.c:821 ../src/misc_confirm.c:469 ../src/misc_track.c:2158
 msgid "No entry selected."
 msgstr "Kein Eintrag ausgewählt."
 
-#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
-#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
+#: ../src/display.c:974 ../src/display.c:1320 ../src/display.c:1376
+#: ../src/display.c:1430 ../src/display.c:1485 ../src/display.c:1746
 #, c-format
 msgid "No entry selected in Sort Tab %d"
 msgstr "Kein Begriff im Sortierungseintrag %d ausgewählt"
 
-#: ../src/display.c:949
+#: ../src/display.c:1015
 msgid "Remove entry of which sort tab from database?"
 msgstr "Markierten Begriff aus welchem Sortierungseintrag entfernen?"
 
-#: ../src/display.c:957
+#: ../src/display.c:1024
 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:979
+#: ../src/display.c:1049
 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:1009
+#: ../src/display.c:1082
 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:1036 ../src/display.c:1074
+#: ../src/display.c:1109 ../src/display.c:1147
 #, c-format
 msgid ""
 "iPod at '%s' is not loaded.\n"
@@ -2643,171 +2407,173 @@
 "iPod unter '%s' wurde nicht eingelesen.\n"
 "Bitte zuerst einlesen."
 
-#: ../src/display.c:1111 ../src/display.c:1138
+#: ../src/display.c:1184 ../src/display.c:1218
 msgid "Update selected entry of which sort tab?"
 msgstr "Markierten Begriff aus welchem Sortierungseintrag aktualisieren?"
 
-#: ../src/display.c:1224
+#: ../src/display.c:1314
 msgid "Export selected entry of which sort tab?"
 msgstr "Markierten Begriff aus welchem Sortierungseintrag exportieren?"
 
-#: ../src/display.c:1280
+#: ../src/display.c:1370
 msgid "Create playlist file from selected entry of which sort tab?"
 msgstr "Datei der Wiedergabeliste für welchen Sortierungseintrag erstellen?"
 
-#: ../src/display.c:1334
+#: ../src/display.c:1424
 msgid "Play tracks in selected entry of which sort tab?"
 msgstr "Stücke aus welchem Sortierungseintrag abspielen?"
 
-#: ../src/display.c:1389
+#: ../src/display.c:1479
 msgid "Enqueue tracks in selected entry of which sort tab?"
 msgstr "Stücke aus welchem Sortierungseintrag zum Abspielen vormerken?"
 
-#: ../src/display.c:1646
+#: ../src/display.c:1736
 msgid "Normalize tracks in selected entry of which sort tab?"
 msgstr "Stücke aus welchem Sortierungseintrag normalisieren?"
 
-#: ../src/display_coverart.c:1713
+#: ../src/display_coverart.c:1874
 msgid "Failed to remove the album from the album hash store."
-msgstr ""
+msgstr "Album konnte nicht entfernt werden."
 
-#: ../src/display_coverart.c:2098
+#: ../src/display_coverart.c:2262
 #, c-format
 msgid "Error occurred dropping an image onto the coverart display: %s\n"
-msgstr ""
+msgstr "Fehler beim Ablegen des Bildes im Fenster: %s\n"
 
-#: ../src/display_itdb.c:376
+#: ../src/display_itdb.c:385
 #, c-format
 msgid "Failed to set cover art: '%s'\n"
 msgstr "Konnte Cover-Bild nicht einfügen: '%s'\n"
 
-#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
-msgid "Local"
-msgstr "Lokal"
+#: ../src/display_itdb.c:871
+msgid "Music Library"
+msgstr ""
 
 #. add podcast playlist
-#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1025
+#: ../src/display_itdb.c:879 ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
 msgid "Podcasts"
 msgstr "Podcasts"
 
-#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:888 ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
 msgid "iPod"
 msgstr "iPod"
 
-#: ../src/display_itdb.c:1084
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr "Lokal"
+
+#: ../src/display_itdb.c:1098
 #, c-format
 msgid "Increased playcount for '%s'"
 msgstr "Wiedergabezähler für '%s' wurde erhöht"
 
-#: ../src/display_photo.c:163
+#: ../src/display_photo.c:158
 #, c-format
 msgid "Error reading iPod photo database (%s).\n"
-msgstr ""
+msgstr "Fehler beim Lesen der iPod Foto-Datenbank (%s).\n"
 
-#: ../src/display_photo.c:168
+#: ../src/display_photo.c:161
 msgid "Error reading iPod photo database.\n"
-msgstr ""
+msgstr "Fehler beim Lesen der iPod Foto-Datenbank.\n"
 
-#: ../src/display_photo.c:238
+#: ../src/display_photo.c:201
 msgid "Could not access the iPod's photo database."
-msgstr ""
+msgstr "Konnte auf iPod Foto-Datenbank nicht zugreifen."
 
-#: ../src/display_photo.c:441
-#, fuzzy
+#: ../src/display_photo.c:404
 msgid "Photo Albums"
-msgstr "Album"
+msgstr "Foto Alben"
 
-#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+#: ../src/display_photo.c:414 ../src/display_photo.c:1587
 msgid "<Unnamed>"
 msgstr ""
 
-#: ../src/display_photo.c:939
+#: ../src/display_photo.c:848
 msgid "The Photo Library album cannot be removed"
-msgstr ""
+msgstr "Das Foto-Verzeichnis konnte nicht entfernt werden"
 
-#: ../src/display_photo.c:961
-#, fuzzy
+#: ../src/display_photo.c:870
 msgid "Do you want to remove the album's photos too?"
-msgstr "Sind Sie sicher, dass sie alle Podcasts vom iPod entfernen wollen?"
+msgstr "Sollen die Album Fotos auch entfernt werden?"
 
-#: ../src/display_photo.c:967
+#: ../src/display_photo.c:876
 msgid "Yes. Do Not Display Again"
-msgstr ""
+msgstr "Ja. Nicht wieder anzeigen."
 
-#: ../src/display_photo.c:1038
+#: ../src/display_photo.c:947
 msgid ""
 "This will remove the photo selection from the selected album.\n"
 " Do you want to delete them from the database as well?"
 msgstr ""
+"Dies wird die Foto-Auswahl aus dem gewählten Album entfernen.\n"
+"Sollen sie auch in der Datenbank gelöscht werden?"
 
-#: ../src/display_photo.c:1053
+#: ../src/display_photo.c:962
 msgid ""
 "This will delete the photo selection from the Photo Library and all albums. "
 "Are you sure?"
 msgstr ""
+"Dies wird die Foto-Auswahl aus dem Verzeichnis und allen Alben entfernen.\n"
+"Sind Sie sicher?"
 
-#: ../src/display_photo.c:1128
+#: ../src/display_photo.c:1036
 msgid "New Photo Album Name"
-msgstr ""
+msgstr "Name des neuen Foto Albums"
 
-#: ../src/display_photo.c:1129
-#, fuzzy
+#: ../src/display_photo.c:1037
 msgid "Please enter a new name for the photo album"
-msgstr "Bitte geben Sie einen Namen für die neue Wiedergabeliste ein"
+msgstr "Bitte geben Sie einen neuen Namen für das Foto Album ein"
 
-#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+#: ../src/display_photo.c:1050 ../src/display_photo.c:1133
 msgid "An album with that name already exists."
-msgstr ""
+msgstr "Ein Album mit diesem Namen existiert bereits."
 
-#: ../src/display_photo.c:1210
-#, fuzzy
+#: ../src/display_photo.c:1119
 msgid "New Photo Album"
-msgstr "Album"
+msgstr "Neues Foto Album"
 
-#: ../src/display_photo.c:1211
-#, fuzzy
+#: ../src/display_photo.c:1120
 msgid "Please enter a name for the new photo album"
-msgstr "Bitte geben Sie einen Namen für die neue Wiedergabeliste ein"
+msgstr "Bitte geben Sie einen Namen für das neue Foto Album ein"
 
-#: ../src/display_photo.c:1232
+#: ../src/display_photo.c:1142
 msgid "The new album failed to be created."
-msgstr ""
+msgstr "Das neue Album konnte nicht angelegt werden"
 
-#: ../src/display_photo.c:1256
-#, fuzzy
+#: ../src/display_photo.c:1166
 msgid "Add Image to iPod"
-msgstr "Füge Verzeichnis/iPod hinzu"
+msgstr "Bild dem iPod hinzufügen"
 
 #. Open a dialog directory chooser window
-#: ../src/display_photo.c:1311
+#: ../src/display_photo.c:1221
 msgid "Add a Directory of Images to the iPod. Select the Directory."
-msgstr ""
+msgstr "Ein Bildverzeichnis dem iPod hinzufügen. Wählen Sie ein Verzeichnis."
 
-#: ../src/display_photo.c:1699
+#: ../src/display_photo.c:1601
 #, 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:516 ../src/display_playlists.c:558
+#: ../src/display_playlists.c:537 ../src/display_playlists.c:579
 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:585 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:606 ../src/display_tracks.c:403
 #, 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:865 ../src/display_playlists.c:877
+#: ../src/display_playlists.c:886 ../src/display_playlists.c:898
 msgid "Can't reorder sorted treeview."
-msgstr "Die Anzeige kann nicht neu geordnet werden."
+msgstr "Die Ansicht kann nicht neu geordnet werden."
 
-#: ../src/display_playlists.c:954
+#: ../src/display_playlists.c:975
 #, c-format
 msgid ""
 "This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2815,61 +2581,49 @@
 "\n"
 msgstr ""
 "Diese Art von 'Verschieben/Einfügen' (%d) wird (noch) nicht unterstützt. "
-"Wenn Sie denken eine Unterstützung wäre sinnvoll, kontaktieren Sie bitten "
+"Wenn Sie denken, eine Unterstützung wäre sinnvoll, kontaktieren Sie bitten "
 "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
+#: ../src/display_playlists.c:2039
 msgid "Photos"
-msgstr ""
+msgstr "Fotos"
 
-#: ../src/display_sorttabs.c:473
+#: ../src/display_sorttabs.c:479
 msgid "'Played' condition ignored because of error."
 msgstr ""
 "Die Bedingung 'Zuletzt abgespielt' wurde aufgrund eines Fehlers ignoriert."
 
-#: ../src/display_sorttabs.c:476
+#: ../src/display_sorttabs.c:482
 msgid "'Modified' condition ignored because of error."
 msgstr ""
 "Die Bedingung 'Zuletzt modifiziert' wurde aufgrund eines Fehlers ignoriert."
 
-#: ../src/display_sorttabs.c:479
+#: ../src/display_sorttabs.c:485
 msgid "'Added' condition ignored because of error."
 msgstr "Die Bedingung 'Hinzugefügt' wurde aufgrund eines Fehlers ignoriert."
 
-#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1568 ../src/misc_conversion.c:59
 msgid "All"
 msgstr "Alle"
 
-#: ../src/display_sorttabs.c:1588
+#: ../src/display_sorttabs.c:1594
 msgid "Compilations"
 msgstr "Sampler"
 
-#: ../src/display_sorttabs.c:2988
+#: ../src/display_sorttabs.c:3001
 msgid "Comp."
 msgstr "Komp."
 
-#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:3007 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333 ../src/misc_conversion.c:84
 msgid "Year"
 msgstr "Jahr"
 
-#: ../src/display_sorttabs.c:2997
+#: ../src/display_sorttabs.c:3010
 msgid "Special"
 msgstr "Spezial"
 
-#: ../src/display_sorttabs.c:3245
-msgid "Last Played"
-msgstr "Zuletzt gespielt"
-
-#: ../src/display_sorttabs.c:3246
-msgid "Last Modified"
-msgstr "Zuletzt modifiziert"
-
 #: ../src/display_spl.c:64
 msgid "days"
 msgstr "Tage"
@@ -2890,7 +2644,7 @@
 msgid "Hz"
 msgstr "Hz"
 
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:794
 msgid "MB"
 msgstr "MB"
 
@@ -2913,7 +2667,7 @@
 
 #: ../src/display_spl.c:91 ../src/misc_conversion.c:81
 msgid "Date modified"
-msgstr "Modifiziert"
+msgstr "Geändert"
 
 #: ../src/display_spl.c:92
 msgid "Track number"
@@ -2923,6 +2677,10 @@
 msgid "Size"
 msgstr "Dateigröße"
 
+#: ../src/display_spl.c:94 ../src/infodlg.c:78
+msgid "Play time"
+msgstr "Spielzeit"
+
 #: ../src/display_spl.c:95 ../src/misc_conversion.c:64
 msgid "Comment"
 msgstr "Kommentar"
@@ -2931,6 +2689,10 @@
 msgid "Date added"
 msgstr "Hinzugefügt"
 
+#: ../src/display_spl.c:98 ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "Wiedergabezähler"
+
 #: ../src/display_spl.c:99
 msgid "Last played"
 msgstr "Zuletzt gespielt"
@@ -2939,6 +2701,10 @@
 msgid "Disc number"
 msgstr "CD-Nummer"
 
+#: ../src/display_spl.c:101 ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "Bewertung"
+
 #: ../src/display_spl.c:102 ../src/misc_conversion.c:87
 msgid "Compilation"
 msgstr "Sampler"
@@ -2957,7 +2723,7 @@
 
 #: ../src/display_spl.c:106
 msgid "Video Kind"
-msgstr ""
+msgstr "Video Art"
 
 #: ../src/display_spl.c:108
 #, fuzzy
@@ -2966,17 +2732,15 @@
 
 #: ../src/display_spl.c:109
 msgid "Skip count"
-msgstr ""
+msgstr "Überspringen"
 
 #: ../src/display_spl.c:110
-#, fuzzy
 msgid "Last skipped"
-msgstr "Zuletzt gespielt"
+msgstr "Zuletzt übersprungen"
 
 #: ../src/display_spl.c:111
-#, fuzzy
 msgid "Album artist"
-msgstr "Künstler"
+msgstr "Album Künstler"
 
 #: ../src/display_spl.c:117
 msgid "contains"
@@ -3041,9 +2805,8 @@
 msgstr "ist nicht gesetzt"
 
 #: ../src/display_spl.c:171
-#, fuzzy
 msgid "Not supported"
-msgstr "Nicht eingetragen"
+msgstr "Nicht unterstützt"
 
 #: ../src/display_spl.c:178
 msgid "minutes"
@@ -3057,10 +2820,6 @@
 msgid "hours"
 msgstr "Stunden"
 
-#: ../src/display_spl.c:182 ../src/info.c:780
-msgid "GB"
-msgstr "GB"
-
 #: ../src/display_spl.c:189
 msgid "random order"
 msgstr "zufällige Reihenfolge"
@@ -3114,30 +2873,29 @@
 msgstr "niedrigste Bewertung"
 
 #: ../src/display_spl.c:208 ../src/display_spl.c:217
-#, fuzzy
 msgid "Movie"
-msgstr "Modifiziert"
+msgstr "Film"
 
-#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+#: ../src/display_spl.c:1143 ../src/display_spl.c:1158
 msgid "to"
 msgstr "bis"
 
-#: ../src/display_spl.c:1485
+#: ../src/display_spl.c:1436
 msgid "-"
 msgstr "-"
 
-#: ../src/display_spl.c:1500
+#: ../src/display_spl.c:1451
 msgid "+"
 msgstr "+"
 
-#: ../src/display_tracks.c:281
+#: ../src/display_tracks.c:398
 #, c-format
 msgid "Moved one track"
 msgid_plural "Moved %d tracks"
 msgstr[0] "Ein Stück verschoben"
 msgstr[1] "%d Stücke verschoben"
 
-#: ../src/display_tracks.c:1810
+#: ../src/display_tracks.c:2022
 #, c-format
 msgid ""
 "Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -3149,67 +2907,101 @@
 "möglich, die Stück-Ansicht in den unsortierten Zustand zurückzusetzen.\n"
 "\n"
 
-#: ../src/display_tracks.c:2069
+#: ../src/display_tracks.c:2288
 msgid "Rtng"
 msgstr "Bwrtng"
 
-#: ../src/display_tracks.c:2072
+#: ../src/display_tracks.c:2291
 msgid "#"
 msgstr "#"
 
-#: ../src/display_tracks.c:2075
+#: ../src/display_tracks.c:2294
 msgid "CD"
 msgstr "CD"
 
-#: ../src/display_tracks.c:2078
+#: ../src/display_tracks.c:2297
 msgid "ID"
 msgstr "ID"
 
-#: ../src/display_tracks.c:2081
+#: ../src/display_tracks.c:2300
 msgid "Trnsfrd"
 msgstr "Übertragen"
 
-#: ../src/display_tracks.c:2085
+#: ../src/display_tracks.c:2309
 msgid "Cmpl"
 msgstr "Sampl"
 
-#: ../src/display_tracks.c:2091
+#: ../src/display_tracks.c:2315
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/display_tracks.c:2094
+#: ../src/display_tracks.c:2318
 msgid "Plycnt"
 msgstr "Zähler"
 
-#: ../src/display_tracks.c:2106
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "Gespielt"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "Modifiziert"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "Hinzugefügt"
+
+#: ../src/display_tracks.c:2330
 msgid "Released"
 msgstr "Veröffentlicht"
 
-#: ../src/display_tracks.c:2112
+#: ../src/display_tracks.c:2336
 msgid "Vol."
 msgstr "Ltst."
 
-#: ../src/display_tracks.c:2115
+#: ../src/display_tracks.c:2339
 msgid "Sndchk."
 msgstr "Sndchk."
 
-#: ../src/fetchcover.c:358
-msgid "Coverart file already exists"
-msgstr ""
-
-#: ../src/fetchcover.c:371
-#, c-format
+#: ../src/fetchcover.c:359
+#, 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."
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to abort the fetchcover "
+"operation?"
 msgstr ""
+"Die Bilddatei %s existiert bereits.\n"
+"Sie wird u.U.  mit anderen Musikstücken im Verzeichnis verknüpft.\n"
+"\n"
+"-  'Ja' überschreibt die existierende Bilddatei, möglicherweise  werden\n"
+"   andere Stücke im gleichen Verzeichnis mit der Bilddatei verknüpft.\n"
+"-  'Nein' speichert die Datei mit einem eindeutigen Namen.\n"
+"-  'Abbrechen' bricht den Vorgang ab."
 
-#: ../src/file.c:236
+#: ../src/fetchcover.c:368
+#, fuzzy
+msgid "Cover art file already exists"
+msgstr "Cover-Bild existiert bereits"
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr ""
+
+#: ../src/fetchcover.c:371
+#, fuzzy
+msgid "Rename"
+msgstr "Benutzername:"
+
+#: ../src/fetchcover.c:372
+#, fuzzy
+msgid "Abort"
+msgstr "Breche ab..."
+
+#: ../src/file.c:238
 #, c-format
 msgid ""
 "'%s' is a directory, not a playlist file.\n"
@@ -3218,72 +3010,99 @@
 "'%s' ist ein Verzeichnis und keine Wiedergabeliste.\n"
 "\n"
 
-#: ../src/file.c:266
+#: ../src/file.c:268
 #, c-format
 msgid ""
 "'%s' is a not a known playlist file.\n"
 "\n"
 msgstr "'%s' ist keine bekannte Wiedergabeliste.\n"
 
-#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/file.c:285 ../src/file_export.c:217 ../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/file.c:369
+#: ../src/file.c:371
 #, c-format
 msgid "Skipping '%s' because it is a directory.\n"
 msgstr "Überspringe '%s', da es sich um ein Verzeichnis handelt.\n"
 
-#: ../src/file.c:374
+#: ../src/file.c:376
 #, c-format
 msgid "Skipping '%s' to avoid adding playlist file recursively\n"
 msgstr ""
 "Überspringe '%s', um eine Endlosschleife zu vermeiden (Wiedergabeliste kann "
 "sich nicht selbst indizieren).\n"
 
-#: ../src/file.c:629
+#: ../src/file.c:631
 #, c-format
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "Unbekanntes Symbol '%s' in der Schablone '%s'\n"
 
-#: ../src/file.c:923
+#: ../src/file.c:939
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Lokaler Dateiname ist nicht gültig (%s)"
 
-#: ../src/file.c:982
+#: ../src/file.c:998
 #, c-format
 msgid "No information found for user '%s' in '%s'"
-msgstr "Keine Informationen für den Benutzer '%s' gefunden in '%s'"
+msgstr "Keine Informationen für Benutzer '%s' gefunden in '%s'"
 
-#: ../src/file.c:991
+#: ../src/file.c:1007
 #, 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:999
+#: ../src/file.c:1015
 #, 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:1123
+#: ../src/file.c:1046
+#, fuzzy, c-format
+msgid "Could not create '%s'"
+msgstr "Konnte ~/.gtkpod nicht erstellen\n"
+
+#: ../src/file.c:1083
+#, fuzzy
+msgid "Error creating thumbnail file"
+msgstr "Fehler beim Erstellen von '%s': %s\n"
+
+#: ../src/file.c:1114 ../src/misc.c:1018
 #, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "Unbekanntes Merkmal '%%%c' in der Schablone '%s'"
+
+#: ../src/file.c:1138
+#, c-format
 msgid ""
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
+msgstr ""
+
+#: ../src/file.c:1142
+#, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr ""
+
+#: ../src/file.c:1291
+#, c-format
+msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
 msgstr ""
 "Das folgende Stück konnte nicht bearbeitet werden (Datei existiert nicht): '%"
 "s'\n"
 
-#: ../src/file.c:1209
+#: ../src/file.c:1377
 #, 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:1307
+#: ../src/file.c:1476
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -3292,36 +3111,36 @@
 "Das folgende Stück konnte nicht bearbeitet werden (Dateityp ist bekannt, "
 "aber die Analyse schlug fehl): '%s'\n"
 
-#: ../src/file.c:1337 ../src/file.c:1391
+#: ../src/file.c:1506 ../src/file.c:1560
 msgid "Nothing to update"
-msgstr "Nichts zum Aktualisieren"
+msgstr "Nichts zum aktualisieren"
 
-#: ../src/file.c:1358
+#: ../src/file.c:1527
 #, c-format
 msgid "Updating %s"
 msgstr "Aktualisiere '%s'"
 
-#: ../src/file.c:1372
+#: ../src/file.c:1541
 msgid "Updated selected tracks with info from file."
 msgstr ""
 "Ausgewählte Stücke wurden mit Informationen aus der Datei aktualisiert."
 
-#: ../src/file.c:1406
+#: ../src/file.c:1575
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "Hole mserv Daten %s"
 
-#: ../src/file.c:1411
+#: ../src/file.c:1580
 msgid "no filename available"
 msgstr "Es steht kein Dateiname zur Verfügung"
 
-#: ../src/file.c:1416
+#: ../src/file.c:1585
 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:1437
+#: ../src/file.c:1606
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -3330,11 +3149,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1443
+#: ../src/file.c:1612
 msgid "Failed Track Update"
 msgstr "Aktualisierung fehlgeschlagen"
 
-#: ../src/file.c:1501
+#: ../src/file.c:1670
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -3343,11 +3162,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1507
+#: ../src/file.c:1676
 msgid "Successful Track Update"
 msgstr "Aktualisierung erfolgreich"
 
-#: ../src/file.c:1566
+#: ../src/file.c:1735
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -3359,93 +3178,93 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1572
+#: ../src/file.c:1741
 msgid "mserv data retrieval problem"
-msgstr "Problem beim Nachschlagen der mserv Daten"
+msgstr "Problem beim Holen der mserv Daten"
 
-#: ../src/file.c:1661
+#: ../src/file.c:1829
 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:1667
+#: ../src/file.c:1835
 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:1671 ../src/file.c:1689
+#: ../src/file.c:1839 ../src/file.c:1857
 #, fuzzy
 msgid "no local filename available"
 msgstr "Es steht kein Dateiname zur Verfügung"
 
-#: ../src/file.c:1679
+#: ../src/file.c:1847
 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:1685
+#: ../src/file.c:1853
 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:1788
+#: ../src/file.c:1956
 #, fuzzy
 msgid "update failed (format not supported?)"
 msgstr "Aktualisierung fehlgeschlagen (Format nicht unterstützt?)"
 
-#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#: ../src/file.c:2041 ../src/misc_playlist.c:936
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Bearbeite '%s'..."
 
-#: ../src/file.c:1879
+#: ../src/file.c:2047
 #, 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:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
+#: ../src/file.c:2167 ../src/misc_track.c:1793 ../src/misc_track.c:1898
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
 "\n"
 msgstr "Podcast ist bereits vorhanden: '%s'\n"
 
-#: ../src/file.c:2064
+#: ../src/file.c:2232
 #, 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:2116 ../src/file.c:2130
+#: ../src/file.c:2284 ../src/file.c:2298
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Konnte Tags der Datei '%s' nicht ändern\n"
 
-#: ../src/file.c:2232
+#: ../src/file.c:2400
 #, 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:2239
+#: ../src/file.c:2407
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
-msgstr "Lock auf '%s' konnte nicht erstellt werden.\n"
+msgstr "'%s' konnte nicht verriegelt.\n"
 
 #. error!
-#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
+#: ../src/file.c:2424 ../src/file.c:2433 ../src/file.c:2444 ../src/file.c:2454
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Ungültige Zeile in '%s': %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:2315
+#: ../src/file.c:2483
 msgid "Remove offline playcounts?"
-msgstr "Sollen Offline-Wiedergabe Zähler gelöscht werden?"
+msgstr "Sollen Offline-Wiedergabezähler gelöscht werden?"
 
 #. title
-#: ../src/file.c:2316
+#: ../src/file.c:2484
 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."
@@ -3454,142 +3273,178 @@
 "werden. Wählen Sie 'OK', um diese aus der Wiedergabezähler-Datei zu "
 "entfernen, 'Abbrechen' um sie beizubehalten."
 
-#: ../src/file.c:2333
+#: ../src/file.c:2501
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Fehler beim Schreiben in die Datei '%s'.\n"
 
-#: ../src/file.c:2390 ../src/tools.c:270
+#: ../src/file.c:2558 ../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:2406 ../src/tools.c:287
+#: ../src/file.c:2574 ../src/tools.c:287
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
 "\n"
 msgstr "Normalisierung fehlgeschlagen: Datei ist nicht verfügbar (%s).\n"
 
-#: ../src/file_convert.c:316
-msgid "Summary status of conversion processes"
+#: ../src/file.c:2631
+#, fuzzy, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr "Normalisierung fehlgeschlagen: Datei ist nicht verfügbar (%s).\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save "
+"lyrics to: %s.\n"
+"\n"
 msgstr ""
 
-#: ../src/file_convert.c:564
+#: ../src/file.c:2712
+#, fuzzy, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr "Originalname nicht verfügbar für (%s).\n"
+
+#: ../src/file_convert.c:328
+msgid "Summary status of conversion processes"
+msgstr "Zusammenfassung des Konvertierungsprotokolls"
+
+#: ../src/file_convert.c:576
 msgid "active"
-msgstr ""
+msgstr "aktive"
 
-#: ../src/file_convert.c:569
+#: ../src/file_convert.c:581
 msgid "inactive"
-msgstr ""
+msgstr "inaktiv"
 
-#: ../src/file_convert.c:580
+#: ../src/file_convert.c:592
 #, c-format
 msgid "Active threads: %d. Scheduled tracks: %d."
-msgstr ""
+msgstr "Aktive Dienste: %d. Geplante Stücke: %d."
 
-#: ../src/file_convert.c:1071
-#, fuzzy, c-format
+#: ../src/file_convert.c:1090
+#, c-format
 msgid "Original filename not available for '%s.'\n"
-msgstr "Normalisierung fehlgeschlagen: Datei ist nicht verfügbar (%s).\n"
+msgstr "Originalname nicht verfügbar für (%s).\n"
 
-#: ../src/file_convert.c:1086
+#: ../src/file_convert.c:1105
 #, c-format
 msgid "Filename '%s' is no longer valid for '%s'.\n"
-msgstr ""
+msgstr "Dateiname '%s' ist nicht mehr gültig für '%s'.\n"
 
-#: ../src/file_convert.c:1137
+#: ../src/file_convert.c:1156
 msgid "Ogg Vorbis"
 msgstr ""
 
-#: ../src/file_convert.c:1143
+#: ../src/file_convert.c:1162
 msgid "FLAC"
 msgstr ""
 
-#: ../src/file_convert.c:1198
+#: ../src/file_convert.c:1217
 #, 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 ""
+"Dateien vom Typ '%s' werden vom iPod nicht unterstützt. Bitte wählen Sie in "
+"den Einstellungen ein geeignetes Konvertierungsskript für '%s' aus.\n"
+"\n"
 
-#: ../src/file_convert.c:1284
-#, fuzzy
+#: ../src/file_convert.c:1303
 msgid "No information available"
-msgstr "Es steht kein Dateiname zur Verfügung"
+msgstr "Keine Information verfügbar"
 
-#: ../src/file_convert.c:1323
+#: ../src/file_convert.c:1342
 #, c-format
 msgid "Could not create '%s'. Filetype conversion will not work.\n"
-msgstr ""
+msgstr "Konnte '%s' nicht erstellen. Konvertierung wird fehlschlagen.\n"
 
-#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
-#, fuzzy, c-format
+#: ../src/file_convert.c:1667 ../src/file_convert.c:3119
+#, c-format
 msgid ""
 "Transfer of '%s' failed. %s\n"
 "\n"
 msgstr ""
-"Die Ausführung von '%s' schlug fehl.\n"
+"Übertragung von '%s' fehlgeschlagen. %s\n"
 "\n"
 
-#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
-#, fuzzy, c-format
+#: ../src/file_convert.c:2073 ../src/file_convert.c:2352
+#, c-format
 msgid ""
 "Conversion of '%s' failed: '%s'.\n"
 "\n"
 msgstr ""
-"Die Ausführung von '%s' schlug fehl.\n"
+"Konvertierung von '%s' fehlgeschlagen: '%s'.\n"
 "\n"
 
-#: ../src/file_convert.c:2062
+#: ../src/file_convert.c:2088
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
 "\n"
 msgstr ""
+"Konvertierung von '%s' fehlgeschlagen: '%s %s' gab Status %d zurück.\n"
+"\n"
 
-#: ../src/file_convert.c:2091
-#, fuzzy, c-format
+#: ../src/file_convert.c:2117
+#, c-format
 msgid ""
 "Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
 "expected.\n"
 "\n"
 msgstr ""
-"Die Ausführung von '%s' schlug fehl.\n"
+"Konvertierung von '%s' fehlgeschlagen: '\"%s\" %s' gab nicht die erwartete "
+"Dateinamenerweiterung zurück.\n"
 "\n"
 
-#: ../src/file_convert.c:2167
-#, fuzzy, c-format
+#: ../src/file_convert.c:2193
+#, c-format
 msgid ""
 "Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
 "\n"
 msgstr ""
-"Die Ausführung von '%s' schlug fehl.\n"
+"Konvertierung von '%s' fehlgeschlagen: Konnte Originaldatei nicht öffnen '%"
+"s' (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:2222
+#: ../src/file_convert.c:2248
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not create directory '%s'.\n"
 "\n"
 msgstr ""
+"Konvertierung von '%s' fehlgeschlagen: Konnte Verzeichnis nicht erstellen '%"
+"s'.\n"
+"\n"
 
-#: ../src/file_convert.c:2356
+#: ../src/file_convert.c:2383
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s' returned exit status %d.\n"
 "\n"
 msgstr ""
+"Konvertierung von '%s' fehlgeschlagen: '%s' gab Status %d zurück.\n"
+"\n"
 
-#: ../src/file_convert.c:2395
+#: ../src/file_convert.c:2422
 #, c-format
 msgid ""
 "Conversion of '%s' failed: could not stat the converted file '%s'.\n"
 "\n"
 msgstr ""
+"Konvertierung von '%s' fehlgeschlagen: Konnte konvertierte Datei nicht "
+"finden '%s'.\n"
+"\n"
 
 #: ../src/file_export.c:182
 #, c-format
@@ -3599,7 +3454,7 @@
 #: ../src/file_export.c:190
 #, c-format
 msgid "Overwriting existing file: '%s'\n"
-msgstr "Überschreibe die vorhandene Datei: '%s'\n"
+msgstr "Überschreibe vorhandene Datei: '%s'\n"
 
 #: ../src/file_export.c:207
 #, c-format
@@ -3614,7 +3469,7 @@
 #: ../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"
+msgstr "Konnte Datei für '%s' auf dem iPod finden\n"
 
 #. create the dialog window
 #: ../src/file_export.c:395 ../src/tools.c:360
@@ -3701,29 +3556,29 @@
 "Datei '%s' konnte nicht zum Schreiben geöffnet werden. (%s)\n"
 "\n"
 
-#: ../src/file_itunesdb.c:129
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:133
+#, c-format
 msgid "Matching SHA1 checksum for file %d/%d"
-msgstr "Suche passende MD5 Prüfsumme für Datei %d/%d"
+msgstr "Suche passende SHA1 Prüfsumme für Datei %d/%d"
 
-#: ../src/file_itunesdb.c:236
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:249
+#, c-format
 msgid "Could not open \"%s\" for reading extended info.\n"
 msgstr ""
 "Datei \"%s\" konnte nicht zum Schreiben der erweiterten Infos geöffnet "
 "werden.\n"
 
-#: ../src/file_itunesdb.c:243
+#: ../src/file_itunesdb.c:256
 msgid "Could not create hash value from itunesdb\n"
 msgstr "Konnte keine Prüfsumme für die iTunesDB bilden\n"
 
-#: ../src/file_itunesdb.c:259
+#: ../src/file_itunesdb.c:272
 #, c-format
 msgid "Error while reading extended info: %s\n"
 msgstr "Fehler beim Lesen der erweiterten Informationen: '%s'\n"
 
-#: ../src/file_itunesdb.c:276
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:289
+#, 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 "
@@ -3732,11 +3587,11 @@
 msgstr ""
 "Die Prüfsumme der iTunesDB '%s' entspricht nicht der Prüfsumme, die in den "
 "erweiterten Informationen '%s' abgelegt ist. gtkpod wird versuchen, die "
-"Informationen mittels der MD5 Prüfsummen zuzuordnen. Dies kann eine lange "
+"Informationen mittels der SHA1 Prüfsummen zuzuordnen. Dies kann eine lange "
 "Zeit in Anspruch nehmen.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:288
+#: ../src/file_itunesdb.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -3745,7 +3600,7 @@
 "%s:\n"
 "Erwartete \"itunesdb_hash=\", aber \"%s\" gefunden\n"
 
-#: ../src/file_itunesdb.c:348
+#: ../src/file_itunesdb.c:363
 #, c-format
 msgid ""
 "%s:\n"
@@ -3754,8 +3609,7 @@
 "%s:\n"
 "Formatfehler: %s\n"
 
-#: ../src/file_itunesdb.c:393
-#, fuzzy
+#: ../src/file_itunesdb.c:408
 msgid ""
 "No SHA1 checksums on individual tracks are available.\n"
 "\n"
@@ -3764,14 +3618,14 @@
 "than gtkpod.\n"
 "\n"
 msgstr ""
-"Es stehen keine MD5 Prüfsummen für die einzelnen Stücke zur Verfügung.\n"
+"Es stehen keine SHA1 Prüfsummen für die einzelnen Stücke zur Verfügung.\n"
 "\n"
 "Um dieses Problem in Zukunft zu vermeiden, schalten Sie bitte die "
-"Duplikaterkennung ein (dies erzeugt MD5 Prüfsummen), oder vermeiden Sie, den "
-"iPod außer mit gtkpod noch mit anderen Programmen zu verwenden.\n"
+"Duplikaterkennung ein (dies erzeugt SHA1 Prüfsummen), oder vermeiden Sie, "
+"den iPod außer mit gtkpod noch mit anderen Programmen zu verwenden.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:457
+#: ../src/file_itunesdb.c:474
 msgid ""
 "Extended info will not be used. If you have non-transferred tracks,\n"
 "these will be lost.\n"
@@ -3779,15 +3633,15 @@
 "Die erweiterten Informationen werden nicht verwendet. Nicht auf den iPod "
 "übertragene Stücke gehen verloren.\n"
 
-#: ../src/file_itunesdb.c:465
+#: ../src/file_itunesdb.c:482
 msgid "Offline iPod database successfully imported"
 msgstr "Die Offline iPod Datenbank wurde erfolgreich eingelesen"
 
-#: ../src/file_itunesdb.c:468
+#: ../src/file_itunesdb.c:485
 msgid "Local database successfully imported"
 msgstr "Lokale Datenbank wurde erfolgreich eingelesen"
 
-#: ../src/file_itunesdb.c:476
+#: ../src/file_itunesdb.c:493
 #, c-format
 msgid ""
 "Offline iPod database import failed: '%s'\n"
@@ -3796,7 +3650,7 @@
 "Das Einlesen der Offline iPod Datenbank schlug fehl: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:480
+#: ../src/file_itunesdb.c:497
 #, c-format
 msgid ""
 "Local database import failed: '%s'\n"
@@ -3805,7 +3659,7 @@
 "Das Einlesen der lokalen Datenbank schlug fehl: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:487
+#: ../src/file_itunesdb.c:504
 msgid ""
 "Offline iPod database import failed: \n"
 "\n"
@@ -3813,7 +3667,7 @@
 "Das Einlesen der Offline iPod Datenbank schlug fehl:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:490
+#: ../src/file_itunesdb.c:507
 msgid ""
 "Local database import failed: \n"
 "\n"
@@ -3821,7 +3675,7 @@
 "Das Einlesen der lokalen Datenbank schlug fehl:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:497
+#: ../src/file_itunesdb.c:514
 #, c-format
 msgid ""
 "'%s' does not exist. Import aborted.\n"
@@ -3830,15 +3684,15 @@
 "'%s' existiert nicht. Einlesen abgebrochen.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:520
+#: ../src/file_itunesdb.c:536
 msgid "Extended info will not be used.\n"
 msgstr "Erweiterte Informationen werden nicht verwendet.\n"
 
-#: ../src/file_itunesdb.c:527
+#: ../src/file_itunesdb.c:543
 msgid "iPod Database Successfully Imported"
-msgstr "iPod Datenbank wurde erfolgreich eingelesen"
+msgstr "iPod Datenbank erfolgreich eingelesen"
 
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:550
 #, c-format
 msgid ""
 "iPod Database Import Failed: '%s'\n"
@@ -3847,7 +3701,7 @@
 "Das Einlesen der iPod Datenbank schlug fehl: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:540
+#: ../src/file_itunesdb.c:556
 msgid ""
 "iPod Database Import Failed.\n"
 "\n"
@@ -3855,7 +3709,7 @@
 "Das Einlesen der iPod Datenbank schlug fehl\n"
 "\n"
 
-#: ../src/file_itunesdb.c:549
+#: ../src/file_itunesdb.c:565
 #, c-format
 msgid ""
 "'%s' (or similar) does not exist. Import aborted.\n"
@@ -3864,14 +3718,15 @@
 "'%s' (o.ä.) existiert nicht. Einlesen abgebrochen.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:865
-#, c-format
+#: ../src/file_itunesdb.c:886
+#, fuzzy, 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"
+"If you are sure that the iPod is properly mounted at '%s', it may not be "
+"initialized for use. In this case, gtkpod can initialize it for you.\n"
+"\n"
+"Do you want to create the directory structure now?"
 msgstr ""
 "Konnte iPod Verzeichnis unter '%s'.\n"
 "nicht finden. Falls der iPod unter '%s', korrekt eingehängt ist, kann gtkpod "
@@ -3879,94 +3734,113 @@
 "\n"
 "Möchten Sie die Verzeichnisstruktur jetzt erstellen?\n"
 
-#: ../src/file_itunesdb.c:1180
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr ""
+
+#: ../src/file_itunesdb.c:892
+#, fuzzy
+msgid "Create directory structure"
+msgstr "Verzeichnis für Zwischenspeicherung:"
+
+#: ../src/file_itunesdb.c:1198
 #, 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:1195
+#: ../src/file_itunesdb.c:1213
 msgid "Aborted writing of extended info.\n"
 msgstr "Schreiben der erweiterten Infos abgebrochen.\n"
 
-#: ../src/file_itunesdb.c:1397
+#: ../src/file_itunesdb.c:1415
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: ../src/file_itunesdb.c:1411
+#: ../src/file_itunesdb.c:1429
 #, fuzzy, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
 msgstr "%d%% (noch %d:%02d:%02d)"
 
-#: ../src/file_itunesdb.c:1463
+#: ../src/file_itunesdb.c:1481
 msgid "Status: Deleting File"
-msgstr ""
+msgstr "Status: Lösche Datei"
 
-#: ../src/file_itunesdb.c:1524
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1542
+#, c-format
 msgid ""
 "Could not remove the following file: '%s'\n"
 "\n"
 msgstr ""
-"Datei '%s' konnte nicht zum Schreiben geöffnet werden. (%s)\n"
+"Konnte folgende Datei nicht löschen: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1632
-#, fuzzy
+#: ../src/file_itunesdb.c:1651
 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] "Das folgende Stück konnte nicht aktualisiert werden"
-msgstr[1] "Die folgenden %d Stücke konnten nicht aktualisiert werden"
+msgstr[0] ""
+"Das folgende Stück konnte nicht erfolgreich konvertiert werden:\n"
+"\n"
+msgstr[1] ""
+"Die folgenden Stücke konnten nicht erfolgreich konvertiert werden:\n"
+"\n"
 
-#: ../src/file_itunesdb.c:1642
-#, fuzzy
+#: ../src/file_itunesdb.c:1661
 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] "Das folgende Stück konnte nicht aktualisiert werden"
-msgstr[1] "Die folgenden %d Stücke konnten nicht aktualisiert werden"
+msgstr[0] ""
+"Das folgende Stück konnte nicht erfolgreich übertragen werden:\n"
+"\n"
+msgstr[1] ""
+"Die folgenden Stücke konnten nicht erfolgreich übertragen werden:\n"
+"\n"
 
 #. ID
 #. modal,
 #. gint id,
 #. gboolean modal,
-#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1670 ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
 msgid "Warning"
 msgstr "Warnung"
 
 #. title
-#: ../src/file_itunesdb.c:1652
+#: ../src/file_itunesdb.c:1671
 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 ""
+"Der iPod konnte nicht getrennt werden. Bitte lösen Sie das unten "
+"beschriebene Problem und trennen den iPod erneut. 'OK' wird die Stücke "
+"erneut für Übertragung und Konvertierung vorsehen."
 
-#: ../src/file_itunesdb.c:1715
+#: ../src/file_itunesdb.c:1734
 #, c-format
 msgid "Status: Copying track"
-msgstr ""
+msgstr "Status: Kopiere Stück"
 
-#: ../src/file_itunesdb.c:1721
+#: ../src/file_itunesdb.c:1740
 #, c-format
 msgid "Status: Waiting for conversion to complete"
-msgstr ""
+msgstr "Status: Konvertierung noch nicht abgeschlossen"
 
-#: ../src/file_itunesdb.c:1725
+#: ../src/file_itunesdb.c:1744
 #, c-format
 msgid "Status: Finished transfer"
-msgstr ""
+msgstr "Status: Übertragung beendet"
 
-#: ../src/file_itunesdb.c:1770
+#: ../src/file_itunesdb.c:1789
 #, c-format
 msgid ""
 "One track could not be transferred because your iPod is full. Either delete "
@@ -3977,17 +3851,20 @@
 "some tracks or otherwise create space on the iPod before ejecting the iPod "
 "again."
 msgstr[0] ""
+"Ein Stück konnte nicht übertragen werden, da der iPod voll ist. Löschen Sie "
+"Stücke oder schaffen sie anders Platz, bevor Sie den iPod erneut trennen."
 msgstr[1] ""
+"%d Stücke konnten nicht übertragen werden, da der iPod voll ist. Löschen Sie "
+"Stücke oder schaffen sie anders Platz, bevor Sie den iPod erneut trennen."
 
-#: ../src/file_itunesdb.c:1852
-#, c-format
+#: ../src/file_itunesdb.c:1871
+#, fuzzy, 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"
+"If you skip storing, you can import the existing database before calling "
+"this function again.\n"
 msgstr ""
 "Sie haben die bereits bestehende iTunesDB ('%s') nicht eingelesen. Dies ist "
 "wahrscheinlich nicht was Sie beabsichtigen, da auf diese Weise die "
@@ -3997,7 +3874,20 @@
 "'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:1887
+#: ../src/file_itunesdb.c:1875 ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr ""
+
+#: ../src/file_itunesdb.c:1877 ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr ""
+
+#: ../src/file_itunesdb.c:1878
+#, fuzzy
+msgid "Skip storing"
+msgstr "Überspringen"
+
+#: ../src/file_itunesdb.c:1909
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -4005,117 +3895,100 @@
 "Die iPod Verzeichnisstruktur muss vorhanden sein bevor Daten auf den iPod "
 "kopiert werden können.\n"
 
-#: ../src/file_itunesdb.c:1896
+#: ../src/file_itunesdb.c:1918
 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:1914
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1936
+#, c-format
 msgid "Now writing database '%s'. Please wait..."
-msgstr "Schreibe iTunesDB. Bitte warten..."
+msgstr "Schreibe Datenbank '%s'. Bitte warten..."
 
-#: ../src/file_itunesdb.c:1963
+#: ../src/file_itunesdb.c:1985
 #, c-format
 msgid "Extended information file not deleted: '%s'"
-msgstr "Die Datei mit den erweiterten Informationen wurde nicht gelöscht: '%s'"
+msgstr "Die erweiterten Informationen wurde nicht gelöscht: '%s'"
 
-#: ../src/file_itunesdb.c:2070
+#: ../src/file_itunesdb.c:2092
 #, c-format
 msgid "%s: Database saved"
 msgstr "%s: Datenbank gespeichert"
 
-#: ../src/file_itunesdb.c:2074
+#: ../src/file_itunesdb.c:2096
 #, c-format
 msgid "%s: Changes saved"
 msgstr "%s: Änderungen gespeichert"
 
-#: ../src/fileselection.c:129
+#: ../src/fileselection.c:142 ../src/fileselection.c:583
 msgid "Successfully added files"
-msgstr "Dateien wurden erfolgreich hinzugefügt"
+msgstr "Dateien erfolgreich hinzugefügt"
 
-#: ../src/fileselection.c:131
+#: ../src/fileselection.c:144 ../src/fileselection.c:585
 msgid "Some files were not added successfully"
 msgstr "Einige Dateien konnten nicht hinzugefügt werden"
 
-#: ../src/fileselection.c:164 ../src/fileselection.c:305
-#: ../src/fileselection.c:792
+#: ../src/fileselection.c:176 ../src/fileselection.c:276
+#: ../src/fileselection.c:601
 msgid "Please select a playlist or repository before adding tracks."
 msgstr ""
+"Bitte wählen Sie eine Wiedergabeliste oder Verzeichnis, bevor Sie Stücke "
+"hinzufügen."
 
-#: ../src/fileselection.c:175 ../src/fileselection.c:314
-#: ../src/fileselection.c:803
+#: ../src/fileselection.c:187 ../src/fileselection.c:285
 msgid "Please load the iPod before adding tracks."
-msgstr ""
+msgstr "Bitte iPod einlesen, bevor Sie Stücke hinzufügen."
 
-#: ../src/fileselection.c:185
-#, fuzzy, c-format
+#: ../src/fileselection.c:197
+#, c-format
 msgid "Add files to '%s'"
-msgstr "Dateien hinzufügen"
+msgstr "Füge Dateien zu '%s' hinzu"
 
-#: ../src/fileselection.c:189
+#: ../src/fileselection.c:201
 #, c-format
 msgid "Add files to '%s/%s'"
-msgstr ""
+msgstr "Füge Dateien zu '%s/%s' hinzu"
 
 #. Create window title
-#: ../src/fileselection.c:322
-#, fuzzy, c-format
+#: ../src/fileselection.c:293
+#, c-format
 msgid "Add playlist files to '%s'"
-msgstr "Wiedergabeliste aus Datei hinzufügen"
+msgstr "Füge Wiedergabelisten zu '%s' hinzu"
 
 #. Create the file chooser, and handle the response
-#: ../src/fileselection.c:378
+#: ../src/fileselection.c:319
 msgid "Set Cover"
-msgstr "Cover auswählen"
+msgstr "Cover hinzufügen"
 
-#: ../src/fileselection.c:816
-#, fuzzy, c-format
-msgid "Add directories to '%s'"
-msgstr "Verzeichnisse rekursiv hinzufügen"
-
-#: ../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:1106
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: ../src/flacfile.c:62
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' does not appear to be an FLAC audio file.\n"
-msgstr "'%s' scheint keine mp4-Audio-Datei zu sein.\n"
+msgstr "'%s' scheint keine FLAC-Audio-Datei zu sein.\n"
 
 #: ../src/flacfile.c:78
-#, fuzzy, c-format
+#, c-format
 msgid "Error retrieving tags for '%s'.\n"
-msgstr "Fehler beim Schreiben in die Datei '%s'.\n"
+msgstr "Fehler beim Lesen der Tags für '%s'.\n"
 
-#: ../src/flacfile.c:165
-#, fuzzy, c-format
+#: ../src/flacfile.c:193
+#, 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 ""
-"Einlesen des Stücks '%s' fehlgeschlagen: m4a/m4p/m4b-Dateien werden ohne die "
-"mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der mp4v2 "
+"Einlesen des Stücks '%s' fehlgeschlagen: FLAC-Dateien werden ohne die FLAC-"
+"Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der FLAC-"
 "Bibliothek kompilieren.\n"
 
-#: ../src/flacfile.c:171
-#, fuzzy, c-format
+#: ../src/flacfile.c:199
+#, 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 ""
-"Schreiben von m4a/m4p Metadaten für '%s' fehlgeschlagen: m4a/m4p/m4b-Dateien "
-"werden ohne die mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod "
-"zusammen mit der mp4v2 Bibliothek kompilieren.\n"
+"FLAC-Metadaten Aktualisierung für '%s' fehlgeschlagen: FLAC-Dateien werden "
+"ohne die FLAC-Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit "
+"der FLAC-Bibliothek kompilieren.\n"
 
 #: ../src/getopt.c:681
 #, c-format
@@ -4176,430 +4049,288 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: die Option '-W %s' lässt keine Argumente zu\n"
 
-#: ../src/info.c:383
-msgid "n/c"
-msgstr "---"
-
-#: ../src/info.c:388 ../src/info.c:838
-msgid "offline"
-msgstr "offline"
-
-#: ../src/info.c:486
-#, c-format
-msgid " P:%d T:%d/%d"
-msgstr " P:%d S:%d/%d"
-
-#: ../src/info.c:780
-msgid "B"
-msgstr "B"
-
-#: ../src/info.c:780
-msgid "kB"
-msgstr "kB"
-
-#: ../src/info.c:780
-msgid "TB"
-msgstr "TB"
-
-#: ../src/info.c:823
-#, c-format
-msgid " %s Free"
-msgstr " %s frei"
-
-#: ../src/info.c:828
-#, c-format
-msgid " %s Pending"
-msgstr " %s voll"
-
-#: ../src/info.c:833
-msgid " disconnected"
-msgstr " getrennt"
-
-#: ../src/info.c:884
-msgid "No database or playlist selected"
-msgstr "Keine Datenbank oder Wiedergabeliste gewählt"
-
-#: ../src/info.c:889
-msgid "No tracks selected"
-msgstr "Keine Stücke ausgewählt"
-
-#: ../src/info.c:894
-msgid "No playlist selected"
-msgstr "Keine Wiedergabeliste ausgewählt"
-
-#: ../src/info.c:899
-msgid "No iPod or iPod playlist selected"
-msgstr "Kein iPod oder keine Wiedergabeliste gewählt"
-
-#. 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 "iPod Einhängepunkt"
-
-#: ../src/ipod_init.c:359
-#, fuzzy, c-format
-msgid "Error initialising iPod: %s\n"
-msgstr "Fehler beim Schreiben in die Datei '%s'.\n"
-
-#: ../src/ipod_init.c:366
-msgid "Error initialising iPod, unknown error\n"
-msgstr ""
-
-#: ../src/ipod_init.c:422
-#, fuzzy, c-format
-msgid "<b>Please select your iPod model at </b><i>%s</i>"
-msgstr "<b>Bitte Einhängepunkt und iPod Modell wählen</b>"
-
-#: ../src/ipod_init.c:463
+#: ../src/help.c:48
 msgid ""
-"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:70
-#, fuzzy
-msgid ""
 "© 2002 - 2007\n"
 "Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
 "Corey Donohoe (atmos at atmos dot org)\n"
 msgstr ""
-"(C) 2002 - 2005\n"
+"(C) 2002 - 2007\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:74
-#, fuzzy
+#: ../src/help.c:52
 msgid ""
 "Patches were supplied by the following people (list may be incomplete -- "
 "please contact me)\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:75
-#, fuzzy
+#: ../src/help.c:53
 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"
+msgstr "Ramesh Dharan: 'Multi-Edit' (Tags mehrerer Stücke auf einmal ändern)"
 
-#: ../src/misc.c:76
-#, fuzzy
+#: ../src/help.c:54
 msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
-msgstr "Hiroshi Kawashima: Automatische Erkennung japanischer Zeichensätze\n"
+msgstr "Hiroshi Kawashima: Automatische Erkennung japanischer Zeichensätze"
 
-#: ../src/misc.c:77
-#, fuzzy
+#: ../src/help.c:55
 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"
+"itunesdb.c"
 
-#: ../src/misc.c:78
-#, fuzzy
+#: ../src/help.c:56
 msgid ""
 "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
 "newlines at the end"
-msgstr "Walter Bell: Korrekte Handhabung der kodierten DND URIs\n"
+msgstr "Walter Bell: Korrekte Handhabung der kodierten DND URIs"
 
-#: ../src/misc.c:79
-#, fuzzy
+#: ../src/help.c:57
 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"
+"Sam Clegg: benutzerdefinierte Dateinamen beim Kopieren von Stücken vom iPod"
 
-#: ../src/misc.c:80
-#, fuzzy
+#: ../src/help.c:58
 msgid "Chris Cutler: automatic creation of various playlist types"
-msgstr "Chris Cutler: automatische Erstellung diverser Wiedergabelisten\n"
+msgstr "Chris Cutler: automatische Erstellung diverser Wiedergabelisten"
 
-#: ../src/misc.c:81
-#, fuzzy
+#: ../src/help.c:59
 msgid ""
 "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
 "dialogue during sync"
 msgstr ""
 "Graeme Wilford: Lesen und Schreiben der 'Komponisten' ID3-Tags, "
-"Fortschrittsbalken während iTunesDB-Abgleich.\n"
+"Fortschrittsbalken während iTunesDB-Abgleich."
 
-#: ../src/misc.c:82
-#, fuzzy
+#: ../src/help.c:60
 msgid ""
 "Edward Matteucci: debugging, special playlist creation, most of the volume "
 "normalizing code"
 msgstr ""
-"Edward Matteucci: Debugging, diverse Wiedergabelistengenerierung, Hauptteil "
-"des Codes für Lautstärkenormalisierung\n"
+"Edward Matteucci: Debugging, spezielle Wiedergabelistengenerierung, "
+"Hauptteil des Codes für Lautstärkenormalisierung"
 
-#: ../src/misc.c:83
-#, fuzzy
+#: ../src/help.c:61
 msgid "Jens Lautenbach: some optical improvements"
-msgstr "Jens Lautenbach: optische Verbesserungen\n"
+msgstr "Jens Lautenbach: optische Verbesserungen"
 
-#: ../src/misc.c:84
-#, fuzzy
+#: ../src/help.c:62
 msgid "Alex Tribble: iPod eject patch"
-msgstr "Alex Tribble: Patch zum Auswurf des iPods\n"
+msgstr "Alex Tribble: Patch zum Trennen des iPods"
 
-#: ../src/misc.c:85
-#, fuzzy
+#: ../src/help.c:63
 msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
-msgstr ""
-"Yaroslav Halchenko: Bearbeitung von verwaisten und verlorenen Stücken\n"
+msgstr "Yaroslav Halchenko: Bearbeitung von verwaisten und verlorenen Stücken"
 
-#: ../src/misc.c:86
-#, fuzzy
+#: ../src/help.c:64
 msgid ""
 "Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
 msgstr ""
 "Andrew Huntwork: Fix zur Groß-/Kleinschreibung von Dateinamen und "
-"verschiedene andere Korrekturen\n"
+"verschiedene andere Korrekturen"
 
-#: ../src/misc.c:87
-#, fuzzy
+#: ../src/help.c:65
 msgid ""
 "Ero Carrera: Filename validation and quick sync when copying tracks from the "
 "iPod"
 msgstr ""
 "Ero Carrera: Dateinamenverifizierung und Schnellabgleich beim Kopieren von "
-"Stücken vom iPod\n"
+"Stücken vom iPod"
 
-#: ../src/misc.c:88
-#, fuzzy
+#: ../src/help.c:66
 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"
+"Lautstärkenormalisierung."
 
-#: ../src/misc.c:89
-#, fuzzy
+#: ../src/help.c:67
 msgid "Armando Atienza: Support with external playcounts"
-msgstr "Armando Atienza: Unterstützung bezüglich externer Playcounts\n"
+msgstr "Armando Atienza: Unterstützung bezüglich externer Playcounts"
 
-#: ../src/misc.c:90
-#, fuzzy
+#: ../src/help.c:68
 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"
+"D.L. Sharp: Unterstützung von m4b Dateien (AAC Dateien mit Bookmark-Funktion)"
 
-#: ../src/misc.c:91
-#, fuzzy
+#: ../src/help.c:69
 msgid "Jim Hall: Decent INSTALL file"
-msgstr "Jim Hall: Ausführliche INSTALL Anleitung\n"
+msgstr "Jim Hall: Ausführliche INSTALL Anleitung"
 
-#: ../src/misc.c:92
-#, fuzzy
+#: ../src/help.c:70
 msgid ""
 "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
 "contacts to the iPod"
 msgstr ""
 "Jürgen Helmers, Markus Gaugusch: Skripte zum Export des Terminkalenders und "
-"der Kontakte auf den iPod\n"
+"der Kontakte auf den iPod"
 
 #. J"urgen!
-#: ../src/misc.c:93
-#, fuzzy
+#: ../src/help.c:71
 msgid "Flavio Stanchina: bugfixes"
-msgstr "Flavio Stanchina: Bugfixes\n"
+msgstr "Flavio Stanchina: Bugfixes"
 
-#: ../src/misc.c:94
-#, fuzzy
+#: ../src/help.c:72
 msgid ""
 "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
 "the title"
 msgstr ""
 "Chris Micacchi: beim Sortieren wird \"the\" und ähnliches am Beginn des "
-"Titels ignoriert\n"
+"Titels ignoriert"
 
-#: ../src/misc.c:95
-#, fuzzy
+#: ../src/help.c:73
 msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
 msgstr ""
-"Steve Jay: Verwendung von statvfs() anstelle von df (bessere Portierung, "
-"schneller)\n"
+"Steve Jay: Benutze statvfs() statt df (bessere Portierbarkeit, schneller)"
 
-#: ../src/misc.c:97
-#, fuzzy
+#: ../src/help.c:75
 msgid ""
 "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
 "tags"
 msgstr ""
 "Christoph Kunz: Beiträge zur Kompatibilität wenn MP3-Tags als id3v2.4 "
-"geschrieben werden.\n"
+"geschrieben werden."
 
-#: ../src/misc.c:99
-#, fuzzy
+#: ../src/help.c:77
 msgid ""
 "James Liggett:\n"
 "replacement of old GTK file selection dialogs with new GTK filechooser "
 "dialogs\n"
 "refactored user preferences system."
 msgstr ""
-"James Ligget:\n"
-"     Ersetzen der alten GTK Dateidialoge durch die neuen GTK Filechooser-"
-"Dialoge.\n"
+"James Ligget: Ersetzen der alten GTK 'file selection' Dialoge durch die "
+"neuen GTK 'filechooser' Dialoge."
 
-#: ../src/misc.c:103
-#, fuzzy
+#: ../src/help.c:81
 msgid "Daniel Kercher: sync scripts for abook and webcalendar"
-msgstr ""
-"Daniel Kercher: Synchronisationsskripte für 'abook' und 'webcalendar'\n"
+msgstr "Daniel Kercher: Synchronisationsskripte für 'abook' und 'webcalendar'"
 
-#: ../src/misc.c:105
-#, fuzzy
+#: ../src/help.c:83
 msgid "Clinton Gormley: sync scripts for thunderbird"
-msgstr "Clinton Gormley: Snychronisationsskripte für 'tunderbird'\n"
+msgstr "Clinton Gormley: Synchronisationsskripte für 'thunderbird'"
 
-#: ../src/misc.c:107
-#, fuzzy
+#: ../src/help.c:85
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
 msgstr ""
-"Sebastien Beridot: Snychronisationsskripte für das ldif Adressbuchformat\n"
+"Sebastien Beridot: Synchronisationsskripte für das ldif Adressbuchformat"
 
-#: ../src/misc.c:109
-#, fuzzy
+#: ../src/help.c:87
 msgid "Sebastian Scherer: sync script for kNotes"
-msgstr "Sebastian Scherer: Synchronisationsskripte für 'kNotes'\n"
+msgstr "Sebastian Scherer: Synchronisationsskripte für 'kNotes'"
 
-#: ../src/misc.c:111
-#, fuzzy
+#: ../src/help.c:89
 msgid "Nick Piper: sync script for Palm, type-ahead search"
-msgstr "Nick Piper: Synchronisationsskript für Palm, 'type-ahead' Suche\n"
+msgstr "Nick Piper: Synchronisationsskript für Palm, 'type-ahead' Suche"
 
-#: ../src/misc.c:113
-#, fuzzy
+#: ../src/help.c:91
 msgid "Uwe Hermann: help with support for iPod Video"
-msgstr "Uwe Hermann: Hilfe bei der iPod Video Unterstützung\n"
+msgstr "Uwe Hermann: Hilfe bei der iPod Video Unterstützung"
 
-#: ../src/misc.c:115
-#, fuzzy
+#: ../src/help.c:93
 msgid ""
 "Iain Benson: support for compilation tag in mp3 files and separate display "
 "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"
+"der Sampler in den Filter-Tabs."
 
-#: ../src/misc.c:116
-#, fuzzy
+#: ../src/help.c:94
 msgid ""
 "Nicolas Chariot: icons of buttons\n"
 "\n"
 msgstr ""
 "Nicolas Chariot: Icons für Knöpfe\n"
 "\n"
-"\n"
 
-#: ../src/misc.c:118
-#, fuzzy
+#: ../src/help.c:96
 msgid "This program borrows code from the following projects:"
-msgstr "Dieses Programm verwendet Code der folgenden Projekte:\n"
+msgstr "Dieses Programm verwendet Code der folgenden Projekte:"
 
-#: ../src/misc.c:119
-#, fuzzy
+#: ../src/help.c:97
 msgid ""
 "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"
+"gnutools: (mktunes.pl, nach C portiert) Schreiben und Lesen der iTunesDB "
+"(http://www.gnu.org/software/gnupod/)"
 
-#: ../src/misc.c:120
-#, fuzzy
+#: ../src/help.c:98
 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 von Samuel Wood (sam dot wood at gmail dot com): "
-"einiger Code für intelligente Wiedergabelisten basiert auf seinen C++-"
-"Klassen.\n"
+"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."
 
-#: ../src/misc.c:121
-#, fuzzy
+#: ../src/help.c:99
 msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
-msgstr "    mp3info:  MP3-Spielzeit-Ermittlung (http://ibiblio.org/mp3info/)\n"
+msgstr "mp3info: MP3-Spielzeit-Ermittlung (http://ibiblio.org/mp3info/)"
 
-#: ../src/misc.c:122
-#, fuzzy
+#: ../src/help.c:100
 msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
 msgstr ""
-"xmms:     Verzeichnisbaum-Anzeige, MP3-Spielzeit-Ermittlung (http://www.xmms."
-"org)\n"
+"xmms: Verzeichnisbaum-Anzeige, MP3-Spielzeit-Ermittlung (http://www.xmms.org)"
 
-#: ../src/misc.c:124
-#, fuzzy
+#: ../src/help.c:102
 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"
+"gnome.org/) erstellt."
 
-#: ../src/misc.c:128
-#, fuzzy
+#: ../src/help.c:106
 msgid "French: David Le Brun (david at dyn-ns dot net)"
-msgstr "Französisch: David Le Brun (david at dyn-ns dot net)\n"
+msgstr "Französisch: David Le Brun (david at dyn-ns dot net)"
 
-#: ../src/misc.c:129
+#: ../src/help.c:107
 msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
-msgstr ""
+msgstr "Französisch: Éric Lassauge (rpmfarm at free dot fr)"
 
-#: ../src/misc.c:130
-#, fuzzy
+#: ../src/help.c:108
 msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
-msgstr "Deutsch:     Jörg Schuler (jcsjcs at users dot sourceforge dot net)\n"
+msgstr "Deutsch: Jörg Schuler (jcsjcs at users dot sourceforge dot net)"
 
-#: ../src/misc.c:131
+#: ../src/help.c:109
 msgid "German: Kai-Ove"
-msgstr ""
+msgstr "Deutsch: Kai-Ove Pietsch (kaiovepietsch at yahoo dot de)"
 
-#: ../src/misc.c:132
-#, fuzzy
+#: ../src/help.c:110
 msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
-msgstr "Hebräisch: Assaf Gillat (gillata at gmail dot com)\n"
+msgstr "Hebräisch: Assaf Gillat (gillata at gmail dot com)"
 
-#: ../src/misc.c:133
-#, fuzzy
+#: ../src/help.c:111
 msgid ""
 "Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
 msgstr ""
 "Italienisch: Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net\n"
+"net)"
 
-#: ../src/misc.c:134
+#: ../src/help.c:112
 msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
-msgstr ""
+msgstr "Italienisch: Daniele Forsi (dforsi at gmail dot com)"
 
-#: ../src/misc.c:135
-#, fuzzy
+#: ../src/help.c:113
 msgid "Japanese: Ayako Sano"
-msgstr "Japanisch:   Ayako Sano\n"
+msgstr "Japanisch: Ayako Sano"
 
-#: ../src/misc.c:136
-#, fuzzy
+#: ../src/help.c:114
 msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
-msgstr ""
-"Japanisch:   Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)\n"
+msgstr "Japanisch: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
 
-#: ../src/misc.c:137
+#: ../src/help.c:115
 msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
-msgstr ""
+msgstr "Rumänisch: Alex Eftimie (alexeftimie at gmail dot com)"
 
-#: ../src/misc.c:138
+#: ../src/help.c:116
 msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
 msgstr ""
+"Spanisch: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
 
-#: ../src/misc.c:139
-#, fuzzy
+#: ../src/help.c:117
 msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
-msgstr "Schwedisch: Stefan Asserhall (stefan asserhall at comhem dot se)\n"
+msgstr "Schwedisch: Stefan Asserhall (stefan asserhall at comhem dot se)"
 
-#: ../src/misc.c:144
+#: ../src/help.c:122
 #, fuzzy
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
@@ -4633,8 +4364,7 @@
 "\n"
 "\n"
 
-#: ../src/misc.c:159
-#, fuzzy
+#: ../src/help.c:137
 msgid ""
 "© 2002-2007\n"
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
@@ -4642,57 +4372,217 @@
 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"
+"Corey Donohoe (atmos at atmos dot org)"
 
-#: ../src/misc.c:167
-#, fuzzy
+#: ../src/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr ""
+
+#: ../src/help.c:143 ../src/help.c:148
 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
+#: ../src/info.c:359 ../src/infodlg.c:190
+msgid "n/c"
+msgstr "---"
+
+#: ../src/info.c:364 ../src/info.c:852 ../src/infodlg.c:193
+msgid "offline"
+msgstr "offline"
+
+#: ../src/info.c:500
 #, c-format
+msgid " P:%d T:%d/%d"
+msgstr " P:%d S:%d/%d"
+
+#: ../src/info.c:794
+msgid "B"
+msgstr "B"
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr "kB"
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr "TB"
+
+#: ../src/info.c:837
+#, c-format
+msgid " %s Free"
+msgstr " %s frei"
+
+#: ../src/info.c:842
+#, c-format
+msgid " %s Pending"
+msgstr " %s voll"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr " getrennt"
+
+#: ../src/info.c:898
+msgid "No database or playlist selected"
+msgstr "Keine Datenbank oder Wiedergabeliste gewählt"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "Keine Stücke ausgewählt"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "Keine Wiedergabeliste ausgewählt"
+
+#: ../src/info.c:913
+msgid "No iPod or iPod playlist selected"
+msgstr "Kein iPod oder keine Wiedergabeliste gewählt"
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"Insgesamt\n"
+"(iPod)"
+
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"Insgesamt\n"
+"(lokal)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"Ausgewählte\n"
+"Wiedergabeliste"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"Angezeigte\n"
+"Stücke"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"Ausgewählte\n"
+"Stücke"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "Anzahl der Stücke"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "Dateigröße"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "Anzahl der Wiedergabelisten"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "Gelöschte Stücke"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "Dateigröße (gelöscht)"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "Nicht übertragene Stücke"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "Dateigröße (nicht übertragen)"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "Effektiv freier Platz"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "Modell eingeben oder wählen"
+
+#: ../src/ipod_init.c:81 ../src/repository.c:560 ../src/repository.c:2374
+msgid "Select mountpoint"
+msgstr "iPod Einhängepunkt"
+
+#: ../src/ipod_init.c:362
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "Fehler beim Initialisieren des iPod: '%s'.\n"
+
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr "Fehler beim Initialisieren des iPod, unbekannter Fehler\n"
+
+#: ../src/ipod_init.c:425
+#, c-format
+msgid "<b>Please select your iPod model at </b><i>%s</i>"
+msgstr "<b>Bitte iPod Modell an </b><i>%s</i> wählen"
+
+#: ../src/ipod_init.c:466
+msgid ""
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
+msgstr ""
+"Konnte gewähltes Modell nicht finden - dies könnte ein Fehler in der GTK+ "
+"oder in der Glade-Bibliothek sein.\n"
+"\n"
+
+#: ../src/misc.c:864
+#, c-format
 msgid "Could not process '%s' (no filename available)"
 msgstr "Kann nicht fortfahren '%s' (kein Dateiname verfügbar)"
 
-#: ../src/misc.c:1088
+#: ../src/misc.c:1101
 #, c-format
-msgid "Unknown token '%%%c' in template '%s'"
-msgstr "Unbekanntes Merkmal '%%%c' in der Schablone '%s'"
-
-#: ../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:1257
+#: ../src/misc.c:1187
 #, c-format
 msgid "Error creating %s: %s\n"
 msgstr "Fehler beim Erstellen von '%s': %s\n"
 
-#: ../src/misc.c:1691
-#, fuzzy, c-format
+#: ../src/misc.c:1642
+#, c-format
 msgid ""
 "Writing preferences file '%s' failed (%s).\n"
 "\n"
 msgstr ""
-"Die Ausführung von '%s' schlug fehl.\n"
+"Schreiben der Konfigurationsdatei '%s' fehlgeschlagen (%s).\n"
 "\n"
 
-#: ../src/misc.c:1693
+#: ../src/misc.c:1644
 msgid "unspecified error"
-msgstr ""
+msgstr "Unbekannter Fehler"
 
-#: ../src/misc.c:1701
+#: ../src/misc.c:1652
 #, c-format
 msgid ""
 "Writing preferences to the iPod (%s) failed: could not get path to Control "
 "Directory.\n"
 "\n"
 msgstr ""
+"Schreiben der Konfiguration auf dem iPod (%s) fehlgeschlagen: Konnte Pfad "
+"für 'Control'-Verzeichnis nicht finden.\n"
+"\n"
 
 #. title
 #: ../src/misc_confirm.c:71
@@ -4700,7 +4590,7 @@
 msgid "The following has occurred:"
 msgstr "Folgendes ist passiert:"
 
-#: ../src/misc_confirm.c:122
+#: ../src/misc_confirm.c:156
 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 "
@@ -4718,13 +4608,13 @@
 "entfernen wollen? Die Anzahl der Wiedergabelisten, in denen die Stücke "
 "jeweils geführt werden, ist in Klammern angegeben."
 
-#: ../src/misc_confirm.c:126
+#: ../src/misc_confirm.c:160
 msgid "Delete Track Completely from iPod?"
 msgid_plural "Delete Tracks Completely from iPod?"
 msgstr[0] "Soll das Stück vollständig vom iPod entfernt werden?"
 msgstr[1] "Sollen die Stücke vollständig vom iPod entfernt werden?"
 
-#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#: ../src/misc_confirm.c:171 ../src/misc_confirm.c:212
 #, c-format
 msgid ""
 "Are you sure you want to remove the following track from the playlist \"%s\"?"
@@ -4738,13 +4628,13 @@
 "Sind Sie sicher, dass Sie die folgenden Stücke aus der Wiedergabeliste \"%s"
 "\" entfernen wollen?"
 
-#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+#: ../src/misc_confirm.c:175 ../src/misc_confirm.c:216
 msgid "Remove Track From Playlist?"
 msgid_plural "Remove Tracks From Playlist?"
 msgstr[0] "Stück aus der Wiedergabeliste entfernen?"
 msgstr[1] "Stücke aus der Wiedergabeliste entfernen?"
 
-#: ../src/misc_confirm.c:163
+#: ../src/misc_confirm.c:197
 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 "
@@ -4762,13 +4652,13 @@
 "Festplatte entfernen wollen? Die Anzahl der Wiedergabelisten, in denen die "
 "Stücke jeweils geführt werden, ist in Klammern angegeben."
 
-#: ../src/misc_confirm.c:167
+#: ../src/misc_confirm.c:201
 msgid "Delete Track from Harddisk?"
 msgid_plural "Delete Tracks from Harddisk?"
 msgstr[0] "Stück von der Festplatte löschen?"
 msgstr[1] "Stücke von der Festplatte löschen?"
 
-#: ../src/misc_confirm.c:192
+#: ../src/misc_confirm.c:226
 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 "
@@ -4786,55 +4676,55 @@
 "Datenbank entfernen wollen? Die Anzahl der Wiedergabelisten, in denen die "
 "Stücke jeweils geführt werden, ist in Klammern angegeben."
 
-#: ../src/misc_confirm.c:196
+#: ../src/misc_confirm.c:230
 msgid "Remove Track from Local Database?"
 msgid_plural "Remove Tracks from Local Database?"
 msgstr[0] "Stück aus der lokalen Datenbank löschen?"
 msgstr[1] "Stücke aus der lokalen Datenbank löschen?"
 
-#: ../src/misc_confirm.c:261
+#: ../src/misc_confirm.c:295
 #, c-format
 msgid "Deleted one track completely from iPod"
 msgid_plural "Deleted %d tracks completely from iPod"
 msgstr[0] "Ein Stück wurde komplett vom iPod entfernt."
 msgstr[1] "%d Stücke wurden komplett vom iPod entfernt."
 
-#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#: ../src/misc_confirm.c:301 ../src/misc_confirm.c:325
 #, c-format
 msgid "Deleted %d track from playlist '%s'"
 msgid_plural "Deleted %d tracks from playlist '%s'"
 msgstr[0] "%d Stück wurde aus der Wiedergabeliste '%s' entfernt."
 msgstr[1] "%d Stücke wurden aus der Wiedergabeliste '%s' entfernt."
 
-#: ../src/misc_confirm.c:285
+#: ../src/misc_confirm.c:319
 #, c-format
 msgid "Deleted one track from harddisk"
 msgid_plural "Deleted %d tracks from harddisk"
 msgstr[0] "Ein Stück wurde von Ihrer Festplatte gelöscht."
 msgstr[1] "%d Stücke wurden von Ihrer Festplatte gelöscht."
 
-#: ../src/misc_confirm.c:297
+#: ../src/misc_confirm.c:331
 #, c-format
 msgid "Deleted track from local database"
 msgid_plural "Deleted %d tracks from local database"
 msgstr[0] "Ein Stück wurde aus der lokalen Datenbank entfernt"
 msgstr[1] "%d Stücke wurden aus der lokalen Datenbank entfernt"
 
-#: ../src/misc_confirm.c:442
+#: ../src/misc_confirm.c:476
 msgid "Cannot remove entry 'All'"
 msgstr "Der Eintrag 'Alle' kann nicht entfernt werden"
 
-#: ../src/misc_confirm.c:536
+#: ../src/misc_confirm.c:570
 #, c-format
 msgid "Removed all %d tracks from the iPod"
 msgstr "Alle %d Stücke wurden vom iPod entfernt"
 
-#: ../src/misc_confirm.c:541
+#: ../src/misc_confirm.c:575
 #, c-format
 msgid "Removed all podcasts from the iPod"
 msgstr "Alle Podcasts wurden vom iPod entfernt"
 
-#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#: ../src/misc_confirm.c:584 ../src/misc_confirm.c:658
 #, c-format
 msgid "Deleted playlist '%s' including %d member track"
 msgid_plural "Deleted playlist '%s' including %d member tracks"
@@ -4842,12 +4732,12 @@
 msgstr[1] "Wiedergabeliste '%s' einschließlich %d Stücken entfernt"
 
 #. first use playlist name
-#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#: ../src/misc_confirm.c:600 ../src/misc_confirm.c:674
 #, c-format
 msgid "Deleted playlist '%s'"
 msgstr "Wiedergabeliste '%s' gelöscht."
 
-#: ../src/misc_confirm.c:600
+#: ../src/misc_confirm.c:634
 #, c-format
 msgid "Deleted playlist '%s' including %d member track on harddisk"
 msgid_plural "Deleted playlist '%s' including %d member tracks on harddisk"
@@ -4858,22 +4748,22 @@
 "Wiedergabeliste '%s' wurde einschließlich %d Stücken von der Festplatte "
 "gelöscht"
 
-#: ../src/misc_confirm.c:617
+#: ../src/misc_confirm.c:651
 #, c-format
 msgid "Removed all %d tracks from the database"
 msgstr "Alle %d Stücke wurden aus der Datenbank entfernt"
 
-#: ../src/misc_confirm.c:695
+#: ../src/misc_confirm.c:729
 #, 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
+#: ../src/misc_confirm.c:734
 #, 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
+#: ../src/misc_confirm.c:742
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and the following track "
@@ -4893,12 +4783,12 @@
 "Wiedergabelisten, in denen die Stücke jeweils geführt werden, ist in "
 "Klammern angegeben."
 
-#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#: ../src/misc_confirm.c:753 ../src/misc_confirm.c:808
 #, c-format
 msgid "Are you sure you want to delete the playlist '%s'?"
 msgstr "Sind Sie sicher, dass Sie die Wiedergabeliste \"%s\" entfernen wollen?"
 
-#: ../src/misc_confirm.c:745
+#: ../src/misc_confirm.c:779
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4918,13 +4808,13 @@
 "Wiedergabelisten, in denen die Stücke jeweils geführt werden, ist in "
 "Klammern angegeben."
 
-#: ../src/misc_confirm.c:753
+#: ../src/misc_confirm.c:787
 #, 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?"
 
-#: ../src/misc_confirm.c:762
+#: ../src/misc_confirm.c:796
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4943,14 +4833,22 @@
 "Stücke aus der Datenbank entfernen wollen? Die Anzahl der Wiedergabelisten, "
 "in denen die Stücke jeweils geführt werden, ist in Klammern angegeben."
 
-#: ../src/misc_confirm.c:841
+#: ../src/misc_confirm.c:869
 msgid ""
-"Data has been changed and not been saved.\n"
-"OK to exit gtkpod?"
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
+"changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
 msgstr ""
-"Änderungen wurden noch nicht gespeichert.\n"
-"Wollen Sie gtkpod trotzdem beenden?"
 
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr ""
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr ""
+
 #: ../src/misc_conversion.c:66
 msgid "File type"
 msgstr "Dateityp"
@@ -5056,15 +4954,15 @@
 #. 40
 #: ../src/misc_conversion.c:100
 msgid "Media Type"
-msgstr ""
+msgstr "Medientyp"
 
 #: ../src/misc_conversion.c:102
 msgid "TV Episode"
-msgstr ""
+msgstr "TV Episode"
 
 #: ../src/misc_conversion.c:103
 msgid "TV Network"
-msgstr ""
+msgstr "TV Netzwerk"
 
 #: ../src/misc_conversion.c:104
 msgid "Season Nr"
@@ -5073,7 +4971,7 @@
 #. 45
 #: ../src/misc_conversion.c:105
 msgid "Episode Nr"
-msgstr ""
+msgstr "Episode Nr."
 
 #: ../src/misc_conversion.c:106
 #, fuzzy
@@ -5081,86 +4979,85 @@
 msgstr "Künstler"
 
 #: ../src/misc_conversion.c:107
-#, fuzzy
 msgid "Sort Artist"
-msgstr "Künstler"
+msgstr "Ordne Künstler"
 
 #: ../src/misc_conversion.c:108
-#, fuzzy
 msgid "Sort Title"
-msgstr "Untertitel"
+msgstr "Ordne Titel"
 
 #: ../src/misc_conversion.c:109
-#, fuzzy
 msgid "Sort Album"
-msgstr "Album"
+msgstr "Ordne Album"
 
 #. 50
 #: ../src/misc_conversion.c:110
-#, fuzzy
 msgid "Sort Album Artist"
-msgstr "Künstler"
+msgstr "Ordne Künstler"
 
 #: ../src/misc_conversion.c:111
-#, fuzzy
 msgid "Sort Composer"
-msgstr "Komponist"
+msgstr "Ordne Komponisten"
 
 #: ../src/misc_conversion.c:112
 msgid "Sort TV Show"
-msgstr ""
+msgstr "Ordne Fernsehshows"
 
 #: ../src/misc_conversion.c:113
 msgid "Gapless Track Flag"
+msgstr "Unterbrechungsfreie Stücke"
+
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
 msgstr ""
 
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:127
 msgid "Name of file on PC, if available"
 msgstr "Dateiname auf dem PC, falls verfügbar"
 
-#: ../src/misc_conversion.c:127
+#: ../src/misc_conversion.c:128
 msgid "Name of file on the iPod"
 msgstr "Name der Datei auf dem iPod"
 
 #. 10
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
 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:130
+#: ../src/misc_conversion.c:131
 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:136
+#: ../src/misc_conversion.c:137
 msgid "Beats per minute"
-msgstr ""
+msgstr "Beats pro Minute"
 
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
 msgid "Number of times the track has been played"
 msgstr "Wie oft dieses Stück bereits gespielt wurde"
 
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
 msgid "Star rating from 0 to 5"
 msgstr "Bewertung mit 0 bis 5 Sternen"
 
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
 msgid "Date and time track has been added"
 msgstr "Zeitpunkt zu dem das Stück hinzugefügt wurde"
 
 #. 20
-#: ../src/misc_conversion.c:140
+#: ../src/misc_conversion.c:141
 msgid "Date and time track has last been played"
 msgstr "Zeitpunkt des letzten Abspielens des Stücks"
 
-#: ../src/misc_conversion.c:141
+#: ../src/misc_conversion.c:142
 msgid "Date and time track has last been modified"
 msgstr "Zeitpunkt der letzten Modifikation des Stücks"
 
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:143
 msgid "Manual volume adjust"
 msgstr "Manuelle Lautstärkeanpassung"
 
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:144
 msgid ""
 "Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
 "the iPod"
@@ -5169,95 +5066,99 @@
 "aktiviert sein"
 
 #. 25
-#: ../src/misc_conversion.c:146
+#: ../src/misc_conversion.c:147
 msgid "CD Nr. and total number of CDS in set"
 msgstr "CD-Nummer und Gesamtzahl der CDs im Set"
 
-#: ../src/misc_conversion.c:149
+#: ../src/misc_conversion.c:150
 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:150
+#: ../src/misc_conversion.c:151
 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:154
+#: ../src/misc_conversion.c:155
 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)"
 
 #. 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
+#: ../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 ../src/misc_conversion.c:174
 msgid "Used for sorting on the iPod"
-msgstr "Name der Datei auf dem iPod"
+msgstr "Benutzt zum ordnen auf dem iPod"
 
-#: ../src/misc_conversion.c:735
+#: ../src/misc_conversion.c:737
 #, 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"
+msgstr "Die URI »%s« ist keine absolute URI, die das Dateischema verwendet"
 
-#: ../src/misc_conversion.c:745
+#: ../src/misc_conversion.c:747
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
-msgstr "Die lokale URI Datei »%s« darf kein »#« enthalten"
+msgstr "Die lokale URI »%s« darf kein »#« enthalten"
 
-#: ../src/misc_conversion.c:762
+#: ../src/misc_conversion.c:764
 #, c-format
 msgid "The URI '%s' is invalid"
-msgstr "Der URI »%s« ist ungültig"
+msgstr "Die URI »%s« ist ungültig"
 
-#: ../src/misc_conversion.c:774
+#: ../src/misc_conversion.c:776
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "Der Rechnername der URI »%s« ist ungültig"
 
-#: ../src/misc_conversion.c:790
+#: ../src/misc_conversion.c:792
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
-msgstr "Der URI »%s« enthält ungültige Escape-Zeichen"
+msgstr "Die URI »%s« enthält ungültige Escape-Zeichen"
 
-#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
-#: ../src/misc_playlist.c:429
+#: ../src/misc_playlist.c:71 ../src/misc_playlist.c:108
+#, fuzzy
+msgid "Please load the iPod before adding playlists."
+msgstr "Bitte iPod einlesen, bevor Sie Stücke hinzufügen."
+
+#: ../src/misc_playlist.c:77 ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
 msgid "Please enter a name for the new playlist"
 msgstr "Bitte geben Sie einen Namen für die neue Wiedergabeliste ein"
 
-#: ../src/misc_playlist.c:154
+#: ../src/misc_playlist.c:174
 msgid "AR:"
 msgstr "Kü:"
 
-#: ../src/misc_playlist.c:157
+#: ../src/misc_playlist.c:177
 msgid "AL:"
 msgstr "Al:"
 
-#: ../src/misc_playlist.c:160
+#: ../src/misc_playlist.c:180
 msgid "GE:"
 msgstr "Ge:"
 
-#: ../src/misc_playlist.c:163
+#: ../src/misc_playlist.c:183
 msgid "CO:"
 msgstr "Ko:"
 
-#: ../src/misc_playlist.c:166
+#: ../src/misc_playlist.c:186
 msgid "YE:"
 msgstr "Ja:"
 
-#: ../src/misc_playlist.c:194
+#: ../src/misc_playlist.c:214
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/misc_playlist.c:272
+#: ../src/misc_playlist.c:292
 #, c-format
 msgid "Random (%d)"
 msgstr "Zufällig (%d)"
 
-#: ../src/misc_playlist.c:297
+#: ../src/misc_playlist.c:317
 msgid ""
 "Auto Store of track view disabled.\n"
 "\n"
@@ -5265,11 +5166,11 @@
 "Autom. Speichern der angezeigten Stücke ausgeschaltet.\n"
 "\n"
 
-#: ../src/misc_playlist.c:356
+#: ../src/misc_playlist.c:376
 msgid "Not Listed"
 msgstr "Nicht eingetragen"
 
-#: ../src/misc_playlist.c:406
+#: ../src/misc_playlist.c:426
 #, c-format
 msgid "Created playlist '%s' with %d track."
 msgid_plural "Created playlist '%s' with %d tracks."
@@ -5277,78 +5178,76 @@
 msgstr[1] "Wiedergabeliste '%s' mit %d Stücken erstellt."
 
 #. n==0
-#: ../src/misc_playlist.c:417
+#: ../src/misc_playlist.c:437
 msgid "No tracks available, playlist not created"
 msgstr ""
 "Keine passenden Stücke vorhanden -- Wiedergabeliste wurde nicht erstellt."
 
-#: ../src/misc_playlist.c:543
+#: ../src/misc_playlist.c:563
 #, c-format
 msgid "Most Listened (%d)"
 msgstr "Häufig (%d)"
 
-#: ../src/misc_playlist.c:584
+#: ../src/misc_playlist.c:604
 #, c-format
 msgid "Never Listened"
 msgstr "Nie gehört"
 
-#: ../src/misc_playlist.c:624
+#: ../src/misc_playlist.c:644
 #, c-format
 msgid "Best Rated (%d)"
 msgstr "Am besten bewertet (%d)"
 
-#: ../src/misc_playlist.c:666
+#: ../src/misc_playlist.c:686
 msgid "Unrated tracks"
-msgstr "Unbewertet"
+msgstr "Unbewertete Stücke"
 
-#: ../src/misc_playlist.c:671
+#: ../src/misc_playlist.c:691
 #, c-format
 msgid "Rated %d"
 msgstr "Bewertet (%d)"
 
-#: ../src/misc_playlist.c:714
+#: ../src/misc_playlist.c:734
 #, c-format
 msgid "Recent (%d)"
 msgstr "Kürzlich (%d)"
 
-#: ../src/misc_playlist.c:753
+#: ../src/misc_playlist.c:773
 msgid "Last Time"
 msgstr "Zuletzt"
 
-#: ../src/misc_playlist.c:844
+#: ../src/misc_playlist.c:864
 msgid "Removal of dangling tracks with no files on PC was canceled."
 msgstr ""
-"Das Entfernen von verlorenen Stücken ohne entsprechende Datei auf dem "
-"Computer wurde abgebrochen."
+"Das Entfernen von Stücken ohne entsprechende Datei auf dem Computer wurde "
+"abgebrochen."
 
-#: ../src/misc_playlist.c:854
+#: ../src/misc_playlist.c:874
 msgid "Handling of dangling tracks with files on PC was canceled."
 msgstr ""
-"Das Bearbeiten von verlorenen Stücken, deren zugehörige Datei auf dem "
-"Computer vorhanden ist, wurde abgebrochen."
+"Das Bearbeiten von Stücken, deren zugehörige Datei auf dem Computer "
+"vorhanden ist, wurde abgebrochen."
 
-#: ../src/misc_playlist.c:882
+#: ../src/misc_playlist.c:902
 msgid "Dangling tracks with no files on PC were removed."
-msgstr ""
-"Verlorene Stücke ohne entsprechende Datei auf dem Computer wurden entfernt."
+msgstr "Stücke ohne entsprechende Datei auf dem Computer wurden entfernt."
 
-#: ../src/misc_playlist.c:943
+#: ../src/misc_playlist.c:963
 msgid "Dangling tracks with files on PC were handled."
-msgstr ""
-"Verlorene Stücke mit zugehöriger Datei auf dem Computer wurden korrigiert."
+msgstr "Stücke mit zugehöriger Datei auf dem Computer wurden korrigiert."
 
-#: ../src/misc_playlist.c:976
+#: ../src/misc_playlist.c:996
 msgid "Track"
 msgstr "Stück"
 
-#: ../src/misc_playlist.c:1019
+#: ../src/misc_playlist.c:1035
+#, fuzzy
 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"
+"If you abort the operation, you can import the existing database before "
+"calling this function again.\n"
 msgstr ""
 "Sie haben die bereits bestehende iTunesDB nicht eingelesen. Dies ist "
 "wahrscheinlich nicht was Sie beabsichtigen, da auf diese Weise die "
@@ -5358,19 +5257,24 @@
 "'Abbrechen', um abzubrechen. Wenn Sie den Vorgang abbrechen, können Sie die "
 "existierende Datenbank einlesen, bevor Sie erneut abgleichen.\n"
 
-#: ../src/misc_playlist.c:1033
+#: ../src/misc_playlist.c:1042
+#, fuzzy
+msgid "Abort operation"
+msgstr "Sortieroptionen"
+
+#: ../src/misc_playlist.c:1056
 msgid "Creating a tree of known files"
 msgstr "Erstelle eine Liste der vorhandenen Dateien"
 
-#: ../src/misc_playlist.c:1077
+#: ../src/misc_playlist.c:1100
 msgid "Checking iPOD files against known files in DB"
 msgstr "Vergleiche Dateien auf dem iPod mit der iTunesDB"
 
-#: ../src/misc_playlist.c:1120
+#: ../src/misc_playlist.c:1143
 msgid "Orphaned"
 msgstr "Verwaist"
 
-#: ../src/misc_playlist.c:1147
+#: ../src/misc_playlist.c:1170
 #, c-format
 msgid ""
 "The following orphaned file had already been added to the iPod again. It "
@@ -5383,12 +5287,12 @@
 "%s\n"
 "\n"
 
-#: ../src/misc_playlist.c:1175
+#: ../src/misc_playlist.c:1198
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Processing..."
 msgstr "'%d' verwaiste und '%d' verlorene Dateien gefunden. Bearbeite..."
 
-#: ../src/misc_playlist.c:1199
+#: ../src/misc_playlist.c:1222
 #, c-format
 msgid ""
 "The following dangling track has a file on PC.\n"
@@ -5407,7 +5311,7 @@
 "Klicken Sie auf OK, um sie beim nächsten Abgleich zu übertragen oder auf "
 "'Abbrechen' um nichts zu tun."
 
-#: ../src/misc_playlist.c:1204
+#: ../src/misc_playlist.c:1227
 #, c-format
 msgid ""
 "The following dangling track doesn't have file on PC. \n"
@@ -5426,11 +5330,11 @@
 
 #. we want unique window for each
 #. gboolean modal,
-#: ../src/misc_playlist.c:1211
+#: ../src/misc_playlist.c:1234
 msgid "Dangling Tracks"
 msgstr "Verlorene Stücke"
 
-#: ../src/misc_playlist.c:1234
+#: ../src/misc_playlist.c:1257
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Done."
 msgstr "'%d' verwaiste und '%d' verlorene Dateien gefunden. Fertig."
@@ -5470,76 +5374,76 @@
 msgid "Duplicate detection"
 msgstr "Duplikaterkennung"
 
-#: ../src/misc_track.c:1339
+#: ../src/misc_track.c:1347
 msgid "Local Database"
 msgstr "Lokale Datenbank"
 
 #. artwork is set
-#: ../src/misc_track.c:1350
+#: ../src/misc_track.c:1358
 msgid "Embedded or filename was lost"
 msgstr "Eingefügt oder Dateiname war unauffindbar"
 
-#: ../src/misc_track.c:1354
+#: ../src/misc_track.c:1362
 msgid "Artwork not set"
-msgstr "Bilddatei nicht gesetzt"
+msgstr "Bilddatei nicht eingefügt"
 
-#: ../src/misc_track.c:1816
-#, fuzzy, c-format
+#: ../src/misc_track.c:1836
+#, 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"
+msgstr "Konnte Datei für '%s' nicht finden. Stück nicht kopiert."
 
-#: ../src/misc_track.c:2052
+#: ../src/misc_track.c:2072
 #, c-format
 msgid "drag and drop: ignored '%s'\n"
 msgstr "Verschieben: '%s' ignoriert\n"
 
-#: ../src/mp3file.c:1336
+#: ../src/mp3file.c:1344
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Fehler beim Setzen des ID3 Feldes: '%s'\n"
 
-#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
-#: ../src/mp3file.c:2733
+#: ../src/mp3file.c:1368 ../src/mp3file.c:1552 ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870 ../src/mp3file.c:2929 ../src/mp3file.c:2956
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
-msgstr "FEHLER beim Öffnen der Datei: '%s' (%s).\n"
+msgstr "Fehler beim Öffnen der Datei: '%s' (%s).\n"
 
-#: ../src/mp3file.c:1688
+#: ../src/mp3file.c:1793 ../src/mp3file.c:2993
 #, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
-msgstr "FEHLER beim Schreiben eines Tags: '%s' (%s).\n"
+msgstr "Fehler beim Schreiben des Tags in Datei: '%s' (%s).\n"
 
 #. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2770
+#: ../src/mp3file.c:2907
 #, 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:243 ../src/mp4file.c:404
-#, fuzzy, c-format
+#: ../src/mp4file.c:243 ../src/mp4file.c:475
+#, 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"
+msgstr "'%s' scheint keine mp4-Audio- oder Video-Datei zu sein.\n"
 
-#: ../src/mp4file.c:253 ../src/mp4file.c:414
+#: ../src/mp4file.c:253 ../src/mp4file.c:485
 #, 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-"
+"'%s' konnte nicht gelesen werden oder die Datei ist keine gültige mp4-"
 "Datei.\n"
 
-#: ../src/mp4file.c:529
+#: ../src/mp4file.c:607
 #, c-format
 msgid "'%s' does not appear to be a mp4 audio file.\n"
-msgstr "'%s' scheint keine mp4-Audio-Datei zu sein.\n"
+msgstr "'%s' scheint keine mp4 Audio-Datei zu sein.\n"
 
-#: ../src/mp4file.c:540
+#: ../src/mp4file.c:618
 #, 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"
+"gültige mp4 Datei.\n"
 
-#: ../src/mp4file.c:553
+#: ../src/mp4file.c:631
 #, c-format
 msgid ""
 "Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5549,7 +5453,7 @@
 "mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der mp4v2 "
 "Bibliothek kompilieren.\n"
 
-#: ../src/mp4file.c:559
+#: ../src/mp4file.c:637
 #, c-format
 msgid ""
 "m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5560,7 +5464,7 @@
 "werden ohne die mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod "
 "zusammen mit der mp4v2 Bibliothek kompilieren.\n"
 
-#: ../src/mp4file.c:565
+#: ../src/mp4file.c:643
 #, c-format
 msgid ""
 "m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5572,182 +5476,163 @@
 "zusammen mit der mp4v2 Bibliothek kompilieren.\n"
 
 #: ../src/oggfile.c:73
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' does not appear to be an ogg audio file.\n"
-msgstr "'%s' scheint keine mp4-Audio-Datei zu sein.\n"
+msgstr "'%s' scheint keine ogg Audio-Datei zu sein.\n"
 
 #: ../src/oggfile.c:154
-#, fuzzy, c-format
+#, 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 ""
-"Einlesen des Stücks '%s' fehlgeschlagen: m4a/m4p/m4b-Dateien werden ohne die "
-"mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der mp4v2 "
+"Einlesen des Stücks '%s' fehlgeschlagen: ogg-Dateien werden ohne die ogg "
+"Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der ogg "
 "Bibliothek kompilieren.\n"
 
 #: ../src/oggfile.c:160
-#, fuzzy, c-format
+#, 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 ""
-"Schreiben von m4a/m4p Metadaten für '%s' fehlgeschlagen: m4a/m4p/m4b-Dateien "
-"werden ohne die mp4v2 Bibliothek nicht unterstützt. Sie müssen gtkpod "
-"zusammen mit der mp4v2 Bibliothek kompilieren.\n"
+"Schreiben von ogg Metadaten für '%s' fehlgeschlagen: ogg-Dateien werden ohne "
+"die ogg Bibliothek nicht unterstützt. Sie müssen gtkpod zusammen mit der ogg "
+"Bibliothek kompilieren.\n"
 
-#: ../src/prefs.c:357
+#: ../src/prefs.c:365
 #, c-format
 msgid "gtkpod version %s usage:\n"
 msgstr "gtkpod Version %s:\n"
 
-#: ../src/prefs.c:358
+#: ../src/prefs.c:366
 msgid "  -h, --help:   display this message\n"
 msgstr "  -h, --help:   diesen Text anzeigen\n"
 
-#: ../src/prefs.c:359
+#: ../src/prefs.c:367
 #, 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:360
+#: ../src/prefs.c:368
 msgid "  --hash <file>:print gtkpod hash for file\n"
-msgstr ""
+msgstr "  --hash <file>:Drucke gtkpod hash für Datei\n"
 
-#: ../src/prefs.c:361
+#: ../src/prefs.c:369
 msgid "  -m path:      define the mountpoint of your iPod\n"
 msgstr "  -m <Pfad>:    Einhängepunkt für iPod angeben\n"
 
-#: ../src/prefs.c:362
+#: ../src/prefs.c:370
 msgid "  --mountpoint: same as '-m'.\n"
 msgstr "  --Einhängepunkt: wie '-m'.\n"
 
-#: ../src/prefs.c:363
+#: ../src/prefs.c:371
 msgid "  -a:           import database automatically after start.\n"
 msgstr "  -a:           iTunesDB automatisch importieren\n"
 
-#: ../src/prefs.c:364
+#: ../src/prefs.c:372
 msgid "  --auto:       same as '-a'.\n"
 msgstr "  --auto:       wie '-a'.\n"
 
-#: ../src/prefs.c:561
-#, c-format
-msgid "Couldn't create ~/.gtkpod\n"
-msgstr ""
+#: ../src/prefs.c:569
+#, fuzzy, c-format
+msgid "Couldn't create '%s'\n"
+msgstr "Konnte ~/.gtkpod nicht erstellen\n"
 
-#: ../src/prefs_window.c:133
-msgid "Please select command for 'Play Now'"
-msgstr "Programm für 'Jetzt abspielen' wählen"
+#: ../src/prefsdlg.c:51
+#, fuzzy
+msgid "Hide"
+msgstr "Video"
 
-#: ../src/prefs_window.c:134
-msgid "Please select command for 'Enqueue'"
-msgstr "Programm für 'Zum Abspielen vormerken':"
-
-#: ../src/prefs_window.c:135
-msgid "Please select the mp3gain executable"
-msgstr "Genauer Pfad des mp3gain-Programms"
-
-#: ../src/prefs_window.c:136
-msgid "Please select the aacgain executable"
-msgstr "Genauer Pfad des aacgain-Programms"
-
-#: ../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:138
-msgid "Select the mserv trackinfo root directory"
-msgstr "Wählen Sie das mserv Stammverzeichnis (Stückinfo)"
-
-#: ../src/prefs_window.c:139
-msgid "Select the ogg/vorbis converter command"
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
 msgstr ""
 
-#: ../src/prefs_window.c:140
-msgid "Select the flac converter command"
+#: ../src/prefsdlg.c:53
+msgid "Text only"
 msgstr ""
 
-#: ../src/prefs_window.c:141
-msgid "Select the m4a converter command."
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
 msgstr ""
 
-#: ../src/prefs_window.c:142
-msgid "Select the mp3 converter command."
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
 msgstr ""
 
-#: ../src/prefs_window.c:143
-msgid "Select the wav converter command."
-msgstr ""
-
-#: ../src/prefs_window.c:201 ../src/repository.c:662
+#: ../src/repository.c:527
 #, 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>Schauen Sie sich die Skripte an, die in '%s' zur Verfügung gestellt "
-"wurden. Wenn Sie ein neues Script schreiben, schicken Sie es bitte an jcsjcs "
-"at users.sourceforge.net, damit es in die nächste Version aufgenommen werden "
-"kann.</i>"
+"Are you sure you want to delete repository \"%s\"? This action cannot be "
+"undone!"
+msgstr "Sind Sie sicher, dass Sie die Wiedergabeliste \"%s\" entfernen wollen?"
 
-#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
-msgid "Preferences not updated"
-msgstr "Die Einstellungen wurden nicht übernommen"
+#: ../src/repository.c:531
+#, fuzzy
+msgid "Delete repository?"
+msgstr "Datenbank löschen"
 
-#: ../src/prefs_window.c:1232
-msgid "Preferences applied"
-msgstr "Die Einstellungen wurden übernommen"
-
-#: ../src/repository.c:573 ../src/repository.c:2395
+#: ../src/repository.c:587 ../src/repository.c:2400
 msgid "Set backup file"
 msgstr "Bestimme Sicherungsdatei"
 
-#: ../src/repository.c:612
+#: ../src/repository.c:626
 msgid "Select directory for synchronization"
 msgstr "Wählen Sie ein Verzeichnis zum Abgleich"
 
-#: ../src/repository.c:638
+#: ../src/repository.c:652
 msgid "Please select command to sync contacts"
 msgstr "Skript zum Abgleichen der Kontakte"
 
-#: ../src/repository.c:644
+#: ../src/repository.c:658
 msgid "Please select command to sync calendar"
 msgstr "Skript zum Abgleichen des Terminkalenders"
 
-#: ../src/repository.c:650
+#: ../src/repository.c:664
 msgid "Please select command to sync notes"
 msgstr "Skript zum Abgleichen der Notizen"
 
-#: ../src/repository.c:729
+#: ../src/repository.c:676
+#, 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>Schauen Sie sich die Skripte an, die in '%s' zur Verfügung gestellt "
+"wurden. Wenn Sie ein neues oder verbessertes Script schreiben, schicken Sie "
+"es bitte an jcsjcs at users.sourceforge.net, damit es in die nächste Version "
+"aufgenommen werden kann.</i>"
+
+#: ../src/repository.c:743
 msgid "Smart playlist updated."
 msgstr "Intelligente Wiedergabeliste aktualisiert."
 
-#: ../src/repository.c:1190
+#: ../src/repository.c:1204
 msgid "Podcasts Repository"
 msgstr "Podcast Datenbank"
 
-#: ../src/repository.c:1194
+#: ../src/repository.c:1208
 msgid "Local Repository"
 msgstr "Lokale Datenbank"
 
-#: ../src/repository.c:1348
+#: ../src/repository.c:1358
 msgid "Master Playlist"
 msgstr "Hauptwiedergabeliste"
 
-#: ../src/repository.c:1352
+#: ../src/repository.c:1362
 msgid "Podcasts Playlist"
 msgstr "Podcast Wiedergabeliste"
 
-#: ../src/repository.c:1360
+#: ../src/repository.c:1370
 msgid "Regular Playlist"
 msgstr "Normale Wiedergabeliste"
 
-#: ../src/repository.c:2423
+#: ../src/repository.c:2428
 msgid "Set local repository file"
 msgstr "Wähle Datei für die lokale Datenbank"
 
-#: ../src/repository.c:2522
+#: ../src/repository.c:2526
 msgid "New Repository"
 msgstr "Neue Datenbank "
 
@@ -5756,45 +5641,58 @@
 msgstr "Die Datei, für die eine Prüfsumme berechnet werden soll, ist leer.\n"
 
 #: ../src/sha1.c:239
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
-msgstr "Konnte '%s' zum Berechnen der MD5-Prüfsumme nicht öffnen: %s\n"
+msgstr "Konnte '%s' zum Berechnen der SHA1-Prüfsumme nicht öffnen: %s\n"
 
-#: ../src/syncdir.c:237
+#: ../src/sort_window.c:237
+#, fuzzy
+msgid "No sorting"
+msgstr "_Sortierung"
+
+#: ../src/sort_window.c:271
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr ""
+"Sie können auch die Spaltenköpfe anklicken, aber diese Option ermöglicht es, "
+"auch nach Spalten zu sortieren, die nicht angezeigt werden."
+
+#: ../src/syncdir.c:246
 #, c-format
 msgid "Sync summary for %s/%s\n"
 msgstr "Zusammenfassung des Abgleichs für %s/%s\n"
 
-#: ../src/syncdir.c:246
+#: ../src/syncdir.c:255
 msgid "The following track has been added or updated:\n"
 msgid_plural "The following tracks have been added or updated:\n"
 msgstr[0] "Das folgende Stück wurde hinzugefügt oder aktualisiert:\n"
 msgstr[1] "Die folgenden Stücke wurden hinzugefügt oder aktualisiert:\n"
 
-#: ../src/syncdir.c:255
+#: ../src/syncdir.c:264
 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] "Das folgende Stück wurde vom iPod entfernt:\n"
 msgstr[1] "Die folgenden Stücke wurden vom iPod entfernt:\n"
 
-#: ../src/syncdir.c:264
+#: ../src/syncdir.c:273
 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] "Das folgende Stück wurde aus der Datenbank entfernt:\n"
 msgstr[1] "Die folgenden Stücke wurden aus der Datenbank entfernt:\n"
 
-#: ../src/syncdir.c:271
+#: ../src/syncdir.c:280
 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] "Das folgende Stück wurde aus der Wiedergabeliste entfernt:\n"
 msgstr[1] "Die folgenden Stücke wurden aus der Wiedergabeliste entfernt:\n"
 
-#: ../src/syncdir.c:277
+#: ../src/syncdir.c:286
 msgid "Nothing was changed.\n"
 msgstr "Nichts geändert.\n"
 
-#: ../src/syncdir.c:282
+#: ../src/syncdir.c:291
 msgid "Sync summary"
 msgstr "Zusammenfassung des Abgleichs"
 
@@ -5912,142 +5810,655 @@
 #: ../src/wavfile.c:181
 #, c-format
 msgid "%s does not appear to be a supported wav file.\n"
-msgstr "'%s' scheint keine unterstützte WAV-Datei zu sein.\n"
+msgstr "'%s' scheint keine unterstützte wav Datei zu sein.\n"
 
 #, fuzzy
-#~ msgid "<b>Resolution:</b>"
-#~ msgstr "<b>Werkzeugtipps</b>"
+#~ msgid "GtkPod"
+#~ msgstr "gtkpod"
 
-#, fuzzy
-#~ msgid "label"
-#~ msgstr "label21"
+#~ msgid "     "
+#~ msgstr "     "
 
+#~ msgid "      "
+#~ msgstr "     "
+
+#~ msgid "%A"
+#~ msgstr "%A"
+
+#~ msgid "...as icons"
+#~ msgstr "...als Symbol"
+
+#~ msgid "...as text"
+#~ msgstr "...als Text"
+
+#~ msgid "...both as icons and text"
+#~ msgstr "...als Text und Symbol"
+
+#~ msgid "...entry 'All' in sort tab..."
+#~ msgstr " ...Begriff 'Alle' im Sortierungseintrag..."
+
+#~ msgid "...master playlist"
+#~ msgstr "...Hauptwiedergabeliste"
+
+#~ msgid "../%A.jpg"
+#~ msgstr "../%A.jpg"
+
+#~ msgid "<b>Adding/Updating/Syncing</b>"
+#~ msgstr "<b>Hinzufügen/Aktualisieren/Abgleichen</b>"
+
+#~ msgid "<b>Audioscrobbler</b>"
+#~ msgstr "<b>Audioscrobbler</b>"
+
+#~ msgid "<b>Automatically select...</b>"
+#~ msgstr "<b>Wähle automatisch...</b>"
+
+#~ msgid "<b>Calendar/Contacts/Notes</b>"
+#~ msgstr "<b>Kalender/Kontakte/Notizen</b>"
+
+#~ msgid "<b>Misc</b>"
+#~ msgstr "<b>Verschiedenes</b>"
+
+#~ msgid "<b>Mountpoint and individual repository/playlist options</b>"
+#~ msgstr ""
+#~ "<b>Einhängepunkt u. individuelle Datenbank/Wiedergabeliste Optionen</b>"
+
+#~ msgid "<b>Repositories</b>"
+#~ msgstr "<b>Datenbanken</b>"
+
+#~ msgid "<b>Sync</b>"
+#~ msgstr "<b>Abgleichen</b>"
+
+#~ msgid "<b>Tag Reading</b>"
+#~ msgstr "<b>Lesen von Tags</b>"
+
+#~ msgid "<b>Track Attributes</b>"
+#~ msgstr "<b>Stück Informationen</b>"
+
+#~ msgid "About gtkpod"
+#~ msgstr "Über gtkpod"
+
+#~ msgid "Always write ID3v2.4 tags (only applies to MP3)"
+#~ msgstr "Immer ID3v2.4 Tags schreiben (trifft nur auf MP3 zu)"
+
 #~ msgid ""
-#~ "Cannot open '%s' for reading.\n"
-#~ "\n"
+#~ "As a last resort set the following tags to the\n"
+#~ "filename if they are (still) empty:"
 #~ msgstr ""
-#~ "Datei '%s' konnte nicht zum Lesen geöffnet werden.\n"
-#~ "\n"
+#~ "Falls Tags (immer noch) nicht gesetzt sind, die folgenden Tags mit dem\n"
+#~ "Dateinamen initialisieren:"
 
-#~ msgid "Unable to open '%s' for reading\n"
-#~ msgstr "Kann '%s' nicht zum Lesen öffnen.\n"
+#~ msgid "Available:"
+#~ msgstr "Verfügbar:"
 
-#~ msgid "Could not open \"iTunesDB.ext\" for reading extended info.\n"
+#~ msgid "Before removing tracks from the harddisk"
+#~ msgstr "Vor dem vollständigen Löschen auf der Festplatte"
+
+#~ msgid "Before removing tracks from the iPod"
+#~ msgstr "Vor dem vollständigen Löschen vom iPod"
+
+#~ msgid "Before removing tracks from the local database"
+#~ msgstr "Vor dem Entfernen aus der lokalen Datenbank"
+
+#~ msgid ""
+#~ "Check before removing photos from a photo album whether\n"
+#~ "they should be deleted from the Photo Database."
 #~ msgstr ""
-#~ "Die \"iTunesDB.ext\" konnte zum Lesen der erweiterten Infos nicht "
-#~ "geöffnet werden.\n"
+#~ "Prüfe vor dem Löschen eines Fotos aus dem Fotoalbum,\n"
+#~ "ob es aus der Foto-Datenbank gelöscht werden soll."
 
-#~ msgid "Add _Directory"
-#~ msgstr "_Verzeichnisse hinzufügen"
+#~ msgid ""
+#~ "Confirm before removing tracks from the iPod or repository\n"
+#~ "when syncing playlists"
+#~ msgstr ""
+#~ "Bestätigung vor dem Löschen vom iPod oder Musikverzeichnis\n"
+#~ "beim Abgleichen der Wiedergabelisten."
 
-#~ msgid "Dirs"
-#~ msgstr "Verzeichnisse"
+#~ msgid "Credits"
+#~ msgstr "Danksagung"
 
-#~ msgid "Files"
-#~ msgstr "Dateien"
+#~ msgid "Currently only rating is supported."
+#~ msgstr "Gegenwärtig wird nur 'Bewertung' unterstützt."
 
-#~ msgid "New PL"
-#~ msgstr "Neue Wiedergabeliste"
+#~ msgid ""
+#~ "Delete tracks that are no longer present from the\n"
+#~ "iPod or repository"
+#~ msgstr ""
+#~ "Lösche Stücke, die nicht mehr auf dem iPod oder\n"
+#~ "in der Datenbank vorhanden sind"
 
-#~ msgid "_About"
-#~ msgstr "_Über"
+#~ 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 ""
+#~ "Bestimmt, wie der Dateiname von Bildern gewählt wird. Mehrere Schablonen "
+#~ "können durch Semikolons getrennt werden Künstler: %a, Album: %A, "
+#~ "Komponist: %c, Titel: %t, Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, "
+#~ "Jahr: %Y, ursprünglicher Dateiname (benötigt 'Erweiterte Informationen'): "
+#~ "%o, ursprünglicher Dateiname ohne Erweiterung: %O, die aktuelle "
+#~ "Wiedergabelist: %p, das Zeichen '%': %%."
 
+#~ 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."
+
+#~ 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."
+
+#~ msgid "Display info about non-updated tracks"
+#~ msgstr "Informationen über nicht aktualisierte Stücke anzeigen"
+
+#~ 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."
+
+#~ msgid "Display toolbar..."
+#~ msgstr "Werkzeugleiste anzeigen..."
+
+#~ msgid "Display tooltips in prefs window"
+#~ msgstr "Werkzeugtipps im Fenster 'Einstellungen' anzeigen"
+
+#~ msgid "Displayed:"
+#~ msgstr "Angezeigt:"
+
+#~ msgid "Don't allow file duplication"
+#~ msgstr "Mehrfaches Einlesen von Stücken verhindern"
+
+#~ msgid ""
+#~ "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+#~ msgstr ""
+#~ "Die Duplikat-Erkennung basiert auf einer (modifizierten) sha1-Prüfsumme "
+#~ "der Datei."
+
+#~ msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
+#~ msgstr "Versuche zuerst <i>folder.jpg</i>, dann <i>&lt;artist&gt;.jpg</i>"
+
+#~ msgid "Flac with :"
+#~ msgstr "FLAC mit:"
+
+#~ msgid ""
+#~ "For example, 'xmms %s' will clear xmms' current playlist, add the "
+#~ "selected tracks and start playing."
+#~ msgstr ""
+#~ "'xmms %s', z.B., löscht die aktuelle Wiedergabeliste von xmms, fügt die "
+#~ "gewählten Stücke hinzu und beginnt mit der Wiedergabe."
+
+#~ msgid ""
+#~ "For example, 'xmms -e %s' will append (enqueue) the selected tracks to "
+#~ "xmms' current playlist."
+#~ msgstr ""
+#~ "'xmms -e %s', z.B., fügt die ausgewählten Stücke zur aktuellen "
+#~ "Wiedergabeliste von xmms hinzu."
+
 #, fuzzy
-#~ msgid "Set Cover Art from _Web"
-#~ msgstr "Lege Cover-Bild fest"
+#~ 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 ""
+#~ "Diese Option wird dringend empfohlen, um einen schnelleren Import der "
+#~ "iTunesDB bei eingeschalteter Duplikatenerkennung zu erreichen. Da "
+#~ "außerdem die Originaldateinamen gespeichert werden, können Tag-Änderungen "
+#~ "in die Originaldatei übernommen werden und es ist sogar möglich, den "
+#~ "Inhalt Ihres iPods im Falle eines Dateisystemschadens (Neuformatierung "
+#~ "des iPods) zu rekonstruieren (dazu müssen die 'transferred=' Einträge in "
+#~ "der gesicherten Datenbank auf '0' gesetzt und 'offline' eingelesen "
+#~ "werden)."
 
-#~ msgid "_Other"
-#~ msgstr "S_onstiges"
+#~ msgid "If both options are selected, embedded APIC data takes precedence."
+#~ msgstr ""
+#~ "Falls beide Optionen angewählt sind, werden die APIC-Daten verwendet."
 
-#~ msgid "File skipped. match exclude masks: '%s'\n"
-#~ msgstr "Datei übersprungen. Erfüllt Ausschlusskriterium: '%s'\n"
+#~ 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 ""
+#~ "Wenn der Dateiname (inkl. Pfad) eines bereits eingelesenen Stückes "
+#~ "identisch ist mit dem Namen eines neu einzulesenden Stückes, dann erlaubt "
+#~ "diese Option Ihnen, das alte Stück zu überschreiben. Normalerweise wird "
+#~ "das Einlesen des Stückes einfach übersprungen. Wenn sich die Datei nicht "
+#~ "geändert hat und Sie die Option 'Mehrfaches Einlesen von Stücken "
+#~ "verhindern' aktiviert haben, wird das Einlesen ebenfalls übersprungen."
 
-#~ msgid "Add Playlists"
-#~ msgstr "Wiedergabeliste(n) hinzufügen"
+#~ msgid ""
+#~ "If you check this, gtkpod will descend into subdirectories recursively."
+#~ msgstr ""
+#~ "Wenn Sie diese Option wählen, werden Verzeichnisse rekursiv eingelesen."
 
-#~ msgid "Select directory to add recursively"
-#~ msgstr "Wählen Sie Verzeichnis(se) zum Hinzufügen aus"
+#~ 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 ""
+#~ "Wenn die Hauptwiedergabeliste nicht automatisch ausgewählt wird, verläuft "
+#~ "der Import der iTunes Datenbank zu Beginn deutlich schneller, da die "
+#~ "Anzeige nicht aktualisiert werden muss."
 
 #~ msgid ""
-#~ "Supposedly something that tells the iPod to increase or decrease the "
-#~ "playback speed"
+#~ "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 ""
-#~ "Anscheinend ein Feld, das den iPod anweist, die Wiedergabe zu "
-#~ "beschleunigen oder zu verlangsamen"
+#~ "Falls mehrere Stücke in der Stücke-Anzeige ausgewählt sind und ein Tag "
+#~ "des ersten Stückes geändert wird, werden die entsprechenden Tags auch in "
+#~ "den anderen Stücken aktualisiert."
 
-#~ msgid "Processing '%s'"
-#~ msgstr "Bearbeite '%s'"
+#~ msgid "Keeps all compilation CDs grouped together in the artists sort tab."
+#~ msgstr ""
+#~ "Alle Sampler-CDs im Filter-Eintrag 'Künstler' als 'Sampler' gruppieren."
 
+#~ msgid "M4A with :"
+#~ msgstr "M4A mit:"
+
+#~ msgid "MP3 with :"
+#~ msgstr "MP3 mit:"
+
+#~ msgid "Match al_l of the following"
+#~ msgstr "Al_le der folgenden Regeln"
+
+#~ msgid "Match an_y of the following"
+#~ msgstr "Mindestens _eine der folgenden Regeln"
+
+#~ msgid "Maximum size of cache directory (in GB):"
+#~ msgstr "Maximal Größe des Zwischenspeichers (GB):"
+
+#~ msgid "Move selected attributes to the displayed list"
+#~ msgstr "Verschiebe gewählte Attribute in die angezeigte Liste"
+
+#~ msgid ""
+#~ "Music files can have images embedded in the APIC tag. Currently this is "
+#~ "only supported for MP3 files."
+#~ msgstr ""
+#~ "Musikdateien können Bilder im 'APIC Tag' enthalten. Dies wird derzeit nur "
+#~ "bei MP3-Dateien unterstützt."
+
+#~ msgid "None"
+#~ msgstr "Keine"
+
+#~ 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 ""
+#~ "Normalerweise wird der Zeichensatz, der beim ersten Einlesen spezifiziert "
+#~ "wurde, auch verwendet, um ein Stück zu aktualisieren. Wenn Sie beim "
+#~ "ersten Einlesen einen falschen Zeichensatz angegeben haben und dies nun "
+#~ "mittels 'Stücke aktualisieren' korrigieren wollen, müssen Sie diese "
+#~ "Option auswählen. Bitte beachten Sie: die Information über den "
+#~ "verwendeten Zeichensatz wird mit den erweiterten Informationen "
+#~ "gespeichert (siehe 'Schreiben der iTunesDB' weiter unten). Stücke, die "
+#~ "vor Version 0.51 eingelesen wurden, haben keine Informationen über den "
+#~ "Zeichensatz gespeichert und der oben spezifizierte Zeichensatz wird "
+#~ "verwendet."
+
+#~ 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 ""
+#~ "Normalerweise wird der Zeichensatz, der beim ersten Einlesen des Stückes "
+#~ "angegeben wurde, auch beim Schreiben der ID3-Tags verwendet. Wenn Sie "
+#~ "beim ersten Einlesen einen falschen Zeichensatz angegeben haben, müssen "
+#~ "Sie diese Option zusammen mit dem richtigen Zeichensatz auswählen. Bitte "
+#~ "beachten Sie: Die Information über den verwendeten Zeichensatz wird mit "
+#~ "den erweiterten Informationen gespeichert (siehe 'Schreiben der iTunesDB' "
+#~ "auf der 'Eingabe-Ausgabe' Seite). Stücke, die vor Version 0.51 eingelesen "
+#~ "wurden, haben keine Informationen über den Zeichensatz gespeichert und "
+#~ "der auf der 'Eingabe/Ausgabe'-Seite eingestellte Zeichensatz wird "
+#~ "verwendet."
+
+#~ msgid "Number of tracks in generated playlists:"
+#~ msgstr "Anzahl der Stücke in erzeugten Wiedergabelisten:"
+
+#~ msgid ""
+#~ "Number of tracks in the generated playlists 'Most Often Listened', 'Best "
+#~ "Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
+#~ msgstr ""
+#~ "Anzahl der Stücke in den erzeugten Wiedergabelisten 'Am häufigsten "
+#~ "gehörte Stücke', 'Höchstbewertete Stücke' und 'Zuletzt gespielte Stücke'. "
+#~ "Wählen Sie '0', wenn Sie die Anzahl nicht begrenzen wollen."
+
+#~ msgid "Ogg with :"
+#~ msgstr "OGG mit:"
+
+#~ msgid "Overwrite tags that are already set"
+#~ msgstr "Tags, die bereits gesetzt sind, überschreiben."
+
+#~ msgid "Password:"
+#~ msgstr "Passwort:"
+
+#~ msgid "Please specify a time interval"
+#~ msgstr "Bitte Zeitintervall angeben"
+
+#~ msgid "Read coverart from embedded APIC data"
+#~ msgstr "Lese Cover-Bild aus den APIC Daten"
+
+#~ 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)"
+
+#~ msgid "Remove selected attributes from the displayed list"
+#~ msgstr "Gewählte Attribute der angezeigten Liste entfernen"
+
+#~ msgid "Root directory of mserv database (trackinfo root)."
+#~ msgstr "Stammverzeichnis der mserv Datenbank (trackinfo root)."
+
+#~ msgid "Rules"
+#~ msgstr "Regeln"
+
+#~ msgid "Scrobble Tracks?"
+#~ msgstr "ID3 Daten senden (scrobble)?"
+
 #, fuzzy
-#~ msgid "label21"
-#~ msgstr "label21"
+#~ 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'"
 
-#~ msgid "window1"
-#~ msgstr "window1"
+#~ msgid "Set mountpoint or edit repository options"
+#~ msgstr "Einhängepunkt festlegen oder Datenbank Optionen editieren"
 
-#~ msgid "<b>Import</b>"
-#~ msgstr "<b>Importieren</b>"
+#~ msgid "Set options for Calendar/Contacts/Notes"
+#~ msgstr "Setze Optionen für Kalender/Kontakte/Notizen"
 
-#~ msgid "Automatically import iTunesDBs on startup"
-#~ msgstr "Beim Start die iTunes Datenbank automatisch importieren"
+#~ 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 ""
+#~ "Benutze 'aacgain -q -k' zur Normalisierung der Lautstärke im Werkzeug-"
+#~ "Menü. Falls gewählt, werden Normalisierungsdaten für m4a und m4b Dateien "
+#~ "errechnet und zu den Musikinformationen hinzugefügt."
 
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Konnte Bilddatei nicht finden: %s"
+#~ 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 ""
+#~ "Benutze 'mp3gain -q -k' zur Normalisierung der Lautstärke im Werkzeug-"
+#~ "Menü. Falls gewählt, werden Normalisierungsdaten für mp3 Dateien "
+#~ "errechnet und zu den Musikinformationen hinzugefügt."
 
-#~ msgid "_Synchronize Playlist"
-#~ msgstr "_Abgleich der Wiedergabeliste"
+#~ msgid "Set this to your last.fm password"
+#~ msgstr "Benutze dies als 'last.fm' Passwort"
 
-#~ msgid "Stop Display Update"
-#~ msgstr "Aktualisierung der Anzeige abbrechen"
+#~ msgid "Set this to your last.fm username"
+#~ msgstr "Benutze dies als 'last.fm' Benutzername"
 
-#~ msgid "Stop"
-#~ msgstr "Stopp"
+#~ msgid ""
+#~ "Set to 0 to effectively disable caching (a maximum of one track will be "
+#~ "cached at a time)."
+#~ msgstr ""
+#~ "Auf '0' setzen, um zwischenspeichern abzuschalten (max. ein Stück wird "
+#~ "jeweils gespeichert)"
 
 #~ 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."
+#~ "Set to 0 to use as many background threads as CPUs are available on your "
+#~ "system."
 #~ msgstr ""
-#~ "Es ist deutlich schneller, die Sortierung vorzunehmen nachdem alle Stücke "
-#~ "hinzugefügt wurden. Wen dieses Verhalten irritiert, sollte diese Option "
-#~ "jedoch nicht wählen."
+#~ "Auf '0' setzen, um die Zahl der Hintergrunddienste an die max. Zahl der "
+#~ "CPUs anzupassen"
 
+#~ msgid "Sorting case sensitive"
+#~ msgstr "Beim Sortieren Groß-/Kleinschreibung beachten"
+
+#~ msgid "Sorttab: "
+#~ msgstr "Sortierungseintrag: "
+
+#~ msgid "Sorttabs"
+#~ msgstr "Sortierungseinträge"
+
+#~ msgid "Template for info field: "
+#~ msgstr "Schablone für dieses Feld: "
+
 #~ msgid ""
-#~ "Temporarily disable sorting when changing playlist\n"
-#~ "or tab entry (faster!)"
+#~ "The tags are written to the files on your harddrive and on the iPod (if "
+#~ "available)."
 #~ msgstr ""
-#~ "Sortieren vorübergehend deaktivieren, wenn die Wiedergabeliste oder der "
-#~ "Sortierungseintrag gewechselt wird (schneller!)"
+#~ "Die Tags werden in die Originaldateien der Festplatte und auch auf dem "
+#~ "iPod (falls angeschlossen) geschrieben."
 
+#~ msgid "This is the same option as in 'Edit/Delete Confirmation'"
+#~ msgstr ""
+#~ "Diese Option ist identisch mit der Sicherheitsabfrage \n"
+#~ "beim 'Bearbeiten/Löschen'"
+
 #~ 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)."
+#~ "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 ""
-#~ "Die Anzeige kann bis zur vollständigen Aktualisierung nach einer Änderung "
-#~ "der Auswahl blockiert werden. Die Aktualisierung ist dann schneller, aber "
-#~ "es muss gewartet werden, bis sich gtkpod wieder meldet. Mit dieser Option "
-#~ "wird automatisch auch das Sortieren vorübergehend deaktiviert (siehe "
-#~ "Option weiter oben)."
+#~ "Es wird empfohlen, Tags als V2.4 Tags zu schreiben. Allerdings "
+#~ "unterstützen eventuell einige Programme diesen Standard noch nicht. "
+#~ "ID3v2.4 verwendet Unicode, um die Tags zu speichern. Dies bedeutet, dass "
+#~ "Sie sich keine Gedanken mehr über den verwendeten Zeichensatz machen zu "
+#~ "brauchen. gtkpod verwendet UTF8, da dies die Tag-Länge reiner ASCII-Tags "
+#~ "nicht verlängert. ID3v2.4 wird ebenfalls beim Schreiben verwendet, falls "
+#~ "die Tags in der Datei bereits als V2.4 vorliegen."
 
+#~ msgid "This option will be re-activated when you upgrade gtkpod."
+#~ msgstr ""
+#~ "Diese Option wird automatisch reaktiviert, wenn eine neue Version von "
+#~ "gtkpod installiert wird."
+
 #~ msgid ""
-#~ "Block display when changing playlist or tab\n"
-#~ " entry (faster!)"
+#~ "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 ""
-#~ "Anzeige nicht aktualisieren, wenn eine neue Wiedergabeliste oder ein "
-#~ "neuer Sortierungseintrag gewählt wird (schneller!)"
+#~ "Stücke können im Hintergrund übertragen werden, sobald sie zu einem iPod "
+#~ "Verzeichnis hinzugefügt wurden. Ansonsten werden sie übertragen, wenn das "
+#~ "iPod-Verzeichnis unverändert ausgehängt wird."
 
-#~ msgid "deleting..."
-#~ msgstr "Lösche Stücke..."
+#~ msgid "Translators"
+#~ msgstr "Übersetzer"
 
-#~ msgid "preparing to copy..."
-#~ msgstr "Kopieren wird vorbereitet..."
+#~ msgid "Use 'Multi-Edit' also for title field"
+#~ msgstr "'Multi-Edit' auch für das Titel-Feld verwenden"
 
-#~ msgid "Copied %d of %d new track."
-#~ msgid_plural "Copied %d of %d new tracks."
-#~ msgstr[0] "%d von %d Stücken kopiert."
-#~ msgstr[1] "%d von %d Stücken kopiert."
+#~ msgid "Use 'Multi-Edit' for tracks selections"
+#~ msgstr "'Multi-Edit' bei markierten Stücken verwenden"
 
-#~ msgid "Some tracks were not written to iPod. Export aborted!"
+#~ msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
+#~ msgstr "Benutze <i>&lt;Album&gt;.jpg</i> im übergeordneten Verzeichnis"
+
+#~ msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
+#~ msgstr "Benutze <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
+
+#~ msgid "Use <i>folder.jpg</i> as cover art."
+#~ msgstr "Benutze <i>folder.jpg</i> als Cover-Bild"
+
+#~ msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
+#~ msgstr "Benutze <i>folder.jpg</i>, <i>folder.png</i>..."
+
+#~ msgid ""
+#~ "Use selected encoding (on the 'General' page)\n"
+#~ "when writing tags"
 #~ msgstr ""
-#~ "Einige Stücke wurden nicht auf den iPod übertragen. Export abgebrochen!"
+#~ "Ausgewählte Kodierung (auf der 'Allgemein' Seite)\n"
+#~ "beim Schreiben von ID3-Tags verwenden"
+
+#~ msgid "Use this template to parse filename for tag information:"
+#~ msgstr ""
+#~ "Diese Schablone verwenden, um aus dem Dateinamen die Tags zu bestimmen:"
+
+#~ msgid "Username to be used for mserv database lookup."
+#~ msgstr "Name, der zum Benutzen der mserv Datenbank verwendet wird."
+
+#~ 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 ""
+#~ "Es kommt selten vor, dass die Titel mehrerer Stücke auf den selben Text "
+#~ "gesetzt werden sollen. Diese Option verhindert möglicherweise "
+#~ "unerwünschte Resultate, insbesondere da noch keine 'Rückgängig'-Funktion "
+#~ "existiert."
+
+#~ msgid "WAV with :"
+#~ msgstr "WAV mit:"
+
+#~ msgid ""
+#~ "When adding dirs/files, update information of\n"
+#~ "existing tracks with identical filenames"
+#~ msgstr ""
+#~ "Beim Hinzufügen von Stücken o. Verzeichnissen bereits\n"
+#~ "existierende Stücke mit dem selben Dateinamen aktualisieren."
+
+#~ msgid "When syncing playlists"
+#~ msgstr "Beim Abgleich von Wiedergabelisten"
+
+#~ msgid ""
+#~ "Write extended information (PC filenames, SHA1 hashes,\n"
+#~ "encoding...). Recommended."
+#~ msgstr ""
+#~ "Erweiterte Informationen schreiben (PC Dateinamen, SHA1-Prüfsummen, "
+#~ "Kodierung).\n"
+#~ "Empfohlen."
+
+#~ msgid "_Encoding (ID3, files):"
+#~ msgstr "Kodi_erung (ID3, Dateien):"
+
+#~ msgid "_Ignore rules"
+#~ msgstr "_Ignoriere Regeln"
+
+#~ msgid "_Image"
+#~ msgstr "B_ild"
+
+#~ msgid "_Last.FM"
+#~ msgstr "_Last.FM"
+
+#~ msgid "_Less Sort Tabs"
+#~ msgstr "_Weniger Sortierungseinträge"
+
+#~ msgid "_Track Info"
+#~ msgstr "_Meta-Infos"
+
+#~ 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 ""
+#~ "Künstler: %a, Album: %A, Komponist: %c, Titel: %t, Musikrichtung: %G, "
+#~ "Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y, Platzhalter: %*, das Zeichen '%': %"
+#~ "%. Mehrere Schablonen können durch ein Semikolon (';') getrennt werden -- "
+#~ "die erste, die auf den Filenamen passt, wird verwendet. Beispiel: '%a - %"
+#~ "A/%T %t.mp3;%t.wav'."
+
+#~ msgid "folder"
+#~ msgstr "Mappe"
+
+#~ msgid "folder.jpg"
+#~ msgstr "folder.jpg"
+
+#~ msgid "folder.jpg;%a.jpg"
+#~ msgstr "folder.jpg;%a.jpg"
+
+#~ msgid "gtkpod"
+#~ msgstr "gtkpod"
+
+#~ 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 erwartet, dass die Dateinamen und ID3 tags in der Kodierung "
+#~ "vorliegen, die hier angegeben wird. Diese kann natürlich zwischen zwei "
+#~ "Aufrufen von 'Dateien hinzufügen' oder 'Verzeichnisse hinzufügen' "
+#~ "geändert werden. 'Systemzeichensatz' bezeichnet die Standardkodierung der "
+#~ "benutzten Sprache."
+
+#~ 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."
+
+#~ msgid "Confirmation Dialogue"
+#~ msgstr "Sicherheitsabfrage"
+
+#~ msgid "Last Played"
+#~ msgstr "Zuletzt gespielt"
+
+#~ msgid "Last Modified"
+#~ msgstr "Zuletzt modifiziert"
+
+#~ msgid "Add directories to '%s'"
+#~ msgstr "Füge Verzeichnisse zu '%s' hinzu"
+
+#~ msgid "Add directories to '%s/%s'"
+#~ msgstr "Füge Verzeichnisse zu '%s/%s' hinzu"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid ""
+#~ "Data has been changed and not been saved.\n"
+#~ "OK to exit gtkpod?"
+#~ msgstr ""
+#~ "Änderungen wurden noch nicht gespeichert.\n"
+#~ "Wollen Sie gtkpod trotzdem beenden?"
+
+#~ msgid "Please select command for 'Play Now'"
+#~ msgstr "Programm für 'Jetzt abspielen' wählen"
+
+#~ msgid "Please select command for 'Enqueue'"
+#~ msgstr "Anweisung für 'Zum Abspielen vormerken':"
+
+#~ msgid "Please select the mp3gain executable"
+#~ msgstr "Genauer Pfad des mp3gain-Programms"
+
+#~ msgid "Please select the aacgain executable"
+#~ msgstr "Genauer Pfad des aacgain-Programms"
+
+#~ msgid "Select the mserv music root directory"
+#~ msgstr "Wählen Sie das mserv Stammverzeichnis für Musik"
+
+#~ msgid "Select the mserv trackinfo root directory"
+#~ msgstr "Wählen Sie das mserv Stammverzeichnis (Stückinfo)"
+
+#~ msgid "Select the ogg/vorbis converter command"
+#~ msgstr "Wählen Sie das ogg vorbis Konvertierungsskript"
+
+#~ msgid "Select the flac converter command"
+#~ msgstr "Wählen Sie das flac Konvertierungsskript"
+
+#~ msgid "Select the m4a converter command."
+#~ msgstr "Wählen Sie das m4a Konvertierungsskript"
+
+#~ msgid "Select the mp3 converter command."
+#~ msgstr "Wählen Sie das mp3 Konvertierungsskript"
+
+#~ msgid "Select the wav converter command."
+#~ msgstr "Wählen Sie das wav Konvertierungsskript"
+
+#~ msgid "Preferences not updated"
+#~ msgstr "Die Einstellungen wurden nicht übernommen"
+
+#~ msgid "Preferences applied"
+#~ msgstr "Die Einstellungen wurden übernommen"

Modified: gtkpod/branches/upstream/current/po/es.po
===================================================================
--- gtkpod/branches/upstream/current/po/es.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/es.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,13 +1,13 @@
 # translation of gtkpod.es.po to spanish
-# Alejandro Lamas Daviña <alejandro.lamas at ific.uv.es>, 2006, 2007.
 # This file is distributed under the same license as the gtkpod package.
 #
+# Alejandro Lamas Daviña <alejandro.lamas at ific.uv.es>, 2006, 2007, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: gtkpod\n"
+"Project-Id-Version: libgpod\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-13 18:36-0500\n"
-"PO-Revision-Date: 2007-06-13 21:38+0200\n"
+"POT-Creation-Date: 2008-12-09 19:55+0900\n"
+"PO-Revision-Date: 2008-12-26 14:47+0100\n"
 "Last-Translator: Alejandro Lamas Daviña <alejandro.lamas at ific.uv.es>\n"
 "Language-Team: spanish <es_ES>\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"
-
-#: ../data/gtkpod.desktop.in.h:2
 msgid "Manage music and video on an Apple iPod"
-msgstr ""
+msgstr "Administrar musica y vídeo en un iPod Apple"
 
+#: ../data/gtkpod.desktop.in.h:2 ../data/gtkpod.glade.h:427
+msgid "gtkpod iPod Manager"
+msgstr "Administrador de iPod gtkpod"
+
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
-msgstr ""
+msgstr "Administrador de iPod"
 
 #: ../data/gtkpod.glade.h:1
 msgid " "
@@ -38,368 +37,381 @@
 msgstr "    "
 
 #: ../data/gtkpod.glade.h:3
-msgid "     "
-msgstr "     "
+msgid " <= cts <= "
+msgstr " <= cts <= "
 
 #: ../data/gtkpod.glade.h:4
-msgid "      "
-msgstr "      "
+msgid ""
+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
+"finished."
+msgstr ""
+"'DD/MM/AAAA HH:MM < d < DD/MM/AAAA HH:MM' o similar. Pulse 'Intro' al "
+"terminar."
 
 #: ../data/gtkpod.glade.h:5
-msgid "   Sort by:"
-msgstr "   Ordenar por:"
+msgid "(Checked)"
+msgstr "(Revisado)"
 
 #: ../data/gtkpod.glade.h:6
-msgid " <= cts <= "
-msgstr " <= cts <= "
+msgid "0"
+msgstr "0"
 
 #: ../data/gtkpod.glade.h:7
-msgid " Logic: "
-msgstr "Operadores lógicos:"
+msgid "1"
+msgstr "1"
 
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr "2"
+
 #: ../data/gtkpod.glade.h:9
-#, no-c-format
-msgid "%A"
-msgstr "%A"
+msgid "3"
+msgstr "3"
 
 #: ../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/AAAA HH:MM < d < DD/MM/AAAA HH:MM' o similar. Pulse 'Intro' al "
-"terminar."
+msgid "4"
+msgstr "4"
 
 #: ../data/gtkpod.glade.h:11
-msgid "'aacgain' executable:"
-msgstr "programa 'aacgain':"
+msgid "5"
+msgstr "5"
 
 #: ../data/gtkpod.glade.h:12
-msgid "'mp3gain' executable:"
-msgstr "programa 'mp3gain':"
+msgid ":"
+msgstr ":"
 
 #: ../data/gtkpod.glade.h:13
-msgid "(Checked)"
-msgstr "(Revisado)"
+msgid "<"
+msgstr "<"
 
 #: ../data/gtkpod.glade.h:14
-msgid "...as icons"
-msgstr "...como iconos"
+msgid "<b>Advanced Options</b>"
+msgstr "<b>Opciones avancadas</b>"
 
 #: ../data/gtkpod.glade.h:15
-msgid "...as text"
-msgstr "...como texto"
+msgid "<b>Ascending</b>"
+msgstr "<b>Ascendente</b>"
 
 #: ../data/gtkpod.glade.h:16
-msgid "...both as icons and text"
-msgstr "...ambos. Como iconos y como texto"
+msgid "<b>Auto Store</b>"
+msgstr "<b>Guardar automáticamente</b>"
 
 #: ../data/gtkpod.glade.h:17
-msgid "...entry 'All' in sort tab..."
-msgstr "...entrada 'Todo' en la pestaña..."
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>Listas de reproducción generadas automáticamente</b>"
 
 #: ../data/gtkpod.glade.h:18
-msgid "...master playlist"
-msgstr "...lista de reproducción principal"
+msgid "<b>Available Columns</b>"
+msgstr "<b>Columnas disponibles</b>"
 
+#: ../data/gtkpod.glade.h:19
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>Formatos compatibles</b>"
+
 #: ../data/gtkpod.glade.h:20
-#, no-c-format
-msgid "../%A.jpg"
-msgstr "../%A.jpg"
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>Opciones de conversión</b>"
 
 #: ../data/gtkpod.glade.h:21
-msgid "0"
-msgstr "0"
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>Pantalla de carátulas</b>"
 
 #: ../data/gtkpod.glade.h:22
-msgid "1"
-msgstr "1"
+msgid "<b>Cover Art</b>"
+msgstr "<b>Carátula</b>"
 
 #: ../data/gtkpod.glade.h:23
-msgid "2"
-msgstr "2"
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>Mensajes de confirmación de borrado</b>"
 
 #: ../data/gtkpod.glade.h:24
-msgid "3"
-msgstr "3"
+msgid "<b>Descending</b>"
+msgstr "<b>Descendente</b>"
 
 #: ../data/gtkpod.glade.h:25
-msgid "4"
-msgstr "4"
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>Columnas mostradas</b>"
 
 #: ../data/gtkpod.glade.h:26
-msgid "5"
-msgstr "5"
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>Pestañas de filtrado</b>"
 
 #: ../data/gtkpod.glade.h:27
-msgid ":"
-msgstr ":"
+msgid "<b>General Options</b>"
+msgstr "<b>Opciones generales</b>"
 
 #: ../data/gtkpod.glade.h:28
-msgid "<"
-msgstr "<"
+msgid "<b>General</b>"
+msgstr "<b>General</b>"
 
 #: ../data/gtkpod.glade.h:29
-msgid "<b>Account Information</b>"
-msgstr "<b>Información de la cuenta</b>"
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>Ignorar palabras comunes (p.e: artículos)</b>"
 
 #: ../data/gtkpod.glade.h:30
-msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>Añadir/Actualizar/Sincronizar</b>"
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>Importación y sincronización</b>"
 
 #: ../data/gtkpod.glade.h:31
-#, fuzzy
-msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Audioscrobbler</b>"
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>Formatos incompatibles</b>"
 
 #: ../data/gtkpod.glade.h:32
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>Listas de reproducción generadas automáticamente</b>"
+msgid "<b>Information Messages</b>"
+msgstr "<b>Mensajes de información</b>"
 
 #: ../data/gtkpod.glade.h:33
-msgid "<b>Automatically select...</b>"
-msgstr "<b>Seleccionar automáticamente...</b>"
+msgid "<b>Lower Margin</b>"
+msgstr "<b>Margen inferior</b>"
 
 #: ../data/gtkpod.glade.h:34
-msgid "<b>Calendar/Contacts/Notes</b>"
-msgstr "<b>Calendario/Contactos/Notas</b>"
+msgid "<b>None</b>"
+msgstr "<b>ninguno</b>"
 
 #: ../data/gtkpod.glade.h:35
-msgid "<b>Coverart</b>"
-msgstr "<b>Carátulas</b>"
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Conversión al vuelo</b>"
 
 #: ../data/gtkpod.glade.h:36
-msgid "<b>Delete Confirmation</b>"
-msgstr "<b>Confirmación de borrado</b>"
+msgid "<b>Playback</b>"
+msgstr "<b>Playback</b>"
 
 #: ../data/gtkpod.glade.h:37
-msgid "<b>Examples</b>"
-msgstr "<b>Ejemplos</b>"
+msgid "<b>Playlist Options</b>"
+msgstr "<b>Opciones de listas de reproducción</b>"
 
 #: ../data/gtkpod.glade.h:38
-msgid "<b>Ignore Frequent Words</b>"
-msgstr "<b>Ignorar palabras comunes (p.e: artículos)</b>"
+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:39
-msgid "<b>Misc</b>"
-msgstr "<b>Miscelaneo</b>"
+msgid "<b>Rules</b>"
+msgstr "<b>Reglas</b>"
 
 #: ../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>"
+msgid "<b>Sort Order</b>"
+msgstr "<b>Opción de ordenamiento</b>"
 
 #: ../data/gtkpod.glade.h:41
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Conversión al vuelo</b>"
+msgid "<b>Synchronization</b>"
+msgstr "<b>Sincronización</b>"
 
 #: ../data/gtkpod.glade.h:42
-msgid "<b>Play</b>"
-msgstr "<b>Reproducir</b>"
+msgid "<b>Tag Editing</b>"
+msgstr "<b>Edición de atributos</b>"
 
 #: ../data/gtkpod.glade.h:43
-msgid "<b>Playlists</b>"
-msgstr "<b>Listas de reproducción</b>"
+msgid "<b>Tags</b>"
+msgstr "<b>Atributos</b>"
 
 #: ../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>"
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>Estilo de la barra de herramientas</b>"
 
 #: ../data/gtkpod.glade.h:45
-msgid "<b>Repositories</b>"
-msgstr "<b>Repositorios</b>"
+msgid "<b>Tooltips</b>"
+msgstr "<b>Sugerencias</b>"
 
 #: ../data/gtkpod.glade.h:46
-msgid "<b>Sort Order</b>"
-msgstr "<b>Opción de ordenamiento</b>"
+msgid "<b>Upper Margin</b>"
+msgstr "<b>Margen superior</b>"
 
 #: ../data/gtkpod.glade.h:47
-msgid "<b>Sort Tabs</b>"
-msgstr "<b>Pestañas</b>"
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>Normalización del volumen</b>"
 
 #: ../data/gtkpod.glade.h:48
-msgid "<b>Sync</b>"
-msgstr "<b>Sincronizar</b>"
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr "<b>Al intentar añadir una pista existente</b>"
 
 #: ../data/gtkpod.glade.h:49
-msgid "<b>Synchronization</b>"
-msgstr "<b>Sincronización</b>"
+msgid "<b>gtkpod Options</b>"
+msgstr "<b>Opciones de gtkpod</b>"
 
 #: ../data/gtkpod.glade.h:50
-msgid "<b>Tag Reading</b>"
-msgstr "<b>Lectura de los atributos</b>"
+msgid "<b>mserv Settings</b>"
+msgstr "<b>opciones de mserv</b>"
 
 #: ../data/gtkpod.glade.h:51
-msgid "<b>Toolbar</b>"
-msgstr "<b>Barra de herramientas</b>"
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:52
-msgid "<b>Tooltips</b>"
-msgstr "<b>Sugerencias</b>"
+msgid "<i>aacgain</i> executable:"
+msgstr "programa <i>aacgain</i>:"
 
 #: ../data/gtkpod.glade.h:53
-#, fuzzy
-msgid "<b>Track Attributes</b>"
-msgstr "<b>Atributos de la pista mostrados</b>"
+msgid "<i>mp3gain</i> executable:"
+msgstr "programa <b>mp3gain</b>:"
 
 #: ../data/gtkpod.glade.h:54
-msgid "<b>Track Editing</b>"
-msgstr "<b>Edición de pistas</b>"
+msgid "<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Especificar un intervalo de tiempo, por favor</span>"
 
 #: ../data/gtkpod.glade.h:55
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>Normalización del volumen</b>"
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
+"<span weight='bold' size='larger'>Mensaje</span>\n"
+"\n"
+"El rápido zorro marrón salta sobre el perro perezoso."
 
-#: ../data/gtkpod.glade.h:56
-msgid "<b>mserv</b>"
-msgstr "<b>mserv</b>"
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
+msgstr "<span weight='bold' size='larger'>Ninguna lista de reproducción ha sido seleccionada</span>"
 
-#: ../data/gtkpod.glade.h:57
+#: ../data/gtkpod.glade.h:59
 msgid ">"
 msgstr ">"
 
-#: ../data/gtkpod.glade.h:58
-msgid "About gtkpod"
-msgstr "Sobre gtkpod"
+#: ../data/gtkpod.glade.h:60
+msgid "About unupdated tracks"
+msgstr "Sobre las pistas no actualizadas"
 
-#: ../data/gtkpod.glade.h:59
+#: ../data/gtkpod.glade.h:61
+msgid "About updated tracks"
+msgstr "Sobre las pistas actualizadas"
+
+#: ../data/gtkpod.glade.h:62
+msgid "Add Column"
+msgstr "Añadir columna"
+
+#: ../data/gtkpod.glade.h:63
 msgid "Add Directories Recursively"
 msgstr "Añadir directorios recursivamente"
 
-#: ../data/gtkpod.glade.h:60
-#, fuzzy
+#: ../data/gtkpod.glade.h:64
 msgid "Add Files"
-msgstr "Añadir _ficheros"
+msgstr "Añadir ficheros"
 
-#: ../data/gtkpod.glade.h:61
+#: ../data/gtkpod.glade.h:65
 msgid "Add Files or Directories"
 msgstr "Añadir ficheros o directorios"
 
-#: ../data/gtkpod.glade.h:62
-#, fuzzy
+#: ../data/gtkpod.glade.h:66
 msgid "Add Fol_der"
-msgstr "Añadir _ficheros"
+msgstr "Añadir _directorio"
 
-#: ../data/gtkpod.glade.h:63
-#, fuzzy
+#: ../data/gtkpod.glade.h:67 ../src/fileselection.c:606
 msgid "Add Folder"
-msgstr "Añadir _ficheros"
+msgstr "Añadir directorio"
 
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:68
 msgid "Add Image_s"
-msgstr ""
+msgstr "Añadir imágene_s"
 
-#: ../data/gtkpod.glade.h:65
-#, fuzzy
+#: ../data/gtkpod.glade.h:69
 msgid "Add Images from a Directory"
-msgstr "Añadir ficheros o directorios"
+msgstr "Añadir imágenes desde un directorio"
 
-#: ../data/gtkpod.glade.h:66
-#, fuzzy
+#: ../data/gtkpod.glade.h:70
 msgid "Add Playlist"
-msgstr "Añadir lista de _reproducción"
+msgstr "Añadir lista de reproducción"
 
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:71
 msgid "Add _Files"
 msgstr "Añadir _ficheros"
 
-#: ../data/gtkpod.glade.h:68
+#: ../data/gtkpod.glade.h:72
 msgid "Add _Playlist"
 msgstr "Añadir lista de _reproducción"
 
-#: ../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:73
+msgid "Add cover art using file name template"
+msgstr "Añadir carátulas usando plantilla de nombre de fichero"
 
-#: ../data/gtkpod.glade.h:70
-msgid "Add directories recursively"
-msgstr "Añadir directorios recursivamente"
+#: ../data/gtkpod.glade.h:74
+msgid ""
+"Add file masks to be excluded from import and synchronization, for example, "
+"<i>*.mp3</i>."
+msgstr ""
+"Añadir máscaras de ficheros a ser excluidos en la importación y sincronización, por ejemplo, "
+"<i>*.mp3</i>."
 
-#: ../data/gtkpod.glade.h:71
-msgid "Add new repository/iPod"
-msgstr "Añadir nuevo repositorio/iPod"
+#: ../data/gtkpod.glade.h:75
+msgid "Add new repository/iPod..."
+msgstr "Añadir nuevo repositorio/iPod..."
 
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:76
 msgid "Add playlist from file"
 msgstr "Añadir lista de reproducción desde fichero"
 
-#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
-#: ../src/display_tracks.c:2103
-msgid "Added"
-msgstr "Añadido"
+#: ../data/gtkpod.glade.h:77
+msgid "Add subfolders recursively"
+msgstr "Añadir subdirectorios recursivamente"
 
-#: ../data/gtkpod.glade.h:74
-msgid "Advanced Sorting Options"
-msgstr "Opciones de ordenación avanzadas"
+#: ../data/gtkpod.glade.h:78
+msgid "Added:"
+msgstr "Añadido:"
 
 #. 0
-#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2995
 #: ../src/display_spl.c:84 ../src/misc_conversion.c:60
 msgid "Album"
 msgstr "Álbum"
 
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:80
 msgid "Album Art"
 msgstr "Carátula de álbum"
 
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:81
 msgid "All (AND)"
 msgstr "y (AND)"
 
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:82
 msgid "All Tracks Never Listened To"
 msgstr "Todas las pistas nunca escuchadas"
 
-#: ../data/gtkpod.glade.h:79
+#: ../data/gtkpod.glade.h:83
 msgid "All Tracks Played Since Last Time"
 msgstr "Todas las pistas reproducidas desde la última vez"
 
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:84
 msgid "All Tracks not Listed in any Playlist"
 msgstr "Todas las pistas no incluidas en otras listas de reproducción"
 
-#: ../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:85
+msgid "Allow duplicate files"
+msgstr "Permitir ficheros duplicados"
 
-#: ../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:86
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr "Usar también esta codificación al actualizar o sincronizar las pistas"
 
-#: ../data/gtkpod.glade.h:83
+#: ../data/gtkpod.glade.h:87
+msgid "Also use this encoding when writing tracks"
+msgstr "Usar también esta codificación al escribir las pistas "
+
+#: ../data/gtkpod.glade.h:88
 msgid "Any (OR)"
 msgstr "o (OR)"
 
-#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
+#: ../data/gtkpod.glade.h:89
+msgid ""
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
+msgstr ""
+"Cualquier regla\n"
+"Todas las reglas\n"
+"Ignorar reglas"
+
+#: ../data/gtkpod.glade.h:92 ../src/display_sorttabs.c:2992
 #: ../src/display_spl.c:85 ../src/misc_conversion.c:61
 msgid "Artist"
 msgstr "Artista"
 
-#: ../data/gtkpod.glade.h:85
-#, fuzzy
+#: ../data/gtkpod.glade.h:93
 msgid "Artwork Preview"
-msgstr "Ruta de la carátula"
+msgstr "Previsualización de 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:"
-msgstr ""
-"Como último recurso, establecer los siguientes\n"
-" atributos al nombre de fichero si (todavía) están vacíos."
+#: ../data/gtkpod.glade.h:94
+msgid "Automatically generate video thumbnails"
+msgstr "Generar automáticamente imágenes de muestra de los vídeos"
 
-#: ../data/gtkpod.glade.h:88
-msgid "Ascending"
-msgstr "Ascendente"
-
-#: ../data/gtkpod.glade.h:89
-msgid "Auto Store"
-msgstr "Guardar automáticamente"
-
-#: ../data/gtkpod.glade.h:90
+#: ../data/gtkpod.glade.h:95
 msgid ""
 "Automatically start displaying tracks that match the criteria entered above. "
 "If not selected, you must press 'Display' to start displaying."
@@ -408,56 +420,51 @@
 "búsqueda. Si no está seleccionado se deberá pulsar 'Mostar' para que "
 "comiencen a visualizarse."
 
-#: ../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:93
-msgid "Before removing tracks from the harddisk"
-msgstr "Antes de borrar pistas del disco duro"
-
-#: ../data/gtkpod.glade.h:94
-msgid "Before removing tracks from the iPod"
-msgstr "Antes de borrar pistas del iPod"
-
-#: ../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:96
+msgid "Background color"
+msgstr "Color de fondo"
+
+#: ../data/gtkpod.glade.h:97
 msgid "Best Rated Tracks"
 msgstr "Pistas con mayor puntuación"
 
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:98
+msgid "Bottom"
+msgstr "Fondo"
+
+#: ../data/gtkpod.glade.h:99 ../src/prefsdlg.c:588
 msgid "Browse"
 msgstr "Examinar"
 
-#: ../data/gtkpod.glade.h:98
-msgid "Cache directory:"
-msgstr "Directorio de caché"
+#: ../data/gtkpod.glade.h:100
+msgid "Browse..."
+msgstr "Examinar..."
 
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:101
+msgid "Cache folder:"
+msgstr "Directorio de caché:"
+
+#: ../data/gtkpod.glade.h:102
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:103
 msgid "Calendar sync command:"
 msgstr "Programa de sincronización del calendario:"
 
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:104
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Llamar automáticamente al sincronizar la base de datos iTunes"
 
-#: ../data/gtkpod.glade.h:102
-msgid "Category: "
-msgstr "Categoría: "
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr "Ordenación sensible a mayúsculas"
 
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:106
+msgid "Category:"
+msgstr "Categoría:"
+
+#: ../data/gtkpod.glade.h:107
 msgid ""
 "Change all tracks\n"
 "simultaneously"
@@ -465,111 +472,145 @@
 "Cambiar todas las pistas\n"
 "a la vez"
 
-#: ../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
+#: ../data/gtkpod.glade.h:109
 msgid "Check for existing files when copying from iPod."
 msgstr "Comprobar la existencia previa de ficheros al copiar del iPod."
 
-#: ../data/gtkpod.glade.h:108
-msgid "Command for 'Enqueue':"
-msgstr "Programa para 'Encolar':"
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr "Elegir un color diferente para el fondo de pantalla de la carátula"
 
-#: ../data/gtkpod.glade.h:109
-msgid "Command for 'Play now':"
-msgstr "Programa para 'Reproducir':"
+#: ../data/gtkpod.glade.h:111
+msgid "Command for \"Enqueue\":"
+msgstr "Programa para \"Encolar\":"
 
+#: ../data/gtkpod.glade.h:112
+msgid "Command for \"Play now\":"
+msgstr "Programa para\"Reproducir\":"
+
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr "Órdenes..."
+
 #. 5
-#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:114 ../src/display_spl.c:97
 #: ../src/misc_conversion.c:65
 msgid "Composer"
 msgstr "Compositor"
 
-#: ../data/gtkpod.glade.h:111
+#: ../data/gtkpod.glade.h:115
 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:112
-msgid ""
-"Confirm before removing tracks from the iPod or repository\n"
-"when syncing playlists"
-msgstr ""
-"Confirmar antes de borrar pistas del iPod o del repositorio\n"
-"al sincronizar las listas de reproducción"
+#: ../data/gtkpod.glade.h:116
+msgid "Confirm deletion of playlists or tracks from a playlist"
+msgstr "Confirmar el borrado de listas de reproducción o pistas de una lista de reproducción"
 
-#: ../data/gtkpod.glade.h:114
-msgid "Confirm lists of directories"
-msgstr "Confirmar la lista de directorios"
+#: ../data/gtkpod.glade.h:117
+msgid "Confirm deletion of tracks during synchronization"
+msgstr "Confirmar el borrado de pistas durante la sincronización"
 
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:118
+msgid "Confirm deletion of tracks:"
+msgstr "Confirmar el borrado de pistas"
+
+#: ../data/gtkpod.glade.h:119
 msgid "Contacts sync command:"
 msgstr "Programa de sincronización de contactos:"
 
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:120
 msgid "Containing Displayed Tracks"
 msgstr "Conteniendo pistas mostradas"
 
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:121
 msgid "Containing Selected Tracks"
 msgstr "Conteniendo pistas seleccionadas"
 
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:122
+msgid "Conversion Preferences"
+msgstr "Preferencias de conversión"
+
+#: ../data/gtkpod.glade.h:123
 msgid "Conversion Progress Display"
 msgstr "Mostrar el progreso de la conversión"
 
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:124
+msgid "Conversion Settings..."
+msgstr "Opciones de conversión..."
+
+#: ../data/gtkpod.glade.h:125
+msgid "Convert AAC (M4A)"
+msgstr "Convertir AAC (M4A)"
+
+#: ../data/gtkpod.glade.h:126
+msgid "Convert FLAC"
+msgstr "Convertir FLAC"
+
+#: ../data/gtkpod.glade.h:127
+msgid "Convert MP3"
+msgstr "Portada MP3"
+
+#: ../data/gtkpod.glade.h:128
+msgid "Convert Ogg Vorbis"
+msgstr "Convertir Ogg Vorbis"
+
+#: ../data/gtkpod.glade.h:129
+msgid "Convert WAV"
+msgstr "Convertir WAV"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Convert compatible formats to a single format"
+msgstr "Convertir formatos compatibles a un único formato"
+
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr "Convertir formatos de música incompatibles a:"
+
+#: ../data/gtkpod.glade.h:132
 msgid "Cover"
 msgstr "Portada"
 
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr "Preferencias de búsqueda de carátulas"
+
+#: ../data/gtkpod.glade.h:134
+msgid "Cover art file pattern:"
+msgstr "Patrón de ficheros de carátulas:"
+
+#: ../data/gtkpod.glade.h:135
 msgid "Create New Playlist"
 msgstr "Crear nueva lista de reproducción"
 
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:136
 msgid "Create Repository"
 msgstr "Crear repositorio"
 
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:137
 msgid "Create _Playlist File"
 msgstr "Crear lista de re_producción"
 
-#: ../data/gtkpod.glade.h:123
-msgid "Credits"
-msgstr "Créditos"
+#: ../data/gtkpod.glade.h:138
+msgid "Customize..."
+msgstr "Personalizar..."
 
-#: ../data/gtkpod.glade.h:124
-msgid "Currently only rating is supported."
-msgstr "De momento sólo se puede puntuar."
-
-#: ../data/gtkpod.glade.h:125
-msgid "Delete repository"
+#: ../data/gtkpod.glade.h:139
+msgid "Delete Repository"
 msgstr "Borrar repositorio"
 
-#: ../data/gtkpod.glade.h:126
-msgid ""
-"Delete tracks that are no longer present from the\n"
-"iPod or repository"
-msgstr ""
-"Borrar del iPod o del repositorio las pistas\n"
-" que ya no se encuentran presentes"
+#: ../data/gtkpod.glade.h:140
+msgid "Delete missing tracks from the iPod or repository"
+msgstr "Borrar pistas perdidas del iPod o del repositorio"
 
-#: ../data/gtkpod.glade.h:128
-msgid "Deleted tracks"
-msgstr "Pistas borradas"
+#: ../data/gtkpod.glade.h:141
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "Borrar pistas perdidas al sincronizar las listas de reproducción"
 
-#: ../data/gtkpod.glade.h:129
-msgid "Descending"
-msgstr "Descendente"
-
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:142
 msgid "Details"
 msgstr "Detalles"
 
-#: ../data/gtkpod.glade.h:132
+#: ../data/gtkpod.glade.h:144
 #, no-c-format
 msgid ""
 "Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -586,7 +627,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:134
+#: ../data/gtkpod.glade.h:146
 #, no-c-format
 msgid ""
 "Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -604,161 +645,115 @@
 "información extendida): %o, lista de reproducción actual: %p, el caracter "
 "'%': %%."
 
-#: ../data/gtkpod.glade.h:136
-#, no-c-format
+#: ../data/gtkpod.glade.h:147
 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 ""
-"Determina el nombre de fichero con la carátula. Se pueden separar diferentes "
-"cadenas con punto y coma (;) que serán probadas en orden. Artista: %a, "
-"álbum: %A, compositor: %c, título: %t, género: %G, número de pista: %T, "
-"número de CD: %C, año: %Y, nombre del fichero original (necesita el fichero "
-"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:137
-msgid ""
 "Directories to sync with are determined from the filenames of the tracks in "
 "the playlist."
 msgstr ""
 "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:138
-msgid "Display a list of tracks that could actually be updated."
-msgstr "Mostrar las pistas que pueden ser actualizadas."
+#: ../data/gtkpod.glade.h:148
+msgid "Display"
+msgstr "Mostrar"
 
-#: ../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:140
+#: ../data/gtkpod.glade.h:149
 msgid "Display conversion log"
 msgstr "Mostar el registro de conversión"
 
-#: ../data/gtkpod.glade.h:141
-msgid "Display info about detected duplicates"
-msgstr "Mostar información sobre los ficheros duplicados detectados"
+#: ../data/gtkpod.glade.h:150
+msgid "Display information about detected duplicate files"
+msgstr "Mostrar información sobre los ficheros duplicados detectados"
 
-#: ../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:143
-msgid "Display info about updated tracks"
-msgstr "Mostrar información sobre las pistas actualizadas"
-
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:151
 msgid "Display messages and warnings at startup"
 msgstr "Mostrar mensajes y avisos al inicio"
 
-#: ../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:152
+msgid "Display synchronization results"
+msgstr "Mostrar los resultados de la sincronización"
 
-#: ../data/gtkpod.glade.h:146
-msgid "Display toolbar..."
-msgstr "Mostrar barra de herramientas..."
-
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:153
 msgid "Display tooltips in main window"
 msgstr "Mostrar sugerencias en la ventana principal"
 
-#: ../data/gtkpod.glade.h:148
-msgid "Display tooltips in prefs window"
-msgstr "Mostrar sugerencias en la ventana de preferencias"
-
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:154
 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:150
-msgid ""
-"Displayed\n"
-"Tracks"
-msgstr ""
-"Pistas\n"
-"mostradas"
-
-#: ../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:154
+#: ../data/gtkpod.glade.h:155
 msgid "Don't automatically sync on startup"
 msgstr "No sincronizar automáticamente al inicio"
 
-#: ../data/gtkpod.glade.h:155
-msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+#: ../data/gtkpod.glade.h:156
+msgid "Dummy\n"
 msgstr ""
-"El reconocimiento de duplicados está basado en una función de resumen sha1 "
-"(modificada) sobre el fichero."
 
-#: ../data/gtkpod.glade.h:156
-msgid "Edit Repository/iPod Options"
-msgstr "Editar opciones del iPod/repositorio"
-
-#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:664
 msgid "Edit Smart Playlist"
 msgstr "Editar lista de reproducción inteligente."
 
-#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:751
 msgid "Edit Track Details"
 msgstr "Editar detalles de la pista"
 
-#: ../data/gtkpod.glade.h:159
-msgid "Edit _Preferences"
-msgstr "Editar _preferencias"
-
 #: ../data/gtkpod.glade.h:160
-msgid "Effective free space"
-msgstr "Espacio disponible"
-
-#: ../data/gtkpod.glade.h:161
 msgid "Empty Playlist"
 msgstr "Lista de reproducción vacía"
 
+#: ../data/gtkpod.glade.h:161
+msgid "Encoding Preferences"
+msgstr "Preferencias de codificación"
+
 #: ../data/gtkpod.glade.h:162
-msgid "Exclude file mask(s)"
-msgstr "Mascara(s) de exclusión de ficheros"
+msgid "Encoding..."
+msgstr "Codificando..."
 
 #: ../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."
+msgid "Excluded files..."
+msgstr "Ficheros excluidos..."
 
 #: ../data/gtkpod.glade.h:164
-msgid "File size"
-msgstr "Tamaño de fichero"
+msgid "Exclusions List"
+msgstr "Lista de exclusiones"
 
 #: ../data/gtkpod.glade.h:165
-msgid "File size (deleted)"
-msgstr "Tamaño de fichero (borrado)"
+msgid "Expand columns beyond the track list width"
+msgstr "Expandir las columnas más allá del ancho de la lista de pistas"
 
 #: ../data/gtkpod.glade.h:166
-msgid "File size (non-transferred)"
-msgstr "Tamaño de fichero (no transferido)"
+msgid "Export can be continued at a later time if canceled."
+msgstr "La exportación podrá continuar más tarde si se cancela."
 
 #: ../data/gtkpod.glade.h:167
-msgid "Filename Format: "
-msgstr "Formato de nombre de fichero:"
+msgid "Feedback"
+msgstr "Retroalimentación"
 
 #: ../data/gtkpod.glade.h:168
+msgid "Filename Parse Preferences"
+msgstr "Preferencias de análisis de nombre de fichero"
+
+#: ../data/gtkpod.glade.h:169
+msgid "Filename format: "
+msgstr "Formato de nombre de fichero: "
+
+#: ../data/gtkpod.glade.h:170
+msgid "Filename parse pattern:"
+msgstr "Patrón de análisis de nombre de fichero:"
+
+#: ../data/gtkpod.glade.h:171
+msgid "Filter tab:"
+msgstr "Pestaña de filtrado:"
+
+#: ../data/gtkpod.glade.h:172
+msgid "Filter tabs"
+msgstr "Pestañas de filtrado"
+
+#: ../data/gtkpod.glade.h:173
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: ../data/gtkpod.glade.h:174
 msgid ""
 "Find orphan files (files with no track info in DB) and dangling tracks "
 "(tracks with no corresponding files on iPod)"
@@ -767,63 +762,36 @@
 "de datos) y pistas pendientes (pistas sin sus correspondientes ficheros en "
 "el iPod)"
 
-#: ../data/gtkpod.glade.h:169
-#, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
-msgstr "Intentar primero <i>folder.jpg</i>, después <i>&lt;artist&gt;.jpg</i>"
+#: ../data/gtkpod.glade.h:175
+msgid "From the hard disk"
+msgstr "Del disco duro"
 
-#: ../data/gtkpod.glade.h:170
-msgid "Flac with :"
-msgstr "Flac con:"
+#: ../data/gtkpod.glade.h:176
+msgid "From the iPod"
+msgstr "Del iPod"
 
-#: ../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 ""
-"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:177
+msgid "From the local database"
+msgstr "De la base de datos local"
 
-#: ../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 ""
-"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:178 ../src/display_spl.c:182 ../src/info.c:794
+msgid "GB"
+msgstr "GiB"
 
-#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
+#: ../data/gtkpod.glade.h:179 ../src/display_sorttabs.c:2998
 #: ../src/display_spl.c:89 ../src/misc_conversion.c:63
 msgid "Genre"
 msgstr "Género"
 
-#: ../data/gtkpod.glade.h:176
-msgid "Group artists on compilation CDs"
-msgstr "Agrupar los artistas en los CDs generados"
+#: ../data/gtkpod.glade.h:180
+msgid "Get Help _Online"
+msgstr "Conseguir ayuda en líne_a"
 
-#: ../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 ""
-"Altamente recomendado para conseguir una importación más rápida cuando se "
-"está usando la detección de duplicados. También, el tener los nombres de "
-"fichero del PC permite escribir las etiquetas ID3 modificadas al disco, e "
-"incluso recontruir los contenidos del iPod en caso de corrupción del sistema "
-"de ficheros (cambiar las entradas \"transferred=\" en la copia de seguridad "
-"de la base de datos)."
+#: ../data/gtkpod.glade.h:181
+msgid "Group artist filter tab by compilation CDs"
+msgstr "Agrupar pestaña de filtrado de artista por generación de CDs"
 
-#: ../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:179
+#: ../data/gtkpod.glade.h:182
 msgid ""
 "If available, the local copy of the track is referenced in the playlist. "
 "Otherwise the file on the iPod is used."
@@ -831,13 +799,7 @@
 "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: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:181
+#: ../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."
@@ -846,25 +808,6 @@
 "Tenga en cuenta que una ordenación de este tipo no funciona bien con todos "
 "los juegos de caracteres."
 
-#: ../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 ""
-"Si el nombre (ruta completa) de una pista existente concuerda con una a "
-"añadir, esta opción permite actualizar la información de la pista existente "
-"en vez de ignorar la pista a añadir. No se actualizará la información si el "
-"fichero no ha cambiado y está seleccionada la opción 'No permitir ficheros "
-"duplicados' más arriba."
-
-#: ../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:184
 msgid ""
 "If you check this, information (cover art and meta information) changed for "
@@ -876,30 +819,12 @@
 "seleccionadas. Usar con precaución."
 
 #: ../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 ""
-"Si no se selecciona la lista de reproducción principal automáticamente, la "
-"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: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 ""
-"Si se seleccionan varias pistas en la lista de pistas y se edita un atributo "
-"en una de las pistas, el atributo también es actualizado en el resto de las "
-"pistas seleccionadas."
-
-#: ../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:188
+#: ../data/gtkpod.glade.h:186
 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."
@@ -908,6 +833,16 @@
 "de las pistas mostradas del menú 'Editar' o seleccionar 'Guardar "
 "automáticamente' más abajo."
 
+#: ../data/gtkpod.glade.h:187
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr ""
+"Incluir pistas nunca reproducidas en la lista de reproducción de"
+"\"Mejor puntuadas\""
+
+#: ../data/gtkpod.glade.h:188
+msgid "Info field template:"
+msgstr "Plantilla del campo información:"
+
 #: ../data/gtkpod.glade.h:189
 msgid "Initialize iPod"
 msgstr "Inicializar iPod"
@@ -921,105 +856,99 @@
 "Insertar después"
 
 #: ../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."
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
+msgstr ""
+"Último reproducido\n"
+"Último modificado\n"
+"Añadido\n"
 
-#: ../data/gtkpod.glade.h:193
+#: ../data/gtkpod.glade.h:196
 msgid "Live _updating"
 msgstr "Act_ualización directa"
 
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:197
 msgid "Load iPod(s)"
 msgstr "Cargar iPod(s)"
 
-#: ../data/gtkpod.glade.h:195
-msgid "Lower Margin"
-msgstr "Margen inferior"
-
-#: ../data/gtkpod.glade.h:196
-msgid "M4A with :"
-msgstr "M4A con:"
-
-#: ../data/gtkpod.glade.h:197
-msgid "MP3 with :"
-msgstr "MP3 con:"
-
 #: ../data/gtkpod.glade.h:198
-msgid "Match al_l of the following"
-msgstr "Encontrar todo _lo siguiente"
+msgid "Logic:"
+msgstr "Lógica:"
 
 #: ../data/gtkpod.glade.h:199
-msgid "Match an_y of the following"
-msgstr "Encontrar algo de lo siguiente (_y)"
+msgid ""
+"MP3\n"
+"AAC\n"
+msgstr ""
+"MP3\n"
+"AAC\n"
 
-#: ../data/gtkpod.glade.h:200
-msgid "Match only _checked tracks"
-msgstr "Encontrar sólo pistas verifi_cadas"
-
-#: ../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:202
-msgid "Maximum size of cache directory (in GB):"
-msgstr "Tamaño máximo del directorio de cache (en GiB):"
+msgid "Mass-modify tags when multiple tracks are selected"
+msgstr "Modificar atributos masivamente cuando estén seleccionadas múltiples pistas"
 
 #: ../data/gtkpod.glade.h:203
-msgid "Model:"
-msgstr "Modelo:"
+msgid "Match only _checked tracks"
+msgstr "Hacer coincidir sólo pistas verifi_cadas"
 
-#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
-msgid "Modified"
-msgstr "Modificado"
+#: ../data/gtkpod.glade.h:204
+msgid "Match:"
+msgstr "Concuerda:"
 
 #: ../data/gtkpod.glade.h:205
-msgid "Most Recently Played Tracks"
-msgstr "Pistas más recientemente escuchadas"
+msgid "Maximum cache size:"
+msgstr "Tamaño máximo de caché:"
 
 #: ../data/gtkpod.glade.h:206
-msgid "Move selected attributes to the displayed list"
-msgstr ""
+msgid "Maximum threads:"
+msgstr "Número máximo de hilos:"
 
 #: ../data/gtkpod.glade.h:207
-msgid "Music Root:"
-msgstr "Directorio raíz de la música:"
+msgid "Metadata"
+msgstr "Metadatos"
 
 #: ../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 ""
-"Los ficheros de música pueden tener imágenes empotradas en la etiqueta APIC. "
-"Actualmente sólo soportado para ficheros MP3."
+msgid "Model:"
+msgstr "Modelo:"
 
 #: ../data/gtkpod.glade.h:209
+msgid "Modified:"
+msgstr "Modificado:"
+
+#: ../data/gtkpod.glade.h:210
+msgid "Most Recently Played Tracks"
+msgstr "Pistas más recientemente escuchadas"
+
+#: ../data/gtkpod.glade.h:211
+msgid "Music"
+msgstr "Música"
+
+#: ../data/gtkpod.glade.h:212
+msgid "Music root:"
+msgstr "Raíz de la música:"
+
+#: ../data/gtkpod.glade.h:213
 msgid "Never show this dialogue again"
 msgstr "No volver a mostrar este diálogo"
 
-#: ../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
+#: ../data/gtkpod.glade.h:214 ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76 ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113 ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448 ../src/misc_playlist.c:450
 msgid "New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: ../data/gtkpod.glade.h:211
+#: ../data/gtkpod.glade.h:215
 msgid "No lower margin"
 msgstr "Sin margen inferior"
 
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:216
 msgid "No upper margin"
 msgstr "Sin margen superior"
 
-#: ../data/gtkpod.glade.h:213
-msgid "Non-transferred tracks"
-msgstr "Pistas no transferidas"
-
-#: ../data/gtkpod.glade.h:214
-msgid "None"
-msgstr "Ninguno"
-
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:217
 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 "
@@ -1036,44 +965,6 @@
 "iTunes'). Las pistas importadas con versiones previas a la 0.51 no tienen "
 "almacenado el juego de caracteres."
 
-#: ../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 ""
-"Por defecto al actualizar la información de las pistas se usa el juego de "
-"caracteres de su importación. Si se ha elegido un juego de caracteres "
-"erroneo y se quiere corregir al actualizar la información de las pistas se "
-"debe marcar esta opción. Nota: la información del juego de caracteres se "
-"guarda en el fichero de información extendida (ver 'Escribir la base de "
-"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: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 ""
-"Por defecto se usará el juego de caracteres especificado en la importación "
-"al escribir los atributos. Si se ha elegido un juego de caracteres erroneo "
-"en la importación de la pista, se puede seleccionar esta opción junto con el "
-"juego de caracteres correcto. Nota: usa el fichero de información extendida "
-"para almacenar la información del juego de caracteres (ver 'Escribiendo la "
-"base de datos iTunes' en el apartado de 'Entrada/Salida'). Las pistas "
-"importadas con versiones anteriores a la 0.51 no tendrán el juego de "
-"caracteres almacenado, el juego de caracteres usado será el especificado en "
-"el apartado de 'Entrada/Salida'."
-
 #: ../data/gtkpod.glade.h:218
 msgid ""
 "Normally, if a track is no longer present in the sync directory, it will be "
@@ -1096,392 +987,299 @@
 "significa borrar del iPod."
 
 #: ../data/gtkpod.glade.h:221
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
+msgstr "Por defecto, la codificación especificada arriba sólo será usada al importar nuevas pistas, y para cualquier operación que afecte a las pistas existentes, se usará la codificación especificada en el momento de ser importado el fichero por primera vez. Se pueden usar las opciones inferiores para modificar este comportamiento en caso de haber especificado incorrectamente la codificación en la primera importación."
+
+#: ../data/gtkpod.glade.h:222
 msgid "Notes sync command:"
 msgstr "Programa de sincronización de notas:"
 
-#: ../data/gtkpod.glade.h:222
-msgid "Number of playlists"
-msgstr "Número de listas de reproducción"
-
 #: ../data/gtkpod.glade.h:223
-msgid "Number of tracks"
-msgstr "Número de pistas"
+msgid "Number of filter tabs:"
+msgstr "Número de pestañas:"
 
 #: ../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:"
+msgid "Number of tracks:"
+msgstr "Número de pistas:"
 
 #: ../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 ""
-"Número de pistas en las listas de reproducción 'Más frecuentemente usadas', "
-"'Mejor puntuadas' y 'Más recientemente reproducidas' generadas "
-"automáticamente. Elegir '0' para suprimir el límite."
-
-#: ../data/gtkpod.glade.h:226
-msgid "Ogg with :"
-msgstr "Ogg con:"
-
-#: ../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:228
+#: ../data/gtkpod.glade.h:226
 msgid "On startup automatically sync with the following directory"
 msgstr "Sincronizar automáticamente al inicio con el siguiente directorio"
 
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically update (Live Playlist)"
 msgstr "Actualizar automáticamente en el inicio (listas de reproducción vivas)"
 
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:228
 msgid "One for each Album"
 msgstr "Una para cada álbum"
 
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:229
 msgid "One for each Artist"
 msgstr "Una para cada artista"
 
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:230
 msgid "One for each Composer"
 msgstr "Una para cada compositor"
 
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:231
 msgid "One for each Genre"
 msgstr "Una para cada género"
 
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:232
 msgid "One for each Rating"
 msgstr "Una para cada puntuación"
 
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:233
 msgid "One for each Year"
 msgstr "Una para cada año"
 
-#: ../data/gtkpod.glade.h:236
-msgid "Overwrite tags that are already set"
-msgstr "Sobreescribir atributos ya establecidos"
+#: ../data/gtkpod.glade.h:234
+msgid "Overwrite existing tags"
+msgstr "Sobreescribir atributos existentes"
 
-#: ../data/gtkpod.glade.h:237
-msgid "Password:"
-msgstr "Contraseña:"
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
+msgstr "Analizar nombre de fichero para colocar atributos que faltan"
 
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:236
 msgid "Path:"
 msgstr "Ruta:"
 
-#: ../data/gtkpod.glade.h:239
-#, fuzzy
+#: ../data/gtkpod.glade.h:237
 msgid "Photo Window"
-msgstr "Ventana de _información"
+msgstr "Ventana de foto"
 
-#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
-msgid "Play time"
-msgstr "Tiempo de reproducción"
+#: ../data/gtkpod.glade.h:238
+msgid "Playcount:"
+msgstr "Contador:"
 
-#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
-#: ../src/misc_conversion.c:77
-msgid "Playcount"
-msgstr "Contador"
+#: ../data/gtkpod.glade.h:239
+msgid "Played:"
+msgstr "Reproducido:"
 
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
-msgid "Played"
-msgstr "Reproducido"
-
-#: ../data/gtkpod.glade.h:243
+#: ../data/gtkpod.glade.h:240
 msgid "Playlist name:"
 msgstr "Nombre de la lista de reproducción:"
 
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:241
 msgid "Playlist type:"
 msgstr "Tipo de lista de reproducción:"
 
-#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
+#: ../data/gtkpod.glade.h:242 ../src/display_playlists.c:2397
 msgid "Playlists"
 msgstr "Listas de reproducción"
 
-#: ../data/gtkpod.glade.h:246
+#: ../data/gtkpod.glade.h:243
 msgid "Please refer to the notice below."
 msgstr "Leer nota inferior"
 
-#: ../data/gtkpod.glade.h:247
-msgid "Please specify a time interval"
-msgstr "Especificar un intervalo de tiempo"
+#: ../data/gtkpod.glade.h:244
+msgid "Position:"
+msgstr "Posición:"
 
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:245
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:246
 msgid "Progress Information"
 msgstr "Información del progreso"
 
-#: ../data/gtkpod.glade.h:250
-msgid "R_ename Album"
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
 msgstr ""
+"Introducir un programa para generar una imagen de muestra del fichero de vídeo."
+"Las siguientes cadenas de formato serán expandidas:\n"
+"- %f: el fichero de entrada\n"
+"- %o el fichero de salida (se genera automáticamente)\n"
 
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:252
+msgid "R_ename Album"
+msgstr "R_enombrar Álbum"
+
+#: ../data/gtkpod.glade.h:253
 msgid "Random Playlist from Displayed Tracks"
 msgstr "Lista de reproducción aleatoria de las pistas mostradas"
 
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:254
 msgid "Randomize Current Playlist"
 msgstr "Lista de reproducción actual aleatoria"
 
-#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
-#: ../src/misc_conversion.c:78
-msgid "Rating"
-msgstr "Puntuación"
-
-#: ../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: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)"
+msgid "Rating:"
+msgstr "Puntuación:"
 
 #: ../data/gtkpod.glade.h:256
-#, fuzzy
-msgid "Remove selected attributes from the displayed list"
-msgstr "Pistas seleccionadas de la lista de reproducción"
+msgid "Read embedded cover art information"
+msgstr "Leer información empotrada de la carátula"
 
 #: ../data/gtkpod.glade.h:257
-msgid "Repository Options"
-msgstr "Opciones de repositorio"
+msgid "Read embedded tags from music files"
+msgstr "Leer atributos empotrados de los ficheros de música"
 
 #: ../data/gtkpod.glade.h:258
-msgid "Repository name:"
-msgstr "Nombre del repositorio:"
+msgid "Report a _Problem"
+msgstr "Informar de un _problema"
 
 #: ../data/gtkpod.glade.h:259
-msgid "Repository type:"
-msgstr "Tipo de repositorio:"
+msgid "Report problems when accessing mserv"
+msgstr "Informar de errores en el acceso a mserv"
 
 #: ../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)."
+msgid "Repository"
+msgstr "Repositorio"
 
 #: ../data/gtkpod.glade.h:261
-msgid "Rules"
-msgstr "Reglas"
+msgid "Repository Options"
+msgstr "Opciones de repositorio"
 
-#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
-msgid "Save Changes"
-msgstr "Guardar cambios"
+#: ../data/gtkpod.glade.h:262
+msgid "Repository name:"
+msgstr "Nombre del repositorio:"
 
 #: ../data/gtkpod.glade.h:263
-#, fuzzy
-msgid "Scrobble Tracks?"
-msgstr "Scrobble Tracks?"
+msgid "Repository type:"
+msgstr "Tipo de repositorio:"
 
 #: ../data/gtkpod.glade.h:264
+msgid "Repository/iPod Options"
+msgstr "Opciones del iPod/repositorio"
+
+#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:806
+msgid "Save Changes"
+msgstr "Guardar cambios"
+
+#: ../data/gtkpod.glade.h:266
 msgid "Select '-1' for no upper limit."
 msgstr "Seleccionar '-1' para eliminar el límite superior."
 
-#: ../data/gtkpod.glade.h:265
+#: ../data/gtkpod.glade.h:267
 msgid "Select '0' for no lower limit."
 msgstr "Seleccionar '0' para eliminar el límite inferior."
 
-#: ../data/gtkpod.glade.h:266
-msgid ""
-"Selected\n"
-"Playlist"
-msgstr ""
-"Lista de reproducción\n"
-"seleccionada"
-
 #: ../data/gtkpod.glade.h:268
-msgid ""
-"Selected\n"
-"Tracks"
-msgstr ""
-"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"
+msgstr "Entrada seleccionada en la pestaña de filtrado de la base de datos"
 
-#: ../data/gtkpod.glade.h:271
-#, fuzzy
+#: ../data/gtkpod.glade.h:269
 msgid "Selected Filter Tab Entry from Hard Disk"
-msgstr "Borrar selección del disco duro"
+msgstr "Entrada seleccionada en la pestaña de filtrado del disco duro"
 
-#: ../data/gtkpod.glade.h:272
-#, fuzzy
+#: ../data/gtkpod.glade.h:270
 msgid "Selected Filter Tab Entry from Playlist"
-msgstr "Pestaña seleccionada de la lista de reproducción"
+msgstr "Entrada seleccionada en la pestaña de filtrado de la lista de reproducción"
 
-#: ../data/gtkpod.glade.h:273
-#, fuzzy
+#: ../data/gtkpod.glade.h:271
 msgid "Selected Filter Tab Entry from iPod"
-msgstr "Borrar selección del iPod"
+msgstr "Entrada seleccionada en la pestaña de filtrado del iPod"
 
-#: ../data/gtkpod.glade.h:274
-#, fuzzy
+#: ../data/gtkpod.glade.h:272
 msgid "Selected Playlist Including Tracks from Database"
-msgstr ""
-"Lista de reproducción seleccionada incluyendo pistas de la base de datos"
+msgstr "Lista de reproducción seleccionada incluyendo pistas de la base de datos"
 
-#: ../data/gtkpod.glade.h:275
-#, fuzzy
+#: ../data/gtkpod.glade.h:273
 msgid "Selected Playlist Including Tracks from Hard Disk"
 msgstr "Lista de reproducción seleccionada incluyendo pistas del disco duro"
 
-#: ../data/gtkpod.glade.h:276
-#, fuzzy
+#: ../data/gtkpod.glade.h:274
 msgid "Selected Playlist Including Tracks from iPod"
 msgstr "Lista de reproducción seleccionada incluyendo pistas del iPod"
 
-#: ../data/gtkpod.glade.h:277
+#: ../data/gtkpod.glade.h:275
 msgid "Selected Tab _Entry"
 msgstr "_Entrada de pestaña seleccionada"
 
-#: ../data/gtkpod.glade.h:278
-#, fuzzy
+#: ../data/gtkpod.glade.h:276
 msgid "Selected Tracks from Database"
 msgstr "Pistas seleccionadas de la base de datos"
 
-#: ../data/gtkpod.glade.h:279
-#, fuzzy
+#: ../data/gtkpod.glade.h:277
 msgid "Selected Tracks from Hard Disk"
 msgstr "Pistas seleccionadas del disco duro"
 
-#: ../data/gtkpod.glade.h:280
-#, fuzzy
+#: ../data/gtkpod.glade.h:278
 msgid "Selected Tracks from Playlist"
 msgstr "Pistas seleccionadas de la lista de reproducción"
 
-#: ../data/gtkpod.glade.h:281
-#, fuzzy
+#: ../data/gtkpod.glade.h:279
 msgid "Selected Tracks from iPod"
 msgstr "Pistas seleccionadas del iPod"
 
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:280
 msgid "Selected _Playlist"
 msgstr "_Lista de reproducción seleccionada"
 
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:281
 msgid "Selected _Tracks"
 msgstr "_Pistas seleccionadas"
 
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:282
 msgid "Selected playlist"
 msgstr "Lista de reproducción seleccionada"
 
-#: ../data/gtkpod.glade.h:285
-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:286
-#, fuzzy
+#: ../data/gtkpod.glade.h:283
 msgid "Set Cover Art from _File"
-msgstr "Usar fichero para configurar la carátula"
+msgstr "Usar _fichero para configurar la carátula"
 
-#: ../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:284
+msgid "Set still missing tags to file name"
+msgstr "Añadir atributos restantes al nombre de fichero"
 
-#: ../data/gtkpod.glade.h:288
-msgid "Set options for Calendar/Contacts/Notes"
-msgstr "Configurar opciones para Calendario/Contactos/Notas"
+#: ../data/gtkpod.glade.h:285
+msgid "Settings..."
+msgstr "Opciones..."
 
-#: ../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 ""
-"Configurar esto a 'aacgain -q -k' para usar la función 'Normalizar el "
-"volumen' en el menú Herramientas. En caso de estar configurado, los datos de "
-"normalización serán calculados y escritos a los ficheros .m4a y m4b que no "
-"los tengan usando este comando."
-
-#: ../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 ""
-"Configurar a 'mp3gain -q -k' para usar la función 'Normalizar el volumen' en "
-"el menú Herramientas. En caso de estar configurado, los datos de "
-"normalización serán calculados y escritos a los ficheros mp3 que no los "
-"tengan usando este comando."
-
-#: ../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:292
-msgid "Set this to your last.fm username"
-msgstr "Poner aquí el nombre de usuario de 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 ""
-"Poner a 0 para desactivar el caché (un máximo de una pista será cacheada "
-"cada vez)."
-
-#: ../data/gtkpod.glade.h:294
-msgid ""
-"Set to 0 to use as many background threads as CPUs are available on your "
-"system."
-msgstr ""
-"Poner a 0 para usar tantos hilos en segundo plano como CPUs disponibles en "
-"el sistema."
-
-#: ../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:296
+#: ../data/gtkpod.glade.h:286
 msgid "Show summary of sync result"
 msgstr "Mostrar resumen del resultado de la sincronización"
 
-#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
-#: ../src/repository.c:1356
+#: ../data/gtkpod.glade.h:287
+msgid "Skip the track"
+msgstr "Saltar la pista"
+
+#: ../data/gtkpod.glade.h:288 ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
 msgid "Smart Playlist"
 msgstr "Lista de reproducción inteligente"
 
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:289
+msgid "Sort by:"
+msgstr "Ordenar por:"
+
+#: ../data/gtkpod.glade.h:290
 msgid "Sort tracks according to: "
 msgstr "Ordenar pistas respecto a:"
 
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:291
 msgid "Sorting Options"
 msgstr "Opciones de ordenamiento"
 
-#: ../data/gtkpod.glade.h:300
-msgid "Sorting case sensitive"
-msgstr "Ordenamiento distinguiendo mayúsculas y minúsculas"
+#: ../data/gtkpod.glade.h:292
+msgid "Sorting..."
+msgstr "Ordenando..."
 
-#: ../data/gtkpod.glade.h:301
-msgid "Sorttab: "
-msgstr "Pestaña:"
-
-#: ../data/gtkpod.glade.h:302
-msgid "Sorttabs"
-msgstr "Orden de pestañas"
-
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:293
 msgid "Source:"
 msgstr "Fuente:"
 
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:295
 #, no-c-format
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
@@ -1491,39 +1289,43 @@
 "intérprete de órdenes. '%i' será reemplazado con el directorio de montaje "
 "del iPod."
 
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:296
 msgid "Specify interval"
 msgstr "Especificar intervalo"
 
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:297
 msgid "Start display automatically"
 msgstr "Mostrar automáticamente"
 
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:298
 msgid "Synchronise Contacts, Calendar and Notes"
 msgstr "Sincronizar contactos, calendarios y notas"
 
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:299
 msgid "Synchronize All"
 msgstr "Sincronizar todo"
 
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:300
 msgid "Synchronize Calendar"
 msgstr "Sincronizar calendario"
 
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:301
 msgid "Synchronize Contacts"
 msgstr "Sincronizar contactos"
 
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:302
 msgid "Synchronize Notes"
 msgstr "Sincronizar notas"
 
-#: ../data/gtkpod.glade.h:313
-msgid "Template for info field: "
-msgstr "Plantilla para el campo de información:"
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
+msgstr "Codificación de atributo y nombre de fichero:"
 
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:304
+msgid "Text color"
+msgstr "Color de texto"
+
+#: ../data/gtkpod.glade.h:305
 msgid ""
 "The local copy of the track is referenced in the playlist. If the track is "
 "not available locally, an error message is displayed."
@@ -1531,7 +1333,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:315
+#: ../data/gtkpod.glade.h:306
 msgid ""
 "The output of the background conversion scripts is copied below. Each page "
 "of the notebook corresponds to one background thread."
@@ -1539,101 +1341,51 @@
 "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:316
-msgid ""
-"The tags are written to the files on your harddrive and on the iPod (if "
-"available)."
-msgstr ""
-"Los atributos son escritos a los ficheros del disco duro y del iPod (si está "
-"disponible)."
-
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:307
 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: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: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 ""
-"Esta es la forma de hacerlo, pero quizás no todos los programas lo soporten "
-"todavía: ID3v2.4 usa unicode para guardar los atributos, por lo que nunca "
-"más será necesario preocuparse por los juegos de caracteres. gtkpod va a "
-"usar codificación UTF8 porque esta no aumentará el tamaño de los atributos "
-"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: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:321
+#: ../data/gtkpod.glade.h:308
 msgid "Time:"
 msgstr "Tiempo:"
 
-#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
+#: ../data/gtkpod.glade.h:309 ../src/display_sorttabs.c:3004
 #: ../src/display_spl.c:83 ../src/misc_conversion.c:62
 msgid "Title"
 msgstr "Título"
 
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:310
 msgid ""
-"Total\n"
-"(iPod)"
-msgstr ""
-"Total\n"
-"(iPod)"
+"To fill additional information, <i>gtkpod</i> can use a database provided by "
+"the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, "
+"leave this alone."
+msgstr "Para añadir información adicional, <i>gtkpod</i> puede usar una base de datos proporcionada por el  servidor de música <i>mserv</i>. En caso de no conocer que es <i>mserv</i>, dejar esto vacio."
 
-#: ../data/gtkpod.glade.h:325
-msgid ""
-"Total\n"
-"(local)"
-msgstr ""
-"Total\n"
-"(local)"
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
+msgstr "Top"
 
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:312
 msgid "Tracks"
 msgstr "Pistas"
 
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:313
 msgid "Tracks Most Often Listened To"
 msgstr "Pistas escuchadas más a menudo"
 
-#: ../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 ""
-"Las pistas pueden ser transferidas en segundo plano nada más ser añadidas al "
-"repositorio del iPod. En caso contrario serán transferidas al expulsar el "
-"iPod, sin hacer modificaciones hasta entonces."
-
-#: ../data/gtkpod.glade.h:330
+#: ../data/gtkpod.glade.h:314
 msgid "Tracks in Selected Tab _Entry"
 msgstr "Pistas en la pestaña s_eleccionada"
 
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:315
 msgid "Tracks in Selected _Playlist"
 msgstr "Pistas en la lista de re_producción seleccionada"
 
-#: ../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:316
+msgid "Transfer tracks in background mode"
+msgstr "Transferir pistas en segundo plano"
 
-#: ../data/gtkpod.glade.h:333
-msgid "Translators"
-msgstr "Traductores"
-
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:317
 msgid ""
 "Try to load contents of all connected iPods. For each iPod a separate "
 "repository must be set up."
@@ -1641,58 +1393,35 @@
 "Intentar cargar los contenidos de todos los iPods. Debe configurarse un "
 "repositorio individual para cada iPod."
 
-#: ../data/gtkpod.glade.h:335
-#, fuzzy
+#: ../data/gtkpod.glade.h:318
 msgid "Undo _Track"
-msgstr "_Deshacer pista"
+msgstr "Deshacer pis_ta"
 
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:319
 msgid "Update _mserv Data from File"
 msgstr "Actualizar datos de _mserv desde fichero"
 
-#: ../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:320
+msgid "Update information about the existing track"
+msgstr "Actualizar información sobre la pista existente"
 
-#: ../data/gtkpod.glade.h:338
-msgid "Update/Sync playlist now"
-msgstr "Actualizar/sincronizar ahora las listas de reproducción"
+#: ../data/gtkpod.glade.h:321
+msgid "Update/Sync All Playlists"
+msgstr "Actualizar/sincronizar todas las listas de reproducción."
 
-#: ../data/gtkpod.glade.h:339
-msgid "Upper margin"
-msgstr "Margen superior"
+#: ../data/gtkpod.glade.h:322
+msgid "Update/Sync Playlist"
+msgstr "Actualizar/sincronizar la lista de reproducción"
 
-#: ../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:323
+msgid "Use legacy format for MP3 tags"
+msgstr "Usar formato de herencia para los atributos MP3"
 
-#: ../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:324
+msgid "Use mserv database to fill track information"
+msgstr "Usar la base de datos mserv para rellenar la información de la pista"
 
-#: ../data/gtkpod.glade.h:342
-#, fuzzy
-msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
-msgstr "Usar <i>&lt;Álbum&gt;.jpg</i> en el directorio padre"
-
-#: ../data/gtkpod.glade.h:343
-#, fuzzy
-msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-msgstr "Usar <i>&lt;Álbum&gt;.jpg</i>, <i>&lt;Álbum&gt;.png</i>..."
-
-#: ../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: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: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:347
+#: ../data/gtkpod.glade.h:325
 msgid ""
 "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
 "for this filename."
@@ -1701,64 +1430,24 @@
 "Sincronizar')\n"
 "para este nombre de fichero."
 
-#: ../data/gtkpod.glade.h:349
-msgid ""
-"Use selected encoding (on the 'General' page)\n"
-"when writing tags"
-msgstr ""
-"Usar la condificación seleccionada (en la pestaña 'General')\n"
-"al escribir los atributos"
-
-#: ../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: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: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:354
+#: ../data/gtkpod.glade.h:327
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../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 ""
-"Normalmente no se quiere modificar el título de varias pistas con el mismo "
-"texto. Esta opción evita resultados no deseados (especialmente al no "
-"disponer de la opción 'deshacer')"
+#: ../data/gtkpod.glade.h:328
+msgid "Video Thumbnail Generation"
+msgstr "Generación de imágenes de muestra de vídeo"
 
-#: ../data/gtkpod.glade.h:356
-#, fuzzy
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
+msgstr "Programa generador de imágenes de muestra de vídeo:"
+
+#: ../data/gtkpod.glade.h:330
 msgid "View Full Size"
-msgstr "Ver carátula a tamaño completo"
+msgstr "Ver tamaño completo"
 
-#: ../data/gtkpod.glade.h:357
-msgid "WAV with :"
-msgstr "WAV con:"
-
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:331
 msgid ""
-"When adding dirs/files, update information of\n"
-"existing tracks with identical filenames"
-msgstr ""
-"Actualizar la información de las pistas existentes al añadir directorios/"
-"ficheros con el mismo nombre"
-
-#: ../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 "
@@ -1769,11 +1458,11 @@
 "origen. Si son iguales, el fichero será ignorado permitiendo una rápida "
 "sincronización de los contenidos del iPod."
 
-#: ../data/gtkpod.glade.h:361
-msgid "When syncing playlists"
-msgstr "Al sincronizar listas de reproducción"
+#: ../data/gtkpod.glade.h:332
+msgid "When updating tracks, display information:"
+msgstr "Mostrar información al actualizar pistas:"
 
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:333
 msgid ""
 "Will show a list of tracks removed and a list of tracks newly added or "
 "updated."
@@ -1781,133 +1470,181 @@
 "Se mostrará una lista de las pistas eliminadas y una lista de las pistas "
 "añadidas o actualizadas."
 
-#: ../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:364
+#: ../data/gtkpod.glade.h:334
 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:365
+#: ../data/gtkpod.glade.h:335
+msgid "Write tags to disk when edited"
+msgstr "Escribir los atributos al disco cuando se editen"
+
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
 msgid ""
-"Write extended information (PC filenames, SHA1 hashes,\n"
-"encoding...). Recommended."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"Escribir la información extendida (nombre de fichero en PC,\n"
-"función resumen SHA1, codificación). Recomendado."
+"Se pueden separar diferentes plantillas con un ';'. Se usará la primera que coincida con el nombre de fichero.\n"
+"\n"
+"Ejemplo: <i>%a - %A/%T%t.mp3;%t.wav</i>.\n"
+"\n"
+"- artista: %a\n"
+"- álbum: %A\n"
+"- compositor: %c\n"
+"- título: %t\n"
+"- género: %G\n"
+"- pista nº: %T\n"
+"- CD nº: %C\n"
+"- año: %Y\n"
+"- saltar datos: %*\n"
+"- el carácter '%': %%"
 
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:352
+#, no-c-format
 msgid ""
-"You can also use the table headers, but this allows you to sort according to "
-"a column that is not displayed."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"También se pueden usar las cabeceras de la tabla,pero esto le permite "
-"ordenar respecto a columnas no mostradas."
+"Se pueden separar diferentes plantillas con un ';'. Se usará la primera que coincida con el nombre de fichero.\n"
+"\n"
+"Ejemplos:\n"
+"- <i>imagen.jpg</i>: Usar <i>imagen.jpg</i> como portada.\n"
+"- <i>imagen</i>: Usar <i>imagen.jpg</i>, <i>imagen.png</i>...\n"
+"-<i>../%A.jpg</i>: Usar <i>&lt;Album&gt;.jpg</i> en el directorio superior\n"
+"-<i>%a</i>: Usar <i>&lt;Album&gt;.jgp</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>imagen.jpg;%a.jpg</i>: Intentar primero <i>imagen.jpg</i>, luego <i>&lt;artista&gt;.jpg</i>\n"
+"\n"
+"- artista: %a\n"
+"- álbum: %A\n"
+"- compositor: %c\n"
+"- título: %t\n"
+"- género: %G\n"
+"- pista nº:%T\n"
+"- CD nº: %C\n"
+"- año: %Y\n"
+"- saltar datos: %*\n"
+"-el carácter '%': %%"
 
-#: ../data/gtkpod.glade.h:368
-#, fuzzy
+#: ../data/gtkpod.glade.h:371
 msgid "_About gtkpod"
-msgstr "Sobre gtkpod"
+msgstr "_Sobre gtkpod"
 
-#: ../data/gtkpod.glade.h:369
-#, fuzzy
+#: ../data/gtkpod.glade.h:372
 msgid "_Add Album"
-msgstr "Álbum"
+msgstr "_Añadir álbum"
 
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:373
 msgid "_Add Image"
-msgstr ""
+msgstr "_Añadir imagen"
 
-#: ../data/gtkpod.glade.h:371
-#, fuzzy
+#: ../data/gtkpod.glade.h:374
 msgid "_Album"
-msgstr "Álbum"
+msgstr "_Álbum"
 
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:375
 msgid "_All Tracks"
 msgstr "Tod_as las pistas"
 
-#: ../data/gtkpod.glade.h:373
-msgid "_Arrange Sort Tabs"
-msgstr "_Ordenar pestañas"
+#: ../data/gtkpod.glade.h:376
+msgid "_Arrange Filter Tabs"
+msgstr "_Ordenar pestañas de filtrado"
 
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:377
 msgid "_Check iPod's Files"
 msgstr "_Comprobar ficheros del iPod"
 
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:378
+msgid "_Contents"
+msgstr "_Contenidos"
+
+#: ../data/gtkpod.glade.h:379
 msgid "_Conversion Log"
 msgstr "Registro de _conversión"
 
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:380
 msgid "_Create Playlists"
 msgstr "_Crear lista de reproducción"
 
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:381
 msgid "_Create iPod's Directories"
 msgstr "_Crear estructura de directorios del iPod"
 
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:382
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:383
 msgid "_Display"
 msgstr "_Mostrar"
 
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:384
 msgid "_Displayed Tracks"
 msgstr "Pistas mostra_das"
 
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:385
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/gtkpod.glade.h:382
-msgid "_Encoding (ID3, files):"
-msgstr "Codificación(ID3, fich_eros):"
-
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:386
 msgid "_Enqueue"
 msgstr "_Encolar"
 
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:387
 msgid "_Export Tracks from Database"
 msgstr "_Exportar pistas de la base de datos"
 
-#: ../data/gtkpod.glade.h:385
-msgid "_File"
-msgstr "_Fichero"
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr "M_enos pestañas de filtrado"
 
-#: ../data/gtkpod.glade.h:386
+#: ../data/gtkpod.glade.h:389
+msgid "_Filter Bar"
+msgstr "Barra de _filtrado"
+
+#: ../data/gtkpod.glade.h:390
 msgid "_General"
 msgstr "_General"
 
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:391
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../data/gtkpod.glade.h:388
-msgid "_Ignore rules"
-msgstr "_Ignorar reglas"
-
-#: ../data/gtkpod.glade.h:389
-msgid "_Image"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:392
 msgid "_Info Window"
 msgstr "Ventana de _información"
 
-#: ../data/gtkpod.glade.h:391
-msgid "_Last.FM"
-msgstr "_Last.FM"
-
-#: ../data/gtkpod.glade.h:392
-msgid "_Less Sort Tabs"
-msgstr "M_enos pestañas"
-
 #: ../data/gtkpod.glade.h:393
 msgid "_Limit to"
 msgstr "_Limitar a"
@@ -1921,163 +1658,131 @@
 msgstr "_Local"
 
 #: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+msgstr "_Letras"
+
+#: ../data/gtkpod.glade.h:397
 msgid "_M3U"
 msgstr "_M3U"
 
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:398
 msgid "_Misc."
-msgstr ""
+msgstr "_Misc."
 
-#: ../data/gtkpod.glade.h:398
-msgid "_More Sort Tabs"
-msgstr "_Mas pestañas"
-
 #: ../data/gtkpod.glade.h:399
-msgid "_Newly Added Tracks"
-msgstr "Pistas añadidas recie_ntemente"
+msgid "_More Filter Tabs"
+msgstr "Más pest_añas de filtrado"
 
 #: ../data/gtkpod.glade.h:400
-msgid "_Normalize Volume"
-msgstr "_Normalizar el volumen"
+msgid "_Music"
+msgstr "_Música"
 
 #: ../data/gtkpod.glade.h:401
-msgid "_Number of sort tabs:"
-msgstr "_Número de pestañas:"
+msgid "_Newly Added Tracks"
+msgstr "Pistas añadidas recie_ntemente"
 
 #: ../data/gtkpod.glade.h:402
+msgid "_Normalize Volume"
+msgstr "_Normalizar el volumen"
+
+#: ../data/gtkpod.glade.h:403
 msgid "_PLS"
 msgstr "_PLS"
 
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
+msgid "_Photos"
+msgstr "_Fotos"
+
+#: ../data/gtkpod.glade.h:405
 msgid "_Play Now"
 msgstr "Re_producir"
 
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:406
 msgid "_Podcasts"
 msgstr "_Podcasts"
 
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:407
 msgid "_Prefer Local"
 msgstr "_Preferir local"
 
-#: ../data/gtkpod.glade.h:406
-#, fuzzy
+#: ../data/gtkpod.glade.h:408
 msgid "_Remove Album"
-msgstr "Álbum"
+msgstr "_Borrar álbum"
 
-#: ../data/gtkpod.glade.h:407
-#, fuzzy
+#: ../data/gtkpod.glade.h:409
 msgid "_Remove Cover Art"
-msgstr "Borrar portada"
+msgstr "_Borrar portada"
 
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:410
 msgid "_Remove Images"
-msgstr ""
+msgstr "Bo_rrar imágenes"
 
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:411
 msgid "_Save Changes"
 msgstr "_Guardar cambios"
 
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:412
 msgid "_Save Displayed Track Order"
 msgstr "Guardar orden de pista_s mostrado"
 
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:413
 msgid "_Sorting"
 msgstr "_Ordenar"
 
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:414
 msgid "_Synchronize Playlist with Dir(s)"
 msgstr "_Sincronizar la lista de reproducción con el/los directorio(s)"
 
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:415
 msgid "_Toolbar"
 msgstr "Barra de _Herramientas"
 
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:416
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:417
 msgid "_Tooltips"
 msgstr "_Sugerencias"
 
-#: ../data/gtkpod.glade.h:416
-msgid "_Track Info"
-msgstr "_Información de la pista"
-
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:418
 msgid "_Undo All"
 msgstr "_Deshacer Todo"
 
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:419
 msgid "_Update Tracks from File"
 msgstr "Act_ualizar pistas desde fichero"
 
-#: ../data/gtkpod.glade.h:419
+#: ../data/gtkpod.glade.h:420
 msgid "_Video"
 msgstr "_Vídeo"
 
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:421
 msgid "_View"
 msgstr "_Ver"
 
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:422
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../data/gtkpod.glade.h:423
 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'."
+#: ../data/gtkpod.glade.h:424
+msgid "checkbutton"
 msgstr ""
-"artista: %a, álbum: %A, compositor: %c, título: %t, género: %G, número de "
-"pista: %T, número de CD: %C, año: %Y, ignorar dato: %*, el carácter '%': %%. "
-"Se pueden separar varias plantillas con punto y coma ';'. La primera que "
-"concuerde con el nombre de fichero será usada. Ejemplo: '%a - %A/%T %t.mp3;%"
-"t.wav'."
 
-#: ../data/gtkpod.glade.h:424
-msgid "folder"
-msgstr "folder"
-
 #: ../data/gtkpod.glade.h:425
-msgid "folder.jpg"
-msgstr "folder.jpg"
+msgid "gtk-revert-to-saved"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:427
-#, no-c-format
-msgid "folder.jpg;%a.jpg"
-msgstr "folder.jpg;%a.jpg"
-
-#: ../data/gtkpod.glade.h:428
-msgid "gtkpod"
-msgstr "gtkpod"
-
-#: ../data/gtkpod.glade.h:429
-msgid "gtkpod Info"
+#: ../data/gtkpod.glade.h:426
+msgid "gtkpod Information"
 msgstr "Información sobre 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 espera que las etiquetas ID3 y los nombres de fichero estén en la "
-"codificación aquí especificada. Se puede modificar para las operaciones de "
-"'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: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:433
+#: ../data/gtkpod.glade.h:429
 msgid ""
 "iPod\n"
 "Local Repository (Standard)\n"
@@ -2087,33 +1792,33 @@
 "Repositorio local (Standard)\n"
 "Repositorio local (Podcasts)\n"
 
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:433
 msgid "iPod mountpoint:"
 msgstr "Punto de montaje del iPod:"
 
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:434
 msgid "iTunesDB backup:"
 msgstr "Copia de seguridad de iTunesDB:"
 
-#: ../data/gtkpod.glade.h:439
-msgid "mserv Root:"
-msgstr "Directorio raíz de mserv:"
+#: ../data/gtkpod.glade.h:435
+msgid "mserv Preferences"
+msgstr "Preferencias de mserv"
 
-#: ../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:436
+msgid "mserv root:"
+msgstr "raíz de mserv:"
 
-#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
+#: ../data/gtkpod.glade.h:437 ../src/details.c:1352
 msgid "n/a"
 msgstr "no disponible"
 
-#: ../data/gtkpod.glade.h:442
+#: ../data/gtkpod.glade.h:438
 msgid "special_sorttab -- Don't translate!"
 msgstr ""
 
 #: ../src/autodetection.c:310
 msgid "Could not initialize GnomeVFS\n"
-msgstr ""
+msgstr "No se ha podido inicializar GnomeVFS\n"
 
 #: ../src/autodetection.c:397
 #, c-format
@@ -2121,6 +1826,8 @@
 "Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
 "\n"
 msgstr ""
+"No se ha podido cargar en gtkpod el nuevo iPod mountado en '%s'.\n"
+"\n"
 
 #: ../src/autodetection.c:403
 #, c-format
@@ -2128,11 +1835,12 @@
 "Newly mounted iPod at '%s' appears to be already loaded!\n"
 "\n"
 msgstr ""
+"¡Parece que el iPod recién montado en '%s' ya está cargado!\n"
+"\n"
 
 #: ../src/autodetection.c:416
-#, fuzzy
 msgid "New iPod"
-msgstr "Nueva lista de reproducción"
+msgstr "Nuevo iPod"
 
 #: ../src/charset.c:53
 msgid "Arabic (IBM-864)"
@@ -2336,170 +2044,173 @@
 
 #. sanity!
 #. check for "System Charset" and return NULL
-#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+#: ../src/charset.c:163 ../src/charset.c:173 ../src/charset.c:232
+#: ../src/charset.c:248 ../src/charset.c:332
 msgid "System Charset"
 msgstr "Juego de caracteres del sistema"
 
 #. 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"
+#: ../src/clientserver.c:215
+msgid "Another instance of gtkpod was detected. Playcount server not started.\n"
 msgstr ""
 "Se ha detectado otra instancia de gtkpod. No se ha arrancado el servidor de "
 "contadores.\n"
 
-#: ../src/confirmation.c:377
-msgid "Confirmation Dialogue"
-msgstr "Diálogo de confirmación"
+#: ../src/confirmation.c:389
+msgid "Confirmation"
+msgstr "Confirmación"
 
-#: ../src/context_menus.c:362
+#: ../src/context_menus.c:364
 #, c-format
 msgid "Copied \"%s\" playlist to %s"
 msgstr "Copiada la lista de reproducción \"%s\" a %s"
 
-#: ../src/context_menus.c:401
+#: ../src/context_menus.c:403
 #, 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:429
+#: ../src/context_menus.c:431
 #, 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:462
+#: ../src/context_menus.c:464
 #, 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:622 ../src/tools.c:854
+#: ../src/context_menus.c:624 ../src/tools.c:854
 msgid "Play Now"
 msgstr "Reproducir"
 
-#: ../src/context_menus.c:628 ../src/tools.c:867
+#: ../src/context_menus.c:630 ../src/tools.c:867
 msgid "Enqueue"
 msgstr "Encolar"
 
-#: ../src/context_menus.c:634
+#: ../src/context_menus.c:636
 msgid "Copy Tracks to Filesystem"
 msgstr "Copiar pistas al sistema de ficheros"
 
-#: ../src/context_menus.c:641 ../src/file_export.c:1085
+#: ../src/context_menus.c:643 ../src/file_export.c:1085
 msgid "Create Playlist File"
 msgstr "Crear lista de reproducción"
 
-#: ../src/context_menus.c:648
+#: ../src/context_menus.c:650
 msgid "Create new Playlist"
 msgstr "Crear nueva lista de reproducción"
 
-#: ../src/context_menus.c:655
+#: ../src/context_menus.c:657
 msgid "Update Tracks from File"
 msgstr "Actualizar pistas desde fichero"
 
-#: ../src/context_menus.c:669
+#: ../src/context_menus.c:671
 msgid "Sync Playlist with Dir(s)"
 msgstr "Sincronizar la lista de reproducción con el/los directorio(s)"
 
-#: ../src/context_menus.c:679
+#: ../src/context_menus.c:681
 msgid "Remove All Tracks from iPod"
 msgstr "Borrar todas las pistas del iPod"
 
-#: ../src/context_menus.c:697
+#: ../src/context_menus.c:687 ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr "Estoy seguro"
+
+#: ../src/context_menus.c:699
 msgid "Remove All Podcasts from iPod"
 msgstr "Borrar todos los podcasts del iPod"
 
-#: ../src/context_menus.c:712
+#: ../src/context_menus.c:714
 msgid "Delete Including Tracks"
 msgstr "Borrar incluyendo pistas"
 
-#: ../src/context_menus.c:720
+#: ../src/context_menus.c:722
 msgid "Delete But Keep Tracks"
 msgstr "Borrar manteniendo las pistas"
 
-#: ../src/context_menus.c:728
+#: ../src/context_menus.c:730
 msgid "Edit iPod Properties"
 msgstr "Editar las propiedades del iPod"
 
-#: ../src/context_menus.c:735
+#: ../src/context_menus.c:737
 msgid "Edit Repository Properties"
 msgstr "Editar las propiedades del repositorio"
 
-#: ../src/context_menus.c:742
+#: ../src/context_menus.c:744
 msgid "Edit Playlist Properties"
 msgstr "Editar propiedades de la lista de reproducción"
 
-#: ../src/context_menus.c:770
+#: ../src/context_menus.c:772
 msgid "View Full Size Artwork"
 msgstr "Ver carátula a tamaño completo"
 
-#: ../src/context_menus.c:777
+#: ../src/context_menus.c:779
 msgid "Select Cover From File"
 msgstr "Seleccionar carátula desde fichero"
 
-#: ../src/context_menus.c:790
+#: ../src/context_menus.c:792
 msgid "Load iPod"
 msgstr "Cargar iPod"
 
-#: ../src/context_menus.c:797
+#: ../src/context_menus.c:799
 msgid "Eject iPod"
 msgstr "Expulsar iPod"
 
-#: ../src/context_menus.c:814
+#: ../src/context_menus.c:816
 msgid "Remove All Tracks from Database"
 msgstr "Borrar todas las pistas de la base de datos"
 
-#: ../src/context_menus.c:829
+#: ../src/context_menus.c:831
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Borrar incluyendo pistas (disco duro)"
 
-#: ../src/context_menus.c:837
+#: ../src/context_menus.c:839
 msgid "Delete Including Tracks (Database)"
 msgstr "Borrar incluyendo pistas (base de datos)"
 
-#: ../src/context_menus.c:845
+#: ../src/context_menus.c:847
 msgid "Delete From iPod"
 msgstr "Borrar del iPod"
 
-#: ../src/context_menus.c:853
+#: ../src/context_menus.c:855
 msgid "Delete From Playlist"
 msgstr "Borrar de la lista de reproducción"
 
-#: ../src/context_menus.c:861
+#: ../src/context_menus.c:863
 msgid "Delete From Harddisk"
 msgstr "Borrar del disco duro"
 
-#: ../src/context_menus.c:869
+#: ../src/context_menus.c:871
 msgid "Delete From Database"
 msgstr "Borrar de la base de datos"
 
-#: ../src/context_menus.c:877
+#: ../src/context_menus.c:879
 msgid "Alphabetize"
 msgstr "Orden alfabético"
 
-#: ../src/context_menus.c:895
-#, fuzzy
+#: ../src/context_menus.c:897
 msgid "Remove Album"
-msgstr "Álbum"
+msgstr "Borrar álbum"
 
-#: ../src/context_menus.c:905
-#, fuzzy
+#: ../src/context_menus.c:907
 msgid "Remove Photo"
-msgstr "Borrar portada"
+msgstr "Borrar foto"
 
-#: ../src/context_menus.c:922
+#: ../src/context_menus.c:924
 msgid "Rename Album"
-msgstr ""
+msgstr "Renombrar álbum"
 
-#: ../src/context_menus.c:981 ../src/context_menus.c:1030
+#: ../src/context_menus.c:983 ../src/context_menus.c:1032
 msgid "Copy selected playlist to..."
 msgstr "Copiar la lista de reproducción seleccionada a..."
 
-#: ../src/context_menus.c:1083
+#: ../src/context_menus.c:1085
 msgid "Copy selected track(s) to..."
 msgstr "Copiar las pistas seleccionadas a..."
 
@@ -2509,32 +2220,28 @@
 msgstr "Error en el formato de la fecha: carácter desconocido:'%s'\n"
 
 #: ../src/details.c:82
-#, fuzzy
 msgid "Audio/Video"
-msgstr "Vídeo musical"
+msgstr "Audio/Vídeo"
 
 #: ../src/details.c:83
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
 #: ../src/details.c:84
-#, fuzzy
 msgid "Video"
-msgstr "_Vídeo"
+msgstr "Vídeo"
 
 #: ../src/details.c:85
-#, fuzzy
 msgid "Podcast"
-msgstr "Podcasts"
+msgstr "Podcast"
 
 #: ../src/details.c:86
-#, fuzzy
 msgid "Video Podcast"
-msgstr "Podcasts"
+msgstr "Vídeo Podcast"
 
 #: ../src/details.c:87
 msgid "Audiobook"
-msgstr ""
+msgstr "Audiolibro"
 
 #: ../src/details.c:88 ../src/display_spl.c:209 ../src/display_spl.c:218
 msgid "Music Video"
@@ -2542,75 +2249,74 @@
 
 #: ../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"
+msgstr "TV Show y vídeo musical"
 
-#: ../src/details.c:836
+#: ../src/details.c:837
 #, c-format
 msgid "%s (image data corrupted or unreadable)"
 msgstr "%s (imagen corrupta o no legible)"
 
-#: ../src/details.c:973
+#: ../src/details.c:975
 #, c-format
 msgid "Please report unknown mediatype %x\n"
-msgstr ""
+msgstr "Por favor, informar sobre el tipo de medio desconocido %x\n"
 
-#: ../src/details.c:1418
+#: ../src/details.c:1417
 msgid "<b>n/a</b>"
 msgstr "<b>no disponible</b>"
 
 #: ../src/details.c:1906
 #, c-format
 msgid "Error occurred dropping an image onto the details window: %s\n"
-msgstr ""
+msgstr "Ha ocurrido un error al soltar una imagen en la ventana de detalles: %s\n"
 
-#: ../src/details.c:1952 ../src/display_coverart.c:2128
+#: ../src/details.c:1952 ../src/display_coverart.c:2297
 msgid "Successfully set new coverart for selected tracks"
-msgstr ""
+msgstr "Configurada correctamente la nueva portada para las pistas seleccionadas"
 
-#: ../src/display.c:490
+#. Set the resolution in the label
+#: ../src/display.c:570
 #, c-format
-msgid "<b>Image Dimensions: %s</b>"
-msgstr ""
+msgid "<b>Image Dimensions: %d x %d</b>"
+msgstr "<b>Dimensiones de la imagen: %d x %d</b>"
 
-#: ../src/display.c:744
+#: ../src/display.c:814
 msgid "Edit selected entry of which sort tab?"
 msgstr "¿De qué pestaña desea editar la entrada seleccionada?"
 
 #. no entry selected
-#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
+#: ../src/display.c:821 ../src/misc_confirm.c:469 ../src/misc_track.c:2158
 msgid "No entry selected."
 msgstr "No se ha seleccionado ninguna entrada"
 
-#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
-#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
+#: ../src/display.c:974 ../src/display.c:1320 ../src/display.c:1376
+#: ../src/display.c:1430 ../src/display.c:1485 ../src/display.c:1746
 #, 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:949
+#: ../src/display.c:1015
 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:957
+#: ../src/display.c:1024
 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:979
+#: ../src/display.c:1049
 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:1009
+#: ../src/display.c:1082
 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:1036 ../src/display.c:1074
+#: ../src/display.c:1109 ../src/display.c:1147
 #, c-format
 msgid ""
 "iPod at '%s' is not loaded.\n"
@@ -2619,172 +2325,171 @@
 "El iPod de '%s' no está cargado.\n"
 "Por favor, cargar primero."
 
-#: ../src/display.c:1111 ../src/display.c:1138
+#: ../src/display.c:1184 ../src/display.c:1218
 msgid "Update selected entry of which sort tab?"
 msgstr "¿De qué pestaña desea actualizar la entrada seleccionada?"
 
-#: ../src/display.c:1224
+#: ../src/display.c:1314
 msgid "Export selected entry of which sort tab?"
 msgstr "¿De qué pestaña desea exportar su selección?"
 
-#: ../src/display.c:1280
+#: ../src/display.c:1370
 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:1334
+#: ../src/display.c:1424
 msgid "Play tracks in selected entry of which sort tab?"
 msgstr "¿De qué pestaña desea reproducir las pistas seleccionadas?"
 
-#: ../src/display.c:1389
+#: ../src/display.c:1479
 msgid "Enqueue tracks in selected entry of which sort tab?"
 msgstr "¿De qué pestaña desea encolar las pistas seleccionadas?"
 
-#: ../src/display.c:1646
+#: ../src/display.c:1736
 msgid "Normalize tracks in selected entry of which sort tab?"
-msgstr ""
-"¿De qué pestaña desea normalizar el volumen de las pistas seleccionadas?"
+msgstr "¿De qué pestaña desea normalizar el volumen de las pistas seleccionadas?"
 
-#: ../src/display_coverart.c:1713
+#: ../src/display_coverart.c:1874
 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
+#: ../src/display_coverart.c:2262
 #, c-format
 msgid "Error occurred dropping an image onto the coverart display: %s\n"
-msgstr ""
+msgstr "Ha ocurrido un error al soltar una imagen sobre la pantalla de carátula:%s\n"
 
-#: ../src/display_itdb.c:376
+#: ../src/display_itdb.c:385
 #, c-format
 msgid "Failed to set cover art: '%s'\n"
 msgstr "Error al configurar la carátula: '%s'\n"
 
-#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
-msgid "Local"
-msgstr "Local"
+#: ../src/display_itdb.c:871
+msgid "Music Library"
+msgstr "Biblioteca de música"
 
 #. add podcast playlist
-#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1025
+#: ../src/display_itdb.c:879 ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
 msgid "Podcasts"
 msgstr "Podcasts"
 
-#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:888 ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
 msgid "iPod"
 msgstr "iPod"
 
-#: ../src/display_itdb.c:1084
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr "Local"
+
+#: ../src/display_itdb.c:1098
 #, c-format
 msgid "Increased playcount for '%s'"
 msgstr "Contador incrementado en '%s'"
 
-#: ../src/display_photo.c:163
+#: ../src/display_photo.c:158
 #, c-format
 msgid "Error reading iPod photo database (%s).\n"
-msgstr ""
+msgstr "Error al leer la base de datos de fotos del iPod (%s).\n"
 
-#: ../src/display_photo.c:168
+#: ../src/display_photo.c:161
 msgid "Error reading iPod photo database.\n"
-msgstr ""
+msgstr "Error al leer la base de datos de fotos del iPod.\n"
 
-#: ../src/display_photo.c:238
+#: ../src/display_photo.c:201
 msgid "Could not access the iPod's photo database."
-msgstr ""
+msgstr "No se ha podido acceder a la base de datos de fotos del iPod."
 
-#: ../src/display_photo.c:441
-#, fuzzy
+#: ../src/display_photo.c:404
 msgid "Photo Albums"
-msgstr "Álbum"
+msgstr "Álbumes de fotos"
 
-#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+#: ../src/display_photo.c:414 ../src/display_photo.c:1587
 msgid "<Unnamed>"
-msgstr ""
+msgstr "<Sin_nombre>"
 
-#: ../src/display_photo.c:939
+#: ../src/display_photo.c:848
 msgid "The Photo Library album cannot be removed"
-msgstr ""
+msgstr "No se puede borrar el álbum de biblioteca de fotos"
 
-#: ../src/display_photo.c:961
-#, fuzzy
+#: ../src/display_photo.c:870
 msgid "Do you want to remove the album's photos too?"
-msgstr "¿Desea realmente borrar todos los podcasts del iPod?"
+msgstr "¿Desea borrar también los álbumes de fotos?"
 
-#: ../src/display_photo.c:967
+#: ../src/display_photo.c:876
 msgid "Yes. Do Not Display Again"
-msgstr ""
+msgstr "Sí. No mostrar de nuevo"
 
-#: ../src/display_photo.c:1038
+#: ../src/display_photo.c:947
 msgid ""
 "This will remove the photo selection from the selected album.\n"
 " Do you want to delete them from the database as well?"
 msgstr ""
+"Esto eliminará la selección de fotos del álbum seleccionado.\n"
+"¿Desea eliminarlas también de la base de datos?"
 
-#: ../src/display_photo.c:1053
+#: ../src/display_photo.c:962
 msgid ""
 "This will delete the photo selection from the Photo Library and all albums. "
 "Are you sure?"
-msgstr ""
+msgstr "Esto eliminará la selección de fotos de la biblioteca de imágenes y de todos los álbumes. ¿Esta seguro?"
 
-#: ../src/display_photo.c:1128
+#: ../src/display_photo.c:1036
 msgid "New Photo Album Name"
-msgstr ""
+msgstr "Nombre del nuevo álbum de fotos"
 
-#: ../src/display_photo.c:1129
-#, fuzzy
+#: ../src/display_photo.c:1037
 msgid "Please enter a new name for the photo album"
-msgstr "Introducir el nombre de la nueva lista de reproducción"
+msgstr "Por favor, introduzca un nuevo nombre para el álbum de fotos"
 
-#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+#: ../src/display_photo.c:1050 ../src/display_photo.c:1133
 msgid "An album with that name already exists."
-msgstr ""
+msgstr "Ya existe un álbum con ese nombre."
 
-#: ../src/display_photo.c:1210
-#, fuzzy
+#: ../src/display_photo.c:1119
 msgid "New Photo Album"
-msgstr "Álbum"
+msgstr "Nuevo álbum de fotos"
 
-#: ../src/display_photo.c:1211
-#, fuzzy
+#: ../src/display_photo.c:1120
 msgid "Please enter a name for the new photo album"
-msgstr "Introducir el nombre de la nueva lista de reproducción"
+msgstr "Por favor, introduzca un nombre para el nuevo álbum de fotos"
 
-#: ../src/display_photo.c:1232
+#: ../src/display_photo.c:1142
 msgid "The new album failed to be created."
-msgstr ""
+msgstr "Ha fallado la creación del nuevo álbum."
 
-#: ../src/display_photo.c:1256
-#, fuzzy
+#: ../src/display_photo.c:1166
 msgid "Add Image to iPod"
-msgstr "Añadir nuevo repositorio/iPod"
+msgstr "Añadir imagen al iPod"
 
 #. Open a dialog directory chooser window
-#: ../src/display_photo.c:1311
+#: ../src/display_photo.c:1221
 msgid "Add a Directory of Images to the iPod. Select the Directory."
-msgstr ""
+msgstr "Añadir un directorio de imágenes al iPod. Seleccionar el directorio."
 
-#: ../src/display_photo.c:1699
+#: ../src/display_photo.c:1601
 #, 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:516 ../src/display_playlists.c:558
+#: ../src/display_playlists.c:537 ../src/display_playlists.c:579
 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:585 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:606 ../src/display_tracks.c:403
 #, 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:865 ../src/display_playlists.c:877
+#: ../src/display_playlists.c:886 ../src/display_playlists.c:898
 msgid "Can't reorder sorted treeview."
 msgstr "No se puede reordenar una vista en árbol ya ordenada"
 
-#: ../src/display_playlists.c:954
+#: ../src/display_playlists.c:975
 #, c-format
 msgid ""
 "This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2794,55 +2499,43 @@
 "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
+#: ../src/display_playlists.c:2039
 msgid "Photos"
-msgstr ""
+msgstr "Fotos"
 
-#: ../src/display_sorttabs.c:473
+#: ../src/display_sorttabs.c:479
 msgid "'Played' condition ignored because of error."
 msgstr "Ignorada la condición de «reproducido» debido a un error"
 
-#: ../src/display_sorttabs.c:476
+#: ../src/display_sorttabs.c:482
 msgid "'Modified' condition ignored because of error."
 msgstr "Ignorada la condición de «modificado» debido a un error"
 
-#: ../src/display_sorttabs.c:479
+#: ../src/display_sorttabs.c:485
 msgid "'Added' condition ignored because of error."
 msgstr "Ignorada la condición de «añadido» debido a un error"
 
-#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1568 ../src/misc_conversion.c:59
 msgid "All"
 msgstr "Todo"
 
-#: ../src/display_sorttabs.c:1588
+#: ../src/display_sorttabs.c:1594
 msgid "Compilations"
 msgstr "Compilaciones"
 
-#: ../src/display_sorttabs.c:2988
+#: ../src/display_sorttabs.c:3001
 msgid "Comp."
 msgstr "Comp."
 
-#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:3007 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333 ../src/misc_conversion.c:84
 msgid "Year"
 msgstr "Año"
 
-#: ../src/display_sorttabs.c:2997
+#: ../src/display_sorttabs.c:3010
 msgid "Special"
 msgstr "Especial"
 
-#: ../src/display_sorttabs.c:3245
-msgid "Last Played"
-msgstr "Última reproducción"
-
-#: ../src/display_sorttabs.c:3246
-msgid "Last Modified"
-msgstr "Última modificación"
-
 #: ../src/display_spl.c:64
 msgid "days"
 msgstr "días"
@@ -2863,7 +2556,7 @@
 msgid "Hz"
 msgstr "Hz"
 
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:794
 msgid "MB"
 msgstr "MB"
 
@@ -2896,6 +2589,10 @@
 msgid "Size"
 msgstr "Tamaño"
 
+#: ../src/display_spl.c:94 ../src/infodlg.c:78
+msgid "Play time"
+msgstr "Tiempo de reproducción"
+
 #: ../src/display_spl.c:95 ../src/misc_conversion.c:64
 msgid "Comment"
 msgstr "Comentario"
@@ -2904,6 +2601,10 @@
 msgid "Date added"
 msgstr "Fecha de adición"
 
+#: ../src/display_spl.c:98 ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "Contador"
+
 #: ../src/display_spl.c:99
 msgid "Last played"
 msgstr "Última reproducción"
@@ -2912,6 +2613,10 @@
 msgid "Disc number"
 msgstr "Número de disco"
 
+#: ../src/display_spl.c:101 ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "Puntuación"
+
 #: ../src/display_spl.c:102 ../src/misc_conversion.c:87
 msgid "Compilation"
 msgstr "Compilación"
@@ -3027,10 +2732,6 @@
 msgid "hours"
 msgstr "horas"
 
-#: ../src/display_spl.c:182 ../src/info.c:780
-msgid "GB"
-msgstr "GiB"
-
 #: ../src/display_spl.c:189
 msgid "random order"
 msgstr "orden aleatorio"
@@ -3087,26 +2788,26 @@
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+#: ../src/display_spl.c:1143 ../src/display_spl.c:1158
 msgid "to"
 msgstr "a"
 
-#: ../src/display_spl.c:1485
+#: ../src/display_spl.c:1436
 msgid "-"
 msgstr "-"
 
-#: ../src/display_spl.c:1500
+#: ../src/display_spl.c:1451
 msgid "+"
 msgstr "+"
 
-#: ../src/display_tracks.c:281
+#: ../src/display_tracks.c:398
 #, c-format
 msgid "Moved one track"
 msgid_plural "Moved %d tracks"
 msgstr[0] "Movida una pista"
 msgstr[1] "Movidas %d pistas"
 
-#: ../src/display_tracks.c:1810
+#: ../src/display_tracks.c:2022
 #, c-format
 msgid ""
 "Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -3119,67 +2820,97 @@
 "volver al estado anterior.\n"
 "\n"
 
-#: ../src/display_tracks.c:2069
+#: ../src/display_tracks.c:2288
 msgid "Rtng"
 msgstr "Puntuación"
 
-#: ../src/display_tracks.c:2072
+#: ../src/display_tracks.c:2291
 msgid "#"
 msgstr "#"
 
-#: ../src/display_tracks.c:2075
+#: ../src/display_tracks.c:2294
 msgid "CD"
 msgstr "CD"
 
-#: ../src/display_tracks.c:2078
+#: ../src/display_tracks.c:2297
 msgid "ID"
 msgstr "ID"
 
-#: ../src/display_tracks.c:2081
+#: ../src/display_tracks.c:2300
 msgid "Trnsfrd"
 msgstr "Transferido"
 
-#: ../src/display_tracks.c:2085
+#: ../src/display_tracks.c:2309
 msgid "Cmpl"
 msgstr "Cmpl"
 
-#: ../src/display_tracks.c:2091
+#: ../src/display_tracks.c:2315
 msgid "Time"
 msgstr "Duración"
 
-#: ../src/display_tracks.c:2094
+#: ../src/display_tracks.c:2318
 msgid "Plycnt"
 msgstr "Contador"
 
-#: ../src/display_tracks.c:2106
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "Reproducido"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "Modificado"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "Añadido"
+
+#: ../src/display_tracks.c:2330
 msgid "Released"
 msgstr "Liberado"
 
-#: ../src/display_tracks.c:2112
+#: ../src/display_tracks.c:2336
 msgid "Vol."
 msgstr "Vol."
 
-#: ../src/display_tracks.c:2115
+#: ../src/display_tracks.c:2339
 msgid "Sndchk."
 msgstr "Control de sonido"
 
-#: ../src/fetchcover.c:358
-msgid "Coverart file already exists"
-msgstr ""
-
-#: ../src/fetchcover.c:371
+#: ../src/fetchcover.c:359
 #, 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."
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to abort the fetchcover "
+"operation?"
 msgstr ""
+"El fichero de portada %s ya existe.\n"
+"Puede estar asociado a otros ficheros de música en el directorio.\n"
+"\n"
+"¿Desea sobreescribir el fichero existente, posiblemente asociando \n"
+"otros ficheros de música del mismo directorio con esta portada,\n"
+"para guardar el fichero con un nombre de fichero único, o cancelar la operación de recogida de portadas?"
 
-#: ../src/file.c:236
+#: ../src/fetchcover.c:368
+msgid "Cover art file already exists"
+msgstr "Ya existe el fichero de carátula"
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: ../src/fetchcover.c:371
+msgid "Rename"
+msgstr "Renombrar"
+
+#: ../src/fetchcover.c:372
+msgid "Abort"
+msgstr "Abortar"
+
+#: ../src/file.c:238
 #, c-format
 msgid ""
 "'%s' is a directory, not a playlist file.\n"
@@ -3188,7 +2919,7 @@
 "'%s' es un directorio, no una lista de reproducción.\n"
 "\n"
 
-#: ../src/file.c:266
+#: ../src/file.c:268
 #, c-format
 msgid ""
 "'%s' is a not a known playlist file.\n"
@@ -3197,63 +2928,88 @@
 "'%s' no es una lista de reproducción conocida.\n"
 "\n"
 
-#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/file.c:285 ../src/file_export.c:217 ../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/file.c:369
+#: ../src/file.c:371
 #, c-format
 msgid "Skipping '%s' because it is a directory.\n"
 msgstr "Ignorando '%s' porque es un directorio.\n"
 
-#: ../src/file.c:374
+#: ../src/file.c:376
 #, c-format
 msgid "Skipping '%s' to avoid adding playlist file recursively\n"
-msgstr ""
-"Ignorando '%s' para evitar añadir lista de reproducción recursivamente\n"
+msgstr "Ignorando '%s' para evitar añadir lista de reproducción recursivamente\n"
 
-#: ../src/file.c:629
+#: ../src/file.c:631
 #, c-format
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "Testigo '%s' desconocido en la plantilla '%s'\n"
 
-#: ../src/file.c:923
+#: ../src/file.c:939
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Nombre de fichero local no válido (%s)"
 
-#: ../src/file.c:982
+#: ../src/file.c:998
 #, 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:991
+#: ../src/file.c:1007
 #, 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:999
+#: ../src/file.c:1015
 #, 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)"
+msgstr "La pista (%s) no está en el directorio raíz de música mserv (%s)"
 
-#: ../src/file.c:1123
+#: ../src/file.c:1046
 #, c-format
+msgid "Could not create '%s'"
+msgstr "No se ha podido crear '%s'"
+
+#: ../src/file.c:1083
+msgid "Error creating thumbnail file"
+msgstr "Error al crear el fichero de imagen de muestra"
+
+#: ../src/file.c:1114 ../src/misc.c:1018
+#, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "Testigo desconocido '%%%c' en la plantilla '%s'"
+
+#: ../src/file.c:1138
+#, c-format
 msgid ""
-"The following track could not be processed (file does not exist): '%s'\n"
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
 msgstr ""
-"La siguiente pista no pudo ser procesada (no existe el fichero): '%s'\n"
+"No es posible iniciar el generador de imágenes de muestra de vídeo\n"
+"(la orden fue: '%s'"
 
-#: ../src/file.c:1209
+#: ../src/file.c:1142
 #, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr "El generador de imágenes de muestra ha devuelto el estado %d"
+
+#: ../src/file.c:1291
+#, 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:1377
+#, 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:1307
+#: ../src/file.c:1476
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -3262,33 +3018,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:1337 ../src/file.c:1391
+#: ../src/file.c:1506 ../src/file.c:1560
 msgid "Nothing to update"
 msgstr "Nada que actualizar"
 
-#: ../src/file.c:1358
+#: ../src/file.c:1527
 #, c-format
 msgid "Updating %s"
 msgstr "Actualizando %s"
 
-#: ../src/file.c:1372
+#: ../src/file.c:1541
 msgid "Updated selected tracks with info from file."
 msgstr "Actualizadas las pistas seleccionadas con la información del fichero."
 
-#: ../src/file.c:1406
+#: ../src/file.c:1575
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "Recibiendo datos mserv %s"
 
-#: ../src/file.c:1411
+#: ../src/file.c:1580
 msgid "no filename available"
 msgstr "Ningún nombre de fichero disponible"
 
-#: ../src/file.c:1416
+#: ../src/file.c:1585
 msgid "Updated selected tracks with data from mserv."
 msgstr "Actualizadas las pistas seleccionadas con la información de mserv"
 
-#: ../src/file.c:1437
+#: ../src/file.c:1606
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -3297,11 +3053,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1443
+#: ../src/file.c:1612
 msgid "Failed Track Update"
 msgstr "Error al actualizar la pista"
 
-#: ../src/file.c:1501
+#: ../src/file.c:1670
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -3310,65 +3066,59 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1507
+#: ../src/file.c:1676
 msgid "Successful Track Update"
 msgstr "Actualización exitosa de la pista"
 
-#: ../src/file.c:1566
+#: ../src/file.c:1735
 #, 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] "No se ha podido conseguir información mserv para la siguiente pista"
-msgstr[1] ""
-"No se ha podido conseguir información mserv para las siguientes %d pistas"
+msgstr[1] "No se ha podido conseguir información mserv para las siguientes %d pistas"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1572
+#: ../src/file.c:1741
 msgid "mserv data retrieval problem"
 msgstr "Problema al recoger datos mserv"
 
-#: ../src/file.c:1661
+#: ../src/file.c:1829
 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"
+msgstr "No está disponible el nombre local, se usará el nombre del iPod en su lugar"
 
-#: ../src/file.c:1667
+#: ../src/file.c:1835
 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"
+msgstr "No está disponible el nombre local y no se encuentra la copia en el iPod"
 
-#: ../src/file.c:1671 ../src/file.c:1689
+#: ../src/file.c:1839 ../src/file.c:1857
 msgid "no local filename available"
 msgstr "No se encuentra disponible el nombre de fichero local"
 
-#: ../src/file.c:1679
+#: ../src/file.c:1847
 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"
+msgstr "No se encuentra el fichero local, se usará el fichero del iPod en su lugar"
 
-#: ../src/file.c:1685
+#: ../src/file.c:1853
 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:1788
-#, fuzzy
+#: ../src/file.c:1956
 msgid "update failed (format not supported?)"
 msgstr "Error al actualizar (¿formato no soportado?)"
 
-#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#: ../src/file.c:2041 ../src/misc_playlist.c:936
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Procesando '%s'..."
 
-#: ../src/file.c:1879
-#, fuzzy, c-format
+#: ../src/file.c:2047
+#, c-format
 msgid "Skipping '%s' because it matches exclude masks.\n"
-msgstr "Ignorando '%s' porque es un directorio.\n"
+msgstr "Ignorando '%s' porque coincide con las máscaras de exclusión.\n"
 
-#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
+#: ../src/file.c:2167 ../src/misc_track.c:1793 ../src/misc_track.c:1898
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
@@ -3377,7 +3127,7 @@
 "Podcast ya almacenado: '%s'\n"
 "\n"
 
-#: ../src/file.c:2064
+#: ../src/file.c:2232
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
@@ -3386,35 +3136,35 @@
 "Escribir a ficheros de video no está todavía soportado (%s). \n"
 "\n"
 
-#: ../src/file.c:2116 ../src/file.c:2130
+#: ../src/file.c:2284 ../src/file.c:2298
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
-msgstr "No se pueden modificar las etiquetas del fichero: %s\n"
+msgstr "No se han podido modificar los atributos del fichero: %s\n"
 
-#: ../src/file.c:2232
+#: ../src/file.c:2400
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
-msgstr "No se puede abrir '%s' para lectura escritura.\n"
+msgstr "No se han podido abrir '%s' para lectura escritura.\n"
 
-#: ../src/file.c:2239
+#: ../src/file.c:2407
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "No se pudo bloquear '%s'.\n"
 
 #. error!
-#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
+#: ../src/file.c:2424 ../src/file.c:2433 ../src/file.c:2444 ../src/file.c:2454
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Linea incorrecta en '%s':%s\n"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:2315
+#: ../src/file.c:2483
 msgid "Remove offline playcounts?"
 msgstr "¿Borrar cuenta reproducciones no en linea?"
 
 #. title
-#: ../src/file.c:2316
+#: ../src/file.c:2484
 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."
@@ -3423,12 +3173,12 @@
 "la base de datos de iTunes. Pulsa «Aceptar» para borrarlas del contador de "
 "modo desconectado, o «Cancelar» para mantenerlas."
 
-#: ../src/file.c:2333
+#: ../src/file.c:2501
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Error al escribir a '%s'.\n"
 
-#: ../src/file.c:2390 ../src/tools.c:270
+#: ../src/file.c:2558 ../src/tools.c:270
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
@@ -3437,7 +3187,7 @@
 "Error al normalizar: tipo de fichero no soportado (%s)\n"
 "\n"
 
-#: ../src/file.c:2406 ../src/tools.c:287
+#: ../src/file.c:2574 ../src/tools.c:287
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -3446,42 +3196,68 @@
 "Error al normalizar: fichero no disponible (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:316
+#: ../src/file.c:2631
+#, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr ""
+"Letra no encontrada, fichero no disponible (%s).\n"
+"\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save "
+"lyrics to: %s.\n"
+"\n"
+msgstr ""
+"El fichero iPod no está disponible y la opción guardar ID3 está desactivada, no se pueden guardar las letras en: %s.\n"
+"\n"
+
+#: ../src/file.c:2712
+#, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr "Letra no escrita, nombre de fichero no disponible (%s).\n"
+
+#: ../src/file_convert.c:328
 msgid "Summary status of conversion processes"
 msgstr "Resumen del estado de los procesos de conversión"
 
-#: ../src/file_convert.c:564
+#: ../src/file_convert.c:576
 msgid "active"
 msgstr "activo"
 
-#: ../src/file_convert.c:569
+#: ../src/file_convert.c:581
 msgid "inactive"
 msgstr "inactivo"
 
-#: ../src/file_convert.c:580
+#: ../src/file_convert.c:592
 #, c-format
 msgid "Active threads: %d. Scheduled tracks: %d."
 msgstr "Hilos activos: %d. Pistas planificadas: %d."
 
-#: ../src/file_convert.c:1071
+#: ../src/file_convert.c:1090
 #, c-format
 msgid "Original filename not available for '%s.'\n"
 msgstr "Nombre de fichero original no disponible para '%s'.\n"
 
-#: ../src/file_convert.c:1086
+#: ../src/file_convert.c:1105
 #, 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:1137
+#: ../src/file_convert.c:1156
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
-#: ../src/file_convert.c:1143
+#: ../src/file_convert.c:1162
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/file_convert.c:1198
+#: ../src/file_convert.c:1217
 #, c-format
 msgid ""
 "Files of type '%s' are not supported by the iPod. Please go to the "
@@ -3491,17 +3267,16 @@
 "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:1284
+#: ../src/file_convert.c:1303
 msgid "No information available"
 msgstr "Información no disponible"
 
-#: ../src/file_convert.c:1323
+#: ../src/file_convert.c:1342
 #, 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"
+msgstr "No se ha podido crear '%s'. La conversión de tipo de fichero no funcionará.\n"
 
-#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#: ../src/file_convert.c:1667 ../src/file_convert.c:3119
 #, c-format
 msgid ""
 "Transfer of '%s' failed. %s\n"
@@ -3510,7 +3285,7 @@
 "Ha fallado la transferencia de '%s'. %s\n"
 "\n"
 
-#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#: ../src/file_convert.c:2073 ../src/file_convert.c:2352
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s'.\n"
@@ -3519,7 +3294,7 @@
 "Ha fallado la conversión de '%s': '%s'\n"
 "\n"
 
-#: ../src/file_convert.c:2062
+#: ../src/file_convert.c:2088
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
@@ -3529,19 +3304,18 @@
 "d.\n"
 "\n"
 
-#: ../src/file_convert.c:2091
-#, fuzzy, c-format
+#: ../src/file_convert.c:2117
+#, c-format
 msgid ""
 "Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
 "expected.\n"
 "\n"
 msgstr ""
-"Ha fallado la conversión de '%s': '%s %s' no ha devuelto la extensión de "
-"fichero como era esperado.\n"
+"Ha fallado la conversión de '%s': '\"%s\"%s' no ha devuelto la extensión de fichero como se esperaba.\n"
 "\n"
 
-#: ../src/file_convert.c:2167
-#, fuzzy, c-format
+#: ../src/file_convert.c:2193
+#, c-format
 msgid ""
 "Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
 "\n"
@@ -3550,7 +3324,7 @@
 "original '%s' (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:2222
+#: ../src/file_convert.c:2248
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not create directory '%s'.\n"
@@ -3559,7 +3333,7 @@
 "Ha fallado la extensión de '%s': No se ha podido crear el directorio '%s'.\n"
 "\n"
 
-#: ../src/file_convert.c:2356
+#: ../src/file_convert.c:2383
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s' returned exit status %d.\n"
@@ -3568,7 +3342,7 @@
 "Ha fallado la conversión de '%s': %s ha devuelto el estado de salida %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2395
+#: ../src/file_convert.c:2422
 #, c-format
 msgid ""
 "Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -3638,8 +3412,7 @@
 
 #: ../src/file_export.c:579
 msgid "Export from iPod database not possible in offline mode."
-msgstr ""
-"Exportar de la base de datos iPod no es posible en el modo desconectado."
+msgstr "Exportar de la base de datos iPod no es posible en el modo desconectado."
 
 #: ../src/file_export.c:587
 msgid "Select Export Destination Directory"
@@ -3647,8 +3420,7 @@
 
 #: ../src/file_export.c:736
 msgid "Drag from iPod database not possible in offline mode."
-msgstr ""
-"Arrastrar de la base de datos iPod no es posible en el modo desconectado."
+msgstr "Arrastrar de la base de datos iPod no es posible en el modo desconectado."
 
 #: ../src/file_export.c:770
 msgid "The following tracks have to be copied to your harddisk"
@@ -3686,30 +3458,29 @@
 "Could not open '%s' for writing (%s).\n"
 "\n"
 msgstr ""
-"No se puede abrir '%s' para escritura (%s).\n"
+"No se ha podido abrir '%s' para escritura (%s).\n"
 "\n"
 
-#: ../src/file_itunesdb.c:129
+#: ../src/file_itunesdb.c:133
 #, 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"
+msgstr "Buscando concordancias de la suma de comprobación SHA1 para el fichero %d/%d"
 
-#: ../src/file_itunesdb.c:236
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:249
+#, 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"
+msgstr "No se ha podido abrir \"%s\" para leer la información extendida.\n"
 
-#: ../src/file_itunesdb.c:243
+#: ../src/file_itunesdb.c:256
 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"
+msgstr "No se ha podido crear valor de resumen (hash) de la base de datos iTunes\n"
 
-#: ../src/file_itunesdb.c:259
+#: ../src/file_itunesdb.c:272
 #, c-format
 msgid "Error while reading extended info: %s\n"
 msgstr "Error al leer la información extendida: %s\n"
 
-#: ../src/file_itunesdb.c:276
+#: ../src/file_itunesdb.c:289
 #, c-format
 msgid ""
 "iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -3723,7 +3494,7 @@
 "Esto puede durar bastante tiempo.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:288
+#: ../src/file_itunesdb.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -3732,7 +3503,7 @@
 "%s:\n"
 "Esperado \"itunesdb_hash=\" , pero encontrado:\"%s\"\n"
 
-#: ../src/file_itunesdb.c:348
+#: ../src/file_itunesdb.c:363
 #, c-format
 msgid ""
 "%s:\n"
@@ -3741,7 +3512,7 @@
 "%s:\n"
 "Error de formato: %s\n"
 
-#: ../src/file_itunesdb.c:393
+#: ../src/file_itunesdb.c:408
 msgid ""
 "No SHA1 checksums on individual tracks are available.\n"
 "\n"
@@ -3758,7 +3529,7 @@
 "programas que no sean gtkpod.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:457
+#: ../src/file_itunesdb.c:474
 msgid ""
 "Extended info will not be used. If you have non-transferred tracks,\n"
 "these will be lost.\n"
@@ -3766,15 +3537,15 @@
 "La información extendida no será usada. Las pistas no transferidas serán "
 "perdidas.\n"
 
-#: ../src/file_itunesdb.c:465
+#: ../src/file_itunesdb.c:482
 msgid "Offline iPod database successfully imported"
 msgstr "Base de datos del iPod en modo desconectado importada con éxito."
 
-#: ../src/file_itunesdb.c:468
+#: ../src/file_itunesdb.c:485
 msgid "Local database successfully imported"
 msgstr "Base de datos local importada con éxito."
 
-#: ../src/file_itunesdb.c:476
+#: ../src/file_itunesdb.c:493
 #, c-format
 msgid ""
 "Offline iPod database import failed: '%s'\n"
@@ -3784,7 +3555,7 @@
 "s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:480
+#: ../src/file_itunesdb.c:497
 #, c-format
 msgid ""
 "Local database import failed: '%s'\n"
@@ -3793,7 +3564,7 @@
 "Error en la importación de la base de datos local: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:487
+#: ../src/file_itunesdb.c:504
 msgid ""
 "Offline iPod database import failed: \n"
 "\n"
@@ -3801,7 +3572,7 @@
 "Error en la importación de la base de datos del iPod en modo desconectado:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:490
+#: ../src/file_itunesdb.c:507
 msgid ""
 "Local database import failed: \n"
 "\n"
@@ -3809,7 +3580,7 @@
 "Error en la importación de la base de datos local:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:497
+#: ../src/file_itunesdb.c:514
 #, c-format
 msgid ""
 "'%s' does not exist. Import aborted.\n"
@@ -3818,15 +3589,15 @@
 "'%s' no existe. Importación cancelada.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:520
+#: ../src/file_itunesdb.c:536
 msgid "Extended info will not be used.\n"
 msgstr "La información extendida no será usada.\n"
 
-#: ../src/file_itunesdb.c:527
+#: ../src/file_itunesdb.c:543
 msgid "iPod Database Successfully Imported"
 msgstr "Base de datos del iPod importada con éxito"
 
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:550
 #, c-format
 msgid ""
 "iPod Database Import Failed: '%s'\n"
@@ -3835,7 +3606,7 @@
 "Error en la importación de la base de datos del iPod:'%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:540
+#: ../src/file_itunesdb.c:556
 msgid ""
 "iPod Database Import Failed.\n"
 "\n"
@@ -3843,7 +3614,7 @@
 "Error en la importación de la base de datos del iPod.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:549
+#: ../src/file_itunesdb.c:565
 #, c-format
 msgid ""
 "'%s' (or similar) does not exist. Import aborted.\n"
@@ -3852,45 +3623,54 @@
 "'%s' (o similar) no existe. Importación cancelada.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:865
+#: ../src/file_itunesdb.c:886
 #, 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"
+"If you are sure that the iPod is properly mounted at '%s', it may not be "
+"initialized for use. In this case, gtkpod can initialize it for you.\n"
+"\n"
+"Do you want to create the directory structure now?"
 msgstr ""
-"No se ha encontrado la estructura del iPod en '%s'.\n"
-"Si estás seguro que el iPod está montado correctamente en '%s', gtkpod puede "
-"crear la esctructura de directorios para ti.\n"
+"No se ha encontrado la estructura de directorios del iPod en '%s'.\n"
 "\n"
-"¿Quieres crear la estructura de directorios ahora?\n"
+"Si estás seguro que el iPod está montado correctamente en '%s', este puede no haber sido inicializado para su uso. En este caso,  gtkpod puede inicializarlo.\n"
+"\n"
+"¿Quieres crear la estructura de directorios ahora?"
 
-#: ../src/file_itunesdb.c:1180
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr "No ha sido encontrada la estructura de directorios del iPod"
+
+#: ../src/file_itunesdb.c:892
+msgid "Create directory structure"
+msgstr "Crear estructura de directorios"
+
+#: ../src/file_itunesdb.c:1198
 #, 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:1195
+#: ../src/file_itunesdb.c:1213
 msgid "Aborted writing of extended info.\n"
 msgstr "Cancelada la escritura de la información extendida.\n"
 
-#: ../src/file_itunesdb.c:1397
+#: ../src/file_itunesdb.c:1415
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/file_itunesdb.c:1411
+#: ../src/file_itunesdb.c:1429
 #, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
 msgstr "%d%% (%d/%d  %d:%02d:%02d restantes)"
 
-#: ../src/file_itunesdb.c:1463
+#: ../src/file_itunesdb.c:1481
 msgid "Status: Deleting File"
 msgstr "Estado: borrando fichero"
 
-#: ../src/file_itunesdb.c:1524
+#: ../src/file_itunesdb.c:1542
 #, c-format
 msgid ""
 "Could not remove the following file: '%s'\n"
@@ -3899,7 +3679,7 @@
 "No se ha podido borrar el siguiente fichero: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1632
+#: ../src/file_itunesdb.c:1651
 msgid ""
 "The following track could not be converted successfully:\n"
 "\n"
@@ -3913,7 +3693,7 @@
 "Las siguientes pistas no han podido ser convertidas:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1642
+#: ../src/file_itunesdb.c:1661
 msgid ""
 "The following track could not be transferred successfully:\n"
 "\n"
@@ -3931,12 +3711,13 @@
 #. modal,
 #. gint id,
 #. gboolean modal,
-#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1670 ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
 msgid "Warning"
 msgstr "Atención"
 
 #. title
-#: ../src/file_itunesdb.c:1652
+#: ../src/file_itunesdb.c:1671
 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 "
@@ -3946,22 +3727,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:1715
+#: ../src/file_itunesdb.c:1734
 #, c-format
 msgid "Status: Copying track"
 msgstr "Estado: copiando pista"
 
-#: ../src/file_itunesdb.c:1721
+#: ../src/file_itunesdb.c:1740
 #, c-format
 msgid "Status: Waiting for conversion to complete"
 msgstr "Estado: esperando a que finalice al conversión"
 
-#: ../src/file_itunesdb.c:1725
+#: ../src/file_itunesdb.c:1744
 #, c-format
 msgid "Status: Finished transfer"
 msgstr "Estado: transferencia finalizada"
 
-#: ../src/file_itunesdb.c:1770
+#: ../src/file_itunesdb.c:1789
 #, c-format
 msgid ""
 "One track could not be transferred because your iPod is full. Either delete "
@@ -3978,24 +3759,32 @@
 "%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:1852
+#: ../src/file_itunesdb.c:1871
 #, 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"
+"If you skip storing, you can import the existing database before calling "
+"this function again.\n"
 msgstr ""
-"La base de datos iTunes ('%s') no ha sido importada. Esto no es correcto y "
-"puede ocasionar la pérdida de la base de datos actual.\n"
+"La base de datos iTunes ('%s') no ha sido importada. Esto no es correcto y ocasionará la pérdida de la base de datos actual.\n"
 "\n"
-"Pulsar «Aceptar» para continuar o «Cancelar» para detener la copia. Si se "
-"cancela, se podrá importar la base de datos iTunes antes de usar de nuevo "
-"esta función.\n"
+"Si se cancela, se podrá importar la base de datos iTunes antes de usar de nuevo esta función.\n"
 
-#: ../src/file_itunesdb.c:1887
+#: ../src/file_itunesdb.c:1875 ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr "Base de datos existente de iTunes no importada"
+
+#: ../src/file_itunesdb.c:1877 ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr "Proceder de todas maneras"
+
+#: ../src/file_itunesdb.c:1878
+msgid "Skip storing"
+msgstr "Saltar almacenamiento"
+
+#: ../src/file_itunesdb.c:1909
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -4003,89 +3792,70 @@
 "La estructura de directorios del iPod debe estar creada antes de que se "
 "pueda sincronizar con el iPod.\n"
 
-#: ../src/file_itunesdb.c:1896
+#: ../src/file_itunesdb.c:1918
 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:1914
-#, fuzzy, c-format
+#: ../src/file_itunesdb.c:1936
+#, c-format
 msgid "Now writing database '%s'. Please wait..."
-msgstr "Escribiendo la base de datos. Espere, por favor."
+msgstr "Escribiendo la base de datos '%s'. Espere, por favor."
 
-#: ../src/file_itunesdb.c:1963
+#: ../src/file_itunesdb.c:1985
 #, 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:2070
+#: ../src/file_itunesdb.c:2092
 #, c-format
 msgid "%s: Database saved"
 msgstr "Guardada la base de datos: %s"
 
-#: ../src/file_itunesdb.c:2074
+#: ../src/file_itunesdb.c:2096
 #, c-format
 msgid "%s: Changes saved"
 msgstr "%s: Cambios guardados"
 
-#: ../src/fileselection.c:129
+#: ../src/fileselection.c:142 ../src/fileselection.c:583
 msgid "Successfully added files"
 msgstr "Ficheros añadidos con éxito."
 
-#: ../src/fileselection.c:131
+#: ../src/fileselection.c:144 ../src/fileselection.c:585
 msgid "Some files were not added successfully"
 msgstr "Algunos ficheros no han sido añadidos con exito"
 
-#: ../src/fileselection.c:164 ../src/fileselection.c:305
-#: ../src/fileselection.c:792
+#: ../src/fileselection.c:176 ../src/fileselection.c:276
+#: ../src/fileselection.c:601
 msgid "Please select a playlist or repository before adding tracks."
-msgstr ""
+msgstr "Por favor, seleccionar una lista de reproducción o un repositorio antes de añadir pistas."
 
-#: ../src/fileselection.c:175 ../src/fileselection.c:314
-#: ../src/fileselection.c:803
+#: ../src/fileselection.c:187 ../src/fileselection.c:285
 msgid "Please load the iPod before adding tracks."
-msgstr ""
+msgstr "Por favor, cargar el iPod antes de añadir pistas."
 
-#: ../src/fileselection.c:185
-#, fuzzy, c-format
+#: ../src/fileselection.c:197
+#, c-format
 msgid "Add files to '%s'"
-msgstr "Añadir ficheros"
+msgstr "Añadir ficheros a '%s'"
 
-#: ../src/fileselection.c:189
+#: ../src/fileselection.c:201
 #, c-format
 msgid "Add files to '%s/%s'"
-msgstr ""
+msgstr "Añadir ficheros a '%s/%s'"
 
 #. Create window title
-#: ../src/fileselection.c:322
-#, fuzzy, c-format
+#: ../src/fileselection.c:293
+#, c-format
 msgid "Add playlist files to '%s'"
-msgstr "Añadir lista de reproducción desde fichero"
+msgstr "Añadir ficheros de lista de reproducción a '%s'"
 
 #. Create the file chooser, and handle the response
-#: ../src/fileselection.c:378
+#: ../src/fileselection.c:319
 msgid "Set Cover"
 msgstr "Configurar portada"
 
-#: ../src/fileselection.c:816
-#, fuzzy, c-format
-msgid "Add directories to '%s'"
-msgstr "Añadir directorios recursivamente"
-
-#: ../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:1106
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: ../src/flacfile.c:62
 #, c-format
 msgid "'%s' does not appear to be an FLAC audio file.\n"
@@ -4094,9 +3864,9 @@
 #: ../src/flacfile.c:78
 #, c-format
 msgid "Error retrieving tags for '%s'.\n"
-msgstr "Error al recuperar las etiquetas de '%s'.\n"
+msgstr "Error al recuperar los atributos de '%s'.\n"
 
-#: ../src/flacfile.c:165
+#: ../src/flacfile.c:193
 #, c-format
 msgid ""
 "Import of '%s' failed: FLAC not supported without the FLAC library. You must "
@@ -4105,7 +3875,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:171
+#: ../src/flacfile.c:199
 #, c-format
 msgid ""
 "FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
@@ -4174,94 +3944,8 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no permite un argumento\n"
 
-#: ../src/info.c:383
-msgid "n/c"
-msgstr "n/c"
-
-#: ../src/info.c:388 ../src/info.c:838
-msgid "offline"
-msgstr "modo desconectado"
-
-#: ../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 "B"
-
-#: ../src/info.c:780
-msgid "kB"
-msgstr "KiB"
-
-#: ../src/info.c:780
-msgid "TB"
-msgstr "TiB"
-
-#: ../src/info.c:823
-#, c-format
-msgid " %s Free"
-msgstr " %s Libre"
-
-#: ../src/info.c:828
-#, c-format
-msgid " %s Pending"
-msgstr " %s Pendiente"
-
-#: ../src/info.c:833
-msgid " disconnected"
-msgstr " desconectado"
-
-#: ../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:889
-msgid "No tracks selected"
-msgstr "No se ha seleccionado ninguna pista"
-
-#: ../src/info.c:894
-msgid "No playlist selected"
-msgstr "No se ha seleccionado ninguna lista de reproducción"
-
-#: ../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."
-
-#. Strings used several times
-#: ../src/ipod_init.c:48
-msgid "Select or enter your model"
-msgstr "Seleccione o introduzca su modelo"
-
-#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
-msgid "Select mountpoint"
-msgstr "Seleccionar el punto de montaje del iPod"
-
-#: ../src/ipod_init.c:359
-#, c-format
-msgid "Error initialising iPod: %s\n"
-msgstr "Error al iniciar el iPod: %s\n"
-
-#: ../src/ipod_init.c:366
-msgid "Error initialising iPod, unknown error\n"
-msgstr "Error al iniciar el iPod, error desconocido\n"
-
-#: ../src/ipod_init.c:422
-#, c-format
-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/ipod_init.c:463
+#: ../src/help.c:48
 msgid ""
-"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:70
-#, fuzzy
-msgid ""
 "© 2002 - 2007\n"
 "Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
 "Corey Donohoe (atmos at atmos dot org)\n"
@@ -4269,173 +3953,131 @@
 "(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:74
-#, fuzzy
+#: ../src/help.c:52
 msgid ""
 "Patches were supplied by the following people (list may be incomplete -- "
 "please contact me)\n"
 msgstr ""
 "Los parches fueron proveídos por: (la lista puede estar incompleta-- por "
 "favor, contactar conmigo)\n"
-"\n"
 
-#: ../src/misc.c:75
-#, fuzzy
+#: ../src/help.c:53
 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"
+msgstr "Ramesh Dharan: Multi-Edición (editar atributos de varias pistas a la vez)"
 
-#: ../src/misc.c:76
-#, fuzzy
+#: ../src/help.c:54
 msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
 msgstr ""
 "Hiroshi Kawashima: Función de autodetección del juego de caracteres "
-"japonés.\n"
+"japonés."
 
-#: ../src/misc.c:77
-#, fuzzy
+#: ../src/help.c:55
 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"
+msgstr "Adrian Ulrich: paso del código de las listas de reproducción de mktunes.pl a itunesdb.c"
 
-#: ../src/misc.c:78
-#, fuzzy
+#: ../src/help.c:56
 msgid ""
 "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
 "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"
+"escape\" y/o \"retorno de carro/nueva linea\" al final"
 
-#: ../src/misc.c:79
-#, fuzzy
+#: ../src/help.c:57
 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"
+"desde el iPod"
 
-#: ../src/misc.c:80
-#, fuzzy
+#: ../src/help.c:58
 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"
+msgstr "Chris Cutler: creación automática de varios tipos de listas de reproducción"
 
-#: ../src/misc.c:81
-#, fuzzy
+#: ../src/help.c:59
 msgid ""
 "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
 "dialogue during sync"
 msgstr ""
-"Graeme Wilford: lectura y escritura del compositor de etiquetas  ID3, "
-"diálogo de progreso durante la sincronización\n"
+"Graeme Wilford: lectura y escritura del compositor de atributos ID3, "
+"diálogo de progreso durante la sincronización"
 
-#: ../src/misc.c:82
-#, fuzzy
+#: ../src/help.c:60
 msgid ""
 "Edward Matteucci: debugging, special playlist creation, most of the volume "
 "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"
+"mayor parte del código de normalización del volumen"
 
-#: ../src/misc.c:83
-#, fuzzy
+#: ../src/help.c:61
 msgid "Jens Lautenbach: some optical improvements"
-msgstr "Jens Lautenbach: algunas mejoras visuales\n"
+msgstr "Jens Lautenbach: algunas mejoras visuales"
 
-#: ../src/misc.c:84
-#, fuzzy
+#: ../src/help.c:62
 msgid "Alex Tribble: iPod eject patch"
-msgstr "Alex Tribble: parche de expulsion del iPod mediante \"eject\"\n"
+msgstr "Alex Tribble: parche de expulsion del iPod"
 
-#: ../src/misc.c:85
-#, fuzzy
+#: ../src/help.c:63
 msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
-msgstr "Yaroslav Halchenko: manejo de pistas en estado huérfano y pendiente\n"
+msgstr "Yaroslav Halchenko: manejo de pistas en estado huérfano y pendiente"
 
-#: ../src/misc.c:86
-#, fuzzy
-msgid ""
-"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/help.c:64
+msgid "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"
 
-#: ../src/misc.c:87
-#, fuzzy
+#: ../src/help.c:65
 msgid ""
 "Ero Carrera: Filename validation and quick sync when copying tracks from the "
 "iPod"
-msgstr ""
-"Ero Carrera: Validación de los nombres de fichero y sincronización rápida al "
-"copiar pistas desde el iPod\n"
+msgstr "Ero Carrera: Validación de los nombres de fichero y sincronización rápida al copiar pistas desde el iPod"
 
-#: ../src/misc.c:88
-#, fuzzy
+#: ../src/help.c:66
 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"
+msgstr "Jens Taprogge: Soporte del atributo de reproducción de ganancia de LAME para normalizar el volumen"
 
-#: ../src/misc.c:89
-#, fuzzy
+#: ../src/help.c:67
 msgid "Armando Atienza: Support with external playcounts"
-msgstr "Armando Atienza: Soporte para contadores externos\n"
+msgstr "Armando Atienza: Soporte para contadores externos"
 
-#: ../src/misc.c:90
-#, fuzzy
+#: ../src/help.c:68
 msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
-msgstr "D.L. Sharp: Soporte para ficheros m4b (audio libros AAC )\n"
+msgstr "D.L. Sharp: Soporte para ficheros m4b (ficheros AAC)"
 
-#: ../src/misc.c:91
-#, fuzzy
+#: ../src/help.c:69
 msgid "Jim Hall: Decent INSTALL file"
-msgstr "Jim Hall: Fichero INSTALL decente\n"
+msgstr "Jim Hall: Fichero INSTALL decente"
 
-#: ../src/misc.c:92
-#, fuzzy
+#: ../src/help.c:70
 msgid ""
 "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
 "contacts to the iPod"
-msgstr ""
-"Juergen Helmers, Markus Gaugusch: guiones de conversión para sincronizar "
-"calendario/contactos al iPod\n"
+msgstr "Juergen Helmers, Markus Gaugusch: guiones de conversión para sincronizar calendario/contactos al iPod"
 
 #. J"urgen!
-#: ../src/misc.c:93
-#, fuzzy
+#: ../src/help.c:71
 msgid "Flavio Stanchina: bugfixes"
-msgstr "Flavio Stanchina: corrección de errores\n"
+msgstr "Flavio Stanchina: corrección de errores"
 
-#: ../src/misc.c:94
-#, fuzzy
+#: ../src/help.c:72
 msgid ""
 "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
 "the title"
-msgstr ""
-"Chris Micacchi: Ignorar artículos al principio de los títulos al ordenar\n"
+msgstr "Chris Micacchi: Ignorar artículos al principio de los títulos al ordenar"
 
-#: ../src/misc.c:95
-#, fuzzy
+#: ../src/help.c:73
 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"
+msgstr "Steve Jay: uso de statvfs() en vez de df (mejor portabilidad, más rápido)"
 
-#: ../src/misc.c:97
-#, fuzzy
+#: ../src/help.c:75
 msgid ""
 "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
 "tags"
 msgstr ""
 "Christoph Kunz: resolución de los problemas de compatibilidad en la "
-"escritura de la etiquetas de tipo mp3 id3v2.4\n"
+"escritura de atributos de tipo mp3 id3v2.4"
 
-#: ../src/misc.c:99
-#, fuzzy
+#: ../src/help.c:77
 msgid ""
 "James Liggett:\n"
 "replacement of old GTK file selection dialogs with new GTK filechooser "
@@ -4443,166 +4085,136 @@
 "refactored user preferences system."
 msgstr ""
 "James Liggett:\n"
-"      reemplazo de los antiguos diálogos GTK de selección de ficheros por "
+"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"
+"rehecho el sistema de preferencias del usuario."
 
-#: ../src/misc.c:103
-#, fuzzy
+#: ../src/help.c:81
 msgid "Daniel Kercher: sync scripts for abook and webcalendar"
-msgstr "Daniel Kercher: guiones de sincronización para abook y webcalendar\n"
+msgstr "Daniel Kercher: guiones de sincronización para abook y webcalendar"
 
-#: ../src/misc.c:105
-#, fuzzy
+#: ../src/help.c:83
 msgid "Clinton Gormley: sync scripts for thunderbird"
-msgstr "Clinton Gormley: guión de sincronización para thunderbird\n"
+msgstr "Clinton Gormley: guión de sincronización para thunderbird"
 
-#: ../src/misc.c:107
-#, fuzzy
+#: ../src/help.c:85
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
-msgstr ""
-"Sebastien Beridot: guión de sincronización para formato de contactos ldif\n"
+msgstr "Sebastien Beridot: guión de sincronización para formato de contactos ldif"
 
-#: ../src/misc.c:109
-#, fuzzy
+#: ../src/help.c:87
 msgid "Sebastian Scherer: sync script for kNotes"
-msgstr "Sebastian Scherer: guión de sincronización para kNotes\n"
+msgstr "Sebastian Scherer: guión de sincronización para kNotes"
 
-#: ../src/misc.c:111
-#, fuzzy
+#: ../src/help.c:89
 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"
+msgstr "Nick Piper: guión de sincronización para Palm, búsqueda type-ahead"
 
-#: ../src/misc.c:113
-#, fuzzy
+#: ../src/help.c:91
 msgid "Uwe Hermann: help with support for iPod Video"
-msgstr "Uwe Hermann: ayuda con el soporte para el iPod Video\n"
+msgstr "Uwe Hermann: ayuda con el soporte para el iPod Video"
 
-#: ../src/misc.c:115
-#, fuzzy
+#: ../src/help.c:93
 msgid ""
 "Iain Benson: support for compilation tag in mp3 files and separate display "
 "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"
+msgstr "Iain Benson: soporte para compilar atributos en ficheros mp3 y visualización separada de las compilaciones en las pestañas."
 
-#: ../src/misc.c:116
-#, fuzzy
+#: ../src/help.c:94
 msgid ""
 "Nicolas Chariot: icons of buttons\n"
 "\n"
 msgstr ""
 "Nicolas Chariot: botones de los iconos\n"
 "\n"
-"\n"
 
-#: ../src/misc.c:118
-#, fuzzy
+#: ../src/help.c:96
 msgid "This program borrows code from the following projects:"
-msgstr "Este programa usa código de los siguientes proyectos:\n"
+msgstr "Este programa usa código de los siguientes proyectos:"
 
-#: ../src/misc.c:119
-#, fuzzy
+#: ../src/help.c:97
 msgid ""
 "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"
+"gnutools: (mktunes.pl, portado a C) lectura y escritura de la base de "
+"datos iTunes (http://www.gnu.org/software/gnupod/)"
 
-#: ../src/misc.c:120
-#, fuzzy
+#: ../src/help.c:98
 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 de Samuel Wood (sam punto wood en gmail punto com): "
+"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"
+"sus clases C++."
 
-#: ../src/misc.c:121
-#, fuzzy
+#: ../src/help.c:99
 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"
+"mp3info:  detección de la duración de los mp3 (http://ibiblio.org/"
+"mp3info/)"
 
-#: ../src/misc.c:122
-#, fuzzy
+#: ../src/help.c:100
 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"
+"xmms:exploración de directorios, detección de la duración de los "
+"mp3 (http://www.xmms.org)"
 
-#: ../src/misc.c:124
-#, fuzzy
+#: ../src/help.c:102
 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"
+"gnome.org/)."
 
-#: ../src/misc.c:128
-#, fuzzy
+#: ../src/help.c:106
 msgid "French: David Le Brun (david at dyn-ns dot net)"
-msgstr "Francés:   David Le Brun (david en dyn-ns punto net)\n"
+msgstr "Francés: David Le Brun (david en dyn-ns punto net)"
 
-#: ../src/misc.c:129
+#: ../src/help.c:107
 msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
-msgstr ""
+msgstr "Francés: Éric Lassauge (rpmfarm at free dot fr)"
 
-#: ../src/misc.c:130
-#, fuzzy
+#: ../src/help.c:108
 msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
-msgstr "Alemán:   Jorg Schuler (jcsjcs en users punto sourceforge punto net)\n"
+msgstr "Alemán: Jorg Schuler (jcsjcs en users punto sourceforge punto net)"
 
-#: ../src/misc.c:131
+#: ../src/help.c:109
 msgid "German: Kai-Ove"
-msgstr ""
+msgstr "Alemán: Kai-Ove"
 
-#: ../src/misc.c:132
-#, fuzzy
+#: ../src/help.c:110
 msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
-msgstr "Hebreo: Assaf Gillat (gillata en gmail punto com)\n"
+msgstr "Hebreo: Assaf Gillat (gillata en gmail punto com)"
 
-#: ../src/misc.c:133
-#, fuzzy
-msgid ""
-"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/help.c:111
+msgid "Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
+msgstr "Italiano: Edward Matteucci (edward_matteucc en users punto sourceforge punto net)"
 
-#: ../src/misc.c:134
+#: ../src/help.c:112
 msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
-msgstr ""
+msgstr "Italiano: Daniele Forsi (dforsi at gmail dot com)"
 
-#: ../src/misc.c:135
-#, fuzzy
+#: ../src/help.c:113
 msgid "Japanese: Ayako Sano"
-msgstr "Japonés: Ayako Sano\n"
+msgstr "Japonés: Ayako Sano"
 
-#: ../src/misc.c:136
-#, fuzzy
+#: ../src/help.c:114
 msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
-msgstr ""
-"Japonés: Kentaro Fukuchi (fukuchi en users punto sourceforge punto net)\n"
+msgstr "Japonés: Kentaro Fukuchi (fukuchi en users punto sourceforge punto net)"
 
-#: ../src/misc.c:137
+#: ../src/help.c:115
 msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
-msgstr ""
+msgstr "Rumano: Alex Eftimie (alexeftimie at gmail dot com)"
 
-#: ../src/misc.c:138
+#: ../src/help.c:116
 msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
-msgstr ""
+msgstr "Español: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
 
-#: ../src/misc.c:139
-#, fuzzy
+#: ../src/help.c:117
 msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
-msgstr "Sueco: Stefan Asserhall (stefan asserhall en comhem punto se)\n"
+msgstr "Sueco: Stefan Asserhall (stefan asserhall en comhem punto se)"
 
-#: ../src/misc.c:144
-#, fuzzy
+#: ../src/help.c:122
 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"
@@ -4619,24 +4231,21 @@
 "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"
+"Este programa es software libre. Puede redistribuirlo y/o modificarlo\n bajo los términos de la Licencia Pública General de GNU según es\n publicada por la Free Software Foundation, bien de la versión 2\n"
+"de dicha Licencia o bien (según su elección) de cualquier\n"
+"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"
+"Este programa se distribuye con la esperanza de que sea útil, pero\n"
+"SIN NINGUNA GARANTÍA, incluso sin la garantía MERCANTIL\n"
+"implícita o sin garantizar la CONVENIENCIA PARA UN\n"
+"PROPÓSITO PARTICULAR. Véase la Licencia Pública General\n"
+"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"
+"Debería haber recibido una copia de la Licencia Pública General\n"
+"junto con este programa. Si no ha sido así, escriba a la Free Software\n Foundation, Inc., 59 Temple Place, Suite 330, Boston,MA\n"
+"02111-1307, USA."
 
-#: ../src/misc.c:159
-#, fuzzy
+#: ../src/help.c:137
 msgid ""
 "© 2002-2007\n"
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
@@ -4644,37 +4253,192 @@
 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"
+"Corey Donohoe (atmos en atmos punto org)"
 
-#: ../src/misc.c:167
-#, fuzzy
+#: ../src/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr "(usando libgpod %s)"
+
+#: ../src/help.c:143 ../src/help.c:148
 msgid "Cross-platform multilingual interface to Apple's iPod™"
+msgstr "Interfaz multi-plataforma y multi-idioma para iPod™ Apple."
+
+#: ../src/info.c:359 ../src/infodlg.c:190
+msgid "n/c"
+msgstr "n/c"
+
+#: ../src/info.c:364 ../src/info.c:852 ../src/infodlg.c:193
+msgid "offline"
+msgstr "modo desconectado"
+
+#: ../src/info.c:500
+#, c-format
+msgid " P:%d T:%d/%d"
+msgstr " P:%d T:%d/%d"
+
+#: ../src/info.c:794
+msgid "B"
+msgstr "B"
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr "KiB"
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr "TiB"
+
+#: ../src/info.c:837
+#, c-format
+msgid " %s Free"
+msgstr " %s Libre"
+
+#: ../src/info.c:842
+#, c-format
+msgid " %s Pending"
+msgstr " %s Pendiente"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr " desconectado"
+
+#: ../src/info.c:898
+msgid "No database or playlist selected"
+msgstr "No se ha seleccionado ninguna base de datos o lista de reproducción"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "No se ha seleccionado ninguna pista"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "No se ha seleccionado ninguna lista de reproducción"
+
+#: ../src/info.c:913
+msgid "No iPod or iPod playlist selected"
+msgstr "No se ha seleccionado ningún iPod o lista de reproducción del iPod."
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
 msgstr ""
-"gtkpod versión %s: Interfaz multi-plataforma y multi-idioma para iPods Apple."
+"Total\n"
+"(iPod)"
 
-#: ../src/misc.c:934
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"Total\n"
+"(local)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"Lista de reproducción\n"
+"seleccionada"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"Pistas\n"
+"mostradas"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"Pistas\n"
+"seleccionadas"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "Número de pistas"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "Tamaño de fichero"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "Número de listas de reproducción"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "Pistas borradas"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "Tamaño de fichero (borrado)"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "Pistas no transferidas"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "Tamaño de fichero (no transferido)"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "Espacio disponible"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "Seleccione o introduzca su modelo"
+
+#: ../src/ipod_init.c:81 ../src/repository.c:560 ../src/repository.c:2374
+msgid "Select mountpoint"
+msgstr "Seleccionar el punto de montaje del iPod"
+
+#: ../src/ipod_init.c:362
 #, c-format
-msgid "Could not process '%s' (no filename available)"
-msgstr "No se puede procesar '%s' (ningún nombre de fichero disponible)"
+msgid "Error initialising iPod: %s\n"
+msgstr "Error al iniciar el iPod: %s\n"
 
-#: ../src/misc.c:1088
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr "Error al iniciar el iPod, error desconocido\n"
+
+#: ../src/ipod_init.c:425
 #, c-format
-msgid "Unknown token '%%%c' in template '%s'"
-msgstr "Testigo desconocido '%%%c' en la plantilla '%s'"
+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:1171
+#: ../src/ipod_init.c:466
+msgid ""
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
+msgstr ""
+"No se ha podido determinar el modelo seleccionado -- esto puede ser un fallo o una incompatibilidad en la librería GTK+ o glade.\n"
+"\n"
+
+#: ../src/misc.c:864
 #, c-format
+msgid "Could not process '%s' (no filename available)"
+msgstr "No se ha podido procesar '%s' (ningún nombre de fichero disponible)"
+
+#: ../src/misc.c:1101
+#, 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:1257
+#: ../src/misc.c:1187
 #, c-format
 msgid "Error creating %s: %s\n"
 msgstr "Error al crear %s: %s\n"
 
-#: ../src/misc.c:1691
+#: ../src/misc.c:1642
 #, c-format
 msgid ""
 "Writing preferences file '%s' failed (%s).\n"
@@ -4683,11 +4447,11 @@
 "Fallo al escribir el fichero de preferencias '%s' (%s).\n"
 "\n"
 
-#: ../src/misc.c:1693
+#: ../src/misc.c:1644
 msgid "unspecified error"
 msgstr "error no especificado"
 
-#: ../src/misc.c:1701
+#: ../src/misc.c:1652
 #, c-format
 msgid ""
 "Writing preferences to the iPod (%s) failed: could not get path to Control "
@@ -4703,7 +4467,7 @@
 msgid "The following has occurred:"
 msgstr "Ha ocurrido lo siguiente:"
 
-#: ../src/misc_confirm.c:122
+#: ../src/misc_confirm.c:156
 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 "
@@ -4720,16 +4484,15 @@
 "de reproducción a las que pertenecen estas pistas está indicado entre "
 "paréntesis."
 
-#: ../src/misc_confirm.c:126
+#: ../src/misc_confirm.c:160
 msgid "Delete Track Completely from iPod?"
 msgid_plural "Delete Tracks Completely from iPod?"
 msgstr[0] "¿Borrar por completo la pista del iPod?"
 msgstr[1] "¿Borrar por completo las pistas del iPod?"
 
-#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#: ../src/misc_confirm.c:171 ../src/misc_confirm.c:212
 #, 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"
 "\"?"
@@ -4740,13 +4503,13 @@
 "¿Desea realmente borrar las siguientes pistas de la lista de reproducción \"%"
 "s\"?"
 
-#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+#: ../src/misc_confirm.c:175 ../src/misc_confirm.c:216
 msgid "Remove Track From Playlist?"
 msgid_plural "Remove Tracks From Playlist?"
 msgstr[0] "¿Borrar la pista de la lista de reproducción?"
 msgstr[1] "¿Borrar las pistas de la lista de reproducción?"
 
-#: ../src/misc_confirm.c:163
+#: ../src/misc_confirm.c:197
 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 "
@@ -4764,13 +4527,13 @@
 "listas de reproducción a las que pertenecen estas pistas está indicado entre "
 "paréntesis."
 
-#: ../src/misc_confirm.c:167
+#: ../src/misc_confirm.c:201
 msgid "Delete Track from Harddisk?"
 msgid_plural "Delete Tracks from Harddisk?"
 msgstr[0] "¿Borrar la pista del disco duro?"
 msgstr[1] "¿Borrar las pistas del disco duro?"
 
-#: ../src/misc_confirm.c:192
+#: ../src/misc_confirm.c:226
 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 "
@@ -4788,55 +4551,55 @@
 "número de listas de reproducción a las que pertenecen estas pistas está "
 "indicado entre paréntesis."
 
-#: ../src/misc_confirm.c:196
+#: ../src/misc_confirm.c:230
 msgid "Remove Track from Local Database?"
 msgid_plural "Remove Tracks from Local Database?"
 msgstr[0] "¿Borrar la pista de la base de datos local?"
 msgstr[1] "¿Borrar las pistas de la base de datos local?"
 
-#: ../src/misc_confirm.c:261
+#: ../src/misc_confirm.c:295
 #, c-format
 msgid "Deleted one track completely from iPod"
 msgid_plural "Deleted %d tracks completely from iPod"
 msgstr[0] "Una pista ha sido borrada por completo del iPod"
 msgstr[1] "%d pistas han sido borradas por completo del iPod"
 
-#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#: ../src/misc_confirm.c:301 ../src/misc_confirm.c:325
 #, c-format
 msgid "Deleted %d track from playlist '%s'"
 msgid_plural "Deleted %d tracks from playlist '%s'"
 msgstr[0] "%d pista ha sido borrada de la lista de reproducción '%s'"
 msgstr[1] "%d pistas han sido borradas de la lista de reproducción '%s'"
 
-#: ../src/misc_confirm.c:285
+#: ../src/misc_confirm.c:319
 #, c-format
 msgid "Deleted one track from harddisk"
 msgid_plural "Deleted %d tracks from harddisk"
 msgstr[0] "Una pista ha sido borrada del disco duro"
 msgstr[1] "%d pistas han sido borradas del disco duro"
 
-#: ../src/misc_confirm.c:297
+#: ../src/misc_confirm.c:331
 #, c-format
 msgid "Deleted track from local database"
 msgid_plural "Deleted %d tracks from local database"
 msgstr[0] "Una pista ha sido borrada de la base de datos local"
 msgstr[1] "%d pistas han sido borradas de la base de datos local"
 
-#: ../src/misc_confirm.c:442
+#: ../src/misc_confirm.c:476
 msgid "Cannot remove entry 'All'"
 msgstr "No se puede borrar la entrada 'Todo'"
 
-#: ../src/misc_confirm.c:536
+#: ../src/misc_confirm.c:570
 #, c-format
 msgid "Removed all %d tracks from the iPod"
 msgstr "Todas las %d pistas han sido borradas del iPod"
 
-#: ../src/misc_confirm.c:541
+#: ../src/misc_confirm.c:575
 #, c-format
 msgid "Removed all podcasts from the iPod"
 msgstr "Todos los podcasts han sido borrados del iPod"
 
-#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#: ../src/misc_confirm.c:584 ../src/misc_confirm.c:658
 #, c-format
 msgid "Deleted playlist '%s' including %d member track"
 msgid_plural "Deleted playlist '%s' including %d member tracks"
@@ -4844,37 +4607,35 @@
 msgstr[1] "Borrada la lista de reproducción '%s' conteniendo %d pistas"
 
 #. first use playlist name
-#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#: ../src/misc_confirm.c:600 ../src/misc_confirm.c:674
 #, c-format
 msgid "Deleted playlist '%s'"
 msgstr "Borrada la lista de reproducción '%s'"
 
-#: ../src/misc_confirm.c:600
+#: ../src/misc_confirm.c:634
 #, 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] ""
-"Borrada la lista de reproducción '%s' conteniendo %d pista en el disco duro"
-msgstr[1] ""
-"Borrada la lista de reproducción '%s' conteniendo %d pistas en el disco duro"
+msgstr[0] "Borrada la lista de reproducción '%s' conteniendo %d pista en el disco duro"
+msgstr[1] "Borrada la lista de reproducción '%s' conteniendo %d pistas en el disco duro"
 
-#: ../src/misc_confirm.c:617
+#: ../src/misc_confirm.c:651
 #, c-format
 msgid "Removed all %d tracks from the database"
 msgstr "Borradas todas las %d pistas de la base de datos"
 
-#: ../src/misc_confirm.c:695
+#: ../src/misc_confirm.c:729
 #, 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
+#: ../src/misc_confirm.c:734
 #, 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
-#, fuzzy, c-format
+#: ../src/misc_confirm.c:742
+#, 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 "
@@ -4885,19 +4646,18 @@
 "is indicated in parentheses."
 msgstr[0] ""
 "¿Desea realmente borrar la lista de reproducción '%s' y la siguiente pista "
-"del iPod? El número de listas de reproducción a las que pertenece esta pista "
-"está indicado entre paréntesis."
+"del iPod? El número de listas de reproducción a las que pertenece esta pista está indicado entre paréntesis."
 msgstr[1] ""
 "¿Desea realmente borrar la lista de reproducción '%s' y las siguientes "
 "pistas del iPod? El número de listas de reproducción a las que pertenecen "
 "estas pistas está indicado entre paréntesis."
 
-#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#: ../src/misc_confirm.c:753 ../src/misc_confirm.c:808
 #, c-format
 msgid "Are you sure you want to delete the playlist '%s'?"
 msgstr "¿Está seguro de querer borrar la lista de reproducción '%s'?"
 
-#: ../src/misc_confirm.c:745
+#: ../src/misc_confirm.c:779
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4916,12 +4676,12 @@
 "del disco duro? El número de listas de reproducción a las que pertenecen "
 "estas pistas está indicado entre paréntesis."
 
-#: ../src/misc_confirm.c:753
+#: ../src/misc_confirm.c:787
 #, 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?"
 
-#: ../src/misc_confirm.c:762
+#: ../src/misc_confirm.c:796
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4940,14 +4700,25 @@
 "de la base de datos? El número de listas de reproducción a las que "
 "pertenecen estas pistas está indicado entre paréntesis."
 
-#: ../src/misc_confirm.c:841
+#: ../src/misc_confirm.c:869
 msgid ""
-"Data has been changed and not been saved.\n"
-"OK to exit gtkpod?"
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
+"changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
 msgstr ""
-"Algunos datos han sido modificados y no se han guardado ¿está seguro de que "
-"desea cerrar gtkpod?"
+"Datos han sido modificados y no guardados. Si cierra gtkpod, se perderán todos los cambios no guardados.\n"
+"\n"
+"¿Quiere guardar los cambios?"
 
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr "¿Guardar cambios antes de salir?"
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr "Salir sin guardar"
+
 #: ../src/misc_conversion.c:66
 msgid "File type"
 msgstr "Tipo de fichero"
@@ -5073,92 +4844,89 @@
 msgstr "Episodio Nº"
 
 #: ../src/misc_conversion.c:106
-#, fuzzy
 msgid "Album Artist"
 msgstr "Artista del álbum"
 
 #: ../src/misc_conversion.c:107
-#, fuzzy
 msgid "Sort Artist"
-msgstr "Artista"
+msgstr "Ordenar artista"
 
 #: ../src/misc_conversion.c:108
-#, fuzzy
 msgid "Sort Title"
-msgstr "Subtítulo"
+msgstr "Ordenar título"
 
 #: ../src/misc_conversion.c:109
-#, fuzzy
 msgid "Sort Album"
-msgstr "Álbum"
+msgstr "Ordenar álbum"
 
 #. 50
 #: ../src/misc_conversion.c:110
-#, fuzzy
 msgid "Sort Album Artist"
-msgstr "Artista del álbum"
+msgstr "Ordenar artista del álbum"
 
 #: ../src/misc_conversion.c:111
-#, fuzzy
 msgid "Sort Composer"
-msgstr "Compositor"
+msgstr "Ordenar compositor"
 
 #: ../src/misc_conversion.c:112
-#, fuzzy
 msgid "Sort TV Show"
-msgstr "TV Show"
+msgstr "Ordenar TV Show"
 
 #: ../src/misc_conversion.c:113
 msgid "Gapless Track Flag"
-msgstr ""
+msgstr "Marca de pista sin huecos"
 
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
+msgstr "Letras"
+
+#: ../src/misc_conversion.c:127
 msgid "Name of file on PC, if available"
 msgstr "Nombre del fichero en el PC, si está disponible"
 
-#: ../src/misc_conversion.c:127
+#: ../src/misc_conversion.c:128
 msgid "Name of file on the iPod"
 msgstr "Nombre del fichero en el iPod"
 
 #. 10
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
 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:130
+#: ../src/misc_conversion.c:131
 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:136
+#: ../src/misc_conversion.c:137
 msgid "Beats per minute"
-msgstr ""
+msgstr "Pulsaciones por minuto"
 
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
 msgid "Number of times the track has been played"
 msgstr "Número de veces que la pista ha sido reproducida"
 
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
 msgid "Star rating from 0 to 5"
 msgstr "Puntuación de estrellas del 0 al 5"
 
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
 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:140
+#: ../src/misc_conversion.c:141
 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:141
+#: ../src/misc_conversion.c:142
 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:142
+#: ../src/misc_conversion.c:143
 msgid "Manual volume adjust"
 msgstr "Ajuste manual del volumen"
 
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:144
 msgid ""
 "Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
 "the iPod"
@@ -5167,96 +4935,97 @@
 "el control de volumen en el iPod"
 
 #. 25
-#: ../src/misc_conversion.c:146
+#: ../src/misc_conversion.c:147
 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:149
-msgid ""
-"The category (e.g. 'Technology' or 'Music') where the podcast was located."
+#: ../src/misc_conversion.c:150
+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:150
+#: ../src/misc_conversion.c:151
 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:154
+#: ../src/misc_conversion.c:155
 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)"
+msgstr "Fecha de publicación (para podcasts. Mostrada junto al título en el 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
-#, fuzzy
+#: ../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 ../src/misc_conversion.c:174
 msgid "Used for sorting on the iPod"
-msgstr "Nombre del fichero en el iPod"
+msgstr "Usado para ordenar en el iPod"
 
-#: ../src/misc_conversion.c:735
+#: ../src/misc_conversion.c:737
 #, 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:745
+#: ../src/misc_conversion.c:747
 #, 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:762
+#: ../src/misc_conversion.c:764
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "El URI '%s' no es válido"
 
-#: ../src/misc_conversion.c:774
+#: ../src/misc_conversion.c:776
 #, 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:790
+#: ../src/misc_conversion.c:792
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "El URI '%s' contiene caracteres de escape no válidos"
 
-#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
-#: ../src/misc_playlist.c:429
+#: ../src/misc_playlist.c:71 ../src/misc_playlist.c:108
+msgid "Please load the iPod before adding playlists."
+msgstr "Por favor, cargar el iPod antes de añadir listas de reproducción."
+
+#: ../src/misc_playlist.c:77 ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
 msgid "Please enter a name for the new playlist"
 msgstr "Introducir el nombre de la nueva lista de reproducción"
 
-#: ../src/misc_playlist.c:154
+#: ../src/misc_playlist.c:174
 msgid "AR:"
 msgstr "AR:"
 
-#: ../src/misc_playlist.c:157
+#: ../src/misc_playlist.c:177
 msgid "AL:"
 msgstr "AL:"
 
-#: ../src/misc_playlist.c:160
+#: ../src/misc_playlist.c:180
 msgid "GE:"
 msgstr "GE:"
 
-#: ../src/misc_playlist.c:163
+#: ../src/misc_playlist.c:183
 #, fuzzy
 msgid "CO:"
 msgstr "CO:"
 
-#: ../src/misc_playlist.c:166
+#: ../src/misc_playlist.c:186
 #, fuzzy
 msgid "YE:"
 msgstr "YE:"
 
-#: ../src/misc_playlist.c:194
+#: ../src/misc_playlist.c:214
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../src/misc_playlist.c:272
+#: ../src/misc_playlist.c:292
 #, c-format
 msgid "Random (%d)"
 msgstr "Aleatorio (%d)"
 
-#: ../src/misc_playlist.c:297
+#: ../src/misc_playlist.c:317
 msgid ""
 "Auto Store of track view disabled.\n"
 "\n"
@@ -5264,11 +5033,11 @@
 "Memorización automática de la vista desactivada.\n"
 "\n"
 
-#: ../src/misc_playlist.c:356
+#: ../src/misc_playlist.c:376
 msgid "Not Listed"
 msgstr "No escuchado"
 
-#: ../src/misc_playlist.c:406
+#: ../src/misc_playlist.c:426
 #, c-format
 msgid "Created playlist '%s' with %d track."
 msgid_plural "Created playlist '%s' with %d tracks."
@@ -5276,102 +5045,103 @@
 msgstr[1] "Creada lista de reproducción '%s' con %d pistas."
 
 #. n==0
-#: ../src/misc_playlist.c:417
+#: ../src/misc_playlist.c:437
 msgid "No tracks available, playlist not created"
 msgstr "Ninguna pista disponible, lista de reproducción no creada"
 
-#: ../src/misc_playlist.c:543
+#: ../src/misc_playlist.c:563
 #, c-format
 msgid "Most Listened (%d)"
 msgstr "La más escuchada (%d)"
 
-#: ../src/misc_playlist.c:584
+#: ../src/misc_playlist.c:604
 #, c-format
 msgid "Never Listened"
 msgstr "Nunca escuchada"
 
-#: ../src/misc_playlist.c:624
+#: ../src/misc_playlist.c:644
 #, c-format
 msgid "Best Rated (%d)"
 msgstr "Mejor puntuada (%d)"
 
-#: ../src/misc_playlist.c:666
+#: ../src/misc_playlist.c:686
 msgid "Unrated tracks"
 msgstr "Pistas sin puntuar"
 
-#: ../src/misc_playlist.c:671
+#: ../src/misc_playlist.c:691
 #, c-format
 msgid "Rated %d"
 msgstr "Puntuación %d"
 
-#: ../src/misc_playlist.c:714
+#: ../src/misc_playlist.c:734
 #, c-format
 msgid "Recent (%d)"
 msgstr "Reciente (%d)"
 
-#: ../src/misc_playlist.c:753
+#: ../src/misc_playlist.c:773
 msgid "Last Time"
 msgstr "Última vez"
 
-#: ../src/misc_playlist.c:844
+#: ../src/misc_playlist.c:864
 msgid "Removal of dangling tracks with no files on PC was canceled."
 msgstr ""
 "La eliminación de pistas pendientes sin su fichero correspondiente en el PC "
 "ha sido cancelada."
 
-#: ../src/misc_playlist.c:854
+#: ../src/misc_playlist.c:874
 msgid "Handling of dangling tracks with files on PC was canceled."
 msgstr ""
 "El manejo de pistas pendientes con sus correspondientes ficheros en el PC ha "
 "sido cancelada."
 
-#: ../src/misc_playlist.c:882
+#: ../src/misc_playlist.c:902
 msgid "Dangling tracks with no files on PC were removed."
 msgstr ""
 "Las pistas pendientes sin su correspondiente fichero en el PC han sido "
 "eliminadas."
 
-#: ../src/misc_playlist.c:943
+#: ../src/misc_playlist.c:963
 msgid "Dangling tracks with files on PC were handled."
 msgstr ""
 "Las pistas pendientes con ficheros correspondientes en el PC han sido "
 "procesadas."
 
-#: ../src/misc_playlist.c:976
+#: ../src/misc_playlist.c:996
 msgid "Track"
 msgstr "Pista"
 
-#: ../src/misc_playlist.c:1019
+#: ../src/misc_playlist.c:1035
 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"
+"If you abort the operation, you can import the existing database before "
+"calling this function again.\n"
 msgstr ""
-"No se ha importado la base de datos iTunes. Esto puede dar lugar a la "
+"No se ha importado la base de datos iTunes. Esto dará lugar a la "
 "pérdida de la actual base de datos.\n"
 "\n"
-"Pulsar 'Aceptar' para continuar o 'Cancelar' para detener la operación. Si "
-"se cancela ahora, se podrá importar la actual base de datos antes de usar de "
-"nuevo esta función.\n"
+" Si se cancela ahora, se podrá importar la actual base de datos antes de usar de nuevo esta función.\n"
 
-#: ../src/misc_playlist.c:1033
+#: ../src/misc_playlist.c:1042
+msgid "Abort operation"
+msgstr "Cancelar operación"
+
+#: ../src/misc_playlist.c:1056
 msgid "Creating a tree of known files"
 msgstr "Creando un árbol de ficheros conocidos"
 
-#: ../src/misc_playlist.c:1077
+#: ../src/misc_playlist.c:1100
 msgid "Checking iPOD files against known files in DB"
 msgstr ""
 "Comprobando los ficheros del iPod con los ficheros conocidos en la base de "
 "datos"
 
-#: ../src/misc_playlist.c:1120
+#: ../src/misc_playlist.c:1143
 msgid "Orphaned"
 msgstr "Huérfano"
 
-#: ../src/misc_playlist.c:1147
+#: ../src/misc_playlist.c:1170
 #, c-format
 msgid ""
 "The following orphaned file had already been added to the iPod again. It "
@@ -5384,12 +5154,12 @@
 "%s\n"
 "\n"
 
-#: ../src/misc_playlist.c:1175
+#: ../src/misc_playlist.c:1198
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Processing..."
 msgstr "Encontrados %d ficheros huerfanos y %d pendientes. Procesando..."
 
-#: ../src/misc_playlist.c:1199
+#: ../src/misc_playlist.c:1222
 #, c-format
 msgid ""
 "The following dangling track has a file on PC.\n"
@@ -5408,7 +5178,7 @@
 "Pulse «Aceptar» para transferir los ficheros en la siguiente sincronización, "
 "«Cancelar» para dejarlos como están."
 
-#: ../src/misc_playlist.c:1204
+#: ../src/misc_playlist.c:1227
 #, c-format
 msgid ""
 "The following dangling track doesn't have file on PC. \n"
@@ -5426,11 +5196,11 @@
 
 #. we want unique window for each
 #. gboolean modal,
-#: ../src/misc_playlist.c:1211
+#: ../src/misc_playlist.c:1234
 msgid "Dangling Tracks"
 msgstr "Pistas pendientes"
 
-#: ../src/misc_playlist.c:1234
+#: ../src/misc_playlist.c:1257
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Done."
 msgstr "Encontradas %d huérfanos y %d ficheros pendientes. Finalizado."
@@ -5452,8 +5222,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."
@@ -5470,76 +5239,74 @@
 msgid "Duplicate detection"
 msgstr "Detección de duplicados"
 
-#: ../src/misc_track.c:1339
+#: ../src/misc_track.c:1347
 msgid "Local Database"
 msgstr "Base de datos local"
 
 #. artwork is set
-#: ../src/misc_track.c:1350
+#: ../src/misc_track.c:1358
 msgid "Embedded or filename was lost"
 msgstr "Se ha perdido el nombre de fichero o el empotrado."
 
-#: ../src/misc_track.c:1354
+#: ../src/misc_track.c:1362
 msgid "Artwork not set"
 msgstr "Carátula no configurada."
 
-#: ../src/misc_track.c:1816
+#: ../src/misc_track.c:1836
 #, 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:2052
+#: ../src/misc_track.c:2072
 #, c-format
 msgid "drag and drop: ignored '%s'\n"
 msgstr "Operación de arrastrar y soltar ignorada '%s'\n"
 
-#: ../src/mp3file.c:1336
+#: ../src/mp3file.c:1344
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Error al rellenar campo ID3: %s\n"
 
-#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
-#: ../src/mp3file.c:2733
+#: ../src/mp3file.c:1368 ../src/mp3file.c:1552 ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870 ../src/mp3file.c:2929 ../src/mp3file.c:2956
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "Error al abrir el fichero: '%s' (%s).\n"
 
-#: ../src/mp3file.c:1688
+#: ../src/mp3file.c:1793 ../src/mp3file.c:2993
 #, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
-msgstr "Error al escribir etiqueta al fichero: '%s' (%s).\n"
+msgstr "Error al escribir atributo al fichero: '%s' (%s).\n"
 
 #. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2770
+#: ../src/mp3file.c:2907
 #, 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"
+msgstr "El fichero \"%s\" tiene una duración de reproducción nula. Será ignorado.\n"
 
-#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#: ../src/mp4file.c:243 ../src/mp4file.c:475
 #, 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:253 ../src/mp4file.c:414
+#: ../src/mp4file.c:253 ../src/mp4file.c:485
 #, 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"
+msgstr "No se ha podido abrir '%s' para su lectura o el fichero no es de tipo mp4.\n"
 
-#: ../src/mp4file.c:529
+#: ../src/mp4file.c:607
 #, 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:540
+#: ../src/mp4file.c:618
 #, 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:553
+#: ../src/mp4file.c:631
 #, c-format
 msgid ""
 "Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5549,7 +5316,7 @@
 "biblioteca mp4v2. gtkpod debe estar compilado junto con la biblioteca "
 "mp4v2.\n"
 
-#: ../src/mp4file.c:559
+#: ../src/mp4file.c:637
 #, c-format
 msgid ""
 "m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5560,7 +5327,7 @@
 "están soportados sin la biblioteca mp4v2. gtkpod debe estar compilado junto "
 "con la biblioteca mp4v2.\n"
 
-#: ../src/mp4file.c:565
+#: ../src/mp4file.c:643
 #, c-format
 msgid ""
 "m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5594,158 +5361,135 @@
 "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:357
+#: ../src/prefs.c:365
 #, c-format
 msgid "gtkpod version %s usage:\n"
 msgstr "Uso de gtkpod versión %s:\n"
 
-#: ../src/prefs.c:358
+#: ../src/prefs.c:366
 msgid "  -h, --help:   display this message\n"
 msgstr "  -h, --help:   muestra este mensaje\n"
 
-#: ../src/prefs.c:359
+#: ../src/prefs.c:367
 msgid "  -p <file>:    increment playcount for file by one\n"
 msgstr "  -p <fichero>:    incrementa el contador del fichero en uno\n"
 
-#: ../src/prefs.c:360
+#: ../src/prefs.c:368
 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:361
+#: ../src/prefs.c:369
 msgid "  -m path:      define the mountpoint of your iPod\n"
 msgstr "  -m ruta:      define el punto de montaje del iPod\n"
 
-#: ../src/prefs.c:362
+#: ../src/prefs.c:370
 msgid "  --mountpoint: same as '-m'.\n"
 msgstr "  --mountpoint: igual que '-m'.\n"
 
-#: ../src/prefs.c:363
+#: ../src/prefs.c:371
 msgid "  -a:           import database automatically after start.\n"
-msgstr ""
-"  -a:           importa automáticamente la base de datos al arrancar.\n"
+msgstr "  -a:           importa automáticamente la base de datos al arrancar.\n"
 
-#: ../src/prefs.c:364
+#: ../src/prefs.c:372
 msgid "  --auto:       same as '-a'.\n"
 msgstr "  --auto:       igual que '-a'.\n"
 
-#: ../src/prefs.c:561
+#: ../src/prefs.c:569
 #, c-format
-msgid "Couldn't create ~/.gtkpod\n"
-msgstr "No se ha podido crear ~/.gtkpod\n"
+msgid "Couldn't create '%s'\n"
+msgstr "No se ha podido crear '%s'\n"
 
-#: ../src/prefs_window.c:133
-msgid "Please select command for 'Play Now'"
-msgstr "Seleccionar programa para 'Reproducir'"
+#: ../src/prefsdlg.c:51
+msgid "Hide"
+msgstr "Ocultar"
 
-#: ../src/prefs_window.c:134
-msgid "Please select command for 'Enqueue'"
-msgstr "Seleccionar programa para 'Encolar'"
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
+msgstr "Sólo iconos"
 
-#: ../src/prefs_window.c:135
-msgid "Please select the mp3gain executable"
-msgstr "Seleccionar el ejecutable mp3gain"
+#: ../src/prefsdlg.c:53
+msgid "Text only"
+msgstr "Sólo texto"
 
-#: ../src/prefs_window.c:136
-msgid "Please select the aacgain executable"
-msgstr "Seleccionar el ejecutable aacgain"
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
+msgstr "Texto bajo los iconos"
 
-#: ../src/prefs_window.c:137
-msgid "Select the mserv music root directory"
-msgstr "Seleccionar el directorio raíz de música de mserv"
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
+msgstr "Texto al lado de los iconos"
 
-#: ../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:139
-msgid "Select the ogg/vorbis converter command"
-msgstr "Seleccionar el comando de conversión a ogg/vorbis."
-
-#: ../src/prefs_window.c:140
-msgid "Select the flac converter command"
-msgstr "Seleccionar el comando de conversión a flac."
-
-#: ../src/prefs_window.c:141
-msgid "Select the m4a converter command."
-msgstr "Seleccionar el comando de conversión a m4a."
-
-#: ../src/prefs_window.c:142
-msgid "Select the mp3 converter command."
-msgstr "Seleccionar el comando de conversión a mp3."
-
-#: ../src/prefs_window.c:143
-msgid "Select the wav converter command."
-msgstr "Seleccionar el comando de conversión a wav."
-
-#: ../src/prefs_window.c:201 ../src/repository.c:662
+#: ../src/repository.c:527
 #, 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>Heche un vistazo a los guiones de '%s'. En caso de escribir un nuevo "
-"guión o mejorar uno existente, por favor, envielo a jcsjcs en users."
-"sourceforge.net para añadirlo en la siguiente publicación.</i>"
+"Are you sure you want to delete repository \"%s\"? This action cannot be "
+"undone!"
+msgstr "¿Está seguro de querer borrar el repositorio \"%s\"? ¡Esta acción no se puede deshacer!"
 
-#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
-msgid "Preferences not updated"
-msgstr "Preferencias no actualizadas"
+#: ../src/repository.c:531
+msgid "Delete repository?"
+msgstr "¿Borrar repositorio?"
 
-#: ../src/prefs_window.c:1232
-msgid "Preferences applied"
-msgstr "Preferencias actualizadas"
-
-#: ../src/repository.c:573 ../src/repository.c:2395
+#: ../src/repository.c:587 ../src/repository.c:2400
 msgid "Set backup file"
 msgstr "Configurar fichero de copia de seguridad"
 
-#: ../src/repository.c:612
+#: ../src/repository.c:626
 msgid "Select directory for synchronization"
 msgstr "Seleccionar directorio a sincronizar"
 
-#: ../src/repository.c:638
+#: ../src/repository.c:652
 msgid "Please select command to sync contacts"
 msgstr "Seleccionar programa para sincronizar contactos"
 
-#: ../src/repository.c:644
+#: ../src/repository.c:658
 msgid "Please select command to sync calendar"
 msgstr "Seleccionar programa para sincronizar calendario"
 
-#: ../src/repository.c:650
+#: ../src/repository.c:664
 msgid "Please select command to sync notes"
 msgstr "Seleccionar programa para sincronizar notas"
 
-#: ../src/repository.c:729
+#: ../src/repository.c:676
+#, 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>Heche un vistazo a los guiones de '%s'. En caso de escribir un nuevo "
+"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/repository.c:743
 msgid "Smart playlist updated."
 msgstr "Lista de reproducción inteligente actualizada."
 
-#: ../src/repository.c:1190
+#: ../src/repository.c:1204
 msgid "Podcasts Repository"
 msgstr "Repositorio de podcasts"
 
-#: ../src/repository.c:1194
+#: ../src/repository.c:1208
 msgid "Local Repository"
 msgstr "Repositorio local"
 
-#: ../src/repository.c:1348
+#: ../src/repository.c:1358
 msgid "Master Playlist"
 msgstr "Lista de reproducción principal"
 
-#: ../src/repository.c:1352
+#: ../src/repository.c:1362
 msgid "Podcasts Playlist"
 msgstr "Lista de reproducción de podcasts"
 
-#: ../src/repository.c:1360
+#: ../src/repository.c:1370
 msgid "Regular Playlist"
 msgstr "Lista de reproducción regular"
 
-#: ../src/repository.c:2423
+#: ../src/repository.c:2428
 msgid "Set local repository file"
 msgstr "Configurar el fichero de repositorio local"
 
-#: ../src/repository.c:2522
+#: ../src/repository.c:2526
 msgid "New Repository"
 msgstr "Nuevo repositorio"
 
@@ -5756,45 +5500,54 @@
 #: ../src/sha1.c:239
 #, c-format
 msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
-msgstr "No se puede abrir '%s' para calcuar la suma de comprobación SHA1: %s\n"
+msgstr "No se ha podido abrir '%s' para calcuar la suma de comprobación SHA1: %s\n"
 
-#: ../src/syncdir.c:237
+#: ../src/sort_window.c:237
+msgid "No sorting"
+msgstr "No ordenar"
+
+#: ../src/sort_window.c:271
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr ""
+"También se pueden usar las cabeceras de la tabla,pero esto le permite "
+"ordenar respecto a columnas no mostradas."
+
+#: ../src/syncdir.c:246
 #, c-format
 msgid "Sync summary for %s/%s\n"
 msgstr "Sincronizar resumen para %s/%s\n"
 
-#: ../src/syncdir.c:246
+#: ../src/syncdir.c:255
 msgid "The following track has been added or updated:\n"
 msgid_plural "The following tracks have been added or updated:\n"
 msgstr[0] "La siguiente pista ha sido añadida o actualizada:\n"
 msgstr[1] "Las siguientes pistas han sido añadidas o actualizadas:\n"
 
-#: ../src/syncdir.c:255
+#: ../src/syncdir.c:264
 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] "La siguiente pista ha sido borrada por completo del iPod:\n"
 msgstr[1] "Las siguientes pistas han sido borradas por completo del iPod:\n"
 
-#: ../src/syncdir.c:264
+#: ../src/syncdir.c:273
 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] "La siguiente pista ha sido borrada del repositorio:\n"
-msgstr[1] ""
-"Las siguientes pistas duplicadas han sido borradas del repositorio:\n"
+msgstr[1] "Las siguientes pistas duplicadas han sido borradas del repositorio:\n"
 
-#: ../src/syncdir.c:271
+#: ../src/syncdir.c:280
 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] "La siguiente pista ha sido borrada de la lista de reproducción:\n"
-msgstr[1] ""
-"Las siguientes pistas han sido borradas de la lista de reproducción:\n"
+msgstr[1] "Las siguientes pistas han sido borradas de la lista de reproducción:\n"
 
-#: ../src/syncdir.c:277
+#: ../src/syncdir.c:286
 msgid "Nothing was changed.\n"
 msgstr "No ha habido cambios.\n"
 
-#: ../src/syncdir.c:282
+#: ../src/syncdir.c:291
 msgid "Sync summary"
 msgstr "Sincronizar resumen"
 
@@ -5918,105 +5671,3 @@
 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"
-
-#~ msgid "window1"
-#~ msgstr "ventana1"

Modified: gtkpod/branches/upstream/current/po/fr.po
===================================================================
--- gtkpod/branches/upstream/current/po/fr.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/fr.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gtkpod 0.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-13 18:36-0500\n"
+"POT-Creation-Date: 2008-12-09 19:55+0900\n"
 "PO-Revision-Date: 2007-07-03 16:28+0100\n"
 "Last-Translator: Éric Lassauge <rpmfarm at free.fr>\n"
 "Language-Team: FR\n"
@@ -19,13 +19,14 @@
 "Plural-Forms: nplurals=2; plural=n>1;\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 "Gérer musiques et vidéos sur un iPod Apple"
 
+#: ../data/gtkpod.desktop.in.h:2 ../data/gtkpod.glade.h:427
+#, fuzzy
+msgid "gtkpod iPod Manager"
+msgstr "Gestionnaire iPod"
+
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
 msgstr "Gestionnaire iPod"
@@ -39,366 +40,423 @@
 msgstr "     "
 
 #: ../data/gtkpod.glade.h:3
-msgid "     "
-msgstr "     "
+msgid " <= cts <= "
+msgstr " <= et <= "
 
 #: ../data/gtkpod.glade.h:4
-msgid "      "
-msgstr "      "
+msgid ""
+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
+"finished."
+msgstr ""
+"'JJ/MM/AAAA HH:MM < d < JJ/MM/AAAA HH:MM' ou similaire. Appuyer sur «Entrée» "
+"pour valider."
 
 #: ../data/gtkpod.glade.h:5
-msgid "   Sort by:"
-msgstr "   Trier par :"
+msgid "(Checked)"
+msgstr "(Coché)"
 
 #: ../data/gtkpod.glade.h:6
-msgid " <= cts <= "
-msgstr " <= et <= "
+msgid "0"
+msgstr "0"
 
 #: ../data/gtkpod.glade.h:7
-msgid " Logic: "
-msgstr " Opérateur logique : "
+msgid "1"
+msgstr "1"
 
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr "2"
+
 #: ../data/gtkpod.glade.h:9
-#, no-c-format
-msgid "%A"
-msgstr "%A"
+msgid "3"
+msgstr "3"
 
 #: ../data/gtkpod.glade.h:10
-msgid ""
-"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
-"finished."
-msgstr ""
-"'JJ/MM/AAAA HH:MM < d < JJ/MM/AAAA HH:MM' ou similaire. Appuyer sur «Entrée» "
-"pour valider."
+msgid "4"
+msgstr "4"
 
 #: ../data/gtkpod.glade.h:11
-msgid "'aacgain' executable:"
-msgstr "Chemin de l'exécutable « aacgain » :"
+msgid "5"
+msgstr "5"
 
 #: ../data/gtkpod.glade.h:12
-msgid "'mp3gain' executable:"
-msgstr "Chemin de l'exécutable « mp3gain » :"
+msgid ":"
+msgstr " :"
 
 #: ../data/gtkpod.glade.h:13
-msgid "(Checked)"
-msgstr "(Coché)"
+msgid "<"
+msgstr "<"
 
 #: ../data/gtkpod.glade.h:14
-msgid "...as icons"
-msgstr "…avec seulement les icônes"
+#, fuzzy
+msgid "<b>Advanced Options</b>"
+msgstr "Options de tri avancées"
 
 #: ../data/gtkpod.glade.h:15
-msgid "...as text"
-msgstr "…avec seulement les libellés"
+#, fuzzy
+msgid "<b>Ascending</b>"
+msgstr "Croissant"
 
 #: ../data/gtkpod.glade.h:16
-msgid "...both as icons and text"
-msgstr "…avec les icônes et libellés"
+#, fuzzy
+msgid "<b>Auto Store</b>"
+msgstr "Sauver automatiquement"
 
 #: ../data/gtkpod.glade.h:17
-msgid "...entry 'All' in sort tab..."
-msgstr "…onglet « Tous » dans la zone de tri…"
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>Listes de lecture générées automatiquement</b>"
 
 #: ../data/gtkpod.glade.h:18
-msgid "...master playlist"
-msgstr "…liste de lecture principale"
+msgid "<b>Available Columns</b>"
+msgstr ""
 
+#: ../data/gtkpod.glade.h:19
+#, fuzzy
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>Pochette</b>"
+
 #: ../data/gtkpod.glade.h:20
-#, no-c-format
-msgid "../%A.jpg"
-msgstr "../%A.jpg"
+#, fuzzy
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>Pochette</b>"
 
 #: ../data/gtkpod.glade.h:21
-msgid "0"
-msgstr "0"
+#, fuzzy
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>Pochette</b>"
 
 #: ../data/gtkpod.glade.h:22
-msgid "1"
-msgstr "1"
+#, fuzzy
+msgid "<b>Cover Art</b>"
+msgstr "<b>Pochette</b>"
 
 #: ../data/gtkpod.glade.h:23
-msgid "2"
-msgstr "2"
+#, fuzzy
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>Confirmation de suppression</b>"
 
 #: ../data/gtkpod.glade.h:24
-msgid "3"
-msgstr "3"
+#, fuzzy
+msgid "<b>Descending</b>"
+msgstr "Décroissant"
 
 #: ../data/gtkpod.glade.h:25
-msgid "4"
-msgstr "4"
+#, fuzzy
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>Confirmation de suppression</b>"
 
 #: ../data/gtkpod.glade.h:26
-msgid "5"
-msgstr "5"
+#, fuzzy
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>Zones de tri</b>"
 
 #: ../data/gtkpod.glade.h:27
-msgid ":"
-msgstr " :"
+#, fuzzy
+msgid "<b>General Options</b>"
+msgstr "<b>Infobulles</b>"
 
 #: ../data/gtkpod.glade.h:28
-msgid "<"
-msgstr "<"
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>nd</b>"
 
 #: ../data/gtkpod.glade.h:29
-msgid "<b>Account Information</b>"
-msgstr "<b>Informations du compte</b>"
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>Ignorer les mots courants</b>"
 
 #: ../data/gtkpod.glade.h:30
-msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>Ajout/Mise à jour/Synchronisation</b>"
+#, fuzzy
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>Synchronisation</b>"
 
 #: ../data/gtkpod.glade.h:31
-msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Audioscrobbler</b>"
+#, fuzzy
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>Informations du compte</b>"
 
 #: ../data/gtkpod.glade.h:32
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>Listes de lecture générées automatiquement</b>"
+#, fuzzy
+msgid "<b>Information Messages</b>"
+msgstr "<b>Informations du compte</b>"
 
 #: ../data/gtkpod.glade.h:33
-msgid "<b>Automatically select...</b>"
-msgstr "<b>Sélection automatique…</b>"
+#, fuzzy
+msgid "<b>Lower Margin</b>"
+msgstr "Borne inférieure"
 
 #: ../data/gtkpod.glade.h:34
-msgid "<b>Calendar/Contacts/Notes</b>"
-msgstr "<b>Calendrier/Contacts/Notes</b>"
+#, fuzzy
+msgid "<b>None</b>"
+msgstr "<b>nd</b>"
 
 #: ../data/gtkpod.glade.h:35
-msgid "<b>Coverart</b>"
-msgstr "<b>Pochette</b>"
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Conversion au fil de l'eau</b>"
 
 #: ../data/gtkpod.glade.h:36
-msgid "<b>Delete Confirmation</b>"
-msgstr "<b>Confirmation de suppression</b>"
+#, fuzzy
+msgid "<b>Playback</b>"
+msgstr "<b>Jouer</b>"
 
 #: ../data/gtkpod.glade.h:37
-msgid "<b>Examples</b>"
-msgstr "<b>Exemples</b>"
+#, fuzzy
+msgid "<b>Playlist Options</b>"
+msgstr "<b>Listes</b>"
 
 #: ../data/gtkpod.glade.h:38
-msgid "<b>Ignore Frequent Words</b>"
-msgstr "<b>Ignorer les mots courants</b>"
+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:39
-msgid "<b>Misc</b>"
-msgstr "<b>Divers</b>"
+#, fuzzy
+msgid "<b>Rules</b>"
+msgstr "<b>Exemples</b>"
 
 #: ../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>"
+msgid "<b>Sort Order</b>"
+msgstr "<b>Ordre de tri</b>"
 
 #: ../data/gtkpod.glade.h:41
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Conversion au fil de l'eau</b>"
+msgid "<b>Synchronization</b>"
+msgstr "<b>Synchronisation</b>"
 
 #: ../data/gtkpod.glade.h:42
-msgid "<b>Play</b>"
-msgstr "<b>Jouer</b>"
+#, fuzzy
+msgid "<b>Tag Editing</b>"
+msgstr "<b>Édition de morceau</b>"
 
 #: ../data/gtkpod.glade.h:43
-msgid "<b>Playlists</b>"
-msgstr "<b>Listes</b>"
+#, fuzzy
+msgid "<b>Tags</b>"
+msgstr "<b>nd</b>"
 
 #: ../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>"
+#, fuzzy
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>Barre d'outils</b>"
 
 #: ../data/gtkpod.glade.h:45
-msgid "<b>Repositories</b>"
-msgstr "<b>Dépots</b>"
+msgid "<b>Tooltips</b>"
+msgstr "<b>Infobulles</b>"
 
 #: ../data/gtkpod.glade.h:46
-msgid "<b>Sort Order</b>"
-msgstr "<b>Ordre de tri</b>"
+#, fuzzy
+msgid "<b>Upper Margin</b>"
+msgstr "Borne supérieure"
 
 #: ../data/gtkpod.glade.h:47
-msgid "<b>Sort Tabs</b>"
-msgstr "<b>Zones de tri</b>"
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>Normalisation du volume</b>"
 
 #: ../data/gtkpod.glade.h:48
-msgid "<b>Sync</b>"
-msgstr "<b>Synchroniser</b>"
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:49
-msgid "<b>Synchronization</b>"
-msgstr "<b>Synchronisation</b>"
+#, fuzzy
+msgid "<b>gtkpod Options</b>"
+msgstr "Options gtkpod"
 
 #: ../data/gtkpod.glade.h:50
-msgid "<b>Tag Reading</b>"
-msgstr "<b>Lecture des attributs</b>"
+#, fuzzy
+msgid "<b>mserv Settings</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:51
-msgid "<b>Toolbar</b>"
-msgstr "<b>Barre d'outils</b>"
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:52
-msgid "<b>Tooltips</b>"
-msgstr "<b>Infobulles</b>"
+#, fuzzy
+msgid "<i>aacgain</i> executable:"
+msgstr "Chemin de l'exécutable « aacgain » :"
 
 #: ../data/gtkpod.glade.h:53
 #, fuzzy
-msgid "<b>Track Attributes</b>"
-msgstr "<b>Attributs des morceaux affichés</b>"
+msgid "<i>mp3gain</i> executable:"
+msgstr "Chemin de l'exécutable « mp3gain » :"
 
 #: ../data/gtkpod.glade.h:54
-msgid "<b>Track Editing</b>"
-msgstr "<b>Édition de morceau</b>"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:55
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>Normalisation du volume</b>"
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:56
-msgid "<b>mserv</b>"
-msgstr "<b>mserv</b>"
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:57
+#: ../data/gtkpod.glade.h:59
 msgid ">"
 msgstr ">"
 
-#: ../data/gtkpod.glade.h:58
-msgid "About gtkpod"
-msgstr "A propos de gtkpod"
+#: ../data/gtkpod.glade.h:60
+#, fuzzy
+msgid "About unupdated tracks"
+msgstr "Afficher les infos des morceaux mis à jour"
 
-#: ../data/gtkpod.glade.h:59
+#: ../data/gtkpod.glade.h:61
+#, fuzzy
+msgid "About updated tracks"
+msgstr "Afficher les infos des morceaux mis à jour"
+
+#: ../data/gtkpod.glade.h:62
+#, fuzzy
+msgid "Add Column"
+msgstr "Album"
+
+#: ../data/gtkpod.glade.h:63
 msgid "Add Directories Recursively"
 msgstr "Ajouter récursivement des répertoires."
 
-#: ../data/gtkpod.glade.h:60
+#: ../data/gtkpod.glade.h:64
 #, fuzzy
 msgid "Add Files"
 msgstr "Ajouter des _fichiers"
 
-#: ../data/gtkpod.glade.h:61
+#: ../data/gtkpod.glade.h:65
 msgid "Add Files or Directories"
 msgstr "Ajouter des fichiers ou répertoires."
 
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:66
 #, fuzzy
 msgid "Add Fol_der"
 msgstr "Ajouter des _fichiers"
 
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:67 ../src/fileselection.c:606
 #, fuzzy
 msgid "Add Folder"
 msgstr "Ajouter des _fichiers"
 
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:68
 msgid "Add Image_s"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:69
 #, fuzzy
 msgid "Add Images from a Directory"
 msgstr "Ajouter des fichiers ou répertoires."
 
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:70
 #, fuzzy
 msgid "Add Playlist"
 msgstr "Ajouter une _liste de lecture"
 
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:71
 msgid "Add _Files"
 msgstr "Ajouter des _fichiers"
 
-#: ../data/gtkpod.glade.h:68
+#: ../data/gtkpod.glade.h:72
 msgid "Add _Playlist"
 msgstr "Ajouter une _liste de lecture"
 
-#: ../data/gtkpod.glade.h:69
-msgid "Add coverart from file using the following template"
+#: ../data/gtkpod.glade.h:73
+#, fuzzy
+msgid "Add cover art using file name template"
 msgstr ""
 "Ajouter la pochette depuis un fichier en utilisant l'expression suivante"
 
-#: ../data/gtkpod.glade.h:70
-msgid "Add directories recursively"
-msgstr "Ajouter les répertoires récursivement"
+#: ../data/gtkpod.glade.h:74
+msgid ""
+"Add file masks to be excluded from import and synchronization, for example, "
+"<i>*.mp3</i>."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:71
-msgid "Add new repository/iPod"
+#: ../data/gtkpod.glade.h:75
+#, fuzzy
+msgid "Add new repository/iPod..."
 msgstr "Ajouter un nouvel iPod/dépôt"
 
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:76
 msgid "Add playlist from file"
 msgstr "Ajouter une liste de lecture depuis un fichier"
 
-#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
-#: ../src/display_tracks.c:2103
-msgid "Added"
+#: ../data/gtkpod.glade.h:77
+#, fuzzy
+msgid "Add subfolders recursively"
+msgstr "Ajouter les répertoires récursivement"
+
+#: ../data/gtkpod.glade.h:78
+#, fuzzy
+msgid "Added:"
 msgstr "Ajouté"
 
-#: ../data/gtkpod.glade.h:74
-msgid "Advanced Sorting Options"
-msgstr "Options de tri avancées"
-
 #. 0
-#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2995
 #: ../src/display_spl.c:84 ../src/misc_conversion.c:60
 msgid "Album"
 msgstr "Album"
 
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:80
 msgid "Album Art"
 msgstr "Affichage pochette"
 
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:81
 msgid "All (AND)"
 msgstr "Et"
 
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:82
 msgid "All Tracks Never Listened To"
 msgstr "Contenant les morceaux qui n'ont jamais été écoutés"
 
-#: ../data/gtkpod.glade.h:79
+#: ../data/gtkpod.glade.h:83
 msgid "All Tracks Played Since Last Time"
 msgstr "Contenant les morceaux joués depuis la dernière fois"
 
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:84
 msgid "All Tracks not Listed in any Playlist"
 msgstr "Contenant tous les morceaux qui n'appartiennent à aucune liste"
 
-#: ../data/gtkpod.glade.h:81
-msgid "Also include tracks never played in \"Best Rated\" playlist"
+#: ../data/gtkpod.glade.h:85
+msgid "Allow duplicate files"
 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: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:86
+#, fuzzy
+msgid "Also use this encoding when updating or synchronizing 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:83
+#: ../data/gtkpod.glade.h:87
+#, fuzzy
+msgid "Also use this encoding when writing 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:88
 msgid "Any (OR)"
 msgstr "Ou"
 
-#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
+#: ../data/gtkpod.glade.h:89
+msgid ""
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:92 ../src/display_sorttabs.c:2992
 #: ../src/display_spl.c:85 ../src/misc_conversion.c:61
 msgid "Artist"
 msgstr "Artiste"
 
-#: ../data/gtkpod.glade.h:85
+#: ../data/gtkpod.glade.h:93
 #, 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:"
+#: ../data/gtkpod.glade.h:94
+msgid "Automatically generate video thumbnails"
 msgstr ""
-"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:88
-msgid "Ascending"
-msgstr "Croissant"
-
-#: ../data/gtkpod.glade.h:89
-msgid "Auto Store"
-msgstr "Sauver automatiquement"
-
-#: ../data/gtkpod.glade.h:90
+#: ../data/gtkpod.glade.h:95
 msgid ""
 "Automatically start displaying tracks that match the criteria entered above. "
 "If not selected, you must press 'Display' to start displaying."
@@ -406,56 +464,54 @@
 "Affiche automatiquement les morceaux qui correspondent aux critères saisis."
 "En désactivant cette option, vous devrez appuyer sur « Afficher »."
 
-#: ../data/gtkpod.glade.h:91
-msgid "Available:"
+#: ../data/gtkpod.glade.h:96
+msgid "Background color"
 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:97
+msgid "Best Rated Tracks"
+msgstr "Contenant les morceaux les mieux notés"
 
-#: ../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:94
-msgid "Before removing tracks from the iPod"
-msgstr "Avant de supprimer complètement les morceaux de l'iPod"
-
-#: ../data/gtkpod.glade.h:95
-msgid "Before removing tracks from the local database"
+#: ../data/gtkpod.glade.h:98
+msgid "Bottom"
 msgstr ""
-"Avant de supprimer complètement les morceaux de la base de données locale"
 
-#: ../data/gtkpod.glade.h:96
-msgid "Best Rated Tracks"
-msgstr "Contenant les morceaux les mieux notés"
-
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:99 ../src/prefsdlg.c:588
 msgid "Browse"
 msgstr "Parcourir"
 
-#: ../data/gtkpod.glade.h:98
-msgid "Cache directory:"
+#: ../data/gtkpod.glade.h:100
+#, fuzzy
+msgid "Browse..."
+msgstr "Parcourir"
+
+#: ../data/gtkpod.glade.h:101
+#, fuzzy
+msgid "Cache folder:"
 msgstr "Dossier de cache :"
 
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:102
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:103
 msgid "Calendar sync command:"
 msgstr "Commande pour la synchronisation du calendrier :"
 
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:104
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Exécuter en même temps que la synchronisation de la base iTunesDB"
 
-#: ../data/gtkpod.glade.h:102
-msgid "Category: "
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:106
+#, fuzzy
+msgid "Category:"
 msgstr "Catégorie : "
 
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:107
 msgid ""
 "Change all tracks\n"
 "simultaneously"
@@ -463,112 +519,158 @@
 "Changer tous les morceaux\n"
 "simultanément"
 
-#: ../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
+#: ../data/gtkpod.glade.h:109
 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:108
-msgid "Command for 'Enqueue':"
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:111
+#, fuzzy
+msgid "Command for \"Enqueue\":"
 msgstr "Ligne de commande pour « Ajouter à la file d'attente » :"
 
-#: ../data/gtkpod.glade.h:109
-msgid "Command for 'Play now':"
+#: ../data/gtkpod.glade.h:112
+#, fuzzy
+msgid "Command for \"Play now\":"
 msgstr "Ligne de commande pour « Jouer maintenant » :"
 
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr ""
+
 #. 5
-#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:114 ../src/display_spl.c:97
 #: ../src/misc_conversion.c:65
 msgid "Composer"
 msgstr "Compositeur"
 
-#: ../data/gtkpod.glade.h:111
+#: ../data/gtkpod.glade.h:115
 msgid "Confirm before removing tracks from the iPod or repository"
 msgstr "Confirmer avant de supprimer les morceaux de l'iPod ou du dépôt"
 
-#: ../data/gtkpod.glade.h:112
-msgid ""
-"Confirm before removing tracks from the iPod or repository\n"
-"when syncing playlists"
+#: ../data/gtkpod.glade.h:116
+#, fuzzy
+msgid "Confirm deletion of playlists or tracks from a playlist"
+msgstr "Avant de supprimer les listes ou morceaux d'une liste de lecture"
+
+#: ../data/gtkpod.glade.h:117
+msgid "Confirm deletion of tracks during synchronization"
 msgstr ""
-"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:114
-msgid "Confirm lists of directories"
+#: ../data/gtkpod.glade.h:118
+#, fuzzy
+msgid "Confirm deletion of tracks:"
 msgstr "Confirmer la liste des répertoires"
 
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:119
 msgid "Contacts sync command:"
 msgstr "Commande pour la synchronisation des contacts :"
 
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:120
 msgid "Containing Displayed Tracks"
 msgstr "Contenant les morceaux affichés"
 
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:121
 msgid "Containing Selected Tracks"
 msgstr "Contenant les morceaux sélectionnés"
 
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:122
+#, fuzzy
+msgid "Conversion Preferences"
+msgstr "_Préférences"
+
+#: ../data/gtkpod.glade.h:123
 msgid "Conversion Progress Display"
 msgstr "Afficher une boîte de dialogue de barre de progression"
 
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:124
+#, fuzzy
+msgid "Conversion Settings..."
+msgstr "_Trace des conversions"
+
+#: ../data/gtkpod.glade.h:125
+msgid "Convert AAC (M4A)"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:126
+msgid "Convert FLAC"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:127
+#, fuzzy
+msgid "Convert MP3"
+msgstr "Pochette"
+
+#: ../data/gtkpod.glade.h:128
+#, fuzzy
+msgid "Convert Ogg Vorbis"
+msgstr "Ogg Vorbis"
+
+#: ../data/gtkpod.glade.h:129
+#, fuzzy
+msgid "Convert WAV"
+msgstr "Pochette"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Convert compatible formats to a single format"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:132
 msgid "Cover"
 msgstr "Pochette"
 
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:134
+msgid "Cover art file pattern:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:135
 msgid "Create New Playlist"
 msgstr "Créer une nouvelle liste de lecture."
 
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:136
 msgid "Create Repository"
 msgstr "Créer un dépot"
 
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:137
 msgid "Create _Playlist File"
 msgstr "Créer un fichier de _liste"
 
-#: ../data/gtkpod.glade.h:123
-msgid "Credits"
-msgstr "Crédits"
+#: ../data/gtkpod.glade.h:138
+msgid "Customize..."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:124
-msgid "Currently only rating is supported."
-msgstr "Actuellement, seule la notation est supportée."
-
-#: ../data/gtkpod.glade.h:125
-msgid "Delete repository"
+#: ../data/gtkpod.glade.h:139
+#, fuzzy
+msgid "Delete Repository"
 msgstr "Supprimer le dépot"
 
-#: ../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épôt"
+#: ../data/gtkpod.glade.h:140
+#, fuzzy
+msgid "Delete missing tracks from the iPod or repository"
+msgstr "Confirmer avant de supprimer les morceaux de l'iPod ou du dépôt"
 
-#: ../data/gtkpod.glade.h:128
-msgid "Deleted tracks"
-msgstr "Morceaux supprimés"
+#: ../data/gtkpod.glade.h:141
+#, fuzzy
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "%d morceau supprimé de la liste de lecture « %s »"
 
-#: ../data/gtkpod.glade.h:129
-msgid "Descending"
-msgstr "Décroissant"
-
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:142
 msgid "Details"
 msgstr "Détails"
 
-#: ../data/gtkpod.glade.h:132
+#: ../data/gtkpod.glade.h:144
 #, no-c-format
 msgid ""
 "Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -578,14 +680,14 @@
 "nr: %C, year: %Y, original filename (requires extended information file): %"
 "o, the character '%': %%."
 msgstr ""
-"Détermine comment le champ d'information doit être construit, par exemple «%"
-"a/%A/%T - %t» ou «%o». Vous pouvez séparer les expressions par des points-"
+"Détermine comment le champ d'information doit être construit, par exemple «%a/"
+"%A/%T - %t» ou «%o». Vous pouvez séparer les expressions par des points-"
 "virgules -- gtkpod déterminera laquelle utiliser suivant l'extension du "
 "fichier donnée. Artiste: %a, album: %A, compositeur: %c, titre: %t, 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:134
+#: ../data/gtkpod.glade.h:146
 #, no-c-format
 msgid ""
 "Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -602,219 +704,168 @@
 "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:136
-#, no-c-format
+#: ../data/gtkpod.glade.h:147
 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 ""
-"Détermine le nom du fichier pour la pochette. Vous pouvez séparer les "
-"expressions utilisées dans l'ordre par des points-virgules. Artiste: %a, "
-"album: %A, compositeur; %c, titre: %t, 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 nom de fichier original sans extension: %O, la liste "
-"courante: %p,  le caractère '%': %%."
-
-#: ../data/gtkpod.glade.h:137
-msgid ""
 "Directories to sync with are determined from the filenames of the tracks in "
 "the playlist."
 msgstr ""
 "Répertoires à synchroniser déterminés par les noms de fichier des morceaux "
 "de la liste de lecture."
 
-#: ../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:148
+#, fuzzy
+msgid "Display"
+msgstr "_Affichage"
 
-#: ../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:140
+#: ../data/gtkpod.glade.h:149
 msgid "Display conversion log"
 msgstr "Afficher les traces des conversions"
 
-#: ../data/gtkpod.glade.h:141
-msgid "Display info about detected duplicates"
+#: ../data/gtkpod.glade.h:150
+#, fuzzy
+msgid "Display information about detected duplicate files"
 msgstr "Afficher les infos au sujet des doublons"
 
-#: ../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:143
-msgid "Display info about updated tracks"
-msgstr "Afficher les infos des morceaux mis à jour"
-
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:151
 msgid "Display messages and warnings at startup"
 msgstr "Afficher les messages et avertissements au démarrage"
 
-#: ../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:152
+#, fuzzy
+msgid "Display synchronization results"
+msgstr "Afficher les traces des conversions"
 
-#: ../data/gtkpod.glade.h:146
-msgid "Display toolbar..."
-msgstr "Afficher la barre d'outils…"
-
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:153
 msgid "Display tooltips in main window"
 msgstr "Afficher les infobulles dans la fenêtre principale"
 
-#: ../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:149
+#: ../data/gtkpod.glade.h:154
 msgid "Display tracks that match the criteria entered above."
 msgstr "Afficher les morceaux qui correspondent aux critères saisis."
 
-#: ../data/gtkpod.glade.h:150
-msgid ""
-"Displayed\n"
-"Tracks"
-msgstr ""
-"Morceaux\n"
-"Affichés"
-
-#: ../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:154
+#: ../data/gtkpod.glade.h:155
 msgid "Don't automatically sync on startup"
 msgstr "Ne pas synchroniser automatiquement au démarrage"
 
-#: ../data/gtkpod.glade.h:155
-msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+#: ../data/gtkpod.glade.h:156
+msgid "Dummy\n"
 msgstr ""
-"La détection de doublons est basée sur la somme de contrôle sha1 des "
-"fichiers."
 
-#: ../data/gtkpod.glade.h:156
-msgid "Edit Repository/iPod Options"
-msgstr "Editer les _options du dépot/iPod"
-
-#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:664
 msgid "Edit Smart Playlist"
 msgstr "Éditer la liste intelligente"
 
-#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:751
 msgid "Edit Track Details"
 msgstr "Editer les _détails du morceau"
 
-#: ../data/gtkpod.glade.h:159
-msgid "Edit _Preferences"
-msgstr "_Préférences"
-
 #: ../data/gtkpod.glade.h:160
-msgid "Effective free space"
-msgstr "Espace libre effectif"
-
-#: ../data/gtkpod.glade.h:161
 msgid "Empty Playlist"
 msgstr "Vide"
 
+#: ../data/gtkpod.glade.h:161
+#, fuzzy
+msgid "Encoding Preferences"
+msgstr "_Préférences"
+
 #: ../data/gtkpod.glade.h:162
-msgid "Exclude file mask(s)"
-msgstr "Masque(s) d'exclusion de fichiers :"
+#, fuzzy
+msgid "Encoding..."
+msgstr "copie …"
 
 #: ../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."
+#, fuzzy
+msgid "Excluded files..."
+msgstr "Masque(s) d'exclusion de fichiers :"
 
 #: ../data/gtkpod.glade.h:164
-msgid "File size"
-msgstr "Taille des fichiers"
+msgid "Exclusions List"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:165
-msgid "File size (deleted)"
-msgstr "Taille des fichiers (supprimés)"
+msgid "Expand columns beyond the track list width"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:166
-msgid "File size (non-transferred)"
-msgstr "Taille des fichiers (non transférés)"
+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:167
-msgid "Filename Format: "
-msgstr "Format du nom des fichiers : "
+msgid "Feedback"
+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 ""
-"Trouver les fichiers orphelins (fichiers sans entrée dans la base iTunesDB) "
-"et les morceaux fictifs (morceaux sans fichier correspondant sur l'iPod)."
+#, fuzzy
+msgid "Filename Parse Preferences"
+msgstr "_Préférences"
 
 #: ../data/gtkpod.glade.h:169
 #, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
-msgstr "Essaye <i>répertoire.jpg</i>, puis <i>&lt;artiste&gt;.jpg</i>"
+msgid "Filename format: "
+msgstr "Format du nom des fichiers : "
 
 #: ../data/gtkpod.glade.h:170
-msgid "Flac with :"
-msgstr "FLAC avec :"
+#, fuzzy
+msgid "Filename parse pattern:"
+msgstr "Format du nom des fichiers : "
 
+#: ../data/gtkpod.glade.h:171
+#, fuzzy
+msgid "Filter tab:"
+msgstr "Type de fichier"
+
 #: ../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."
+#, fuzzy
+msgid "Filter tabs"
+msgstr "Fichiers"
 
+#: ../data/gtkpod.glade.h:173
+#, fuzzy
+msgid "Filter:"
+msgstr "_Fichier"
+
 #: ../data/gtkpod.glade.h:174
-#, no-c-format
 msgid ""
-"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
-"current playlist."
+"Find orphan files (files with no track info in DB) and dangling tracks "
+"(tracks with no corresponding files on iPod)"
 msgstr ""
-"Par exemple « xmms -e %s » ajoutera à la liste de lecture de xmms les "
-"morceaux sélectionnés."
+"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:175 ../src/display_sorttabs.c:2985
+#: ../data/gtkpod.glade.h:175
+#, fuzzy
+msgid "From the hard disk"
+msgstr "Supprimer du disque dur"
+
+#: ../data/gtkpod.glade.h:176
+#, fuzzy
+msgid "From the iPod"
+msgstr "Supprimer de l'iPod"
+
+#: ../data/gtkpod.glade.h:177
+#, fuzzy
+msgid "From the local database"
+msgstr "Base de données locale"
+
+#: ../data/gtkpod.glade.h:178 ../src/display_spl.c:182 ../src/info.c:794
+msgid "GB"
+msgstr "Go"
+
+#: ../data/gtkpod.glade.h:179 ../src/display_sorttabs.c:2998
 #: ../src/display_spl.c:89 ../src/misc_conversion.c:63
 msgid "Genre"
 msgstr "Genre"
 
-#: ../data/gtkpod.glade.h:176
-msgid "Group artists on compilation CDs"
-msgstr "Grouper les artistes pour les CDs de compilation"
-
-#: ../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)."
+#: ../data/gtkpod.glade.h:180
+msgid "Get Help _Online"
 msgstr ""
-"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 (change "
-"l'entrée « transferred= » dans la sauvegarde de la base de données)."
 
-#: ../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
+#, fuzzy
+msgid "Group artist filter tab by compilation CDs"
+msgstr "Grouper les artistes pour les CDs de compilation"
 
-#: ../data/gtkpod.glade.h:179
+#: ../data/gtkpod.glade.h:182
 msgid ""
 "If available, the local copy of the track is referenced in the playlist. "
 "Otherwise the file on the iPod is used."
@@ -822,13 +873,7 @@
 "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: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:181
+#: ../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."
@@ -836,26 +881,6 @@
 "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: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 ""
-"Si le fichier (chemin complet) d'un morceau existant correspond au morceau à "
-"ajouter, cette option vous permet de mettre à jour les informations du "
-"morceau existant plutôt que de l'écraser. Notez que cette option est "
-"différente de l'option ci-dessus : les doublons sont des fichiers "
-"strictement identiques (même taille, mêmes tags)"
-
-#: ../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:184
 msgid ""
 "If you check this, information (cover art and meta information) changed for "
@@ -867,27 +892,10 @@
 "sélectionnés. A utiliser avec précaution."
 
 #: ../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 ""
-"Si vous ne choisissez pas de liste de lecture principale automatiquement, "
-"l'import initial sera beaucoup plus rapide car l'affichage n'aura pas à être "
-"mis à jour à chaque morceau."
-
-#: ../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 ""
-"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: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:188
+#: ../data/gtkpod.glade.h:186
 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."
@@ -896,6 +904,17 @@
 "menu « Édition » puis « Sauver l'ordre de tri des morceaux affichés » ou "
 "l'option « Sauver automatiquement » ci-dessus."
 
+#: ../data/gtkpod.glade.h:187
+#, fuzzy
+msgid "Include tracks never played in the \"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:188
+msgid "Info field template:"
+msgstr ""
+
 #: ../data/gtkpod.glade.h:189
 msgid "Initialize iPod"
 msgstr "Initialiser l'iPod"
@@ -909,105 +928,100 @@
 "Insérer après"
 
 #: ../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"
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:193
+#: ../data/gtkpod.glade.h:196
 msgid "Live _updating"
 msgstr "Mise à jour automatique"
 
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:197
 msgid "Load iPod(s)"
 msgstr "Charger _iPod(s)"
 
-#: ../data/gtkpod.glade.h:195
-msgid "Lower Margin"
-msgstr "Borne inférieure"
-
-#: ../data/gtkpod.glade.h:196
-msgid "M4A with :"
-msgstr "M4A avec :"
-
-#: ../data/gtkpod.glade.h:197
-msgid "MP3 with :"
-msgstr "MP3 avec :"
-
 #: ../data/gtkpod.glade.h:198
-msgid "Match al_l of the following"
-msgstr "Répondant à _toutes"
+#, fuzzy
+msgid "Logic:"
+msgstr " Opérateur logique : "
 
 #: ../data/gtkpod.glade.h:199
-msgid "Match an_y of the following"
-msgstr "Répondant à _quelques"
+msgid ""
+"MP3\n"
+"AAC\n"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:202
+msgid "Mass-modify tags when multiple tracks are selected"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:203
 msgid "Match only _checked tracks"
 msgstr "Seulement les morceaux _cochés"
 
-#: ../data/gtkpod.glade.h:201
-msgid "Maximum number of background threads:"
+#: ../data/gtkpod.glade.h:204
+#, fuzzy
+msgid "Match:"
+msgstr "Chemin :"
+
+#: ../data/gtkpod.glade.h:205
+msgid "Maximum cache size:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:206
+#, fuzzy
+msgid "Maximum threads:"
 msgstr "Nombre maximum de threads en arrière-plan :"
 
-#: ../data/gtkpod.glade.h:202
-msgid "Maximum size of cache directory (in GB):"
-msgstr "Taille maximale du dossier cache (en Go) :"
+#: ../data/gtkpod.glade.h:207
+msgid "Metadata"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:208
 msgid "Model:"
 msgstr "Modèle :"
 
-#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
-msgid "Modified"
+#: ../data/gtkpod.glade.h:209
+#, fuzzy
+msgid "Modified:"
 msgstr "Modifié le"
 
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:210
 msgid "Most Recently Played Tracks"
 msgstr "Contenant les morceaux dernièrement joués"
 
-#: ../data/gtkpod.glade.h:206
-msgid "Move selected attributes to the displayed list"
-msgstr ""
+#: ../data/gtkpod.glade.h:211
+#, fuzzy
+msgid "Music"
+msgstr "Racine musique :"
 
-#: ../data/gtkpod.glade.h:207
-msgid "Music Root:"
+#: ../data/gtkpod.glade.h:212
+#, fuzzy
+msgid "Music root:"
 msgstr "Racine musique :"
 
-#: ../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 ""
-"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:209
+#: ../data/gtkpod.glade.h:213
 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
+#: ../data/gtkpod.glade.h:214 ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76 ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113 ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448 ../src/misc_playlist.c:450
 msgid "New Playlist"
 msgstr "Nouvelle liste de lecture"
 
-#: ../data/gtkpod.glade.h:211
+#: ../data/gtkpod.glade.h:215
 msgid "No lower margin"
 msgstr "Pas de borne inférieure"
 
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:216
 msgid "No upper margin"
 msgstr "Pas de borne supérieure"
 
-#: ../data/gtkpod.glade.h:213
-msgid "Non-transferred tracks"
-msgstr "Morceaux non transférés"
-
-#: ../data/gtkpod.glade.h:214
-msgid "None"
-msgstr "Aucun"
-
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:217
 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 "
@@ -1024,44 +1038,6 @@
 "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: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 ""
-"Par défaut, le jeu de caractère spécifié lors du premier import d'un morceau "
-"sera celui utilisé pour la mise à jour. Pour corriger un mauvais jeu de car. "
-"sélectionné à l'import initial d'un morceau, cocher cette option pour le "
-"modifier lors de la mise à jour de ce morceau. Note : les infos sur les "
-"caractères sont stockées dans un fichier d'informations étendues et les "
-"morceaux importés.avant la version 0.51 de gtkpod n'utilisait pas ce "
-"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: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 ""
-"Par défaut, le jeu de caractère spécifié lors du premier import d'un morceau "
-"sera celui utilisé pour la mise à jour. Pour corriger un mauvais jeu de car. "
-"sélectionné à l'import initial d'un morceau, cocher cette option pour le "
-"modifier lors de la mise à jour de ce morceau. Note : les infos sur les "
-"caractères sont stockées dans un fichier d'information étendu et les "
-"morceaux importés avant la version 0.51 de gtkpod n'utilisait pas ce "
-"fichier. Ce sera le jeu spécifié ici qui sera utilisé en cas de mise à jour "
-"de ces morceaux."
-
 #: ../data/gtkpod.glade.h:218
 msgid ""
 "Normally, if a track is no longer present in the sync directory, it will be "
@@ -1084,384 +1060,322 @@
 "liste principale signifie effacer de l'iPod."
 
 #: ../data/gtkpod.glade.h:221
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:222
 msgid "Notes sync command:"
 msgstr "Commande pour la synchronisation des notes :"
 
-#: ../data/gtkpod.glade.h:222
-msgid "Number of playlists"
-msgstr "Nombre de listes de lecture"
-
 #: ../data/gtkpod.glade.h:223
-msgid "Number of tracks"
-msgstr "Nombre de morceaux"
+#, fuzzy
+msgid "Number of filter tabs:"
+msgstr "_Nombre de zones de tri :"
 
 #: ../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 :"
+#, fuzzy
+msgid "Number of tracks:"
+msgstr "Nombre de morceaux"
 
 #: ../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 ""
-"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:226
-msgid "Ogg with :"
-msgstr "Ogg avec :"
-
-#: ../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:228
+#: ../data/gtkpod.glade.h:226
 msgid "On startup automatically sync with the following directory"
 msgstr "Au démarrage synchroniser automatiquement avec le répertoire suivant"
 
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically update (Live Playlist)"
 msgstr "Au démarrage synchroniser automatiquement (liste dynamique)"
 
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:228
 msgid "One for each Album"
 msgstr "Par album"
 
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:229
 msgid "One for each Artist"
 msgstr "Par artiste"
 
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:230
 msgid "One for each Composer"
 msgstr "Par compositeur"
 
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:231
 msgid "One for each Genre"
 msgstr "Par genre"
 
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:232
 msgid "One for each Rating"
 msgstr "Par note"
 
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:233
 msgid "One for each Year"
 msgstr "Par année"
 
-#: ../data/gtkpod.glade.h:236
-msgid "Overwrite tags that are already set"
-msgstr "Écraser les attributs déjà présents"
+#: ../data/gtkpod.glade.h:234
+#, fuzzy
+msgid "Overwrite existing tags"
+msgstr "Écrasement du fichier existant : « %s »\n"
 
-#: ../data/gtkpod.glade.h:237
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:236
 msgid "Path:"
 msgstr "Chemin :"
 
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:237
 #, 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"
-
-#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
-#: ../src/misc_conversion.c:77
-msgid "Playcount"
+#: ../data/gtkpod.glade.h:238
+#, fuzzy
+msgid "Playcount:"
 msgstr "Cpt. lecture"
 
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
-msgid "Played"
+#: ../data/gtkpod.glade.h:239
+#, fuzzy
+msgid "Played:"
 msgstr "Joué le"
 
-#: ../data/gtkpod.glade.h:243
+#: ../data/gtkpod.glade.h:240
 msgid "Playlist name:"
 msgstr "Nom de la liste :"
 
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:241
 msgid "Playlist type:"
 msgstr "Type de liste :"
 
-#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
+#: ../data/gtkpod.glade.h:242 ../src/display_playlists.c:2397
 msgid "Playlists"
 msgstr "Listes de lecture"
 
-#: ../data/gtkpod.glade.h:246
+#: ../data/gtkpod.glade.h:243
 msgid "Please refer to the notice below."
 msgstr "Référez vous à la règle ci-dessous."
 
-#: ../data/gtkpod.glade.h:247
-msgid "Please specify a time interval"
-msgstr "Spécifiez un intervalle de temps"
+#: ../data/gtkpod.glade.h:244
+#, fuzzy
+msgid "Position:"
+msgstr "Compilation"
 
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:245
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:246
 msgid "Progress Information"
 msgstr "Afficher des informations de progression"
 
-#: ../data/gtkpod.glade.h:250
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:252
 msgid "R_ename Album"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:253
 msgid "Random Playlist from Displayed Tracks"
 msgstr "Contenant les morceaux affichés aléatoirement"
 
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:254
 msgid "Randomize Current Playlist"
 msgstr "Mélanger l'ordre de la liste de lecture actuelle"
 
-#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
-#: ../src/misc_conversion.c:78
-msgid "Rating"
+#: ../data/gtkpod.glade.h:255
+#, fuzzy
+msgid "Rating:"
 msgstr "Note"
 
-#: ../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:256
+msgid "Read embedded cover art information"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:255
-msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
+#: ../data/gtkpod.glade.h:257
+msgid "Read embedded tags from music files"
 msgstr ""
-"Lire les attributs à partir du contenu des fichiers (attributs ID3 dans les "
-"fichiers)"
 
-#: ../data/gtkpod.glade.h:256
+#: ../data/gtkpod.glade.h:258
+msgid "Report a _Problem"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:259
 #, fuzzy
-msgid "Remove selected attributes from the displayed list"
-msgstr "Morceaux sélectionnés de la liste de lecture"
+msgid "Report problems when accessing mserv"
+msgstr "Afficher les informations sur les problèmes liés à mserv"
 
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:260
+#, fuzzy
+msgid "Repository"
+msgstr "Nouveau dépot"
+
+#: ../data/gtkpod.glade.h:261
 msgid "Repository Options"
 msgstr "Options du dépot"
 
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:262
 msgid "Repository name:"
 msgstr "Nom du dépot :"
 
-#: ../data/gtkpod.glade.h:259
+#: ../data/gtkpod.glade.h:263
 msgid "Repository type:"
 msgstr "Type de dépot :"
 
-#: ../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
+#, fuzzy
+msgid "Repository/iPod Options"
+msgstr "Editer les _options du dépot/iPod"
 
-#: ../data/gtkpod.glade.h:261
-msgid "Rules"
-msgstr "Règles"
-
-#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
+#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:806
 msgid "Save Changes"
 msgstr "Enregistrer"
 
-#: ../data/gtkpod.glade.h:263
-msgid "Scrobble Tracks?"
-msgstr "« scrobbling » des morceaux ?"
-
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:266
 msgid "Select '-1' for no upper limit."
 msgstr "Choisissez «-1» pour aucune limite supérieure."
 
-#: ../data/gtkpod.glade.h:265
+#: ../data/gtkpod.glade.h:267
 msgid "Select '0' for no lower limit."
 msgstr "Choisissez «0» pour aucune limite inférieure."
 
-#: ../data/gtkpod.glade.h:266
-msgid ""
-"Selected\n"
-"Playlist"
-msgstr ""
-"Liste de lecture\n"
-"Sélectionnée"
-
 #: ../data/gtkpod.glade.h:268
-msgid ""
-"Selected\n"
-"Tracks"
-msgstr ""
-"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
+#: ../data/gtkpod.glade.h:269
 #, fuzzy
 msgid "Selected Filter Tab Entry from Hard Disk"
 msgstr "Zone de tri sélectionnée du disque dur"
 
-#: ../data/gtkpod.glade.h:272
+#: ../data/gtkpod.glade.h:270
 #, 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
+#: ../data/gtkpod.glade.h:271
 #, fuzzy
 msgid "Selected Filter Tab Entry from iPod"
 msgstr "Zone de tri sélectionnée de l'iPod"
 
-#: ../data/gtkpod.glade.h:274
+#: ../data/gtkpod.glade.h:272
 #, 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
+#: ../data/gtkpod.glade.h:273
 #, 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
+#: ../data/gtkpod.glade.h:274
 #, 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
+#: ../data/gtkpod.glade.h:275
 msgid "Selected Tab _Entry"
 msgstr "Zon_e de tri sélectionnée"
 
-#: ../data/gtkpod.glade.h:278
+#: ../data/gtkpod.glade.h:276
 #, fuzzy
 msgid "Selected Tracks from Database"
 msgstr "Morceaux sélectionnés de la base de données"
 
-#: ../data/gtkpod.glade.h:279
+#: ../data/gtkpod.glade.h:277
 #, fuzzy
 msgid "Selected Tracks from Hard Disk"
 msgstr "Morceaux sélectionnés du disque dur"
 
-#: ../data/gtkpod.glade.h:280
+#: ../data/gtkpod.glade.h:278
 #, fuzzy
 msgid "Selected Tracks from Playlist"
 msgstr "Morceaux sélectionnés de la liste de lecture"
 
-#: ../data/gtkpod.glade.h:281
+#: ../data/gtkpod.glade.h:279
 #, fuzzy
 msgid "Selected Tracks from iPod"
 msgstr "Morceaux sélectionnés de l'iPod"
 
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:280
 msgid "Selected _Playlist"
 msgstr "_Liste de lecture sélectionnée"
 
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:281
 msgid "Selected _Tracks"
 msgstr "Morceaux sélec_tionnés"
 
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:282
 msgid "Selected playlist"
 msgstr "_Liste de lecture sélectionnée"
 
-#: ../data/gtkpod.glade.h:285
-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
+#: ../data/gtkpod.glade.h:283
 msgid "Set Cover Art from _File"
 msgstr "Pochette à partir du _fichier"
 
-#: ../data/gtkpod.glade.h:287
-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:288
-msgid "Set options for Calendar/Contacts/Notes"
-msgstr "Options pour Calendrier/Contacts/Notes"
-
-#: ../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."
+#: ../data/gtkpod.glade.h:284
+msgid "Set still missing tags to file name"
 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."
 
-#: ../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."
+#: ../data/gtkpod.glade.h:285
+#, fuzzy
+msgid "Settings..."
+msgstr "Annulation …"
 
-#: ../data/gtkpod.glade.h:291
-msgid "Set this to your last.fm password"
-msgstr "Remplir avec le mot de passe last.fm"
-
-#: ../data/gtkpod.glade.h:292
-msgid "Set this to your last.fm username"
-msgstr "Remplir avec le nom d'utilisateur 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 ""
-"Mettre à 0 pour inhiber le cache (un morceau au maximum dans le cache)."
-
-#: ../data/gtkpod.glade.h:294
-msgid ""
-"Set to 0 to use as many background threads as CPUs are available on your "
-"system."
-msgstr "Mettre à 0 pour utiliser autant de « threads » que possible."
-
-#: ../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:296
+#: ../data/gtkpod.glade.h:286
 msgid "Show summary of sync result"
 msgstr "Montrer le résumé du résultat de la synchronisation"
 
-#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
-#: ../src/repository.c:1356
+#: ../data/gtkpod.glade.h:287
+#, fuzzy
+msgid "Skip the track"
+msgstr "Un morceau copié"
+
+#: ../data/gtkpod.glade.h:288 ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
 msgid "Smart Playlist"
 msgstr "Intelligente"
 
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:289
+#, fuzzy
+msgid "Sort by:"
+msgstr "   Trier par :"
+
+#: ../data/gtkpod.glade.h:290
 msgid "Sort tracks according to: "
 msgstr "Trier les morceaux suivant :"
 
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:291
 msgid "Sorting Options"
 msgstr "Options de tri"
 
-#: ../data/gtkpod.glade.h:300
-msgid "Sorting case sensitive"
-msgstr "Trier en tenant compte de la casse"
+#: ../data/gtkpod.glade.h:292
+#, fuzzy
+msgid "Sorting..."
+msgstr "Annulation …"
 
-#: ../data/gtkpod.glade.h:301
-msgid "Sorttab: "
-msgstr "Zone de tri :"
-
-#: ../data/gtkpod.glade.h:302
-msgid "Sorttabs"
-msgstr "Zones de tri :"
-
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:293
 msgid "Source:"
 msgstr "Source :"
 
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:295
 #, no-c-format
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
@@ -1470,39 +1384,43 @@
 "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:306
+#: ../data/gtkpod.glade.h:296
 msgid "Specify interval"
 msgstr "Spécifier un intervalle"
 
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:297
 msgid "Start display automatically"
 msgstr "Afficher automatiquement"
 
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:298
 msgid "Synchronise Contacts, Calendar and Notes"
 msgstr "Synchroniser le calendrier, contacts et notes"
 
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:299
 msgid "Synchronize All"
 msgstr "Tout synchroniser"
 
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:300
 msgid "Synchronize Calendar"
 msgstr "Synchroniser le calendrier"
 
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:301
 msgid "Synchronize Contacts"
 msgstr "Synchroniser les contacts"
 
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:302
 msgid "Synchronize Notes"
 msgstr "Synchroniser les notes"
 
-#: ../data/gtkpod.glade.h:313
-msgid "Template for info field: "
-msgstr "Modèle pour le champ d'info :"
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:304
+msgid "Text color"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:305
 msgid ""
 "The local copy of the track is referenced in the playlist. If the track is "
 "not available locally, an error message is displayed."
@@ -1510,7 +1428,7 @@
 "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:315
+#: ../data/gtkpod.glade.h:306
 msgid ""
 "The output of the background conversion scripts is copied below. Each page "
 "of the notebook corresponds to one background thread."
@@ -1518,101 +1436,55 @@
 "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:316
-msgid ""
-"The tags are written to the files on your harddrive and on the iPod (if "
-"available)."
-msgstr ""
-"Les attributs ID3 seront écrits dans les fichiers sur votre disque et l'iPod "
-"(si disponible)."
-
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:307
 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: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 »"
-
-#: ../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 ""
-"Les tags ID3v2.4 utilisent l'unicode pour stocker les attributs de façon à "
-"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:320
-msgid "This option will be re-activated when you upgrade gtkpod."
-msgstr "Cette option se réactivera quand vous mettrez à jour gtkpod"
-
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:308
 msgid "Time:"
 msgstr "Heure :"
 
-#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
+#: ../data/gtkpod.glade.h:309 ../src/display_sorttabs.c:3004
 #: ../src/display_spl.c:83 ../src/misc_conversion.c:62
 msgid "Title"
 msgstr "Titre"
 
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:310
 msgid ""
-"Total\n"
-"(iPod)"
+"To fill additional information, <i>gtkpod</i> can use a database provided by "
+"the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, "
+"leave this alone."
 msgstr ""
-"Total\n"
-"(iPod)"
 
-#: ../data/gtkpod.glade.h:325
-msgid ""
-"Total\n"
-"(local)"
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
 msgstr ""
-"Total\n"
-"(local)"
 
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:312
 msgid "Tracks"
 msgstr "Morceaux"
 
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:313
 msgid "Tracks Most Often Listened To"
 msgstr "Contenant les morceaux les plus écoutés"
 
-#: ../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:330
+#: ../data/gtkpod.glade.h:314
 msgid "Tracks in Selected Tab _Entry"
 msgstr "Morceaux dans la Zon_e de tri sélectionnée"
 
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:315
 msgid "Tracks in Selected _Playlist"
 msgstr "Morceaux de la _Liste de lecture sélectionnée"
 
-#: ../data/gtkpod.glade.h:332
-msgid "Transfer tracks to the iPod in the background"
+#: ../data/gtkpod.glade.h:316
+#, fuzzy
+msgid "Transfer tracks in background mode"
 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:333
-msgid "Translators"
-msgstr "Traducteurs"
-
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:317
 msgid ""
 "Try to load contents of all connected iPods. For each iPod a separate "
 "repository must be set up."
@@ -1620,57 +1492,39 @@
 "Essaye de charger le contenu des iPods connectés. Pour chaque iPod un dépot "
 "différent doit être créé."
 
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:318
 msgid "Undo _Track"
 msgstr "Annuler pour le _Morceau"
 
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:319
 msgid "Update _mserv Data from File"
 msgstr "Mettre à jour les données _mserv à partir des fichiers"
 
-#: ../data/gtkpod.glade.h:337
-msgid "Update/Sync all playlists now"
+#: ../data/gtkpod.glade.h:320
+#, fuzzy
+msgid "Update information about the existing track"
+msgstr "Afficher les informations sur les problèmes liés à mserv"
+
+#: ../data/gtkpod.glade.h:321
+#, fuzzy
+msgid "Update/Sync All Playlists"
 msgstr "Mettre à jour/Synchroniser toutes les listes"
 
-#: ../data/gtkpod.glade.h:338
-msgid "Update/Sync playlist now"
+#: ../data/gtkpod.glade.h:322
+#, fuzzy
+msgid "Update/Sync Playlist"
 msgstr "Mettre à jour/Synchroniser"
 
-#: ../data/gtkpod.glade.h:339
-msgid "Upper margin"
-msgstr "Borne supérieure"
+#: ../data/gtkpod.glade.h:323
+msgid "Use legacy format for MP3 tags"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:340
-msgid "Use 'Multi-Edit' also for title field"
-msgstr "Utiliser « Édition multiple » également pour les titres"
-
-#: ../data/gtkpod.glade.h:341
-msgid "Use 'Multi-Edit' for tracks selections"
-msgstr "Utiliser « Édition multiple » pour les morceaux sélectionnés"
-
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:324
 #, fuzzy
-msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
-msgstr "Utilise <i>&lt;Album&gt;.jpg</i> dans le répertoire parent"
-
-#: ../data/gtkpod.glade.h:343
-#, fuzzy
-msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-msgstr "Utilise <i>&lt;Album&gt;.jpg</i>; <i>&lt;Album&gt;.png</i>…"
-
-#: ../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:345
-msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
-msgstr "Utilise <i>répertoire.jpg</i>, <i>répertoire.png</i>…"
-
-#: ../data/gtkpod.glade.h:346
-msgid "Use mserv database to fill additional information"
+msgid "Use mserv database to fill track information"
 msgstr "Utiliser la base mserv pour remplir les autres informations"
 
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:325
 msgid ""
 "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
 "for this filename."
@@ -1678,61 +1532,25 @@
 "Utilise le jeu de caractère sélectionné pour ce fichier\n"
 "(voir la section ci-dessus : « Ajout/Mise à jour/Synchronisation »)."
 
-#: ../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 "
-"l'écriture des attributs"
+#: ../data/gtkpod.glade.h:327
+msgid "Username:"
+msgstr "Utilisateur :"
 
-#: ../data/gtkpod.glade.h:351
-msgid "Use selected encoding also when updating or syncing tracks"
+#: ../data/gtkpod.glade.h:328
+msgid "Video Thumbnail Generation"
 msgstr ""
-"Le jeu de caractères sélectionné sera utilisé pour\n"
-"la mise à jour ou la synchronisation des morceaux"
 
-#: ../data/gtkpod.glade.h:352
-msgid "Use this template to parse filename for tag information:"
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
 msgstr ""
-"Utiliser ce masque pour générer les attributs à partir du nom de fichier :"
 
-#: ../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:354
-msgid "Username:"
-msgstr "Utilisateur :"
-
-#: ../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 ""
-"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:356
+#: ../data/gtkpod.glade.h:330
 #, fuzzy
 msgid "View Full Size"
 msgstr "Voir les pochettes en taille réelle"
 
-#: ../data/gtkpod.glade.h:357
-msgid "WAV with :"
-msgstr "WAV avec :"
-
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:331
 msgid ""
-"When adding dirs/files, update information of\n"
-"existing tracks with identical filenames"
-msgstr ""
-"Lors de l'ajout de fichiers/répertoires, mettre à jour\n"
-"les informations des morceaux existants avec les doublons"
-
-#: ../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 "
@@ -1744,11 +1562,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:361
-msgid "When syncing playlists"
-msgstr "Lors de la synchronisation des listes"
+#: ../data/gtkpod.glade.h:332
+msgid "When updating tracks, display information:"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:333
 msgid ""
 "Will show a list of tracks removed and a list of tracks newly added or "
 "updated."
@@ -1756,135 +1574,157 @@
 "Montrer la liste des morceaux supprimés et une liste des morceaux récemment "
 "ajoutés ou modifiés."
 
-#: ../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:364
+#: ../data/gtkpod.glade.h:334
 msgid "Write all changes made to the disk and the iPod(s)."
 msgstr ""
 "Écrire toutes les modifications faites dans le disque et le(s) iPod(s)."
 
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:335
+#, fuzzy
+msgid "Write tags to disk when edited"
+msgstr ""
+"Écrire les attributs ID3 sur le disque lors de leur modification dans gtkpod"
+
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
 msgid ""
-"Write extended information (PC filenames, SHA1 hashes,\n"
-"encoding...). Recommended."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"Écrire les infos supplémentaires (noms de fichiers PC,\n"
-"somme de contrôle SHA1, jeu de caractères…). Recommandé."
 
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:352
+#, no-c-format
 msgid ""
-"You can also use the table headers, but this allows you to sort according to "
-"a column that is not displayed."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"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
+#: ../data/gtkpod.glade.h:371
 #, fuzzy
 msgid "_About gtkpod"
 msgstr "A propos de gtkpod"
 
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:372
 #, fuzzy
 msgid "_Add Album"
 msgstr "Album"
 
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:373
 msgid "_Add Image"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:371
+#: ../data/gtkpod.glade.h:374
 #, fuzzy
 msgid "_Album"
 msgstr "Album"
 
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:375
 msgid "_All Tracks"
 msgstr "_Tous les morceaux"
 
-#: ../data/gtkpod.glade.h:373
-msgid "_Arrange Sort Tabs"
+#: ../data/gtkpod.glade.h:376
+#, fuzzy
+msgid "_Arrange Filter Tabs"
 msgstr "_Organiser les zones de tri"
 
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:377
 msgid "_Check iPod's Files"
 msgstr "_Contrôler les fichiers de l'iPod"
 
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:378
+#, fuzzy
+msgid "_Contents"
+msgstr "Commentaire"
+
+#: ../data/gtkpod.glade.h:379
 msgid "_Conversion Log"
 msgstr "_Trace des conversions"
 
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:380
 msgid "_Create Playlists"
 msgstr "_Créer une liste de lecture"
 
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:381
 msgid "_Create iPod's Directories"
 msgstr "_Créer les répertoires système de l'iPod"
 
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:382
 msgid "_Delete"
 msgstr "_Effacer"
 
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:383
 msgid "_Display"
 msgstr "_Affichage"
 
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:384
 msgid "_Displayed Tracks"
 msgstr "Morceaux _affichés"
 
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:385
 msgid "_Edit"
 msgstr "_Édition"
 
-#: ../data/gtkpod.glade.h:382
-msgid "_Encoding (ID3, files):"
-msgstr "Jeu de caractères (ID3, fichiers) :"
-
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:386
 msgid "_Enqueue"
 msgstr "_Ajouter à la file d'attente"
 
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:387
 msgid "_Export Tracks from Database"
 msgstr "E_xporter les morceaux de la base de données"
 
-#: ../data/gtkpod.glade.h:385
-msgid "_File"
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:389
+#, fuzzy
+msgid "_Filter Bar"
 msgstr "_Fichier"
 
-#: ../data/gtkpod.glade.h:386
+#: ../data/gtkpod.glade.h:390
 msgid "_General"
 msgstr "_Général"
 
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:391
 msgid "_Help"
 msgstr "A_ide"
 
-#: ../data/gtkpod.glade.h:388
-msgid "_Ignore rules"
-msgstr "Ne respectant _pas"
-
-#: ../data/gtkpod.glade.h:389
-msgid "_Image"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:392
 msgid "_Info Window"
 msgstr "_Fenêtre d'infos"
 
-#: ../data/gtkpod.glade.h:391
-msgid "_Last.FM"
-msgstr "_Last.FM"
-
-#: ../data/gtkpod.glade.h:392
-msgid "_Less Sort Tabs"
-msgstr "_Supprimer une zone de tri"
-
 #: ../data/gtkpod.glade.h:393
 msgid "_Limit to"
 msgstr "_Limiter à"
@@ -1898,161 +1738,136 @@
 msgstr "_Locale"
 
 #: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:397
 msgid "_M3U"
 msgstr "_M3U"
 
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:398
 msgid "_Misc."
 msgstr "_Divers"
 
-#: ../data/gtkpod.glade.h:398
-msgid "_More Sort Tabs"
+#: ../data/gtkpod.glade.h:399
+#, fuzzy
+msgid "_More Filter Tabs"
 msgstr "_Ajouter une zone de tri"
 
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:400
+#, fuzzy
+msgid "_Music"
+msgstr "_Divers"
+
+#: ../data/gtkpod.glade.h:401
 msgid "_Newly Added Tracks"
 msgstr "_Nouveaux morceaux ajoutés"
 
-#: ../data/gtkpod.glade.h:400
+#: ../data/gtkpod.glade.h:402
 msgid "_Normalize Volume"
 msgstr "_Normaliser le volume"
 
-#: ../data/gtkpod.glade.h:401
-msgid "_Number of sort tabs:"
-msgstr "_Nombre de zones de tri :"
-
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
 msgid "_PLS"
 msgstr "_PLS"
 
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
+#, fuzzy
+msgid "_Photos"
+msgstr "Trier par Album"
+
+#: ../data/gtkpod.glade.h:405
 msgid "_Play Now"
 msgstr "_Jouer maintenant"
 
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:406
 msgid "_Podcasts"
 msgstr "_Podcasts"
 
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:407
 msgid "_Prefer Local"
 msgstr "Locale de _préférence"
 
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:408
 #, fuzzy
 msgid "_Remove Album"
 msgstr "Trier par Album"
 
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:409
 msgid "_Remove Cover Art"
 msgstr "_Supprimer la pochette"
 
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:410
 msgid "_Remove Images"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:411
 msgid "_Save Changes"
 msgstr "_Enregistrer les modifications"
 
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:412
 msgid "_Save Displayed Track Order"
 msgstr "_Sauver l'ordre de tri des morceaux affichés"
 
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:413
 msgid "_Sorting"
 msgstr "_Tri"
 
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:414
 msgid "_Synchronize Playlist with Dir(s)"
 msgstr "_Sync les listes avec le(s) répertoire(s)"
 
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:415
 msgid "_Toolbar"
 msgstr "_Barre d'outils"
 
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:416
 msgid "_Tools"
 msgstr "_Outils"
 
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:417
 msgid "_Tooltips"
 msgstr "_Infobulles"
 
-#: ../data/gtkpod.glade.h:416
-msgid "_Track Info"
-msgstr "Infos du _Morceau"
-
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:418
 msgid "_Undo All"
 msgstr "Annuler _Tout"
 
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:419
 msgid "_Update Tracks from File"
 msgstr "_Mettre à jour les morceaux à partir des fichiers"
 
-#: ../data/gtkpod.glade.h:419
+#: ../data/gtkpod.glade.h:420
 msgid "_Video"
 msgstr "_Vidéo"
 
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:421
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:422
+msgid "_Zoom"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:423
 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'."
+#: ../data/gtkpod.glade.h:424
+msgid "checkbutton"
 msgstr ""
-"artiste: %a, album: %A, compositeur: %c, titre: %t, genre: %G, N° de piste: %"
-"T, N° de CD: %C, année: %Y, ignore: %*, le caractère '%': %%. Vous pouvez "
-"séparer plusieurs masques par un ';'. Le premier masque concordant sera "
-"utilisé. Exemple : «%a - %A/%T %t.mp3;%t.wav»."
 
-#: ../data/gtkpod.glade.h:424
-msgid "folder"
-msgstr "répertoire"
-
 #: ../data/gtkpod.glade.h:425
-msgid "folder.jpg"
-msgstr "répertoire.jpg"
+msgid "gtk-revert-to-saved"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:427
-#, no-c-format
-msgid "folder.jpg;%a.jpg"
-msgstr "répertoire.jpg;%a.jpg"
-
-#: ../data/gtkpod.glade.h:428
-msgid "gtkpod"
-msgstr "gtkpod"
-
-#: ../data/gtkpod.glade.h:429
-msgid "gtkpod Info"
+#: ../data/gtkpod.glade.h:426
+#, fuzzy
+msgid "gtkpod Information"
 msgstr "Infos 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 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 "
-"votre système."
-
-#: ../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:433
+#: ../data/gtkpod.glade.h:429
 msgid ""
 "iPod\n"
 "Local Repository (Standard)\n"
@@ -2062,27 +1877,29 @@
 "Dépot local (standard)\n"
 "Dépot local (Podcasts)\n"
 
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:433
 msgid "iPod mountpoint:"
 msgstr "Point de montage de l'iPod :"
 
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:434
 msgid "iTunesDB backup:"
 msgstr "Sauvegarde iTunesDB :"
 
-#: ../data/gtkpod.glade.h:439
-msgid "mserv Root:"
+#: ../data/gtkpod.glade.h:435
+#, fuzzy
+msgid "mserv Preferences"
+msgstr "Préférences"
+
+#: ../data/gtkpod.glade.h:436
+#, fuzzy
+msgid "mserv root:"
 msgstr "Racine mserv :"
 
-#: ../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:441 ../src/details.c:1347
+#: ../data/gtkpod.glade.h:437 ../src/details.c:1352
 msgid "n/a"
 msgstr "nd"
 
-#: ../data/gtkpod.glade.h:442
+#: ../data/gtkpod.glade.h:438
 msgid "special_sorttab -- Don't translate!"
 msgstr ""
 
@@ -2311,169 +2128,176 @@
 
 #. sanity!
 #. check for "System Charset" and return NULL
-#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+#: ../src/charset.c:163 ../src/charset.c:173 ../src/charset.c:232
+#: ../src/charset.c:248 ../src/charset.c:332
 msgid "System Charset"
 msgstr "Jeu de caractères du système"
 
 #. we are not the first instance of gtkpod -- the socket is
 #. already being used, so we pass
-#: ../src/clientserver.c:214
+#: ../src/clientserver.c:215
 msgid ""
 "Another instance of gtkpod was detected. Playcount server not started.\n"
 msgstr ""
 "Une autre instance de gtkpod tourne déjà. Serveur de compteur non démarré.\n"
 
-#: ../src/confirmation.c:377
-msgid "Confirmation Dialogue"
-msgstr "Message de confirmation"
+#: ../src/confirmation.c:389
+#, fuzzy
+msgid "Confirmation"
+msgstr "Information"
 
-#: ../src/context_menus.c:362
+#: ../src/context_menus.c:364
 #, c-format
 msgid "Copied \"%s\" playlist to %s"
 msgstr "Copie liste de lecture « %s » vers %s"
 
-#: ../src/context_menus.c:401
+#: ../src/context_menus.c:403
 #, c-format
 msgid "Copied %d track to '%s'"
 msgid_plural "Copied %d tracks to '%s'"
 msgstr[0] "Extraction de %d morceau %d vers « %s »"
 msgstr[1] "Extraction de %d morceaux vers « %s »"
 
-#: ../src/context_menus.c:429
+#: ../src/context_menus.c:431
 #, c-format
 msgid "Copied '%s' playlist to '%s' in '%s'"
 msgstr "Extraction liste de lecture « %s » vers « %s » dans « %s »"
 
-#: ../src/context_menus.c:462
+#: ../src/context_menus.c:464
 #, c-format
 msgid "Copied %d track to '%s' in '%s'"
 msgid_plural "Copied %d tracks to %s in '%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:622 ../src/tools.c:854
+#: ../src/context_menus.c:624 ../src/tools.c:854
 msgid "Play Now"
 msgstr "Jouer maintenant"
 
-#: ../src/context_menus.c:628 ../src/tools.c:867
+#: ../src/context_menus.c:630 ../src/tools.c:867
 msgid "Enqueue"
 msgstr "Mettre dans la file d'attente"
 
-#: ../src/context_menus.c:634
+#: ../src/context_menus.c:636
 msgid "Copy Tracks to Filesystem"
 msgstr "Copier les morceaux vers le disque dur"
 
-#: ../src/context_menus.c:641 ../src/file_export.c:1085
+#: ../src/context_menus.c:643 ../src/file_export.c:1085
 msgid "Create Playlist File"
 msgstr "Créer un fichier de liste"
 
-#: ../src/context_menus.c:648
+#: ../src/context_menus.c:650
 msgid "Create new Playlist"
 msgstr "Créer une nouvelle liste"
 
-#: ../src/context_menus.c:655
+#: ../src/context_menus.c:657
 msgid "Update Tracks from File"
 msgstr "Mette à jour les morceaux depuis le fichier"
 
-#: ../src/context_menus.c:669
+#: ../src/context_menus.c:671
 msgid "Sync Playlist with Dir(s)"
 msgstr "Sync. les listes avec le(s) répertoire(s)"
 
-#: ../src/context_menus.c:679
+#: ../src/context_menus.c:681
 msgid "Remove All Tracks from iPod"
 msgstr "Supprimer tout les morceaux de l'iPod"
 
-#: ../src/context_menus.c:697
+#: ../src/context_menus.c:687 ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr "Je suis sûr"
+
+#: ../src/context_menus.c:699
 msgid "Remove All Podcasts from iPod"
 msgstr "Supprimer tout les podcats de l'iPod"
 
-#: ../src/context_menus.c:712
+#: ../src/context_menus.c:714
 msgid "Delete Including Tracks"
 msgstr "Supprimer avec les morceaux inclus"
 
-#: ../src/context_menus.c:720
+#: ../src/context_menus.c:722
 msgid "Delete But Keep Tracks"
 msgstr "Supprimer mais garder les morceaux"
 
-#: ../src/context_menus.c:728
+#: ../src/context_menus.c:730
 msgid "Edit iPod Properties"
 msgstr "Editer les propriétes de l'iPod"
 
-#: ../src/context_menus.c:735
+#: ../src/context_menus.c:737
 msgid "Edit Repository Properties"
 msgstr "Éditer les propriétés du dépôt"
 
-#: ../src/context_menus.c:742
+#: ../src/context_menus.c:744
 msgid "Edit Playlist Properties"
 msgstr "Editer les propriétes de la liste de lecture"
 
-#: ../src/context_menus.c:770
+#: ../src/context_menus.c:772
 msgid "View Full Size Artwork"
 msgstr "Voir les pochettes en taille réelle"
 
-#: ../src/context_menus.c:777
+#: ../src/context_menus.c:779
 msgid "Select Cover From File"
 msgstr "Choisir la pochette à partir d'un fichier"
 
-#: ../src/context_menus.c:790
+#: ../src/context_menus.c:792
 msgid "Load iPod"
 msgstr "Charger l'iPod"
 
-#: ../src/context_menus.c:797
+#: ../src/context_menus.c:799
 msgid "Eject iPod"
 msgstr "Ejecter l'iPod"
 
-#: ../src/context_menus.c:814
+#: ../src/context_menus.c:816
 msgid "Remove All Tracks from Database"
 msgstr "Supprimer tout les morceaux de la base de données"
 
-#: ../src/context_menus.c:829
+#: ../src/context_menus.c:831
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Supprimer avec les morceaux inclus (disque dur)"
 
-#: ../src/context_menus.c:837
+#: ../src/context_menus.c:839
 msgid "Delete Including Tracks (Database)"
 msgstr "Supprimer avec les morceaux inclus (base de données)"
 
-#: ../src/context_menus.c:845
+#: ../src/context_menus.c:847
 msgid "Delete From iPod"
 msgstr "Supprimer de l'iPod"
 
-#: ../src/context_menus.c:853
+#: ../src/context_menus.c:855
 msgid "Delete From Playlist"
 msgstr "Supprimer de la liste de lecture"
 
-#: ../src/context_menus.c:861
+#: ../src/context_menus.c:863
 msgid "Delete From Harddisk"
 msgstr "Supprimer du disque dur"
 
-#: ../src/context_menus.c:869
+#: ../src/context_menus.c:871
 msgid "Delete From Database"
 msgstr "Supprimer de la base de données"
 
-#: ../src/context_menus.c:877
+#: ../src/context_menus.c:879
 msgid "Alphabetize"
 msgstr "Trier"
 
-#: ../src/context_menus.c:895
+#: ../src/context_menus.c:897
 #, fuzzy
 msgid "Remove Album"
 msgstr "Trier par Album"
 
-#: ../src/context_menus.c:905
+#: ../src/context_menus.c:907
 #, fuzzy
 msgid "Remove Photo"
 msgstr "_Supprimer la pochette"
 
-#: ../src/context_menus.c:922
+#: ../src/context_menus.c:924
 msgid "Rename Album"
 msgstr ""
 
-#: ../src/context_menus.c:981 ../src/context_menus.c:1030
+#: ../src/context_menus.c:983 ../src/context_menus.c:1032
 msgid "Copy selected playlist to..."
 msgstr "Copier la liste de lecture sélectionné vers …"
 
-#: ../src/context_menus.c:1083
+#: ../src/context_menus.c:1085
 msgid "Copy selected track(s) to..."
 msgstr "Copier le(s) morceau(x) sélectionné(s) vers …"
 
@@ -2519,17 +2343,17 @@
 msgid "TV Show & Music Video"
 msgstr "Émission télé & vidéo musicale"
 
-#: ../src/details.c:836
+#: ../src/details.c:837
 #, c-format
 msgid "%s (image data corrupted or unreadable)"
 msgstr "%s (données de l'image corrompues ou invalides)"
 
-#: ../src/details.c:973
+#: ../src/details.c:975
 #, c-format
 msgid "Please report unknown mediatype %x\n"
 msgstr "Type de média %x inconnu\n"
 
-#: ../src/details.c:1418
+#: ../src/details.c:1417
 msgid "<b>n/a</b>"
 msgstr "<b>nd</b>"
 
@@ -2538,47 +2362,48 @@
 msgid "Error occurred dropping an image onto the details window: %s\n"
 msgstr ""
 
-#: ../src/details.c:1952 ../src/display_coverart.c:2128
+#: ../src/details.c:1952 ../src/display_coverart.c:2297
 msgid "Successfully set new coverart for selected tracks"
 msgstr ""
 
-#: ../src/display.c:490
+#. Set the resolution in the label
+#: ../src/display.c:570
 #, c-format
-msgid "<b>Image Dimensions: %s</b>"
+msgid "<b>Image Dimensions: %d x %d</b>"
 msgstr ""
 
-#: ../src/display.c:744
+#: ../src/display.c:814
 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:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
+#: ../src/display.c:821 ../src/misc_confirm.c:469 ../src/misc_track.c:2158
 msgid "No entry selected."
 msgstr "Aucun élément sélectionné."
 
-#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
-#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
+#: ../src/display.c:974 ../src/display.c:1320 ../src/display.c:1376
+#: ../src/display.c:1430 ../src/display.c:1485 ../src/display.c:1746
 #, 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:949
+#: ../src/display.c:1015
 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:957
+#: ../src/display.c:1024
 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:979
+#: ../src/display.c:1049
 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:1009
+#: ../src/display.c:1082
 msgid "Remove tracks in selected entry of which filter tab from playlist?"
 msgstr "Supprimer les morceaux de quelle zone de tri de la liste de lecture ?"
 
-#: ../src/display.c:1036 ../src/display.c:1074
+#: ../src/display.c:1109 ../src/display.c:1147
 #, c-format
 msgid ""
 "iPod at '%s' is not loaded.\n"
@@ -2587,174 +2412,178 @@
 "L'iPod en « %s » n'est pas chargé.\n"
 "Charger d'abord."
 
-#: ../src/display.c:1111 ../src/display.c:1138
+#: ../src/display.c:1184 ../src/display.c:1218
 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:1224
+#: ../src/display.c:1314
 msgid "Export selected entry of which sort tab?"
 msgstr "Exporter l'entrée sélectionnée de quelle zone de tri ?"
 
-#: ../src/display.c:1280
+#: ../src/display.c:1370
 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:1334
+#: ../src/display.c:1424
 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:1389
+#: ../src/display.c:1479
 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:1646
+#: ../src/display.c:1736
 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:1713
+#: ../src/display_coverart.c:1874
 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
+#: ../src/display_coverart.c:2262
 #, c-format
 msgid "Error occurred dropping an image onto the coverart display: %s\n"
 msgstr ""
 
-#: ../src/display_itdb.c:376
+#: ../src/display_itdb.c:385
 #, c-format
 msgid "Failed to set cover art: '%s'\n"
 msgstr "Impossible d'écrire la pochette : « %s »\n"
 
-#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
-msgid "Local"
-msgstr "Local"
+#: ../src/display_itdb.c:871
+msgid "Music Library"
+msgstr ""
 
 #. add podcast playlist
-#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1025
+#: ../src/display_itdb.c:879 ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
 msgid "Podcasts"
 msgstr "Podcasts"
 
-#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:888 ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
 msgid "iPod"
 msgstr "iPod"
 
-#: ../src/display_itdb.c:1084
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr "Local"
+
+#: ../src/display_itdb.c:1098
 #, c-format
 msgid "Increased playcount for '%s'"
 msgstr "Compteur de lecture incrémenté pour « %s »"
 
-#: ../src/display_photo.c:163
+#: ../src/display_photo.c:158
 #, c-format
 msgid "Error reading iPod photo database (%s).\n"
 msgstr ""
 
-#: ../src/display_photo.c:168
+#: ../src/display_photo.c:161
 msgid "Error reading iPod photo database.\n"
 msgstr ""
 
-#: ../src/display_photo.c:238
+#: ../src/display_photo.c:201
 msgid "Could not access the iPod's photo database."
 msgstr ""
 
-#: ../src/display_photo.c:441
+#: ../src/display_photo.c:404
 #, fuzzy
 msgid "Photo Albums"
 msgstr "Trier par Album"
 
-#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+#: ../src/display_photo.c:414 ../src/display_photo.c:1587
 msgid "<Unnamed>"
 msgstr ""
 
-#: ../src/display_photo.c:939
+#: ../src/display_photo.c:848
 msgid "The Photo Library album cannot be removed"
 msgstr ""
 
-#: ../src/display_photo.c:961
+#: ../src/display_photo.c:870
 #, 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
+#: ../src/display_photo.c:876
 msgid "Yes. Do Not Display Again"
 msgstr ""
 
-#: ../src/display_photo.c:1038
+#: ../src/display_photo.c:947
 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
+#: ../src/display_photo.c:962
 msgid ""
 "This will delete the photo selection from the Photo Library and all albums. "
 "Are you sure?"
 msgstr ""
 
-#: ../src/display_photo.c:1128
+#: ../src/display_photo.c:1036
 msgid "New Photo Album Name"
 msgstr ""
 
-#: ../src/display_photo.c:1129
+#: ../src/display_photo.c:1037
 #, 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
+#: ../src/display_photo.c:1050 ../src/display_photo.c:1133
 msgid "An album with that name already exists."
 msgstr ""
 
-#: ../src/display_photo.c:1210
+#: ../src/display_photo.c:1119
 #, fuzzy
 msgid "New Photo Album"
 msgstr "Trier par Album"
 
-#: ../src/display_photo.c:1211
+#: ../src/display_photo.c:1120
 #, 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
+#: ../src/display_photo.c:1142
 msgid "The new album failed to be created."
 msgstr ""
 
-#: ../src/display_photo.c:1256
+#: ../src/display_photo.c:1166
 #, 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
+#: ../src/display_photo.c:1221
 msgid "Add a Directory of Images to the iPod. Select the Directory."
 msgstr ""
 
-#: ../src/display_photo.c:1699
+#: ../src/display_photo.c:1601
 #, 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:516 ../src/display_playlists.c:558
+#: ../src/display_playlists.c:537 ../src/display_playlists.c:579
 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:585 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:606 ../src/display_tracks.c:403
 #, 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:865 ../src/display_playlists.c:877
+#: ../src/display_playlists.c:886 ../src/display_playlists.c:898
 msgid "Can't reorder sorted treeview."
 msgstr "Impossíble de réorganiser la vue arborescente triée."
 
-#: ../src/display_playlists.c:954
+#: ../src/display_playlists.c:975
 #, c-format
 msgid ""
 "This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2764,55 +2593,43 @@
 "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
+#: ../src/display_playlists.c:2039
 msgid "Photos"
 msgstr ""
 
-#: ../src/display_sorttabs.c:473
+#: ../src/display_sorttabs.c:479
 msgid "'Played' condition ignored because of error."
 msgstr "Condition « Joué le » ignorée à cause d'une erreur."
 
-#: ../src/display_sorttabs.c:476
+#: ../src/display_sorttabs.c:482
 msgid "'Modified' condition ignored because of error."
 msgstr "Condition « Modifié le » ignorée à cause d'une erreur."
 
-#: ../src/display_sorttabs.c:479
+#: ../src/display_sorttabs.c:485
 msgid "'Added' condition ignored because of error."
 msgstr "Condition « Ajouté le » ignorée à cause d'une erreur."
 
-#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1568 ../src/misc_conversion.c:59
 msgid "All"
 msgstr "Tous"
 
-#: ../src/display_sorttabs.c:1588
+#: ../src/display_sorttabs.c:1594
 msgid "Compilations"
 msgstr "Compilations"
 
-#: ../src/display_sorttabs.c:2988
+#: ../src/display_sorttabs.c:3001
 msgid "Comp."
 msgstr "Comp."
 
-#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:3007 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333 ../src/misc_conversion.c:84
 msgid "Year"
 msgstr "Année"
 
-#: ../src/display_sorttabs.c:2997
+#: ../src/display_sorttabs.c:3010
 msgid "Special"
 msgstr "Spécial"
 
-#: ../src/display_sorttabs.c:3245
-msgid "Last Played"
-msgstr "Dernière fois joué"
-
-#: ../src/display_sorttabs.c:3246
-msgid "Last Modified"
-msgstr "Dernière fois modifié"
-
 #: ../src/display_spl.c:64
 msgid "days"
 msgstr "jours"
@@ -2833,7 +2650,7 @@
 msgid "Hz"
 msgstr "Hz"
 
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:794
 msgid "MB"
 msgstr "Mo"
 
@@ -2866,6 +2683,10 @@
 msgid "Size"
 msgstr "Taille"
 
+#: ../src/display_spl.c:94 ../src/infodlg.c:78
+msgid "Play time"
+msgstr "Durée"
+
 #: ../src/display_spl.c:95 ../src/misc_conversion.c:64
 msgid "Comment"
 msgstr "Commentaire"
@@ -2874,6 +2695,10 @@
 msgid "Date added"
 msgstr "Ajouté le"
 
+#: ../src/display_spl.c:98 ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "Cpt. lecture"
+
 #: ../src/display_spl.c:99
 msgid "Last played"
 msgstr "Dernière fois joué"
@@ -2882,6 +2707,10 @@
 msgid "Disc number"
 msgstr "N° de disque"
 
+#: ../src/display_spl.c:101 ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "Note"
+
 #: ../src/display_spl.c:102 ../src/misc_conversion.c:87
 msgid "Compilation"
 msgstr "Compilation"
@@ -2996,10 +2825,6 @@
 msgid "hours"
 msgstr "heures"
 
-#: ../src/display_spl.c:182 ../src/info.c:780
-msgid "GB"
-msgstr "Go"
-
 #: ../src/display_spl.c:189
 msgid "random order"
 msgstr "ordre aléatoire"
@@ -3056,26 +2881,26 @@
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+#: ../src/display_spl.c:1143 ../src/display_spl.c:1158
 msgid "to"
 msgstr "à"
 
-#: ../src/display_spl.c:1485
+#: ../src/display_spl.c:1436
 msgid "-"
 msgstr "-"
 
-#: ../src/display_spl.c:1500
+#: ../src/display_spl.c:1451
 msgid "+"
 msgstr "+"
 
-#: ../src/display_tracks.c:281
+#: ../src/display_tracks.c:398
 #, c-format
 msgid "Moved one track"
 msgid_plural "Moved %d tracks"
 msgstr[0] "Un morceau déplacé"
 msgstr[1] "%d morceaux déplacés"
 
-#: ../src/display_tracks.c:1810
+#: ../src/display_tracks.c:2022
 #, c-format
 msgid ""
 "Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -3088,64 +2913,72 @@
 "précédent.\n"
 "\n"
 
-#: ../src/display_tracks.c:2069
+#: ../src/display_tracks.c:2288
 msgid "Rtng"
 msgstr "Note"
 
-#: ../src/display_tracks.c:2072
+#: ../src/display_tracks.c:2291
 msgid "#"
 msgstr "N°"
 
-#: ../src/display_tracks.c:2075
+#: ../src/display_tracks.c:2294
 msgid "CD"
 msgstr "CD"
 
-#: ../src/display_tracks.c:2078
+#: ../src/display_tracks.c:2297
 msgid "ID"
 msgstr "Id"
 
-#: ../src/display_tracks.c:2081
+#: ../src/display_tracks.c:2300
 msgid "Trnsfrd"
 msgstr "Transféré"
 
-#: ../src/display_tracks.c:2085
+#: ../src/display_tracks.c:2309
 msgid "Cmpl"
 msgstr "Cmpl"
 
-#: ../src/display_tracks.c:2091
+#: ../src/display_tracks.c:2315
 msgid "Time"
 msgstr "Durée"
 
-#: ../src/display_tracks.c:2094
+#: ../src/display_tracks.c:2318
 msgid "Plycnt"
 msgstr "Cpt. lect"
 
-#: ../src/display_tracks.c:2106
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "Joué le"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "Modifié le"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "Ajouté"
+
+#: ../src/display_tracks.c:2330
 msgid "Released"
 msgstr "Sortie"
 
-#: ../src/display_tracks.c:2112
+#: ../src/display_tracks.c:2336
 msgid "Vol."
 msgstr "Vol."
 
-#: ../src/display_tracks.c:2115
+#: ../src/display_tracks.c:2339
 msgid "Sndchk."
 msgstr "Ctrl. Son"
 
-#: ../src/fetchcover.c:358
-msgid "Coverart file already exists"
-msgstr ""
-
-#: ../src/fetchcover.c:371
+#: ../src/fetchcover.c:359
 #, 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."
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to 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 "
@@ -3157,7 +2990,25 @@
 "- 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
+#: ../src/fetchcover.c:368
+msgid "Cover art file already exists"
+msgstr ""
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr ""
+
+#: ../src/fetchcover.c:371
+#, fuzzy
+msgid "Rename"
+msgstr "Utilisateur :"
+
+#: ../src/fetchcover.c:372
+#, fuzzy
+msgid "Abort"
+msgstr "A _propos"
+
+#: ../src/file.c:238
 #, c-format
 msgid ""
 "'%s' is a directory, not a playlist file.\n"
@@ -3166,7 +3017,7 @@
 "« %s » est un répertoire, pas un fichier de liste.\n"
 "\n"
 
-#: ../src/file.c:266
+#: ../src/file.c:268
 #, c-format
 msgid ""
 "'%s' is a not a known playlist file.\n"
@@ -3175,64 +3026,90 @@
 "« %s » n'est pas un fichier de liste reconnu\n"
 "\n"
 
-#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/file.c:285 ../src/file_export.c:217 ../src/oggfile.c:62
 #: ../src/wavfile.c:107
 #, c-format
 msgid "Could not open '%s' for reading.\n"
 msgstr "Ne peut ouvrir en lecture le fichier « %s ».\n"
 
-#: ../src/file.c:369
+#: ../src/file.c:371
 #, 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"
 
-#: ../src/file.c:374
+#: ../src/file.c:376
 #, 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"
 
-#: ../src/file.c:629
+#: ../src/file.c:631
 #, c-format
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "Paramètre « %s » inconnu dans le modèle « %s »\n"
 
-#: ../src/file.c:923
+#: ../src/file.c:939
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Nom de fichier local invalide (%s)"
 
-#: ../src/file.c:982
+#: ../src/file.c:998
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "Aucune info pour l'utilisateur « %s » dans « %s »"
 
-#: ../src/file.c:991
+#: ../src/file.c:1007
 #, 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:999
+#: ../src/file.c:1015
 #, 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:1123
+#: ../src/file.c:1046
+#, fuzzy, c-format
+msgid "Could not create '%s'"
+msgstr "Impossible de créer « ~/.gtkpod »\n"
+
+#: ../src/file.c:1083
+#, fuzzy
+msgid "Error creating thumbnail file"
+msgstr "Erreur à la création de « %s » : %s\n"
+
+#: ../src/file.c:1114 ../src/misc.c:1018
 #, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "Paramètre « %%%c » inconnu dans le modèle « %s »"
+
+#: ../src/file.c:1138
+#, c-format
 msgid ""
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
+msgstr ""
+
+#: ../src/file.c:1142
+#, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr ""
+
+#: ../src/file.c:1291
+#, 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:1209
+#: ../src/file.c:1377
 #, 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:1307
+#: ../src/file.c:1476
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -3241,34 +3118,34 @@
 "Le morceau suivant ne peut pas être mis à jour (type de fichier connu mais "
 "échec de l'analyse) : « %s »\n"
 
-#: ../src/file.c:1337 ../src/file.c:1391
+#: ../src/file.c:1506 ../src/file.c:1560
 msgid "Nothing to update"
 msgstr "Rien à mettre à jour"
 
-#: ../src/file.c:1358
+#: ../src/file.c:1527
 #, c-format
 msgid "Updating %s"
 msgstr "%s en cours de mise à jour"
 
-#: ../src/file.c:1372
+#: ../src/file.c:1541
 msgid "Updated selected tracks with info from file."
 msgstr "Les morceaux sélectionnés ont été mis à jour à partir des fichiers."
 
-#: ../src/file.c:1406
+#: ../src/file.c:1575
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "Récupération des données mserv %s"
 
-#: ../src/file.c:1411
+#: ../src/file.c:1580
 msgid "no filename available"
 msgstr "pas de nom de fichier disponible"
 
-#: ../src/file.c:1416
+#: ../src/file.c:1585
 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:1437
+#: ../src/file.c:1606
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -3277,11 +3154,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1443
+#: ../src/file.c:1612
 msgid "Failed Track Update"
 msgstr "Échec de la mise à jour du morceau"
 
-#: ../src/file.c:1501
+#: ../src/file.c:1670
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -3290,11 +3167,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1507
+#: ../src/file.c:1676
 msgid "Successful Track Update"
 msgstr "Morceau mis à jour"
 
-#: ../src/file.c:1566
+#: ../src/file.c:1735
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -3305,48 +3182,48 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1572
+#: ../src/file.c:1741
 msgid "mserv data retrieval problem"
 msgstr "problème de récupération des données mserv"
 
-#: ../src/file.c:1661
+#: ../src/file.c:1829
 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:1667
+#: ../src/file.c:1835
 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:1671 ../src/file.c:1689
+#: ../src/file.c:1839 ../src/file.c:1857
 msgid "no local filename available"
 msgstr "pas de nom de fichier disponible"
 
-#: ../src/file.c:1679
+#: ../src/file.c:1847
 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:1685
+#: ../src/file.c:1853
 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:1788
+#: ../src/file.c:1956
 msgid "update failed (format not supported?)"
 msgstr "échec de la mise à jour (format non supporté ?)"
 
-#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#: ../src/file.c:2041 ../src/misc_playlist.c:936
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Traitement de « %s » …"
 
-#: ../src/file.c:1879
+#: ../src/file.c:2047
 #, c-format
 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:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
+#: ../src/file.c:2167 ../src/misc_track.c:1793 ../src/misc_track.c:1898
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
@@ -3355,7 +3232,7 @@
 "Podcast déjà présent : « %s »\n"
 "\n"
 
-#: ../src/file.c:2064
+#: ../src/file.c:2232
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
@@ -3364,35 +3241,35 @@
 "L'écriture de fichiers vidéo n'est pas encore supportée (%s).\n"
 "\n"
 
-#: ../src/file.c:2116 ../src/file.c:2130
+#: ../src/file.c:2284 ../src/file.c:2298
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Impossible de changer les attributs du fichier : « %s »\n"
 
-#: ../src/file.c:2232
+#: ../src/file.c:2400
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "Impossible d'ouvrir en lecture/écriture le fichier « %s ».\n"
 
-#: ../src/file.c:2239
+#: ../src/file.c:2407
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "Impossible de verrouiller « %s ».\n"
 
 #. error!
-#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
+#: ../src/file.c:2424 ../src/file.c:2433 ../src/file.c:2444 ../src/file.c:2454
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Ligne incomplète dans « %s » : %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:2315
+#: ../src/file.c:2483
 msgid "Remove offline playcounts?"
 msgstr "Supprimer les compteurs de lecture hors-ligne ?"
 
 #. title
-#: ../src/file.c:2316
+#: ../src/file.c:2484
 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."
@@ -3400,61 +3277,83 @@
 "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:2333
+#: ../src/file.c:2501
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Erreur d'écriture du fichier « %s ».\n"
 
-#: ../src/file.c:2390 ../src/tools.c:270
+#: ../src/file.c:2558 ../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:2406 ../src/tools.c:287
+#: ../src/file.c:2574 ../src/tools.c:287
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
 "\n"
 msgstr "Échec de la normalisation : fichier non disponible (%s).\n"
 
-#: ../src/file_convert.c:316
+#: ../src/file.c:2631
+#, fuzzy, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr "Échec de la normalisation : fichier non disponible (%s).\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save "
+"lyrics to: %s.\n"
+"\n"
+msgstr ""
+
+#: ../src/file.c:2712
+#, fuzzy, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr "Nom de fichier original introuvable pour « %s ».\n"
+
+#: ../src/file_convert.c:328
 msgid "Summary status of conversion processes"
 msgstr "État de la conversion"
 
-#: ../src/file_convert.c:564
+#: ../src/file_convert.c:576
 msgid "active"
 msgstr "actif"
 
-#: ../src/file_convert.c:569
+#: ../src/file_convert.c:581
 msgid "inactive"
 msgstr "inactif"
 
-#: ../src/file_convert.c:580
+#: ../src/file_convert.c:592
 #, c-format
 msgid "Active threads: %d. Scheduled tracks: %d."
 msgstr "threads actifs : %d. Morceaux prévus : %d."
 
-#: ../src/file_convert.c:1071
+#: ../src/file_convert.c:1090
 #, c-format
 msgid "Original filename not available for '%s.'\n"
 msgstr "Nom de fichier original introuvable pour « %s ».\n"
 
-#: ../src/file_convert.c:1086
+#: ../src/file_convert.c:1105
 #, c-format
 msgid "Filename '%s' is no longer valid for '%s'.\n"
 msgstr "Le nom de fichier « %s » n'est plus valide pour « %s ».\n"
 
-#: ../src/file_convert.c:1137
+#: ../src/file_convert.c:1156
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
-#: ../src/file_convert.c:1143
+#: ../src/file_convert.c:1162
 msgid "FLAC"
 msgstr "Audio FLAC"
 
-#: ../src/file_convert.c:1198
+#: ../src/file_convert.c:1217
 #, c-format
 msgid ""
 "Files of type '%s' are not supported by the iPod. Please go to the "
@@ -3465,16 +3364,16 @@
 "préférences pour configurer un script de conversion adéquat pour « %s ».\n"
 "\n"
 
-#: ../src/file_convert.c:1284
+#: ../src/file_convert.c:1303
 msgid "No information available"
 msgstr "Pas d'information disponible."
 
-#: ../src/file_convert.c:1323
+#: ../src/file_convert.c:1342
 #, c-format
 msgid "Could not create '%s'. Filetype conversion will not work.\n"
 msgstr "Impossible de créer « %s ». La conversion ne fonctionnera pas.\n"
 
-#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#: ../src/file_convert.c:1667 ../src/file_convert.c:3119
 #, c-format
 msgid ""
 "Transfer of '%s' failed. %s\n"
@@ -3483,7 +3382,7 @@
 "Échec du transfert de « %s ». %s\n"
 "\n"
 
-#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#: ../src/file_convert.c:2073 ../src/file_convert.c:2352
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s'.\n"
@@ -3492,7 +3391,7 @@
 "Échec de la conversion de « %s » : « %s ».\n"
 "\n"
 
-#: ../src/file_convert.c:2062
+#: ../src/file_convert.c:2088
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
@@ -3501,38 +3400,37 @@
 "Échec de la conversion de « %s » : « %s %s » a un code de retour de %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2091
+#: ../src/file_convert.c:2117
 #, fuzzy, c-format
 msgid ""
 "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"
+"Échec de la conversion de « %s » : « %s %s » n'a pas retourné une extension de "
+"fichier comme attendu.\n"
 "\n"
 
-#: ../src/file_convert.c:2167
+#: ../src/file_convert.c:2193
 #, c-format
 msgid ""
 "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"
+"Échec de la conversion de « %s » : impossible d'accéder au fichier original « %"
+"s » (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:2222
+#: ../src/file_convert.c:2248
 #, 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"
+"Échec de la conversion de « %s » : impossible de créer le répertoire « %s ».\n"
 "\n"
 
-#: ../src/file_convert.c:2356
+#: ../src/file_convert.c:2383
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s' returned exit status %d.\n"
@@ -3541,7 +3439,7 @@
 "Échec de la conversion de « %s » : « %s » a un code de retour de %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2395
+#: ../src/file_convert.c:2422
 #, c-format
 msgid ""
 "Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -3659,26 +3557,26 @@
 "\n"
 msgstr "Ne peut ouvrir le fichier « %s » en lecture (%s).\n"
 
-#: ../src/file_itunesdb.c:129
+#: ../src/file_itunesdb.c:133
 #, c-format
 msgid "Matching SHA1 checksum for file %d/%d"
 msgstr "Correspondance des sommes de contrôles SHA1 pour le fichier %d/%d"
 
-#: ../src/file_itunesdb.c:236
+#: ../src/file_itunesdb.c:249
 #, 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:243
+#: ../src/file_itunesdb.c:256
 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:259
+#: ../src/file_itunesdb.c:272
 #, 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:276
+#: ../src/file_itunesdb.c:289
 #, c-format
 msgid ""
 "iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -3692,7 +3590,7 @@
 "contrôle SHA1. Cela peut prendre du temps.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:288
+#: ../src/file_itunesdb.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -3701,7 +3599,7 @@
 "%s :\n"
 "« itunesdb_hash= » attendue mais réception de : « %s »\n"
 
-#: ../src/file_itunesdb.c:348
+#: ../src/file_itunesdb.c:363
 #, c-format
 msgid ""
 "%s:\n"
@@ -3710,7 +3608,7 @@
 "%s :\n"
 "Erreur de format : %s\n"
 
-#: ../src/file_itunesdb.c:393
+#: ../src/file_itunesdb.c:408
 msgid ""
 "No SHA1 checksums on individual tracks are available.\n"
 "\n"
@@ -3726,7 +3624,7 @@
 "votre iPod avec d'autres programmes que gtkpod.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:457
+#: ../src/file_itunesdb.c:474
 msgid ""
 "Extended info will not be used. If you have non-transferred tracks,\n"
 "these will be lost.\n"
@@ -3734,17 +3632,17 @@
 "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:465
+#: ../src/file_itunesdb.c:482
 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:468
+#: ../src/file_itunesdb.c:485
 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:476
+#: ../src/file_itunesdb.c:493
 #, c-format
 msgid ""
 "Offline iPod database import failed: '%s'\n"
@@ -3753,7 +3651,7 @@
 "Échec de l'import de la base de l'iPod en mode déconnecté : « %s »\n"
 "\n"
 
-#: ../src/file_itunesdb.c:480
+#: ../src/file_itunesdb.c:497
 #, c-format
 msgid ""
 "Local database import failed: '%s'\n"
@@ -3762,7 +3660,7 @@
 "Échec de l'import de la base de données locale : « %s »\n"
 "\n"
 
-#: ../src/file_itunesdb.c:487
+#: ../src/file_itunesdb.c:504
 msgid ""
 "Offline iPod database import failed: \n"
 "\n"
@@ -3770,7 +3668,7 @@
 "Échec de l'import de la base de données de l'iPod en mode déconnecté : \n"
 "\n"
 
-#: ../src/file_itunesdb.c:490
+#: ../src/file_itunesdb.c:507
 msgid ""
 "Local database import failed: \n"
 "\n"
@@ -3778,7 +3676,7 @@
 "Échec de l'import de la base données locale : \n"
 "\n"
 
-#: ../src/file_itunesdb.c:497
+#: ../src/file_itunesdb.c:514
 #, c-format
 msgid ""
 "'%s' does not exist. Import aborted.\n"
@@ -3787,15 +3685,15 @@
 "« %s » n'existe pas. Import annulé.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:520
+#: ../src/file_itunesdb.c:536
 msgid "Extended info will not be used.\n"
 msgstr "Les infos étendues ne seront pas utilisées.\n"
 
-#: ../src/file_itunesdb.c:527
+#: ../src/file_itunesdb.c:543
 msgid "iPod Database Successfully Imported"
 msgstr "La base de l'iPod a été importée avec succès"
 
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:550
 #, c-format
 msgid ""
 "iPod Database Import Failed: '%s'\n"
@@ -3804,7 +3702,7 @@
 "Échec de l'import de la base de l'iPod : « %s »\n"
 "\n"
 
-#: ../src/file_itunesdb.c:540
+#: ../src/file_itunesdb.c:556
 msgid ""
 "iPod Database Import Failed.\n"
 "\n"
@@ -3812,7 +3710,7 @@
 "Échec de l'import de la base de l'iPod.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:549
+#: ../src/file_itunesdb.c:565
 #, c-format
 msgid ""
 "'%s' (or similar) does not exist. Import aborted.\n"
@@ -3821,43 +3719,53 @@
 "« %s » (ou similaire) n'existe pas. Import annulé.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:865
-#, c-format
+#: ../src/file_itunesdb.c:886
+#, fuzzy, 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"
+"If you are sure that the iPod is properly mounted at '%s', it may not be "
+"initialized for use. In this case, gtkpod can initialize it for you.\n"
+"\n"
+"Do you want to create the directory structure now?"
 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"
 
-#: ../src/file_itunesdb.c:1180
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr ""
+
+#: ../src/file_itunesdb.c:892
+#, fuzzy
+msgid "Create directory structure"
+msgstr "Dossier de cache :"
+
+#: ../src/file_itunesdb.c:1198
 #, 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"
 
-#: ../src/file_itunesdb.c:1195
+#: ../src/file_itunesdb.c:1213
 msgid "Aborted writing of extended info.\n"
 msgstr "Écriture des infos étendues interrompue.\n"
 
-#: ../src/file_itunesdb.c:1397
+#: ../src/file_itunesdb.c:1415
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/file_itunesdb.c:1411
+#: ../src/file_itunesdb.c:1429
 #, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
 msgstr "%d%% (%d:%02d:%02d restant)"
 
-#: ../src/file_itunesdb.c:1463
+#: ../src/file_itunesdb.c:1481
 msgid "Status: Deleting File"
 msgstr "État : suppression de fichier"
 
-#: ../src/file_itunesdb.c:1524
+#: ../src/file_itunesdb.c:1542
 #, c-format
 msgid ""
 "Could not remove the following file: '%s'\n"
@@ -3866,7 +3774,7 @@
 "Impossible de supprimer le fichier : « %s »\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1632
+#: ../src/file_itunesdb.c:1651
 msgid ""
 "The following track could not be converted successfully:\n"
 "\n"
@@ -3876,7 +3784,7 @@
 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:1642
+#: ../src/file_itunesdb.c:1661
 msgid ""
 "The following track could not be transferred successfully:\n"
 "\n"
@@ -3890,12 +3798,13 @@
 #. modal,
 #. gint id,
 #. gboolean modal,
-#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1670 ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
 msgid "Warning"
 msgstr "Attention"
 
 #. title
-#: ../src/file_itunesdb.c:1652
+#: ../src/file_itunesdb.c:1671
 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 "
@@ -3906,22 +3815,22 @@
 "conversion et le transfert des morceaux qui ont eu des problèmes sera re-"
 "planifiée."
 
-#: ../src/file_itunesdb.c:1715
+#: ../src/file_itunesdb.c:1734
 #, c-format
 msgid "Status: Copying track"
 msgstr "État : copie de morceau"
 
-#: ../src/file_itunesdb.c:1721
+#: ../src/file_itunesdb.c:1740
 #, c-format
 msgid "Status: Waiting for conversion to complete"
 msgstr "État : attente de la fin de la conversion"
 
-#: ../src/file_itunesdb.c:1725
+#: ../src/file_itunesdb.c:1744
 #, c-format
 msgid "Status: Finished transfer"
 msgstr "État : fin du transfert"
 
-#: ../src/file_itunesdb.c:1770
+#: ../src/file_itunesdb.c:1789
 #, c-format
 msgid ""
 "One track could not be transferred because your iPod is full. Either delete "
@@ -3938,15 +3847,14 @@
 "%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:1852
-#, c-format
+#: ../src/file_itunesdb.c:1871
+#, fuzzy, 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"
+"If you skip storing, 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"
@@ -3955,7 +3863,20 @@
 "annulez, vous pouvez importer la base existante avant d'appeler de nouveau "
 "cette fonction.\n"
 
-#: ../src/file_itunesdb.c:1887
+#: ../src/file_itunesdb.c:1875 ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr ""
+
+#: ../src/file_itunesdb.c:1877 ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr ""
+
+#: ../src/file_itunesdb.c:1878
+#, fuzzy
+msgid "Skip storing"
+msgstr "Nombre de fois ignoré"
+
+#: ../src/file_itunesdb.c:1909
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -3963,87 +3884,68 @@
 "Les répertoires systèmes de l'iPod doivent exister avant de pouvoir "
 "synchroniser l'iPod.\n"
 
-#: ../src/file_itunesdb.c:1896
+#: ../src/file_itunesdb.c:1918
 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:1914
+#: ../src/file_itunesdb.c:1936
 #, c-format
 msgid "Now writing database '%s'. Please wait..."
 msgstr "Écriture de la base « %s ». Veuillez patienter …"
 
-#: ../src/file_itunesdb.c:1963
+#: ../src/file_itunesdb.c:1985
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "Fichier d'infos étendues non supprimé : « %s »"
 
-#: ../src/file_itunesdb.c:2070
+#: ../src/file_itunesdb.c:2092
 #, c-format
 msgid "%s: Database saved"
 msgstr "%s : Base de l'iPod sauvegardée"
 
-#: ../src/file_itunesdb.c:2074
+#: ../src/file_itunesdb.c:2096
 #, c-format
 msgid "%s: Changes saved"
 msgstr "%s : Modifications sauvegardées"
 
-#: ../src/fileselection.c:129
+#: ../src/fileselection.c:142 ../src/fileselection.c:583
 msgid "Successfully added files"
 msgstr "Les fichiers ont bien été ajoutés"
 
-#: ../src/fileselection.c:131
+#: ../src/fileselection.c:144 ../src/fileselection.c:585
 msgid "Some files were not added successfully"
 msgstr "Echec de l'ajout de quelques fichiers"
 
-#: ../src/fileselection.c:164 ../src/fileselection.c:305
-#: ../src/fileselection.c:792
+#: ../src/fileselection.c:176 ../src/fileselection.c:276
+#: ../src/fileselection.c:601
 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."
 
-#: ../src/fileselection.c:175 ../src/fileselection.c:314
-#: ../src/fileselection.c:803
+#: ../src/fileselection.c:187 ../src/fileselection.c:285
 msgid "Please load the iPod before adding tracks."
 msgstr "Charger le iPod avant d'ajouter des morceaux."
 
-#: ../src/fileselection.c:185
+#: ../src/fileselection.c:197
 #, c-format
 msgid "Add files to '%s'"
 msgstr "Ajoute des fichiers à « %s »"
 
-#: ../src/fileselection.c:189
+#: ../src/fileselection.c:201
 #, c-format
 msgid "Add files to '%s/%s'"
 msgstr "Ajoute des fichiers à « %s/%s »"
 
 #. Create window title
-#: ../src/fileselection.c:322
+#: ../src/fileselection.c:293
 #, 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:378
+#: ../src/fileselection.c:319
 msgid "Set Cover"
 msgstr "Modifier la pochette"
 
-#: ../src/fileselection.c:816
-#, c-format
-msgid "Add directories to '%s'"
-msgstr "Ajouter les dossier à « %s »"
-
-#: ../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:1106
-msgid "Cancel"
-msgstr "Annuler"
-
 #: ../src/flacfile.c:62
 #, c-format
 msgid "'%s' does not appear to be an FLAC audio file.\n"
@@ -4054,7 +3956,7 @@
 msgid "Error retrieving tags for '%s'.\n"
 msgstr "Échec de la récupération des attributs de « %s ».\n"
 
-#: ../src/flacfile.c:165
+#: ../src/flacfile.c:193
 #, c-format
 msgid ""
 "Import of '%s' failed: FLAC not supported without the FLAC library. You must "
@@ -4063,7 +3965,7 @@
 "É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:171
+#: ../src/flacfile.c:199
 #, c-format
 msgid ""
 "FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
@@ -4131,95 +4033,7 @@
 msgid "%s: option `-W %s' doesn't allow an 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:838
-msgid "offline"
-msgstr "déconnecté"
-
-#: ../src/info.c:486
-#, c-format
-msgid " P:%d T:%d/%d"
-msgstr "L :%d M :%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 "To"
-
-#: ../src/info.c:823
-#, c-format
-msgid " %s Free"
-msgstr " %s de libre"
-
-#: ../src/info.c:828
-#, c-format
-msgid " %s Pending"
-msgstr " %s en cours"
-
-#: ../src/info.c:833
-msgid " disconnected"
-msgstr "déconnecté"
-
-#: ../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:889
-msgid "No tracks selected"
-msgstr "Aucun morceau sélectionné"
-
-#: ../src/info.c:894
-msgid "No playlist selected"
-msgstr "Aucune liste de lecture sélectionnée"
-
-#: ../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 "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
-#, c-format
-msgid "Error initialising iPod: %s\n"
-msgstr "Erreur d'initialisation du iPod : %s\n"
-
-#: ../src/ipod_init.c:366
-msgid "Error initialising iPod, unknown error\n"
-msgstr "Erreur d'initialisation du iPod, erreur inconnue\n"
-
-#: ../src/ipod_init.c:422
-#, c-format
-msgid "<b>Please select your iPod model at </b><i>%s</i>"
-msgstr "<b>Sélectionnez le modèle de votre iPod dans</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 ""
-"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:70
+#: ../src/help.c:48
 #, fuzzy
 msgid ""
 "© 2002 - 2007\n"
@@ -4232,7 +4046,7 @@
 "\n"
 "\n"
 
-#: ../src/misc.c:74
+#: ../src/help.c:52
 #, fuzzy
 msgid ""
 "Patches were supplied by the following people (list may be incomplete -- "
@@ -4242,27 +4056,27 @@
 "peut-être incomplète - veuillez me contacter)\n"
 "\n"
 
-#: ../src/misc.c:75
+#: ../src/help.c:53
 #, fuzzy
 msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
 msgstr ""
 "Ramesh Dharan : « Édition multiple » (édition des attributs de plusieurs "
 "fichiers en même temps)\n"
 
-#: ../src/misc.c:76
+#: ../src/help.c:54
 #, 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:77
+#: ../src/help.c:55
 #, 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:78
+#: ../src/help.c:56
 #, fuzzy
 msgid ""
 "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
@@ -4271,28 +4085,28 @@
 "Walter Bell : correction de la manipulation des URIs avec des caractères "
 "d'échappement\n"
 
-#: ../src/misc.c:79
+#: ../src/help.c:57
 #, 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:80
+#: ../src/help.c:58
 #, 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:81
+#: ../src/help.c:59
 #, fuzzy
 msgid ""
 "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
 "dialogue during sync"
 msgstr ""
-"Graeme Wilford : lecture et écriture des attributs  « 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:82
+#: ../src/help.c:60
 #, fuzzy
 msgid ""
 "Edward Matteucci: debugging, special playlist creation, most of the volume "
@@ -4301,30 +4115,30 @@
 "Edward Matteucci : mise au point, création de liste de lectures, majeure "
 "partie de la normalisation du volume\n"
 
-#: ../src/misc.c:83
+#: ../src/help.c:61
 #, fuzzy
 msgid "Jens Lautenbach: some optical improvements"
 msgstr "Jens Lautenbach : améliorations esthétiques de l'interface\n"
 
-#: ../src/misc.c:84
+#: ../src/help.c:62
 #, fuzzy
 msgid "Alex Tribble: iPod eject patch"
 msgstr "Alex Tribble : éjection de l'iPod\n"
 
-#: ../src/misc.c:85
+#: ../src/help.c:63
 #, fuzzy
 msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
 msgstr ""
 "Yaroslav Halchenko : gestion des fichiers orphelins et morceaux fictifs\n"
 
-#: ../src/misc.c:86
+#: ../src/help.c:64
 #, fuzzy
 msgid ""
 "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:87
+#: ../src/help.c:65
 #, fuzzy
 msgid ""
 "Ero Carrera: Filename validation and quick sync when copying tracks from the "
@@ -4333,29 +4147,29 @@
 "Ero Carrera : Validation du nom de fichier et synchro. rapide lors de la "
 "copie de l'iPod\n"
 
-#: ../src/misc.c:88
+#: ../src/help.c:66
 #, fuzzy
 msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
 msgstr ""
-"Jens Taprogge : Support de l'attribut « 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:89
+#: ../src/help.c:67
 #, fuzzy
 msgid "Armando Atienza: Support with external playcounts"
 msgstr "Armando Atienza : Suppport pour les compteurs de lecture externes\n"
 
-#: ../src/misc.c:90
+#: ../src/help.c:68
 #, fuzzy
 msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
 msgstr "D.L. Sharp : Support des fichiers m4b\n"
 
-#: ../src/misc.c:91
+#: ../src/help.c:69
 #, fuzzy
 msgid "Jim Hall: Decent INSTALL file"
 msgstr "Jim Hall : Fichier INSTALL décent\n"
 
-#: ../src/misc.c:92
+#: ../src/help.c:70
 #, fuzzy
 msgid ""
 "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
@@ -4365,31 +4179,31 @@
 "contacts\n"
 
 #. J"urgen!
-#: ../src/misc.c:93
+#: ../src/help.c:71
 #, fuzzy
 msgid "Flavio Stanchina: bugfixes"
 msgstr "Flavio Stanchina : correction de bogues\n"
 
-#: ../src/misc.c:94
+#: ../src/help.c:72
 #, fuzzy
 msgid ""
 "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
 "the title"
 msgstr "Chris Micacchi : lors du tri, gestion de 'the' au début du titre\n"
 
-#: ../src/misc.c:95
+#: ../src/help.c:73
 #, 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:97
+#: ../src/help.c:75
 #, fuzzy
 msgid ""
 "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
 "tags"
 msgstr "Christoph Kunz : compatibilité des adresses pour attributs id3v2.4\n"
 
-#: ../src/misc.c:99
+#: ../src/help.c:77
 #, fuzzy
 msgid ""
 "James Liggett:\n"
@@ -4402,37 +4216,37 @@
 "nouveau\n"
 "     refonte de la gestion des préférences.\n"
 
-#: ../src/misc.c:103
+#: ../src/help.c:81
 #, fuzzy
 msgid "Daniel Kercher: sync scripts for abook and webcalendar"
 msgstr "Daniel Kercher : scripts de synchronisation abook et webcalendar\n"
 
-#: ../src/misc.c:105
+#: ../src/help.c:83
 #, fuzzy
 msgid "Clinton Gormley: sync scripts for thunderbird"
 msgstr "Clinton Gormley : scripts de synchronisation pour thunderbird\n"
 
-#: ../src/misc.c:107
+#: ../src/help.c:85
 #, fuzzy
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
 msgstr "Sebastien Beridot : script de synchronisation pour le format ldif\n"
 
-#: ../src/misc.c:109
+#: ../src/help.c:87
 #, fuzzy
 msgid "Sebastian Scherer: sync script for kNotes"
 msgstr "Sebastian Scherer : script de synchronisation pour kNotes\n"
 
-#: ../src/misc.c:111
+#: ../src/help.c:89
 #, fuzzy
 msgid "Nick Piper: sync script for Palm, type-ahead search"
 msgstr "Nick Piper: script de synchronisation pour Palm\n"
 
-#: ../src/misc.c:113
+#: ../src/help.c:91
 #, 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:115
+#: ../src/help.c:93
 #, fuzzy
 msgid ""
 "Iain Benson: support for compilation tag in mp3 files and separate display "
@@ -4441,7 +4255,7 @@
 "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:116
+#: ../src/help.c:94
 #, fuzzy
 msgid ""
 "Nicolas Chariot: icons of buttons\n"
@@ -4451,12 +4265,12 @@
 "\n"
 "\n"
 
-#: ../src/misc.c:118
+#: ../src/help.c:96
 #, fuzzy
 msgid "This program borrows code from the following projects:"
 msgstr "Ce programme emprunte du code aux projets suivants :\n"
 
-#: ../src/misc.c:119
+#: ../src/help.c:97
 #, fuzzy
 msgid ""
 "gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB  (http://"
@@ -4465,7 +4279,7 @@
 "    gnutools : (mktunes.pl porté en C) pour la lecture et écriture de "
 "iTunesDB (http://www.gnu.org/software/gnupod/)\n"
 
-#: ../src/misc.c:120
+#: ../src/help.c:98
 #, fuzzy
 msgid ""
 "iPod.cpp, iPod.h by Samuel Wood (sam dot wood at gmail dot com): some code "
@@ -4475,48 +4289,48 @@
 "certaines parties de code des listes intelligentes sont basées sur ses "
 "classes C++.\n"
 
-#: ../src/misc.c:121
+#: ../src/help.c:99
 #, 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:122
+#: ../src/help.c:100
 #, 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:124
+#: ../src/help.c:102
 #, 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:128
+#: ../src/help.c:106
 #, 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:129
+#: ../src/help.c:107
 msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
 msgstr ""
 
-#: ../src/misc.c:130
+#: ../src/help.c:108
 #, 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:131
+#: ../src/help.c:109
 msgid "German: Kai-Ove"
 msgstr ""
 
-#: ../src/misc.c:132
+#: ../src/help.c:110
 #, fuzzy
 msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
 msgstr "Hébreu : Assaf Gillat (gillata at gmail dot com)\n"
 
-#: ../src/misc.c:133
+#: ../src/help.c:111
 #, fuzzy
 msgid ""
 "Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
@@ -4524,35 +4338,35 @@
 "Italien : Edward Matteucci (edward_matteucc at users dot sourceforge dot "
 "net)\n"
 
-#: ../src/misc.c:134
+#: ../src/help.c:112
 msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
 msgstr ""
 
-#: ../src/misc.c:135
+#: ../src/help.c:113
 #, fuzzy
 msgid "Japanese: Ayako Sano"
 msgstr "Japonais : Ayako Sano\n"
 
-#: ../src/misc.c:136
+#: ../src/help.c:114
 #, 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:137
+#: ../src/help.c:115
 msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
 msgstr ""
 
-#: ../src/misc.c:138
+#: ../src/help.c:116
 msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
 msgstr ""
 
-#: ../src/misc.c:139
+#: ../src/help.c:117
 #, 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:144
+#: ../src/help.c:122
 #, fuzzy
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
@@ -4586,7 +4400,7 @@
 "\n"
 "\n"
 
-#: ../src/misc.c:159
+#: ../src/help.c:137
 #, fuzzy
 msgid ""
 "© 2002-2007\n"
@@ -4599,34 +4413,194 @@
 "\n"
 "\n"
 
-#: ../src/misc.c:167
+#: ../src/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr ""
+
+#: ../src/help.c:143 ../src/help.c:148
 #, 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
+#: ../src/info.c:359 ../src/infodlg.c:190
+msgid "n/c"
+msgstr "n/d"
+
+#: ../src/info.c:364 ../src/info.c:852 ../src/infodlg.c:193
+msgid "offline"
+msgstr "déconnecté"
+
+#: ../src/info.c:500
 #, c-format
+msgid " P:%d T:%d/%d"
+msgstr "L :%d M :%d/%d"
+
+#: ../src/info.c:794
+msgid "B"
+msgstr "o"
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr "ko"
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr "To"
+
+#: ../src/info.c:837
+#, c-format
+msgid " %s Free"
+msgstr " %s de libre"
+
+#: ../src/info.c:842
+#, c-format
+msgid " %s Pending"
+msgstr " %s en cours"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr "déconnecté"
+
+#: ../src/info.c:898
+msgid "No database or playlist selected"
+msgstr "Aucune base de donnée ou liste de lecture sélectionnée"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "Aucun morceau sélectionné"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "Aucune liste de lecture sélectionnée"
+
+#: ../src/info.c:913
+msgid "No iPod or iPod playlist selected"
+msgstr "Aucun iPod ou liste de lecture sélectionné(e)"
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"Total\n"
+"(iPod)"
+
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"Total\n"
+"(local)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"Liste de lecture\n"
+"Sélectionnée"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"Morceaux\n"
+"Affichés"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"Morceaux\n"
+"Sélectionnés"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "Nombre de morceaux"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "Taille des fichiers"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "Nombre de listes de lecture"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "Morceaux supprimés"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "Taille des fichiers (supprimés)"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "Morceaux non transférés"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "Taille des fichiers (non transférés)"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "Espace libre effectif"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "Choisir ou entrer le modèle"
+
+#: ../src/ipod_init.c:81 ../src/repository.c:560 ../src/repository.c:2374
+msgid "Select mountpoint"
+msgstr "Point de montage de l'iPod :"
+
+#: ../src/ipod_init.c:362
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "Erreur d'initialisation du iPod : %s\n"
+
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr "Erreur d'initialisation du iPod, erreur inconnue\n"
+
+#: ../src/ipod_init.c:425
+#, c-format
+msgid "<b>Please select your iPod model at </b><i>%s</i>"
+msgstr "<b>Sélectionnez le modèle de votre iPod dans</b><i>%s</i>"
+
+#: ../src/ipod_init.c:466
+msgid ""
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
+msgstr ""
+"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:864
+#, c-format
 msgid "Could not process '%s' (no filename available)"
 msgstr "Impossible de traiter « %s » (pas de nom de fichier disponible)"
 
-#: ../src/misc.c:1088
+#: ../src/misc.c:1101
 #, c-format
-msgid "Unknown token '%%%c' in template '%s'"
-msgstr "Paramètre « %%%c » inconnu dans le modèle « %s »"
-
-#: ../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"
 
-#: ../src/misc.c:1257
+#: ../src/misc.c:1187
 #, c-format
 msgid "Error creating %s: %s\n"
 msgstr "Erreur à la création de « %s » : %s\n"
 
-#: ../src/misc.c:1691
+#: ../src/misc.c:1642
 #, c-format
 msgid ""
 "Writing preferences file '%s' failed (%s).\n"
@@ -4635,11 +4609,11 @@
 "Échec de l'enregistrement du fichier de préférences « %s » (%s).\n"
 "\n"
 
-#: ../src/misc.c:1693
+#: ../src/misc.c:1644
 msgid "unspecified error"
 msgstr "Erreur non spécifiée"
 
-#: ../src/misc.c:1701
+#: ../src/misc.c:1652
 #, c-format
 msgid ""
 "Writing preferences to the iPod (%s) failed: could not get path to Control "
@@ -4655,7 +4629,7 @@
 msgid "The following has occurred:"
 msgstr "L'erreur suivante est survenue  :"
 
-#: ../src/misc_confirm.c:122
+#: ../src/misc_confirm.c:156
 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 "
@@ -4671,13 +4645,13 @@
 "Êtes-vous sûr de vouloir supprimer les morceaux suivants de votre iPod ? Le "
 "nombre de listes dont ces morceaux font partie est indiqué entre parenthèses."
 
-#: ../src/misc_confirm.c:126
+#: ../src/misc_confirm.c:160
 msgid "Delete Track Completely from iPod?"
 msgid_plural "Delete Tracks Completely from iPod?"
 msgstr[0] "Suppression d'un morceau de l'iPod ?"
 msgstr[1] "Suppression de %d morceaux de l'iPod ?"
 
-#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#: ../src/misc_confirm.c:171 ../src/misc_confirm.c:212
 #, c-format
 msgid ""
 "Are you sure you want to remove the following track from the playlist \"%s\"?"
@@ -4689,13 +4663,13 @@
 msgstr[1] ""
 "Êtes-vous sûr de vouloir supprimer les morceaux suivants de la liste « %s » ?"
 
-#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+#: ../src/misc_confirm.c:175 ../src/misc_confirm.c:216
 msgid "Remove Track From Playlist?"
 msgid_plural "Remove Tracks From Playlist?"
 msgstr[0] "Supprimer le morceau de la liste de lecture ?"
 msgstr[1] "Supprimer les morceaux de la liste de lecture ?"
 
-#: ../src/misc_confirm.c:163
+#: ../src/misc_confirm.c:197
 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 "
@@ -4713,13 +4687,13 @@
 "durPod ? Le nombre de listes dont ces morceaux font partie est indiqué entre "
 "parenthèses."
 
-#: ../src/misc_confirm.c:167
+#: ../src/misc_confirm.c:201
 msgid "Delete Track from Harddisk?"
 msgid_plural "Delete Tracks from Harddisk?"
 msgstr[0] "Supprimer le morceau du disque dur ?"
 msgstr[1] "Supprimer les morceaux du disque dur ?"
 
-#: ../src/misc_confirm.c:192
+#: ../src/misc_confirm.c:226
 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 "
@@ -4737,55 +4711,55 @@
 "données locale ? Le nombre de listes dont ces morceaux font partie est "
 "indiqué entre parenthèses."
 
-#: ../src/misc_confirm.c:196
+#: ../src/misc_confirm.c:230
 msgid "Remove Track from Local Database?"
 msgid_plural "Remove Tracks from Local Database?"
 msgstr[0] "Supprimer un morceau de la base de données locale ?"
 msgstr[1] "Supprimer des morceaux de la base de données locale ?"
 
-#: ../src/misc_confirm.c:261
+#: ../src/misc_confirm.c:295
 #, c-format
 msgid "Deleted one track completely from iPod"
 msgid_plural "Deleted %d tracks completely from iPod"
 msgstr[0] "Suppression d'un morceau de l'iPod"
 msgstr[1] "Suppression de %d morceaux de l'iPod"
 
-#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#: ../src/misc_confirm.c:301 ../src/misc_confirm.c:325
 #, 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 »"
 
-#: ../src/misc_confirm.c:285
+#: ../src/misc_confirm.c:319
 #, c-format
 msgid "Deleted one track from harddisk"
 msgid_plural "Deleted %d tracks from harddisk"
 msgstr[0] "%d morceau supprimé du disque dur"
 msgstr[1] "%d morceaux supprimés du disque dur"
 
-#: ../src/misc_confirm.c:297
+#: ../src/misc_confirm.c:331
 #, c-format
 msgid "Deleted track from local database"
 msgid_plural "Deleted %d tracks from local database"
 msgstr[0] "1 morceau supprimé de la base de données locale"
 msgstr[1] "%d morceaux supprimés de la base de données locale"
 
-#: ../src/misc_confirm.c:442
+#: ../src/misc_confirm.c:476
 msgid "Cannot remove entry 'All'"
 msgstr "Ne peut supprimer l'entrée « Tous »"
 
-#: ../src/misc_confirm.c:536
+#: ../src/misc_confirm.c:570
 #, c-format
 msgid "Removed all %d tracks from the iPod"
 msgstr "Suppression des %d morceaux de l'iPod"
 
-#: ../src/misc_confirm.c:541
+#: ../src/misc_confirm.c:575
 #, c-format
 msgid "Removed all podcasts from the iPod"
 msgstr "Suppression de tous les podcasts de l'iPod"
 
-#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#: ../src/misc_confirm.c:584 ../src/misc_confirm.c:658
 #, c-format
 msgid "Deleted playlist '%s' including %d member track"
 msgid_plural "Deleted playlist '%s' including %d member tracks"
@@ -4793,36 +4767,35 @@
 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
+#: ../src/misc_confirm.c:600 ../src/misc_confirm.c:674
 #, c-format
 msgid "Deleted playlist '%s'"
 msgstr "Liste de lecture « %s » supprimée"
 
-#: ../src/misc_confirm.c:600
+#: ../src/misc_confirm.c:634
 #, 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[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
+#: ../src/misc_confirm.c:651
 #, c-format
 msgid "Removed all %d tracks from the database"
 msgstr "Suppression des %d morceaux de la base de données"
 
-#: ../src/misc_confirm.c:695
+#: ../src/misc_confirm.c:729
 #, 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
+#: ../src/misc_confirm.c:734
 #, 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
+#: ../src/misc_confirm.c:742
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and the following track "
@@ -4841,12 +4814,12 @@
 "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
+#: ../src/misc_confirm.c:753 ../src/misc_confirm.c:808
 #, 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 » ?"
 
-#: ../src/misc_confirm.c:745
+#: ../src/misc_confirm.c:779
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4865,13 +4838,13 @@
 "de votre disque dur ? Le nombre de liste dont ces morceaux font partie est "
 "indiqué entre parenthèses."
 
-#: ../src/misc_confirm.c:753
+#: ../src/misc_confirm.c:787
 #, 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 ?"
 
-#: ../src/misc_confirm.c:762
+#: ../src/misc_confirm.c:796
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4890,14 +4863,22 @@
 "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
+#: ../src/misc_confirm.c:869
 msgid ""
-"Data has been changed and not been saved.\n"
-"OK to exit gtkpod?"
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
+"changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
 msgstr ""
-"Des données modifiées n'ont pas été sauvées.\n"
-"Voulez-vous vraiment quitter gtkpod ?"
 
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr ""
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr ""
+
 #: ../src/misc_conversion.c:66
 msgid "File type"
 msgstr "Type de fichier"
@@ -5054,53 +5035,57 @@
 msgid "Gapless Track Flag"
 msgstr ""
 
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
+msgstr ""
+
+#: ../src/misc_conversion.c:127
 msgid "Name of file on PC, if available"
 msgstr "Nom du fichier sur le PC, si disponible"
 
-#: ../src/misc_conversion.c:127
+#: ../src/misc_conversion.c:128
 msgid "Name of file on the iPod"
 msgstr "Nom du fichier sur l'iPod"
 
 #. 10
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
 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:130
+#: ../src/misc_conversion.c:131
 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:136
+#: ../src/misc_conversion.c:137
 msgid "Beats per minute"
 msgstr "Battement Par Minute"
 
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
 msgid "Number of times the track has been played"
 msgstr "Nombre de fois où le fichier a été joué"
 
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
 msgid "Star rating from 0 to 5"
 msgstr "Notation en étoiles de 0 à 5"
 
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
 msgid "Date and time track has been added"
 msgstr "Date et heure de l'ajout du morceau"
 
 #. 20
-#: ../src/misc_conversion.c:140
+#: ../src/misc_conversion.c:141
 msgid "Date and time track has last been played"
 msgstr "La dernière fois que le fichier a été joué"
 
-#: ../src/misc_conversion.c:141
+#: ../src/misc_conversion.c:142
 msgid "Date and time track has last been modified"
 msgstr "La dernière fois que le fichier a été modifié"
 
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:143
 msgid "Manual volume adjust"
 msgstr "Ajustement manuel du volume"
 
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:144
 msgid ""
 "Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
 "the iPod"
@@ -5109,91 +5094,96 @@
 "son » sur l'iPod"
 
 #. 25
-#: ../src/misc_conversion.c:146
+#: ../src/misc_conversion.c:147
 msgid "CD Nr. and total number of CDS in set"
 msgstr "N° de CD et nombre total de CD"
 
-#: ../src/misc_conversion.c:149
+#: ../src/misc_conversion.c:150
 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."
 
-#: ../src/misc_conversion.c:150
+#: ../src/misc_conversion.c:151
 msgid "Accessible by selecting the center button on the iPod."
 msgstr "Accessible en choisissant le bouton central de l'iPod."
 
-#: ../src/misc_conversion.c:154
+#: ../src/misc_conversion.c:155
 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)"
 
 #. 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
+#: ../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 ../src/misc_conversion.c:174
 msgid "Used for sorting on the iPod"
 msgstr "Utilisé pour trier sur l'iPod"
 
-#: ../src/misc_conversion.c:735
+#: ../src/misc_conversion.c:737
 #, 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"
 
-#: ../src/misc_conversion.c:745
+#: ../src/misc_conversion.c:747
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "L'URI de fichier local « %s » ne peut pas inclure un '#'"
 
-#: ../src/misc_conversion.c:762
+#: ../src/misc_conversion.c:764
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "L'URI « %s » est invalide"
 
-#: ../src/misc_conversion.c:774
+#: ../src/misc_conversion.c:776
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "Le nom d'hôte de l'URI « %s » est invalide"
 
-#: ../src/misc_conversion.c:790
+#: ../src/misc_conversion.c:792
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 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
+#: ../src/misc_playlist.c:71 ../src/misc_playlist.c:108
+#, fuzzy
+msgid "Please load the iPod before adding playlists."
+msgstr "Charger le iPod avant d'ajouter des morceaux."
+
+#: ../src/misc_playlist.c:77 ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
 msgid "Please enter a name for the new playlist"
 msgstr "Entrer le nom de la nouvelle liste de lecture"
 
-#: ../src/misc_playlist.c:154
+#: ../src/misc_playlist.c:174
 msgid "AR:"
 msgstr "AR :"
 
-#: ../src/misc_playlist.c:157
+#: ../src/misc_playlist.c:177
 msgid "AL:"
 msgstr "AL :"
 
-#: ../src/misc_playlist.c:160
+#: ../src/misc_playlist.c:180
 msgid "GE:"
 msgstr "GE :"
 
-#: ../src/misc_playlist.c:163
+#: ../src/misc_playlist.c:183
 msgid "CO:"
 msgstr "CO :"
 
-#: ../src/misc_playlist.c:166
+#: ../src/misc_playlist.c:186
 msgid "YE:"
 msgstr "AN :"
 
-#: ../src/misc_playlist.c:194
+#: ../src/misc_playlist.c:214
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/misc_playlist.c:272
+#: ../src/misc_playlist.c:292
 #, c-format
 msgid "Random (%d)"
 msgstr "Aléatoirement (%d)"
 
-#: ../src/misc_playlist.c:297
+#: ../src/misc_playlist.c:317
 msgid ""
 "Auto Store of track view disabled.\n"
 "\n"
@@ -5201,11 +5191,11 @@
 "Mémorisation automatique de la vue désactivée.\n"
 "\n"
 
-#: ../src/misc_playlist.c:356
+#: ../src/misc_playlist.c:376
 msgid "Not Listed"
 msgstr "Jamais écoutés"
 
-#: ../src/misc_playlist.c:406
+#: ../src/misc_playlist.c:426
 #, c-format
 msgid "Created playlist '%s' with %d track."
 msgid_plural "Created playlist '%s' with %d tracks."
@@ -5213,78 +5203,78 @@
 msgstr[1] "Liste de lecture « %s » créée avec %d morceaux."
 
 #. n==0
-#: ../src/misc_playlist.c:417
+#: ../src/misc_playlist.c:437
 msgid "No tracks available, playlist not created"
 msgstr "Aucun morceau disponible, liste de lecture non créée"
 
-#: ../src/misc_playlist.c:543
+#: ../src/misc_playlist.c:563
 #, c-format
 msgid "Most Listened (%d)"
 msgstr "Les plus écoutés (%d)"
 
-#: ../src/misc_playlist.c:584
+#: ../src/misc_playlist.c:604
 #, c-format
 msgid "Never Listened"
 msgstr "Jamais écoutés"
 
-#: ../src/misc_playlist.c:624
+#: ../src/misc_playlist.c:644
 #, c-format
 msgid "Best Rated (%d)"
 msgstr "Mieux notés (%d)"
 
-#: ../src/misc_playlist.c:666
+#: ../src/misc_playlist.c:686
 msgid "Unrated tracks"
 msgstr "Morceaux non notés"
 
-#: ../src/misc_playlist.c:671
+#: ../src/misc_playlist.c:691
 #, c-format
 msgid "Rated %d"
 msgstr "Notés %d"
 
-#: ../src/misc_playlist.c:714
+#: ../src/misc_playlist.c:734
 #, c-format
 msgid "Recent (%d)"
 msgstr "Récents (%d)"
 
-#: ../src/misc_playlist.c:753
+#: ../src/misc_playlist.c:773
 msgid "Last Time"
 msgstr "Dernière fois"
 
-#: ../src/misc_playlist.c:844
+#: ../src/misc_playlist.c:864
 msgid "Removal of dangling tracks with no files on PC was canceled."
 msgstr ""
 "La suppression des morceaux fictifs sans fichier correspondant sur le PC a "
 "été annulée."
 
-#: ../src/misc_playlist.c:854
+#: ../src/misc_playlist.c:874
 msgid "Handling of dangling tracks with files on PC was canceled."
 msgstr ""
 "La récupération des morceaux fictifs à partir des fichiers du PC a été "
 "annulée."
 
-#: ../src/misc_playlist.c:882
+#: ../src/misc_playlist.c:902
 msgid "Dangling tracks with no files on PC were removed."
 msgstr ""
 "Les morceaux fictifs sans fichier correspondant sur le PC ont été supprimés."
 
-#: ../src/misc_playlist.c:943
+#: ../src/misc_playlist.c:963
 msgid "Dangling tracks with files on PC were handled."
 msgstr ""
 "Les morceaux fictifs avec leur fichier correspondant sur le PC ont été "
 "récupérés."
 
-#: ../src/misc_playlist.c:976
+#: ../src/misc_playlist.c:996
 msgid "Track"
 msgstr "Morceau"
 
-#: ../src/misc_playlist.c:1019
+#: ../src/misc_playlist.c:1035
+#, fuzzy
 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"
+"If you abort the operation, you can import the existing database before "
+"calling this function again.\n"
 msgstr ""
 "Vous n'avez pas importé la base iTunesDB existante. C'est souvent une erreur "
 "et cela résultera à la perte de la base déjà existante.\n"
@@ -5293,20 +5283,25 @@
 "annulez, vous pouvez importer la base existante avant d'appeler de nouveau "
 "cette fonction.\n"
 
-#: ../src/misc_playlist.c:1033
+#: ../src/misc_playlist.c:1042
+#, fuzzy
+msgid "Abort operation"
+msgstr "Options de tri"
+
+#: ../src/misc_playlist.c:1056
 msgid "Creating a tree of known files"
 msgstr "Création de l'arborescence des fichiers reconnus"
 
-#: ../src/misc_playlist.c:1077
+#: ../src/misc_playlist.c:1100
 msgid "Checking iPOD files against known files in DB"
 msgstr ""
 "Contrôle des fichiers sur l'iPod par rapport à ceux de la base iTunesDB"
 
-#: ../src/misc_playlist.c:1120
+#: ../src/misc_playlist.c:1143
 msgid "Orphaned"
 msgstr "Orphelin"
 
-#: ../src/misc_playlist.c:1147
+#: ../src/misc_playlist.c:1170
 #, c-format
 msgid ""
 "The following orphaned file had already been added to the iPod again. It "
@@ -5319,12 +5314,12 @@
 "%s\n"
 "\n"
 
-#: ../src/misc_playlist.c:1175
+#: ../src/misc_playlist.c:1198
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Processing..."
 msgstr "%d orphelins et %d morceaux fictifs. Traitement en cours …"
 
-#: ../src/misc_playlist.c:1199
+#: ../src/misc_playlist.c:1222
 #, c-format
 msgid ""
 "The following dangling track has a file on PC.\n"
@@ -5344,7 +5339,7 @@
 "Choisissez OK pour les transférer à la prochaine synchro, Annuler pour "
 "laisser tel quel."
 
-#: ../src/misc_playlist.c:1204
+#: ../src/misc_playlist.c:1227
 #, c-format
 msgid ""
 "The following dangling track doesn't have file on PC. \n"
@@ -5362,11 +5357,11 @@
 
 #. we want unique window for each
 #. gboolean modal,
-#: ../src/misc_playlist.c:1211
+#: ../src/misc_playlist.c:1234
 msgid "Dangling Tracks"
 msgstr "Morceaux fictifs"
 
-#: ../src/misc_playlist.c:1234
+#: ../src/misc_playlist.c:1257
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Done."
 msgstr "Trouvé %d orphelins et %d morceaux fictifs. Fini."
@@ -5406,72 +5401,72 @@
 msgid "Duplicate detection"
 msgstr "Détection de doublon"
 
-#: ../src/misc_track.c:1339
+#: ../src/misc_track.c:1347
 msgid "Local Database"
 msgstr "Base de données locale"
 
 #. artwork is set
-#: ../src/misc_track.c:1350
+#: ../src/misc_track.c:1358
 msgid "Embedded or filename was lost"
 msgstr "nom de fichier perdu"
 
-#: ../src/misc_track.c:1354
+#: ../src/misc_track.c:1362
 msgid "Artwork not set"
 msgstr "Pochette non renseigné"
 
-#: ../src/misc_track.c:1816
+#: ../src/misc_track.c:1836
 #, c-format
 msgid "Could not find source file for '%s'. Track not copied."
 msgstr "Impossible de trouver le fichier pour « %s ». Morceau pas copié."
 
-#: ../src/misc_track.c:2052
+#: ../src/misc_track.c:2072
 #, c-format
 msgid "drag and drop: ignored '%s'\n"
 msgstr "Glisser/déposer : « %s » ignoré\n"
 
-#: ../src/mp3file.c:1336
+#: ../src/mp3file.c:1344
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Erreur en remplissant le champ ID3 : %s\n"
 
-#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
-#: ../src/mp3file.c:2733
+#: ../src/mp3file.c:1368 ../src/mp3file.c:1552 ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870 ../src/mp3file.c:2929 ../src/mp3file.c:2956
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "Erreur à l'ouverture du fichier : « %s » (%s).\n"
 
-#: ../src/mp3file.c:1688
+#: ../src/mp3file.c:1793 ../src/mp3file.c:2993
 #, 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"
 
 #. Tracks with zero play length are ignored by iPod...
-#: ../src/mp3file.c:2770
+#: ../src/mp3file.c:2907
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "Le fichier « %s » à une durée de zéro. Ignoré.\n"
 
-#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#: ../src/mp4file.c:243 ../src/mp4file.c:475
 #, c-format
 msgid "'%s' does not appear to be a mp4 audio or video file.\n"
 msgstr "« %s » n'est pas un fichier audio ou vidéo mp4.\n"
 
-#: ../src/mp4file.c:253 ../src/mp4file.c:414
+#: ../src/mp4file.c:253 ../src/mp4file.c:485
 #, 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"
 
-#: ../src/mp4file.c:529
+#: ../src/mp4file.c:607
 #, c-format
 msgid "'%s' does not appear to be a mp4 audio file.\n"
 msgstr "« %s » n'est pas un fichier audio mp4.\n"
 
-#: ../src/mp4file.c:540
+#: ../src/mp4file.c:618
 #, 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"
 
-#: ../src/mp4file.c:553
+#: ../src/mp4file.c:631
 #, c-format
 msgid ""
 "Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5480,7 +5475,7 @@
 "É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:559
+#: ../src/mp4file.c:637
 #, c-format
 msgid ""
 "m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5490,15 +5485,15 @@
 "É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:565
+#: ../src/mp4file.c:643
 #, 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 ""
-"É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"
+"É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:73
 #, c-format
@@ -5523,159 +5518,140 @@
 "É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:357
+#: ../src/prefs.c:365
 #, c-format
 msgid "gtkpod version %s usage:\n"
 msgstr "gtkpod version %s utilisation :\n"
 
-#: ../src/prefs.c:358
+#: ../src/prefs.c:366
 msgid "  -h, --help:   display this message\n"
 msgstr "  -h, --help :   affiche ce message\n"
 
-#: ../src/prefs.c:359
+#: ../src/prefs.c:367
 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:360
+#: ../src/prefs.c:368
 msgid "  --hash <file>:print gtkpod hash for file\n"
 msgstr "  -- hash <fichier> : affiche la valeur de hachage pour les fichiers\n"
 
-#: ../src/prefs.c:361
+#: ../src/prefs.c:369
 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:362
+#: ../src/prefs.c:370
 msgid "  --mountpoint: same as '-m'.\n"
 msgstr "  --mountpoint : identique à « -m ».\n"
 
-#: ../src/prefs.c:363
+#: ../src/prefs.c:371
 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:364
+#: ../src/prefs.c:372
 msgid "  --auto:       same as '-a'.\n"
 msgstr "  --auto :       identique à « -a ».\n"
 
-#: ../src/prefs.c:561
-#, c-format
-msgid "Couldn't create ~/.gtkpod\n"
+#: ../src/prefs.c:569
+#, fuzzy, c-format
+msgid "Couldn't create '%s'\n"
 msgstr "Impossible de créer « ~/.gtkpod »\n"
 
-#: ../src/prefs_window.c:133
-msgid "Please select command for 'Play Now'"
-msgstr "Ligne de commande pour « Jouer maintenant »"
+#: ../src/prefsdlg.c:51
+#, fuzzy
+msgid "Hide"
+msgstr "Vidéo"
 
-#: ../src/prefs_window.c:134
-msgid "Please select command for 'Enqueue'"
-msgstr "Ligne de commande pour « Mettre dans la file d'attente »"
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
+msgstr ""
 
-#: ../src/prefs_window.c:135
-msgid "Please select the mp3gain executable"
-msgstr "Chemin de l'exécutable « mp3gain »"
+#: ../src/prefsdlg.c:53
+msgid "Text only"
+msgstr ""
 
-#: ../src/prefs_window.c:136
-msgid "Please select the aacgain executable"
-msgstr "Chemin de l'exécutable « aacgain »"
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
+msgstr ""
 
-#: ../src/prefs_window.c:137
-msgid "Select the mserv music root directory"
-msgstr "Sélectionner le répertoire racine de musique mserv"
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
+msgstr ""
 
-#: ../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:139
-msgid "Select the ogg/vorbis converter command"
-msgstr "Choisir la commande pour le convertisseur ogg/vorbis"
-
-#: ../src/prefs_window.c:140
-msgid "Select the flac converter command"
-msgstr "Ligne de commande pour la conversion FLAC"
-
-#: ../src/prefs_window.c:141
-msgid "Select the m4a converter command."
-msgstr "Ligne de commande pour la conversion M4a"
-
-#: ../src/prefs_window.c:142
-msgid "Select the mp3 converter command."
-msgstr "Ligne de commande pour la conversion MP3"
-
-#: ../src/prefs_window.c:143
-msgid "Select the wav converter command."
-msgstr "Ligne de commande pour la conversion Wav"
-
-#: ../src/prefs_window.c:201 ../src/repository.c:662
-#, c-format
+#: ../src/repository.c:527
+#, 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>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>"
+"Are you sure you want to delete repository \"%s\"? This action cannot be "
+"undone!"
+msgstr "Êtes-vous sûr de vouloir supprimer la liste de lecture « %s » ?"
 
-#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
-msgid "Preferences not updated"
-msgstr "Préférences non mises à jour"
+#: ../src/repository.c:531
+#, fuzzy
+msgid "Delete repository?"
+msgstr "Supprimer le dépot"
 
-#: ../src/prefs_window.c:1232
-msgid "Preferences applied"
-msgstr "Préférences mises à jour"
-
-#: ../src/repository.c:573 ../src/repository.c:2395
+#: ../src/repository.c:587 ../src/repository.c:2400
 msgid "Set backup file"
 msgstr "Fichier de sauvegarde"
 
-#: ../src/repository.c:612
+#: ../src/repository.c:626
 msgid "Select directory for synchronization"
 msgstr "Sélectionner un répertoire pour la synchronisation"
 
-#: ../src/repository.c:638
+#: ../src/repository.c:652
 msgid "Please select command to sync contacts"
 msgstr "Ligne de commande pour synchroniser les contacts"
 
-#: ../src/repository.c:644
+#: ../src/repository.c:658
 msgid "Please select command to sync calendar"
 msgstr "Ligne de commande pour synchroniser le calendrier"
 
-#: ../src/repository.c:650
+#: ../src/repository.c:664
 msgid "Please select command to sync notes"
 msgstr "Ligne de commande pour synchroniser les notes"
 
-#: ../src/repository.c:729
+#: ../src/repository.c:676
+#, 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 plaît l'envoyer à jcsjcs at "
+"users.sourceforge.net afin qu'il soit inclus dans les prochaines versions de "
+"gtkpod.</i>"
+
+#: ../src/repository.c:743
 msgid "Smart playlist updated."
 msgstr "Liste Intelligente mise à jour"
 
-#: ../src/repository.c:1190
+#: ../src/repository.c:1204
 msgid "Podcasts Repository"
 msgstr "Dépot podcasts"
 
-#: ../src/repository.c:1194
+#: ../src/repository.c:1208
 msgid "Local Repository"
 msgstr "Dépot local"
 
-#: ../src/repository.c:1348
+#: ../src/repository.c:1358
 msgid "Master Playlist"
 msgstr "Liste de lecture principale"
 
-#: ../src/repository.c:1352
+#: ../src/repository.c:1362
 msgid "Podcasts Playlist"
 msgstr "Liste de lecture Podcasts"
 
-#: ../src/repository.c:1360
+#: ../src/repository.c:1370
 msgid "Regular Playlist"
 msgstr "Liste de lecture standard"
 
-#: ../src/repository.c:2423
+#: ../src/repository.c:2428
 msgid "Set local repository file"
 msgstr "Fichier de dépot local"
 
-#: ../src/repository.c:2522
+#: ../src/repository.c:2526
 msgid "New Repository"
 msgstr "Nouveau dépot"
 
@@ -5689,18 +5665,31 @@
 msgstr ""
 "Impossible d'ouvrir « %s » pour calculer la somme de contrôle SHA1 : %s\n"
 
-#: ../src/syncdir.c:237
+#: ../src/sort_window.c:237
+#, fuzzy
+msgid "No sorting"
+msgstr "_Tri"
+
+#: ../src/sort_window.c:271
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr ""
+"Vous pouvez aussi utiliser le tableau des entêtes, mais cela permet de trier "
+"sur une colonne qui n'est pas affichée."
+
+#: ../src/syncdir.c:246
 #, c-format
 msgid "Sync summary for %s/%s\n"
 msgstr "Résumé de synchronisation pour %s/%s\n"
 
-#: ../src/syncdir.c:246
+#: ../src/syncdir.c:255
 msgid "The following track has been added or updated:\n"
 msgid_plural "The following tracks have been added or updated:\n"
 msgstr[0] "Le morceau suivant a été mis à jour ou ajouté :\n"
 msgstr[1] "Les morceaux suivants ont été mis à jour ou ajoutés :\n"
 
-#: ../src/syncdir.c:255
+#: ../src/syncdir.c:264
 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"
@@ -5708,23 +5697,23 @@
 msgstr[1] "Les morceaux suivants ont été supprimés de l'iPod :\n"
 
 # y, c-format
-#: ../src/syncdir.c:264
+#: ../src/syncdir.c:273
 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épôt :\n"
 msgstr[1] "Les morceaux suivants ont été supprimés du dépôt :\n"
 
-#: ../src/syncdir.c:271
+#: ../src/syncdir.c:280
 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] "Le morceau suivant a été supprimé de la liste :\n"
 msgstr[1] "Les morceaux suivants ont été supprimés de la liste :\n"
 
-#: ../src/syncdir.c:277
+#: ../src/syncdir.c:286
 msgid "Nothing was changed.\n"
 msgstr "Rien de changé.\n"
 
-#: ../src/syncdir.c:282
+#: ../src/syncdir.c:291
 msgid "Sync summary"
 msgstr "Résumé de synchronisation"
 
@@ -5848,10 +5837,619 @@
 msgid "%s does not appear to be a supported wav file.\n"
 msgstr "%s ne semble pas être un format wav supporté.\n"
 
+#~ msgid "GtkPod"
+#~ msgstr "GtkPod"
+
+#~ msgid "     "
+#~ msgstr "     "
+
+#~ msgid "      "
+#~ msgstr "      "
+
+#~ msgid "%A"
+#~ msgstr "%A"
+
+#~ msgid "...as icons"
+#~ msgstr "…avec seulement les icônes"
+
+#~ msgid "...as text"
+#~ msgstr "…avec seulement les libellés"
+
+#~ msgid "...both as icons and text"
+#~ msgstr "…avec les icônes et libellés"
+
+#~ msgid "...entry 'All' in sort tab..."
+#~ msgstr "…onglet « Tous » dans la zone de tri…"
+
+#~ msgid "...master playlist"
+#~ msgstr "…liste de lecture principale"
+
+#~ msgid "../%A.jpg"
+#~ msgstr "../%A.jpg"
+
+#~ msgid "<b>Adding/Updating/Syncing</b>"
+#~ msgstr "<b>Ajout/Mise à jour/Synchronisation</b>"
+
+#~ msgid "<b>Audioscrobbler</b>"
+#~ msgstr "<b>Audioscrobbler</b>"
+
+#~ msgid "<b>Automatically select...</b>"
+#~ msgstr "<b>Sélection automatique…</b>"
+
+#~ msgid "<b>Calendar/Contacts/Notes</b>"
+#~ msgstr "<b>Calendrier/Contacts/Notes</b>"
+
+#~ msgid "<b>Misc</b>"
+#~ msgstr "<b>Divers</b>"
+
+#~ msgid "<b>Mountpoint and individual repository/playlist options</b>"
+#~ msgstr "<b>Point de montage et options pour dépots/listes</b>"
+
+#~ msgid "<b>Repositories</b>"
+#~ msgstr "<b>Dépots</b>"
+
+#~ msgid "<b>Sync</b>"
+#~ msgstr "<b>Synchroniser</b>"
+
+#~ msgid "<b>Tag Reading</b>"
+#~ msgstr "<b>Lecture des attributs</b>"
+
 #, fuzzy
-#~ msgid "<b>Resolution:</b>"
-#~ msgstr "<b>Infobulles</b>"
+#~ msgid "<b>Track Attributes</b>"
+#~ msgstr "<b>Attributs des morceaux affichés</b>"
 
+#~ msgid "About gtkpod"
+#~ msgstr "A propos de gtkpod"
+
+#~ msgid "Always write ID3v2.4 tags (only applies to MP3)"
+#~ msgstr ""
+#~ "Toujours écrire les attributs ID3v2.4 (s'applique seulement aux MP3)"
+
+#~ msgid ""
+#~ "As a last resort set the following tags to the\n"
+#~ "filename if they are (still) empty:"
+#~ msgstr ""
+#~ "Mettre un attribut par défaut au cas où les attributs restent\n"
+#~ "vides après l'extraction à partir du nom de fichier :"
+
+#~ msgid "Before removing tracks from the harddisk"
+#~ msgstr "Avant de supprimer complètement les morceaux du disque dur"
+
+#~ msgid "Before removing tracks from the iPod"
+#~ msgstr "Avant de supprimer complètement les morceaux de l'iPod"
+
+#~ msgid "Before removing tracks from the local database"
+#~ msgstr ""
+#~ "Avant de supprimer complètement les morceaux de la base de données locale"
+
+#~ 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épôt\n"
+#~ "lors de la synchronisation des listes"
+
+#~ msgid "Credits"
+#~ msgstr "Crédits"
+
+#~ msgid "Currently only rating is supported."
+#~ msgstr "Actuellement, seule la notation est supportée."
+
+#~ 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épôt"
+
+#~ 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 ""
+#~ "Détermine le nom du fichier pour la pochette. Vous pouvez séparer les "
+#~ "expressions utilisées dans l'ordre par des points-virgules. Artiste: %a, "
+#~ "album: %A, compositeur; %c, titre: %t, 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 nom de fichier original sans extension: %O, la "
+#~ "liste courante: %p,  le caractère '%': %%."
+
+#~ msgid "Display a list of tracks that could actually be updated."
+#~ msgstr "Afficher la liste des morceaux qui peuvent être mis à jour."
+
+#~ msgid "Display a list of tracks that could not be updated."
+#~ msgstr "Afficher la liste des morceaux qui ne peuvent pas être mis à jour."
+
+#~ msgid "Display info about non-updated tracks"
+#~ msgstr "Afficher les infos des morceaux qui n'ont pas été mis à jour"
+
+#~ 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."
+
+#~ msgid "Display toolbar..."
+#~ msgstr "Afficher la barre d'outils…"
+
+#~ msgid "Display tooltips in prefs window"
+#~ msgstr "Afficher les infobulles dans la fenêtre des préférences"
+
+#, fuzzy
+#~ msgid "Displayed:"
+#~ msgstr "_Affichage"
+
+#~ msgid "Don't allow file duplication"
+#~ msgstr "Ne pas autoriser de doublons de fichiers"
+
+#~ 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 sha1 des "
+#~ "fichiers."
+
+#, fuzzy
+#~ msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
+#~ msgstr "Essaye <i>répertoire.jpg</i>, puis <i>&lt;artiste&gt;.jpg</i>"
+
+#~ msgid "Flac with :"
+#~ msgstr "FLAC avec :"
+
+#~ 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."
+
+#~ 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."
+
+#~ 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 ""
+#~ "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 (change l'entrée « transferred= » dans la sauvegarde de la base "
+#~ "de données)."
+
+#~ 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é."
+
+#~ 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 ""
+#~ "Si le fichier (chemin complet) d'un morceau existant correspond au "
+#~ "morceau à ajouter, cette option vous permet de mettre à jour les "
+#~ "informations du morceau existant plutôt que de l'écraser. Notez que cette "
+#~ "option est différente de l'option ci-dessus : les doublons sont des "
+#~ "fichiers strictement identiques (même taille, mêmes tags)"
+
+#~ 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."
+
+#~ 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 ""
+#~ "Si vous ne choisissez pas de liste de lecture principale automatiquement, "
+#~ "l'import initial sera beaucoup plus rapide car l'affichage n'aura pas à "
+#~ "être mis à jour à chaque morceau."
+
+#~ 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 ""
+#~ "Si vous sélectionnez plusieures chansons et éditez un attribut du premier "
+#~ "morceau les attributs des autres morceaux seront également mis à jour."
+
+#~ 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"
+
+#~ msgid "M4A with :"
+#~ msgstr "M4A avec :"
+
+#~ msgid "MP3 with :"
+#~ msgstr "MP3 avec :"
+
+#~ msgid "Match al_l of the following"
+#~ msgstr "Répondant à _toutes"
+
+#~ msgid "Match an_y of the following"
+#~ msgstr "Répondant à _quelques"
+
+#~ msgid "Maximum size of cache directory (in GB):"
+#~ msgstr "Taille maximale du dossier cache (en Go) :"
+
+#~ msgid ""
+#~ "Music files can have images embedded in the APIC tag. Currently this is "
+#~ "only supported for MP3 files."
+#~ msgstr ""
+#~ "Les fichiers de musique peuvent avoir des images dans le tag APIC. Pour "
+#~ "l'instant ceci est uniquement vrai pour les fichiers MP3."
+
+#~ msgid "None"
+#~ msgstr "Aucun"
+
+#~ 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 ""
+#~ "Par défaut, le jeu de caractère spécifié lors du premier import d'un "
+#~ "morceau sera celui utilisé pour la mise à jour. Pour corriger un mauvais "
+#~ "jeu de car. sélectionné à l'import initial d'un morceau, cocher cette "
+#~ "option pour le modifier lors de la mise à jour de ce morceau. Note : les "
+#~ "infos sur les caractères sont stockées dans un fichier d'informations "
+#~ "étendues et les morceaux importés.avant la version 0.51 de gtkpod "
+#~ "n'utilisait pas ce fichier. Ce sera le jeu de caractères spécifié ici qui "
+#~ "sera utilisé en cas de mise à jour de ces morceaux."
+
+#~ 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 ""
+#~ "Par défaut, le jeu de caractère spécifié lors du premier import d'un "
+#~ "morceau sera celui utilisé pour la mise à jour. Pour corriger un mauvais "
+#~ "jeu de car. sélectionné à l'import initial d'un morceau, cocher cette "
+#~ "option pour le modifier lors de la mise à jour de ce morceau. Note : les "
+#~ "infos sur les caractères sont stockées dans un fichier d'information "
+#~ "étendu et les morceaux importés avant la version 0.51 de gtkpod "
+#~ "n'utilisait pas ce fichier. Ce sera le jeu spécifié ici qui sera utilisé "
+#~ "en cas de mise à jour de ces morceaux."
+
+#~ msgid "Number of tracks in generated playlists:"
+#~ msgstr "Nombre de morceaux dans les listes de lecture générées :"
+
+#~ msgid ""
+#~ "Number of tracks in the generated playlists 'Most Often Listened', 'Best "
+#~ "Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
+#~ msgstr ""
+#~ "Nombre de morceaux dans les listes de lecture générées automatiquement."
+#~ "Mettre '0' pour ne pas spécifier de limite."
+
+#~ msgid "Ogg with :"
+#~ msgstr "Ogg avec :"
+
+#~ msgid "Overwrite tags that are already set"
+#~ msgstr "Écraser les attributs déjà présents"
+
+#~ msgid "Password:"
+#~ msgstr "Mot de passe :"
+
+#~ msgid "Please specify a time interval"
+#~ msgstr "Spécifiez un intervalle de temps"
+
+#~ msgid "Read coverart from embedded APIC data"
+#~ msgstr "Lire la pochette depuis les données APIC"
+
+#~ 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)"
+
+#, fuzzy
+#~ msgid "Remove selected attributes from the displayed list"
+#~ msgstr "Morceaux sélectionnés de la liste de lecture"
+
+#~ msgid "Root directory of mserv database (trackinfo root)."
+#~ msgstr "Rép. de la base mserv (infos)."
+
+#~ msgid "Rules"
+#~ msgstr "Règles"
+
+#~ msgid "Scrobble Tracks?"
+#~ msgstr "« scrobbling » des morceaux ?"
+
+#~ 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 »"
+
+#~ msgid "Set mountpoint or edit repository options"
+#~ msgstr "Définir le point de montage ou éditer les options du dépot"
+
+#~ msgid "Set options for Calendar/Contacts/Notes"
+#~ msgstr "Options pour Calendrier/Contacts/Notes"
+
+#~ 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."
+
+#~ 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."
+
+#~ msgid "Set this to your last.fm password"
+#~ msgstr "Remplir avec le mot de passe last.fm"
+
+#~ msgid "Set this to your last.fm username"
+#~ msgstr "Remplir avec le nom d'utilisateur last.fm"
+
+#~ 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)."
+
+#~ msgid ""
+#~ "Set to 0 to use as many background threads as CPUs are available on your "
+#~ "system."
+#~ msgstr "Mettre à 0 pour utiliser autant de « threads » que possible."
+
+#~ msgid "Sorting case sensitive"
+#~ msgstr "Trier en tenant compte de la casse"
+
+#~ msgid "Sorttab: "
+#~ msgstr "Zone de tri :"
+
+#~ msgid "Sorttabs"
+#~ msgstr "Zones de tri :"
+
+#~ msgid "Template for info field: "
+#~ msgstr "Modèle pour le champ d'info :"
+
+#~ msgid ""
+#~ "The tags are written to the files on your harddrive and on the iPod (if "
+#~ "available)."
+#~ msgstr ""
+#~ "Les attributs ID3 seront écrits dans les fichiers sur votre disque et "
+#~ "l'iPod (si disponible)."
+
+#~ msgid "This is the same option as in 'Edit/Delete Confirmation'"
+#~ msgstr ""
+#~ "C'est la même option que dans « Édition/Confirmation de suppression »"
+
+#~ 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 ""
+#~ "Les tags ID3v2.4 utilisent l'unicode pour stocker les attributs de façon "
+#~ "à 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."
+
+#~ msgid "This option will be re-activated when you upgrade gtkpod."
+#~ msgstr "Cette option se réactivera quand vous mettrez à jour gtkpod"
+
+#~ 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."
+
+#~ msgid "Translators"
+#~ msgstr "Traducteurs"
+
+#~ msgid "Use 'Multi-Edit' also for title field"
+#~ msgstr "Utiliser « Édition multiple » également pour les titres"
+
+#~ msgid "Use 'Multi-Edit' for tracks selections"
+#~ msgstr "Utiliser « Édition multiple » pour les morceaux sélectionnés"
+
+#, fuzzy
+#~ msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
+#~ msgstr "Utilise <i>&lt;Album&gt;.jpg</i> dans le répertoire parent"
+
+#, fuzzy
+#~ msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
+#~ msgstr "Utilise <i>&lt;Album&gt;.jpg</i>; <i>&lt;Album&gt;.png</i>…"
+
+#~ msgid "Use <i>folder.jpg</i> as cover art."
+#~ msgstr "Utilise <i>répertoire.jpg</i> pour la pochette."
+
+#~ msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
+#~ msgstr "Utilise <i>répertoire.jpg</i>, <i>répertoire.png</i>…"
+
+#~ 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 "
+#~ "l'écriture des attributs"
+
+#~ 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 :"
+
+#~ msgid "Username to be used for mserv database lookup."
+#~ msgstr "Utilisateur pour se connecter à la base mserv."
+
+#~ 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 ""
+#~ "Généralement, vous ne devriez pas avoir à utiliser cette option, car elle "
+#~ "peut avoir des effets inattendus (pas d'annulation possible)."
+
+#~ msgid "WAV with :"
+#~ msgstr "WAV avec :"
+
+#~ msgid ""
+#~ "When adding dirs/files, update information of\n"
+#~ "existing tracks with identical filenames"
+#~ msgstr ""
+#~ "Lors de l'ajout de fichiers/répertoires, mettre à jour\n"
+#~ "les informations des morceaux existants avec les doublons"
+
+#~ msgid "When syncing playlists"
+#~ msgstr "Lors de la synchronisation des listes"
+
+#~ 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 SHA1, jeu de caractères…). Recommandé."
+
+#~ msgid "_Encoding (ID3, files):"
+#~ msgstr "Jeu de caractères (ID3, fichiers) :"
+
+#~ msgid "_Ignore rules"
+#~ msgstr "Ne respectant _pas"
+
+#~ msgid "_Last.FM"
+#~ msgstr "_Last.FM"
+
+#~ msgid "_Less Sort Tabs"
+#~ msgstr "_Supprimer une zone de tri"
+
+#~ msgid "_Track Info"
+#~ msgstr "Infos du _Morceau"
+
+#~ 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 ""
+#~ "artiste: %a, album: %A, compositeur: %c, titre: %t, genre: %G, N° de "
+#~ "piste: %T, N° de CD: %C, année: %Y, ignore: %*, le caractère '%': %%. "
+#~ "Vous pouvez séparer plusieurs masques par un ';'. Le premier masque "
+#~ "concordant sera utilisé. Exemple : «%a - %A/%T %t.mp3;%t.wav»."
+
+#~ msgid "folder"
+#~ msgstr "répertoire"
+
+#~ msgid "folder.jpg"
+#~ msgstr "répertoire.jpg"
+
+#~ msgid "folder.jpg;%a.jpg"
+#~ msgstr "répertoire.jpg;%a.jpg"
+
+#~ msgid "gtkpod"
+#~ msgstr "gtkpod"
+
+#~ 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 votre système."
+
+#~ msgid "mserv database lookup will be done for music in this directory."
+#~ msgstr "La base mserv utilise ce répertoire pour chercher une musique."
+
+#~ msgid "Confirmation Dialogue"
+#~ msgstr "Message de confirmation"
+
+#~ msgid "Last Played"
+#~ msgstr "Dernière fois joué"
+
+#~ msgid "Last Modified"
+#~ msgstr "Dernière fois modifié"
+
+#~ msgid "Add directories to '%s'"
+#~ msgstr "Ajouter les dossier à « %s »"
+
+#~ msgid "Add directories to '%s/%s'"
+#~ msgstr "Ajouter les dossiers à « %s/%s »"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid ""
+#~ "Data has been changed and not been saved.\n"
+#~ "OK to exit gtkpod?"
+#~ msgstr ""
+#~ "Des données modifiées n'ont pas été sauvées.\n"
+#~ "Voulez-vous vraiment quitter gtkpod ?"
+
+#~ msgid "Please select command for 'Play Now'"
+#~ msgstr "Ligne de commande pour « Jouer maintenant »"
+
+#~ msgid "Please select command for 'Enqueue'"
+#~ msgstr "Ligne de commande pour « Mettre dans la file d'attente »"
+
+#~ msgid "Please select the mp3gain executable"
+#~ msgstr "Chemin de l'exécutable « mp3gain »"
+
+#~ msgid "Please select the aacgain executable"
+#~ msgstr "Chemin de l'exécutable « aacgain »"
+
+#~ msgid "Select the mserv music root directory"
+#~ msgstr "Sélectionner le répertoire racine de musique mserv"
+
+#~ msgid "Select the mserv trackinfo root directory"
+#~ msgstr "Sélectionner le répertoire racine d'infos mserv"
+
+#~ msgid "Select the ogg/vorbis converter command"
+#~ msgstr "Choisir la commande pour le convertisseur ogg/vorbis"
+
+#~ msgid "Select the flac converter command"
+#~ msgstr "Ligne de commande pour la conversion FLAC"
+
+#~ msgid "Select the m4a converter command."
+#~ msgstr "Ligne de commande pour la conversion M4a"
+
+#~ msgid "Select the mp3 converter command."
+#~ msgstr "Ligne de commande pour la conversion MP3"
+
+#~ msgid "Select the wav converter command."
+#~ msgstr "Ligne de commande pour la conversion Wav"
+
+#~ msgid "Preferences not updated"
+#~ msgstr "Préférences non mises à jour"
+
+#~ msgid "Preferences applied"
+#~ msgstr "Préférences mises à jour"
+
 #~ msgid "label"
 #~ msgstr "étiquette"
 
@@ -5875,15 +6473,9 @@
 #~ msgid "Dirs"
 #~ msgstr "Répertoires"
 
-#~ msgid "Files"
-#~ msgstr "Fichiers"
-
 #~ msgid "New PL"
 #~ msgstr "Nouvelle liste"
 
-#~ msgid "_About"
-#~ msgstr "A _propos"
-
 #~ msgid "Download Cover"
 #~ msgstr "Télécharger la pochette"
 

Modified: gtkpod/branches/upstream/current/po/he.po
===================================================================
--- gtkpod/branches/upstream/current/po/he.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/he.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,13 +1,13 @@
 # translation of gtkpod.po to HEBREW
 # This file is distributed under the same license as the gtkpod package
-# Assaf Gillat <gillata at gmail.com>, 2005/7.
+# Assaf Gillat <gillata at gmail.com>, 2005-8.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gtkpod\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-13 18:36-0500\n"
-"PO-Revision-Date: 2007-12-16 22:15+0200\n"
+"POT-Creation-Date: 2008-12-09 19:55+0900\n"
+"PO-Revision-Date: 2008-12-15 23:20+0900\n"
 "Last-Translator: Assaf Gillat <gillata at gmail.com>\n"
 "Language-Team: HEBREW <kde-il at yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -19,13 +19,13 @@
 "X-Poedit-Country: ISRAEL\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 "ניהול מוסיקה ווידאו על נגן ה־iPod של Apple"
 
+#: ../data/gtkpod.desktop.in.h:2 ../data/gtkpod.glade.h:427
+msgid "gtkpod iPod Manager"
+msgstr "תוכנת gtkpod מנהל ה־iPod"
+
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
 msgstr "מנהל ה־iPod"
@@ -39,409 +39,433 @@
 msgstr "    "
 
 #: ../data/gtkpod.glade.h:3
-msgid "     "
-msgstr "     "
+msgid " <= cts <= "
+msgstr " <= cts <= "
 
 #: ../data/gtkpod.glade.h:4
-msgid "      "
-msgstr "      "
+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:5
-msgid "   Sort by:"
-msgstr "   מיין על פי:"
+msgid "(Checked)"
+msgstr "(מסומן)"
 
 #: ../data/gtkpod.glade.h:6
-msgid " <= cts <= "
-msgstr " <= cts <= "
+msgid "0"
+msgstr "0"
 
 #: ../data/gtkpod.glade.h:7
-msgid " Logic: "
-msgstr " לוגיקה: "
+msgid "1"
+msgstr "1"
 
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr "2"
+
 #: ../data/gtkpod.glade.h:9
-#, no-c-format
-msgid "%A"
-msgstr "%A"
+msgid "3"
+msgstr "3"
 
 #: ../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 "4"
+msgstr "4"
 
 #: ../data/gtkpod.glade.h:11
-msgid "'aacgain' executable:"
-msgstr "קובץ ריצה של 'aacgain':"
+msgid "5"
+msgstr "5"
 
 #: ../data/gtkpod.glade.h:12
-msgid "'mp3gain' executable:"
-msgstr "קובץ ריצה של 'mp3gain':"
+msgid ":"
+msgstr ":"
 
 #: ../data/gtkpod.glade.h:13
-msgid "(Checked)"
-msgstr "(מסומן)"
+msgid "<"
+msgstr "<"
 
 #: ../data/gtkpod.glade.h:14
-msgid "...as icons"
-msgstr "...בתור סמלים"
+msgid "<b>Advanced Options</b>"
+msgstr "<b>אפשרויות מתקדמות</b>"
 
 #: ../data/gtkpod.glade.h:15
-msgid "...as text"
-msgstr "...בתור טקסט"
+msgid "<b>Ascending</b>"
+msgstr "<b>עולה</b>"
 
 #: ../data/gtkpod.glade.h:16
-msgid "...both as icons and text"
-msgstr "...ביחד גם סמלים וגם טקסט"
+msgid "<b>Auto Store</b>"
+msgstr "<b>שמירה אוטומטית</b>"
 
 #: ../data/gtkpod.glade.h:17
-msgid "...entry 'All' in sort tab..."
-msgstr "...רשומה 'הכל' בכרטיסיית המיון..."
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>יצירה אוטומטית של רשימות השמעה</b>"
 
 #: ../data/gtkpod.glade.h:18
-msgid "...master playlist"
-msgstr "...רשימת השמעה ראשית"
+msgid "<b>Available Columns</b>"
+msgstr "<b>עמודות זמינות</b>"
 
+#: ../data/gtkpod.glade.h:19
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>פורמטים תואמים</b>"
+
 #: ../data/gtkpod.glade.h:20
-#, no-c-format
-msgid "../%A.jpg"
-msgstr "../%A.jpg"
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>אפשרויות המרה</b>"
 
 #: ../data/gtkpod.glade.h:21
-msgid "0"
-msgstr "0"
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>תצוגת עטיפות</b>"
 
 #: ../data/gtkpod.glade.h:22
-msgid "1"
-msgstr "1"
+msgid "<b>Cover Art</b>"
+msgstr "<b>עטיפות</b>"
 
 #: ../data/gtkpod.glade.h:23
-msgid "2"
-msgstr "2"
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>הודעת ווידוא מחיקה</b>"
 
 #: ../data/gtkpod.glade.h:24
-msgid "3"
-msgstr "3"
+msgid "<b>Descending</b>"
+msgstr "<b>יורד</b>"
 
 #: ../data/gtkpod.glade.h:25
-msgid "4"
-msgstr "4"
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>עמודות מוצגות</b>"
 
 #: ../data/gtkpod.glade.h:26
-msgid "5"
-msgstr "5"
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>כרטיסיות מסנן</b>"
 
 #: ../data/gtkpod.glade.h:27
-msgid ":"
-msgstr ":"
+msgid "<b>General Options</b>"
+msgstr "<b>אפשרויות כלליות</b>"
 
 #: ../data/gtkpod.glade.h:28
-msgid "<"
-msgstr "<"
+msgid "<b>General</b>"
+msgstr "<b>כללי</b>"
 
 #: ../data/gtkpod.glade.h:29
-msgid "<b>Account Information</b>"
-msgstr "<b>מידע חשבון</b>"
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>התעלם ממילים תכופות</b>"
 
 #: ../data/gtkpod.glade.h:30
-msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>הוספה/עדכון/סנכרון</b>"
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>יבוא וסנכרון</b>"
 
 #: ../data/gtkpod.glade.h:31
-msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Audioscrobbler</b>"
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>פורמטים לא תואמים</b>"
 
 #: ../data/gtkpod.glade.h:32
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>יצירה אוטומטית של רשימות השמעה</b>"
+msgid "<b>Information Messages</b>"
+msgstr "<b>הודעות מידע</b>"
 
 #: ../data/gtkpod.glade.h:33
-msgid "<b>Automatically select...</b>"
-msgstr "<b>בחירה אוטומטית...</b>"
+msgid "<b>Lower Margin</b>"
+msgstr "<b>שוליים תחתונים</b>"
 
 #: ../data/gtkpod.glade.h:34
-msgid "<b>Calendar/Contacts/Notes</b>"
-msgstr "<b>יומן/אנשי קשר/תזכורות</b>"
+msgid "<b>None</b>"
+msgstr "<b>ללא</b>"
 
 #: ../data/gtkpod.glade.h:35
-msgid "<b>Coverart</b>"
-msgstr "<b>עטיפות</b>"
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>המרה על המקום</b>"
 
 #: ../data/gtkpod.glade.h:36
-msgid "<b>Delete Confirmation</b>"
-msgstr "<b>ווידוא מחיקה</b>"
+msgid "<b>Playback</b>"
+msgstr "<b>ניגון</b>"
 
 #: ../data/gtkpod.glade.h:37
-msgid "<b>Examples</b>"
-msgstr "<b>דוגמאות</b>"
+msgid "<b>Playlist Options</b>"
+msgstr "<b>אפשרויות רשימות השמעה</b>"
 
 #: ../data/gtkpod.glade.h:38
-msgid "<b>Ignore Frequent Words</b>"
-msgstr "<b>התעלם ממילים תכופות</b>"
+msgid "<b>Please select mountpoint and your iPod model</b>"
+msgstr "<b>אנא בחר נקודת עגינה ואת הדגם של ה־iPod</b>"
 
 #: ../data/gtkpod.glade.h:39
-msgid "<b>Misc</b>"
-msgstr "<b>אחר</b>"
+msgid "<b>Rules</b>"
+msgstr "<b>חוקים</b>"
 
 #: ../data/gtkpod.glade.h:40
-msgid "<b>Mountpoint and individual repository/playlist options</b>"
-msgstr "<b>אפשרויות עגינה ומאגר/רשימת ניגון פרטנית</b>"
+msgid "<b>Sort Order</b>"
+msgstr "<b>סדר מיון</b>"
 
 #: ../data/gtkpod.glade.h:41
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>המרה על המקום</b>"
+msgid "<b>Synchronization</b>"
+msgstr "<b>סנכרון</b>"
 
 #: ../data/gtkpod.glade.h:42
-msgid "<b>Play</b>"
-msgstr "<b>נגן</b>"
+msgid "<b>Tag Editing</b>"
+msgstr "<b>עריכת תגיות</b>"
 
 #: ../data/gtkpod.glade.h:43
-msgid "<b>Playlists</b>"
-msgstr "<b>רשימות השמעה</b>"
+msgid "<b>Tags</b>"
+msgstr "<b>תגיות</b>"
 
 #: ../data/gtkpod.glade.h:44
-msgid "<b>Please select mountpoint and your iPod model</b>"
-msgstr "<b>אנא בחר נקודת עגינה ואת הדגם של ה־iPod</b>"
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>עיצוב סרגל כלים</b>"
 
 #: ../data/gtkpod.glade.h:45
-msgid "<b>Repositories</b>"
-msgstr "<b>מאגרים</b>"
+msgid "<b>Tooltips</b>"
+msgstr "<b>תוויות מידע</b>"
 
 #: ../data/gtkpod.glade.h:46
-msgid "<b>Sort Order</b>"
-msgstr "<b>סדר מיון</b>"
+msgid "<b>Upper Margin</b>"
+msgstr "<b>שוליים עליונים</b>"
 
 #: ../data/gtkpod.glade.h:47
-msgid "<b>Sort Tabs</b>"
-msgstr "<b>כרטיסיות מיון</b>"
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>נרמול עוצמת קול</b>"
 
 #: ../data/gtkpod.glade.h:48
-msgid "<b>Sync</b>"
-msgstr "<b>סנכרון</b>"
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr "<b>בזמן ניסיון הוספת רצועה קיימת</b>"
 
 #: ../data/gtkpod.glade.h:49
-msgid "<b>Synchronization</b>"
-msgstr "<b>סנכרון</b>"
+msgid "<b>gtkpod Options</b>"
+msgstr "<b>אפשרויות ה-gtkpod</b>"
 
 #: ../data/gtkpod.glade.h:50
-msgid "<b>Tag Reading</b>"
-msgstr "<b>קריאת תגיות</b>"
+msgid "<b>mserv Settings</b>"
+msgstr "<b>אפשרויות mserv</b>"
 
 #: ../data/gtkpod.glade.h:51
-msgid "<b>Toolbar</b>"
-msgstr "<b>סרגל כלים</b>"
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:52
-msgid "<b>Tooltips</b>"
-msgstr "<b>תוויות מידע</b>"
+msgid "<i>aacgain</i> executable:"
+msgstr "קובץ ריצה של <i>aacgain</i>:"
 
 #: ../data/gtkpod.glade.h:53
-msgid "<b>Track Attributes</b>"
-msgstr "<b>מאפייני רצועה</b>"
+msgid "<i>mp3gain</i> executable:"
+msgstr "קובץ ריצה של <i>mp3gain</i>:"
 
 #: ../data/gtkpod.glade.h:54
-msgid "<b>Track Editing</b>"
-msgstr "<b>עריכת רצועות</b>"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">אנא ציין פרק זמן</span>"
 
 #: ../data/gtkpod.glade.h:55
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>נרמול עוצמת קול</b>"
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
+"<span weight='bold' size='larger'>הודעה</span>\n"
+"\n"
+"העצבת והבאסה הם חטא, לי יש רק זמן גדוש כיף."
 
-#: ../data/gtkpod.glade.h:56
-msgid "<b>mserv</b>"
-msgstr "<b>mserv</b>"
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
+msgstr "<span weight='bold' size='larger'>לא נבחרה רשימת השמעה</span>"
 
-#: ../data/gtkpod.glade.h:57
+#: ../data/gtkpod.glade.h:59
 msgid ">"
 msgstr ">"
 
-#: ../data/gtkpod.glade.h:58
-msgid "About gtkpod"
-msgstr "אודות gtkpod"
+#: ../data/gtkpod.glade.h:60
+msgid "About unupdated tracks"
+msgstr "אודות רצועות לא מעודכנות"
 
-#: ../data/gtkpod.glade.h:59
+#: ../data/gtkpod.glade.h:61
+msgid "About updated tracks"
+msgstr "אודות רצועות מעודכנות"
+
+#: ../data/gtkpod.glade.h:62
+msgid "Add Column"
+msgstr "הוסף עמודה"
+
+#: ../data/gtkpod.glade.h:63
 msgid "Add Directories Recursively"
 msgstr "הוספת תיקיות רקורסיבית"
 
-#: ../data/gtkpod.glade.h:60
+#: ../data/gtkpod.glade.h:64
 msgid "Add Files"
 msgstr "הוספת קבצים"
 
-#: ../data/gtkpod.glade.h:61
+#: ../data/gtkpod.glade.h:65
 msgid "Add Files or Directories"
 msgstr "הוספת קבצים או תיקיות"
 
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:66
 msgid "Add Fol_der"
 msgstr "הוספת _תיקייה"
 
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:67 ../src/fileselection.c:606
 msgid "Add Folder"
 msgstr "הוספת תיקייה"
 
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:68
 msgid "Add Image_s"
 msgstr "הוסף _תמונות"
 
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:69
 msgid "Add Images from a Directory"
 msgstr "הוספת תמונות מתיקייה"
 
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:70
 msgid "Add Playlist"
 msgstr "הוספת רשימות השמעה"
 
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:71
 msgid "Add _Files"
 msgstr "הוספת _קבצים"
 
-#: ../data/gtkpod.glade.h:68
+#: ../data/gtkpod.glade.h:72
 msgid "Add _Playlist"
 msgstr "הוספת _רשימות השמעה"
 
-#: ../data/gtkpod.glade.h:69
-msgid "Add coverart from file using the following template"
-msgstr "הוסף עטיפה מתוך קובץ תוך שימוש בתבנית הבאה"
+#: ../data/gtkpod.glade.h:73
+msgid "Add cover art using file name template"
+msgstr "הוסף עטיפה מתוך תוך שימוש בתבנית מקובץ"
 
-#: ../data/gtkpod.glade.h:70
-msgid "Add directories recursively"
-msgstr "הוספת תיקיות בצורה רקורסיבית"
+#: ../data/gtkpod.glade.h:74
+msgid ""
+"Add file masks to be excluded from import and synchronization, for example, "
+"<i>*.mp3</i>."
+msgstr ""
+"הוסף תבניות מיסוך בכדי שתוכל למנוע מהן להופיע בייבוא והסנכרון, לדוגמה  <i>*."
+"mp3</i>."
 
-#: ../data/gtkpod.glade.h:71
-msgid "Add new repository/iPod"
-msgstr "הוסף מאגר/iPod חדש"
+#: ../data/gtkpod.glade.h:75
+msgid "Add new repository/iPod..."
+msgstr "הוסף מאגר/iPod חדש..."
 
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:76
 msgid "Add playlist from file"
 msgstr "הוספת רשימת השמעה מקובץ"
 
-#: ../data/gtkpod.glade.h:73
-#: ../src/display_sorttabs.c:3247
-#: ../src/display_tracks.c:2103
-msgid "Added"
-msgstr "הוספו"
+#: ../data/gtkpod.glade.h:77
+msgid "Add subfolders recursively"
+msgstr "הוספת תיקיות משנה בצורה רקורסיבית"
 
-#: ../data/gtkpod.glade.h:74
-msgid "Advanced Sorting Options"
-msgstr "אפשרויות מיון מתקדמות"
+#: ../data/gtkpod.glade.h:78
+msgid "Added:"
+msgstr "הוספו:"
 
 #. 0
-#: ../data/gtkpod.glade.h:75
-#: ../src/display_sorttabs.c:2982
-#: ../src/display_spl.c:84
-#: ../src/misc_conversion.c:60
+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2995
+#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
 msgid "Album"
 msgstr "כותר"
 
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:80
 msgid "Album Art"
 msgstr "התמונות של האלבום"
 
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:81
 msgid "All (AND)"
 msgstr "וגם (הכל)"
 
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:82
 msgid "All Tracks Never Listened To"
 msgstr "כל הרצועות שמעולם לא השמיעו אותן"
 
-#: ../data/gtkpod.glade.h:79
+#: ../data/gtkpod.glade.h:83
 msgid "All Tracks Played Since Last Time"
 msgstr "כל הרצועות שהושמעו מאז הפעם האחרונה"
 
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:84
 msgid "All Tracks not Listed in any Playlist"
 msgstr "כל הרצועות שלא מופיעות באף רשימת השמעה"
 
-#: ../data/gtkpod.glade.h:81
-msgid "Also include tracks never played in \"Best Rated\" playlist"
-msgstr "כלול גם רצועות שלעולם לא נוגנו ברשימת השמעה \"הדירוג הכי גבוה\""
+#: ../data/gtkpod.glade.h:85
+msgid "Allow duplicate files"
+msgstr "הרשה קבצים משוכפלים"
 
-#: ../data/gtkpod.glade.h:82
-msgid "Always write ID3v2.4 tags (only applies to MP3)"
-msgstr "כתוב תמיד תגיות ID3v2.4 (תקף רק ל-MP3)"
+#: ../data/gtkpod.glade.h:86
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr "השתמש בערכת תווים זאת ,גם בזמן עדכון או סנכרון רצועות"
 
-#: ../data/gtkpod.glade.h:83
+#: ../data/gtkpod.glade.h:87
+msgid "Also use this encoding when writing tracks"
+msgstr "השתמש בערכת תווים זאת גם בזמן כתיבת רצועות"
+
+#: ../data/gtkpod.glade.h:88
 msgid "Any (OR)"
 msgstr "או (כל אחד)"
 
-#: ../data/gtkpod.glade.h:84
-#: ../src/display_sorttabs.c:2979
-#: ../src/display_spl.c:85
-#: ../src/misc_conversion.c:61
+#: ../data/gtkpod.glade.h:89
+msgid ""
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
+msgstr ""
+"אף אחד מהחוקים\n"
+"כל החוקים\n"
+"התעלם מהחוקים"
+
+#: ../data/gtkpod.glade.h:92 ../src/display_sorttabs.c:2992
+#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
 msgid "Artist"
 msgstr "אמן"
 
-#: ../data/gtkpod.glade.h:85
+#: ../data/gtkpod.glade.h:93
 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 ""
-"בתור אפשרות אחרונה קבע את התגיות לשם הקובץ\n"
-"אם הן (עדיין) ריקות:"
-
-#: ../data/gtkpod.glade.h:88
-msgid "Ascending"
-msgstr "עולה"
-
-#: ../data/gtkpod.glade.h:89
-msgid "Auto Store"
-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:91
-msgid "Available:"
-msgstr "זמין:"
-
-#: ../data/gtkpod.glade.h:92
-msgid "Before removing playlists or tracks from a playlist"
-msgstr "לפני הסרת רשימות השמעה או רצועות מרשימת השמעה"
-
-#: ../data/gtkpod.glade.h:93
-msgid "Before removing tracks from the harddisk"
-msgstr "לפני הסרת רצועות מהדיסק הקשיח"
-
 #: ../data/gtkpod.glade.h:94
-msgid "Before removing tracks from the iPod"
-msgstr "לפני הסרת רצועות מה-iPod"
+msgid "Automatically generate video thumbnails"
+msgstr "צור תמונות וידאו ממוזערות  אוטומטית"
 
 #: ../data/gtkpod.glade.h:95
-msgid "Before removing tracks from the local database"
-msgstr "לפני הסרת רצועות ממסד הנתונים המקומי"
+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:96
+msgid "Background color"
+msgstr "צבע רקע"
+
+#: ../data/gtkpod.glade.h:97
 msgid "Best Rated Tracks"
 msgstr "הרצועות המדורגות בראש"
 
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:98
+msgid "Bottom"
+msgstr "למטה"
+
+#: ../data/gtkpod.glade.h:99 ../src/prefsdlg.c:588
 msgid "Browse"
 msgstr "סייר"
 
-#: ../data/gtkpod.glade.h:98
-msgid "Cache directory:"
-msgstr "תיקיית מטמון"
+#: ../data/gtkpod.glade.h:100
+msgid "Browse..."
+msgstr "סייר..."
 
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:101
+msgid "Cache folder:"
+msgstr "תיקיית מטמון:"
+
+#: ../data/gtkpod.glade.h:102
 msgid "Calendar"
 msgstr "יומן"
 
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:103
 msgid "Calendar sync command:"
 msgstr "פקודת סנכרון ליומן:"
 
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:104
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "קרא אוטומטית בזמן סנכרון iTunesDB"
 
-#: ../data/gtkpod.glade.h:102
-msgid "Category: "
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr "מיון ללא הבחנת רשיות"
+
+#: ../data/gtkpod.glade.h:106
+msgid "Category:"
 msgstr "קטגוריה:"
 
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:107
 msgid ""
 "Change all tracks\n"
 "simultaneously"
@@ -449,343 +473,366 @@
 "שנה את כל הרצועות\n"
 "בבת אחת"
 
-#: ../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
+#: ../data/gtkpod.glade.h:109
 msgid "Check for existing files when copying from iPod."
 msgstr "בדוק קבצים קיימים בזמן העתקה מה-iPod."
 
-#: ../data/gtkpod.glade.h:108
-msgid "Command for 'Enqueue':"
-msgstr "פקודה עבור 'הכנס לתור':"
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr "בחר צבע אחר עבור הרקע של תצוגת עטיפות אלבומים"
 
-#: ../data/gtkpod.glade.h:109
-msgid "Command for 'Play now':"
-msgstr "פקודה עבור 'נגן עכשיו':"
+#: ../data/gtkpod.glade.h:111
+msgid "Command for \"Enqueue\":"
+msgstr "פקודה עבור \"הכנס לתור\":"
 
+#: ../data/gtkpod.glade.h:112
+msgid "Command for \"Play now\":"
+msgstr "פקודה עבור \"נגן עכשיו\":"
+
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr "פקודות..."
+
 #. 5
-#: ../data/gtkpod.glade.h:110
-#: ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:114 ../src/display_spl.c:97
 #: ../src/misc_conversion.c:65
 msgid "Composer"
 msgstr "יוצר"
 
-#: ../data/gtkpod.glade.h:111
+#: ../data/gtkpod.glade.h:115
 msgid "Confirm before removing tracks from the iPod or repository"
 msgstr "אשר לפני הסרת רצועות מה-iPod או המאגר"
 
-#: ../data/gtkpod.glade.h:112
-msgid ""
-"Confirm before removing tracks from the iPod or repository\n"
-"when syncing playlists"
-msgstr ""
-"אשר לפני הסרת רצועות מה־iPod או המאגר\n"
-"בזמן סנכרון רשימות ההשמעה"
-
-#: ../data/gtkpod.glade.h:114
-msgid "Confirm lists of directories"
-msgstr "וודא רשימה של תיקיות"
-
-#: ../data/gtkpod.glade.h:115
-msgid "Contacts sync command:"
-msgstr "פקודת סנכרון לאנשי קשר:"
-
 #: ../data/gtkpod.glade.h:116
-msgid "Containing Displayed Tracks"
-msgstr "המכילה רצועות נראות"
+msgid "Confirm deletion of playlists or tracks from a playlist"
+msgstr "אשר מחיקה של רשימות השמעה או רצועות מרשימת ההשמעה"
 
 #: ../data/gtkpod.glade.h:117
-msgid "Containing Selected Tracks"
-msgstr "המכילה רצועות נבחרות"
+msgid "Confirm deletion of tracks during synchronization"
+msgstr "אשר מחיקת רצועות בזמן סנכרון"
 
 #: ../data/gtkpod.glade.h:118
-msgid "Conversion Progress Display"
-msgstr "תצוגת התקדמות עבור המרות"
+msgid "Confirm deletion of tracks:"
+msgstr "אשר מחיקה של רצועות:"
 
 #: ../data/gtkpod.glade.h:119
-msgid "Cover"
-msgstr "עטיפה"
+msgid "Contacts sync command:"
+msgstr "פקודת סנכרון לאנשי קשר:"
 
 #: ../data/gtkpod.glade.h:120
-msgid "Create New Playlist"
-msgstr "יצירת רשימת השמעה חדשה"
+msgid "Containing Displayed Tracks"
+msgstr "המכילה רצועות נראות"
 
 #: ../data/gtkpod.glade.h:121
-msgid "Create Repository"
-msgstr "צור מאגר"
+msgid "Containing Selected Tracks"
+msgstr "המכילה רצועות נבחרות"
 
 #: ../data/gtkpod.glade.h:122
-msgid "Create _Playlist File"
-msgstr "יצירת קובץ _רשימת השמעה"
+msgid "Conversion Preferences"
+msgstr "העדפות עבור המרות"
 
 #: ../data/gtkpod.glade.h:123
-msgid "Credits"
-msgstr "קרדיט"
+msgid "Conversion Progress Display"
+msgstr "תצוגת התקדמות עבור המרות"
 
 #: ../data/gtkpod.glade.h:124
-msgid "Currently only rating is supported."
-msgstr "נכון לעכשיו רק המדרוג נתמך."
+msgid "Conversion Settings..."
+msgstr "אפשרויות המרות.."
 
 #: ../data/gtkpod.glade.h:125
-msgid "Delete repository"
-msgstr "מחק מהמאגר"
+msgid "Convert AAC (M4A)"
+msgstr "המר AAC (M4A)"
 
 #: ../data/gtkpod.glade.h:126
-msgid ""
-"Delete tracks that are no longer present from the\n"
-"iPod or repository"
-msgstr "מחק רצועות שכבר לא קיימות מה־iPod או המאגר"
+msgid "Convert FLAC"
+msgstr "המר FLAC"
 
+#: ../data/gtkpod.glade.h:127
+msgid "Convert MP3"
+msgstr "המרת MP3"
+
 #: ../data/gtkpod.glade.h:128
-msgid "Deleted tracks"
-msgstr "רצועות נמחקות"
+msgid "Convert Ogg Vorbis"
+msgstr "המרת Ogg Vorbis"
 
 #: ../data/gtkpod.glade.h:129
-msgid "Descending"
-msgstr "יורד"
+msgid "Convert WAV"
+msgstr "המרת WAV"
 
 #: ../data/gtkpod.glade.h:130
-msgid "Details"
-msgstr "פרטים"
+msgid "Convert compatible formats to a single format"
+msgstr "המר פורמטי מוזיקה לפורמט אחיד"
 
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr "המר פורמטי מוזיקה לא תואמים ל:"
+
 #: ../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 ""
-"קובע איך מחרוזת המידע תבנה, לדוגמה:\n"
-"'%a/% A/%T - %t.mp3' or '%ס'\n"
-"אתה יכול להפריד מספר תבניות על ידי נקודה־פסיק. היישום gtkpod יקבע באיזה מהם להשתמש על ידי הסיומת הניתנת.\n"
-"אמן: a%, כותר: A%, יוצר: c%, שם הרצועה: t%, סגנון: G%, מספר רצועה: T%, מספר תקליטור: C%, שנה: Y%, שם מקורי (דרוש מידע מורחב): o%, הסימן '%': %%."
+msgid "Cover"
+msgstr "עטיפה"
 
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr "העדפות חיפוש עבור עטיפות אלבומים"
+
 #: ../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 ""
-"קובע את שם הרצועה שאותה תעתיק מה-iPod. לדוגמה:\n"
-"'%a/%A/%T - %t.mp3' or '%o'.\n"
-"אתה יכול לציין מספר תבניות מופרדות על ידי נקודה־פסיק. היישום gtkpod יקבע באיזה יעשה שימוש על ידי הסיומת הניתנת.\n"
-"אמן: a%, כותר: A%, יוצר: c%, שם הרצועה: t%, סגנון: G%, מספר רצועה: T%, מספר תקליטור: C%, שנה: Y%, שם מקורי (דרוש מידע מורחב): o%, רשימת ההשמעה הנוכחית: p%, הסימן '%': %%."
+msgid "Cover art file pattern:"
+msgstr "תבנית קובץ עטיפה:"
 
+#: ../data/gtkpod.glade.h:135
+msgid "Create New Playlist"
+msgstr "יצירת רשימת השמעה חדשה"
+
 #: ../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 "Create Repository"
+msgstr "צור מאגר"
 
 #: ../data/gtkpod.glade.h:137
-msgid "Directories to sync with are determined from the filenames of the tracks in the playlist."
-msgstr "התיקיות לסנכרון נקבעות לפי שמות הקבצים של הרצועות ברשימת ההשמעה."
+msgid "Create _Playlist File"
+msgstr "יצירת קובץ _רשימת השמעה"
 
 #: ../data/gtkpod.glade.h:138
-msgid "Display a list of tracks that could actually be updated."
-msgstr "הצג רשימה של רצועות שאפשר לעדכן אותן."
+msgid "Customize..."
+msgstr "התאמה אישית..."
 
 #: ../data/gtkpod.glade.h:139
-msgid "Display a list of tracks that could not be updated."
-msgstr "הצג רשימה של רצועות שאי אפשר לעדכן אותן."
+msgid "Delete Repository"
+msgstr "מחק את המאגר"
 
 #: ../data/gtkpod.glade.h:140
-msgid "Display conversion log"
-msgstr "הצג יומן המרות"
+msgid "Delete missing tracks from the iPod or repository"
+msgstr "מחק רצועות חסרות מה-iPod או המאגר"
 
 #: ../data/gtkpod.glade.h:141
-msgid "Display info about detected duplicates"
-msgstr "הצג מידע אודות כפילויות מזוהות"
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "מחק רצועות חסרות בזמן סנכרון רשימות השמעה"
 
 #: ../data/gtkpod.glade.h:142
-msgid "Display info about non-updated tracks"
-msgstr "הצג מידע על רצועות שלא עודכנו בזמן סנכרון תיקיות"
+msgid "Details"
+msgstr "פרטים"
 
-#: ../data/gtkpod.glade.h:143
-msgid "Display info about updated tracks"
-msgstr "הצג מידע אודות רצועות מעודכנות"
-
 #: ../data/gtkpod.glade.h:144
-msgid "Display messages and warnings at startup"
-msgstr "הראה הודעות ואזהרות בתחילת התוכנית"
+#, 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 ""
+"קובע איך מחרוזת המידע תבנה, לדוגמה:\n"
+"'%a/% A/%T - %t.mp3' or '%ס'\n"
+"אתה יכול להפריד מספר תבניות על ידי נקודה־פסיק. היישום gtkpod יקבע באיזה מהם "
+"להשתמש על ידי הסיומת הניתנת.\n"
+"אמן: a%, כותר: A%, יוצר: c%, שם הרצועה: t%, סגנון: G%, מספר רצועה: T%, מספר "
+"תקליטור: C%, שנה: Y%, שם מקורי (דרוש מידע מורחב): o%, הסימן '%': %%."
 
-#: ../data/gtkpod.glade.h:145
-msgid "Display the list of duplicates that have been detected after adding files."
-msgstr "הצג את רשימת הכפילויות שזוהו אחרי הוספת הקבצים."
-
 #: ../data/gtkpod.glade.h:146
-msgid "Display toolbar..."
-msgstr "הראה סרגל כלים..."
+#, 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. לדוגמה:\n"
+"'%a/%A/%T - %t.mp3' or '%o'.\n"
+"אתה יכול לציין מספר תבניות מופרדות על ידי נקודה־פסיק. היישום gtkpod יקבע "
+"באיזה יעשה שימוש על ידי הסיומת הניתנת.\n"
+"אמן: a%, כותר: A%, יוצר: c%, שם הרצועה: t%, סגנון: G%, מספר רצועה: T%, מספר "
+"תקליטור: C%, שנה: Y%, שם מקורי (דרוש מידע מורחב): o%, רשימת ההשמעה הנוכחית: p"
+"%, הסימן '%': %%."
 
 #: ../data/gtkpod.glade.h:147
-msgid "Display tooltips in main window"
-msgstr "הצג תוויות מידע בחלון הראשי"
+msgid ""
+"Directories to sync with are determined from the filenames of the tracks in "
+"the playlist."
+msgstr "התיקיות לסנכרון נקבעות לפי שמות הקבצים של הרצועות ברשימת ההשמעה."
 
 #: ../data/gtkpod.glade.h:148
-msgid "Display tooltips in prefs window"
-msgstr "הצג תוויות מידע בחלון האפשרויות"
+msgid "Display"
+msgstr "תצוגה"
 
 #: ../data/gtkpod.glade.h:149
-msgid "Display tracks that match the criteria entered above."
-msgstr "הצג רצועות המתאימות לקריטריונים המוכנסים למעלה."
+msgid "Display conversion log"
+msgstr "הצג יומן המרות"
 
 #: ../data/gtkpod.glade.h:150
-msgid ""
-"Displayed\n"
-"Tracks"
-msgstr ""
-"רצועות\n"
-"מוצגות"
+msgid "Display information about detected duplicate files"
+msgstr "הצג מידע אודות קבצים שנמצאו משוכפלים"
 
+#: ../data/gtkpod.glade.h:151
+msgid "Display messages and warnings at startup"
+msgstr "הראה הודעות ואזהרות בתחילת התוכנית"
+
 #: ../data/gtkpod.glade.h:152
-msgid "Displayed:"
-msgstr "מוצגים:"
+msgid "Display synchronization results"
+msgstr "הצג תוצאות סנכרון"
 
 #: ../data/gtkpod.glade.h:153
-msgid "Don't allow file duplication"
-msgstr "אל תרשה כפילויות של קבצים"
+msgid "Display tooltips in main window"
+msgstr "הצג תוויות מידע בחלון הראשי"
 
 #: ../data/gtkpod.glade.h:154
+msgid "Display tracks that match the criteria entered above."
+msgstr "הצג רצועות המתאימות לקריטריונים המוכנסים למעלה."
+
+#: ../data/gtkpod.glade.h:155
 msgid "Don't automatically sync on startup"
 msgstr "אל תסנכרן אוטומטית בתחילת התוכנית"
 
-#: ../data/gtkpod.glade.h:155
-msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
-msgstr "זיהוי כפילויות מתבסס על חישוב קוד ערבוב sha1 על הקובץ."
-
 #: ../data/gtkpod.glade.h:156
-msgid "Edit Repository/iPod Options"
-msgstr "ערוך מאגר/אפשרויות iPod"
+msgid "Dummy\n"
+msgstr "דמה\n"
 
-#: ../data/gtkpod.glade.h:157
-#: ../src/context_menus.c:662
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:664
 msgid "Edit Smart Playlist"
 msgstr "ערוך רשימת השמעה חכמה"
 
-#: ../data/gtkpod.glade.h:158
-#: ../src/context_menus.c:749
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:751
 msgid "Edit Track Details"
 msgstr "ערוך פרטי רצועה"
 
-#: ../data/gtkpod.glade.h:159
-msgid "Edit _Preferences"
-msgstr "עריכת _העדפות"
-
 #: ../data/gtkpod.glade.h:160
-msgid "Effective free space"
-msgstr "מקום פנוי אפקטיבי"
-
-#: ../data/gtkpod.glade.h:161
 msgid "Empty Playlist"
 msgstr "רשימת השמעה ריקה"
 
+#: ../data/gtkpod.glade.h:161
+msgid "Encoding Preferences"
+msgstr "העדפות קידוד"
+
 #: ../data/gtkpod.glade.h:162
-msgid "Exclude file mask(s)"
-msgstr "אל תכלול מסכה(ות) קבצים"
+msgid "Encoding..."
+msgstr "קידוד..."
 
 #: ../data/gtkpod.glade.h:163
-msgid "Export can be continued at a later time if canceled."
-msgstr "אפשר להמשיך את היצוא בזמן מאוחר יותר, אם בוטל."
+msgid "Excluded files..."
+msgstr "קבצים כלולים..."
 
 #: ../data/gtkpod.glade.h:164
-msgid "File size"
-msgstr "גודל קובץ"
+msgid "Exclusions List"
+msgstr "רשימת לא כלולים"
 
 #: ../data/gtkpod.glade.h:165
-msgid "File size (deleted)"
-msgstr "גודל קובץ (נמחק)"
+msgid "Expand columns beyond the track list width"
+msgstr "הרחב עמודות מעבר לרוחב רשימת הרצועות"
 
 #: ../data/gtkpod.glade.h:166
-msgid "File size (non-transferred)"
-msgstr "גודל קובץ (לא-מועבר)"
+msgid "Export can be continued at a later time if canceled."
+msgstr "אפשר להמשיך את היצוא בזמן מאוחר יותר, אם בוטל."
 
 #: ../data/gtkpod.glade.h:167
-msgid "Filename Format: "
-msgstr "תבנית הקובץ:"
+msgid "Feedback"
+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)"
+msgid "Filename Parse Preferences"
+msgstr "העדפות ניתוח שמות קבצים"
 
 #: ../data/gtkpod.glade.h:169
-msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
-msgstr "תחילה נסה את <i>folder.jpg</i>, ואחר כך את <i>&lt;artist&gt;.jpg</i>"
+msgid "Filename format: "
+msgstr "תבנית הקובץ:"
 
 #: ../data/gtkpod.glade.h:170
-msgid "Flac with :"
-msgstr "סוג Flac עם :"
+msgid "Filename parse pattern:"
+msgstr "תבנית ניתוח שם קובץ:"
 
+#: ../data/gtkpod.glade.h:171
+msgid "Filter tab:"
+msgstr "כרטיסיית סינון:"
+
 #: ../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 "לדוגמא, 'xmms %s' ינקה את רשימת ההשמעה הנוכחית של xmms, יוסיף את הרצועות הנבחרות ויתחיל לנגן."
+msgid "Filter tabs"
+msgstr "כרטיסיות סינון"
 
+#: ../data/gtkpod.glade.h:173
+msgid "Filter:"
+msgstr "מסנן:"
+
 #: ../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."
+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:175
-#: ../src/display_sorttabs.c:2985
-#: ../src/display_spl.c:89
-#: ../src/misc_conversion.c:63
-msgid "Genre"
-msgstr "סגנון"
+msgid "From the hard disk"
+msgstr "מהדיסק הקשיח"
 
 #: ../data/gtkpod.glade.h:176
-msgid "Group artists on compilation CDs"
-msgstr "קבץ אמנים בתקליטורי שיצרת"
+msgid "From the iPod"
+msgstr "מה-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 במקרה של בעיה במערכת הקבצים (שנה את שדה ה-\"הועבר\" במסד הנתונים המגובה)."
+msgid "From the local database"
+msgstr "מתוך מסד הנתונים המקומי"
 
-#: ../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:178 ../src/display_spl.c:182 ../src/info.c:794
+msgid "GB"
+msgstr "ג\"ב"
 
-#: ../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:179 ../src/display_sorttabs.c:2998
+#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
+msgid "Genre"
+msgstr "סגנון"
 
 #: ../data/gtkpod.glade.h:180
-msgid "If both options are selected, embedded APIC data takes precedence."
-msgstr "אם שתי האפשרויות נבחרו, מידע מוכל בתוך ה־APIC יהיה בעל עדיפות ראשונה."
+msgid "Get Help _Online"
+msgstr "השג עזרה ב_רשת"
 
 #: ../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 "אם יסומן, המיון יבחין בין אותיות קטנות לגדולות. שים לב שהבחנה זאת לא תעבוד היטב ברוב ערכות התווים."
+msgid "Group artist filter tab by compilation CDs"
+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 "אם הקובץ (נתיב מלא) של רצועה קיימת תואם את זה של רצועה להוספה, אפשרות זאת מאפשרת לך לעדכן את המידע על הרצועה הקיימת במקום רק לדלג על הרצועה בכלל. שום עדכון לא יתבצע אם הקובץ לא השתנה ובחרת באפשרות לא לאפשר כפילות בקבצים למעלה."
+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:183
-msgid "If you check this, gtkpod will descend into subdirectories recursively."
-msgstr "אם תסמן אופציה זו, gtkpod יכנס לתוך תיקיות משנה רקורסיבית."
+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
-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 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 don't select the master playlist automatically, the initial database import is much faster because the display dosn't have to be updated."
-msgstr "אם לא תבחר את רשימת ההשמעה הראשית אוטומטית, יבוא מסד הנתונים הראשוני יהיה יותר מהיר בעקבות כך שהתצוגה לא תהיה חייבת להתעדכן."
+msgid "Ignore these words when at the beginning of the following fields:"
+msgstr "התעלם ממילים אלו כאשר הן מופיעות בתחילת השדות הבאים:"
 
 #: ../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 "אם אתה בוחר מספר רצועות ברשימת הרצועות ועורך תגית של הרצועה הראשונה, התגיות ברצועות הממוינות מתעדכנות גם כן."
+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:187
-msgid "Ignore these words when at the beginning of the following fields:"
-msgstr "התעלם ממילים אלו כאשר הן מופיעות בתחילת השדות הבאים:"
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr "כלול גם רצועות שלעולם לא נוגנו ברשימת השמעה \"הדירוג הכי טוב\""
 
 #: ../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 בחר 'שמור סדר רצועות נראות' מתפריט ה-'עריכה' או בחר 'שמירה אוטומטית' למטה."
+msgid "Info field template:"
+msgstr "תבנית שדה מידע:"
 
 #: ../data/gtkpod.glade.h:189
 msgid "Initialize iPod"
@@ -800,642 +847,572 @@
 "הכנס אחרי"
 
 #: ../data/gtkpod.glade.h:192
-msgid "Keeps all compilation CDs grouped together in the artists sort tab."
-msgstr "שמור את כל תקליטורי היצירות מקובצים ביחד בתוך כרטיסיות המיון של האמנים."
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
+msgstr ""
+"הושמע לאחרונה\n"
+"שונה לאחרונה\n"
+"התווסף\n"
 
-#: ../data/gtkpod.glade.h:193
+#: ../data/gtkpod.glade.h:196
 msgid "Live _updating"
 msgstr "עדכון _חי"
 
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:197
 msgid "Load iPod(s)"
 msgstr "טען iPod(ים)"
 
-#: ../data/gtkpod.glade.h:195
-msgid "Lower Margin"
-msgstr "שוליים תחתונים"
-
-#: ../data/gtkpod.glade.h:196
-msgid "M4A with :"
-msgstr "סוג M4A עם :"
-
-#: ../data/gtkpod.glade.h:197
-msgid "MP3 with :"
-msgstr "סוג MP3 עם :"
-
 #: ../data/gtkpod.glade.h:198
-msgid "Match al_l of the following"
-msgstr "התאם את _כל הבאים"
+msgid "Logic:"
+msgstr " לוגיקה: "
 
 #: ../data/gtkpod.glade.h:199
-msgid "Match an_y of the following"
-msgstr "התאם _כל אחד מן הבאים"
+msgid ""
+"MP3\n"
+"AAC\n"
+msgstr ""
+"MP3\n"
+"AAC\n"
 
-#: ../data/gtkpod.glade.h:200
-msgid "Match only _checked tracks"
-msgstr "התאם רק רצועות _מסומנות"
-
-#: ../data/gtkpod.glade.h:201
-msgid "Maximum number of background threads:"
-msgstr "המספר המירבי עבור התהליכים ברקע:"
-
 #: ../data/gtkpod.glade.h:202
-msgid "Maximum size of cache directory (in GB):"
-msgstr "הגודל המירבי עבור מטמון התיקיות (ב־GB):"
+msgid "Mass-modify tags when multiple tracks are selected"
+msgstr "שנה כמות של תגיות כאשר נבחרו רצועות מרובות."
 
 #: ../data/gtkpod.glade.h:203
-msgid "Model:"
-msgstr "דגם:"
+msgid "Match only _checked tracks"
+msgstr "התאם רק רצועות _מסומנות"
 
 #: ../data/gtkpod.glade.h:204
-#: ../src/display_tracks.c:2100
-msgid "Modified"
-msgstr "שונה"
+msgid "Match:"
+msgstr "התאמה:"
 
 #: ../data/gtkpod.glade.h:205
-msgid "Most Recently Played Tracks"
-msgstr "הרצועות שהושמעו הכי לאחרונה"
+msgid "Maximum cache size:"
+msgstr "גודל מטמון מקסימלי:"
 
 #: ../data/gtkpod.glade.h:206
-msgid "Move selected attributes to the displayed list"
-msgstr "העבר את המאפיינים הנבחרים לרשימה המוצגת"
+msgid "Maximum threads:"
+msgstr "המספר המירבי עבור ריבוי התהליכים:"
 
 #: ../data/gtkpod.glade.h:207
-msgid "Music Root:"
-msgstr "שורש המוזיקה:"
+msgid "Metadata"
+msgstr "מטהדאטה"
 
 #: ../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."
+msgid "Model:"
+msgstr "דגם:"
 
 #: ../data/gtkpod.glade.h:209
-msgid "Never show this dialogue again"
-msgstr "אל תראה חלון דו-שיח זה בעתיד"
+msgid "Modified:"
+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 "רשימת השמעה חדשה"
+msgid "Most Recently Played Tracks"
+msgstr "הרצועות שהושמעו הכי לאחרונה"
 
 #: ../data/gtkpod.glade.h:211
-msgid "No lower margin"
-msgstr "ללא שוליים תחתונים"
+msgid "Music"
+msgstr "מוזיקה"
 
 #: ../data/gtkpod.glade.h:212
-msgid "No upper margin"
-msgstr "ללא שוליים עליונים"
+msgid "Music root:"
+msgstr "שורש המוזיקה:"
 
 #: ../data/gtkpod.glade.h:213
-msgid "Non-transferred tracks"
-msgstr "רצועות לא מועברות"
+msgid "Never show this dialogue again"
+msgstr "אל תראה חלון דו-שיח זה בעתיד"
 
-#: ../data/gtkpod.glade.h:214
-msgid "None"
-msgstr "ללא"
+#: ../data/gtkpod.glade.h:214 ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76 ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113 ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448 ../src/misc_playlist.c:450
+msgid "New Playlist"
+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 לא תהיה להם ערכת תווים שמורה. במקום זאת ערכת התווים המצוינת למעלה תהיה זו שנשתמש בה."
+msgid "No lower margin"
+msgstr "ללא שוליים תחתונים"
 
 #: ../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 "באופן רגיל ערכת התווים המצוינת כאשר מייבאים לראשונה את הרצועות תהיה זו שיעשה בה שימוש לעדכן את מידע הרצועה. אם בחרת ערכת תווים שגויה כאשר ייבאת לראשונה את הרצועה וברצונך לתקן זאת בעזרת 'עדכן רצועה', אתה תהיה חייב לסמן את האפשרות הזאת. הערה: מידע ערכת התווים נשמר במידע המורחב (ראה : כתיבה ל-iTunesDB למטה) ורצועות שיובאו לפני גרסה 0.51 לא תהיה להם ערכת תווים שמורה. במקום זאת ערכת התווים המצוינת למעלה תהיה זו שנשתמש בה אז."
+msgid "No upper margin"
+msgstr "ללא שוליים עליונים"
 
 #: ../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 "בדרך כלל יעשה שימוש בערכת התווים המצוינת בזמן ייבוא הרצועה לשם כתיבת התגיות. אם בחרת ערכת תווים שגויה בזמן ייבוא רצועה, אתה יכול לבחור אפשרות זו ביחד עם ערכת התווים הנכונה. הערה: משתמש בקובץ המידע המורחב לשמור את מידע ערכת התווים (ראה 'כתיבת iTunesDB' בעמוד קלט/פלט) ורצועות שיובאו לפני גרסה 0.51 לא תהייה להן ערכה שמורה -- הערכה המצוינת בעמוד קלט/פלט יעשה בה שימוש."
+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: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."
+"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."
+"בצורה נורמלית, אם רצועה כבר לא קיימת בתיקיית הסנכרון, היא תוסר מרשימת "
+"הניגון, אבל לא מה־iPod או המאגר המקומי.\n"
+"אם אפשרות זו מסומנת, הרצועות יוסרו לגמרי מה־iPod או המאגר המקומי, אלא אם כן "
+"הרצועה מופיעה ברשימת השמעה אחרת בנוסף.\n"
+"הערה: אם תסנכרן את רשימת ההשמעה הראשית, אתה חייב לסמן את אפשרות זו אם תרצה "
+"שהרצועות יוסרו, בגלל שהסרה מהרשימה הראשית משמעותה הסרה מה־iPod."
 
 #: ../data/gtkpod.glade.h:221
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
+msgstr ""
+"בצורה רגילה, הקידוד המצויין למעלה ישמש רק עבור ייבוא רצועות חדשות, ועבור כל "
+"פעולות הכוללות רצועות קיימות, יעשה שימוש רק בקידוד המצוין בזמן שהקובץ יובא "
+"לראשונה. תוכל גם להשתמש  באפשרויות למטה על מנת לעקוף את התנהגות זאת, במידה "
+"שהזנת קידוד לא נכון בזמן היבוא הראשון."
+
+#: ../data/gtkpod.glade.h:222
 msgid "Notes sync command:"
 msgstr "פקודת סנכרון לפתקאות (notes):"
 
-#: ../data/gtkpod.glade.h:222
-msgid "Number of playlists"
-msgstr "מספר רשימות ההשמעה"
-
 #: ../data/gtkpod.glade.h:223
-msgid "Number of tracks"
-msgstr "מספר רצועות"
+msgid "Number of filter tabs:"
+msgstr "מספר כרטיסיות הסינון:"
 
 #: ../data/gtkpod.glade.h:224
-msgid "Number of tracks in generated playlists:"
-msgstr "מספר הרצועות ברשימת השמעה:"
+msgid "Number of tracks:"
+msgstr "מספר הרצועות:"
 
 #: ../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:226
-msgid "Ogg with :"
-msgstr "סוג Ogg עם :"
-
-#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically sync with playlist directories"
 msgstr "בתחילה התכנית סנכרן אוטומטית עם תיקיות רשימות ההשמעה"
 
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:226
 msgid "On startup automatically sync with the following directory"
 msgstr "בתחילת התוכנית סנכרן אוטומטית עם התיקייה הבאה"
 
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically update (Live Playlist)"
 msgstr "בתחילת התוכנית עדכ אוטומטית (רשימת השמעה חיה)"
 
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:228
 msgid "One for each Album"
 msgstr "אחת לכל כותר"
 
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:229
 msgid "One for each Artist"
 msgstr "אחת לכל אמן"
 
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:230
 msgid "One for each Composer"
 msgstr "אחת לכל יוצר"
 
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:231
 msgid "One for each Genre"
 msgstr "אחת לכל סגנון"
 
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:232
 msgid "One for each Rating"
 msgstr "אחת לכל מדרוג"
 
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:233
 msgid "One for each Year"
 msgstr "אחת לכל שנה"
 
-#: ../data/gtkpod.glade.h:236
-msgid "Overwrite tags that are already set"
-msgstr "שכתב תגיות שכבר כתובות"
+#: ../data/gtkpod.glade.h:234
+msgid "Overwrite existing tags"
+msgstr "שכתב תגיות קיימות"
 
-#: ../data/gtkpod.glade.h:237
-msgid "Password:"
-msgstr "סיסמה:"
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
+msgstr "נתח שם קובץ על מנת ליצור תגיות חסרות"
 
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:236
 msgid "Path:"
 msgstr "נתיב:"
 
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:237
 msgid "Photo Window"
 msgstr "חלון תמונות"
 
-#: ../data/gtkpod.glade.h:240
-#: ../src/display_spl.c:94
-msgid "Play time"
-msgstr "זמן השמעה"
+#: ../data/gtkpod.glade.h:238
+msgid "Playcount:"
+msgstr "מספור השמעות:"
 
-#: ../data/gtkpod.glade.h:241
-#: ../src/display_spl.c:98
-#: ../src/misc_conversion.c:77
-msgid "Playcount"
-msgstr "מספור השמעות"
+#: ../data/gtkpod.glade.h:239
+msgid "Played:"
+msgstr "הושמע:"
 
-#: ../data/gtkpod.glade.h:242
-#: ../src/display_tracks.c:2097
-msgid "Played"
-msgstr "הושמע"
-
-#: ../data/gtkpod.glade.h:243
+#: ../data/gtkpod.glade.h:240
 msgid "Playlist name:"
 msgstr "שם רשימת ההשמעה:"
 
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:241
 msgid "Playlist type:"
 msgstr "סוג רשימת ההשמעה:"
 
-#: ../data/gtkpod.glade.h:245
-#: ../src/display_playlists.c:2258
+#: ../data/gtkpod.glade.h:242 ../src/display_playlists.c:2397
 msgid "Playlists"
 msgstr "רשימות השמעה"
 
-#: ../data/gtkpod.glade.h:246
+#: ../data/gtkpod.glade.h:243
 msgid "Please refer to the notice below."
 msgstr "הסתכל בבקשה בהודעה למטה."
 
-#: ../data/gtkpod.glade.h:247
-msgid "Please specify a time interval"
-msgstr "אנא ציין מרווח זמן"
+#: ../data/gtkpod.glade.h:244
+msgid "Position:"
+msgstr "מיקום:"
 
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:245
 msgid "Preferences"
 msgstr "הגדרות"
 
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:246
 msgid "Progress Information"
 msgstr "מידע התקדמות"
 
-#: ../data/gtkpod.glade.h:250
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
+msgstr ""
+"ספק פקודת מעטפת על מנת ליצור תמונות ממוזערות של קבצי הווידאו שלך. הפורמט "
+"המחרוזת הבא יורחב:\n"
+"- %f: שם קובץ הקלט\n"
+"- %o: שם קובץ הפלט (שנוצר אוטומטית)\n"
+
+#: ../data/gtkpod.glade.h:252
 msgid "R_ename Album"
 msgstr "_שנה שם לאלבום"
 
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:253
 msgid "Random Playlist from Displayed Tracks"
 msgstr "רשימת השמעה אקראית מהרצועות הנראות"
 
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:254
 msgid "Randomize Current Playlist"
 msgstr "יצירת רשימת השמעה אקראית"
 
-#: ../data/gtkpod.glade.h:253
-#: ../src/display_spl.c:101
-#: ../src/misc_conversion.c:78
-msgid "Rating"
-msgstr "מדרוג"
-
-#: ../data/gtkpod.glade.h:254
-msgid "Read coverart from embedded APIC data"
-msgstr "קרא תמונת עטיפה מתוך מידע ה־APIC"
-
 #: ../data/gtkpod.glade.h:255
-msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
-msgstr "קרא תגיות מתוכן הקובץ (כלומר תגיות ID3 של קבצי MP3)"
+msgid "Rating:"
+msgstr "מדרוג:"
 
 #: ../data/gtkpod.glade.h:256
-msgid "Remove selected attributes from the displayed list"
-msgstr "הסר את המאפיינים הנבחרים מהרשימה המוצגת"
+msgid "Read embedded cover art information"
+msgstr "קרא מידע מוטבע של עטיפות אלבום"
 
 #: ../data/gtkpod.glade.h:257
-msgid "Repository Options"
-msgstr "אפשרויות מאגר"
+msgid "Read embedded tags from music files"
+msgstr "קרא תגיות מוטבעות מקבצי המוסיקה"
 
 #: ../data/gtkpod.glade.h:258
-msgid "Repository name:"
-msgstr "שם המאגר:"
+msgid "Report a _Problem"
+msgstr "דווח על ת_קלה"
 
 #: ../data/gtkpod.glade.h:259
-msgid "Repository type:"
-msgstr "סוג מאגר:"
+msgid "Report problems when accessing mserv"
+msgstr "דווח על בעיות בזמן גישה ל-mserv"
 
 #: ../data/gtkpod.glade.h:260
-msgid "Root directory of mserv database (trackinfo root)."
-msgstr "תיקיית שורש או מסד נתונים mserv (השורש של trackinfo)."
+msgid "Repository"
+msgstr "מאגר"
 
 #: ../data/gtkpod.glade.h:261
-msgid "Rules"
-msgstr "חוקים"
+msgid "Repository Options"
+msgstr "אפשרויות מאגר"
 
 #: ../data/gtkpod.glade.h:262
-#: ../src/context_menus.c:804
-msgid "Save Changes"
-msgstr "שמור שינויים"
+msgid "Repository name:"
+msgstr "שם המאגר:"
 
 #: ../data/gtkpod.glade.h:263
-msgid "Scrobble Tracks?"
-msgstr "שלח רצועות?"
+msgid "Repository type:"
+msgstr "סוג מאגר:"
 
 #: ../data/gtkpod.glade.h:264
+msgid "Repository/iPod Options"
+msgstr "אפשרויות מאגר/iPod"
+
+#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:806
+msgid "Save Changes"
+msgstr "שמור שינויים"
+
+#: ../data/gtkpod.glade.h:266
 msgid "Select '-1' for no upper limit."
 msgstr "בחר '-1' עבור ביטול גבול עליון."
 
-#: ../data/gtkpod.glade.h:265
+#: ../data/gtkpod.glade.h:267
 msgid "Select '0' for no lower limit."
 msgstr "בחר '0' עבור ביטול גבול תחתון."
 
-#: ../data/gtkpod.glade.h:266
-msgid ""
-"Selected\n"
-"Playlist"
-msgstr ""
-"רשימות השמעה\n"
-"נבחרות"
-
 #: ../data/gtkpod.glade.h:268
-msgid ""
-"Selected\n"
-"Tracks"
-msgstr ""
-"רצועות\n"
-"נבחרות"
-
-#: ../data/gtkpod.glade.h:270
 msgid "Selected Filter Tab Entry from Database"
 msgstr "נבחרה רשומת כרטיסיית מסנן ממסד הנתונים"
 
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:269
 msgid "Selected Filter Tab Entry from Hard Disk"
 msgstr "נבחרה רשומת כרטיסיית מסנן מהדיסק הקשיח"
 
-#: ../data/gtkpod.glade.h:272
+#: ../data/gtkpod.glade.h:270
 msgid "Selected Filter Tab Entry from Playlist"
 msgstr "נבחרה רשומת כרטיסיית מסנן מרשימת ההשמעה"
 
-#: ../data/gtkpod.glade.h:273
+#: ../data/gtkpod.glade.h:271
 msgid "Selected Filter Tab Entry from iPod"
 msgstr "נבחרה רשומת כרטיסיית מסנן מה־iPod"
 
-#: ../data/gtkpod.glade.h:274
+#: ../data/gtkpod.glade.h:272
 msgid "Selected Playlist Including Tracks from Database"
 msgstr "נבחרה רשימת השמעה כולל רצועות ממסד הנתונים"
 
-#: ../data/gtkpod.glade.h:275
+#: ../data/gtkpod.glade.h:273
 msgid "Selected Playlist Including Tracks from Hard Disk"
 msgstr "נבחרה רשימת השמעה כולל רצועות מהדיסק הקשיח"
 
-#: ../data/gtkpod.glade.h:276
+#: ../data/gtkpod.glade.h:274
 msgid "Selected Playlist Including Tracks from iPod"
 msgstr "נבחרה רשימת השמעה כולל רצועות מה־iPod"
 
-#: ../data/gtkpod.glade.h:277
+#: ../data/gtkpod.glade.h:275
 msgid "Selected Tab _Entry"
 msgstr "רשומות _כרטיסיה נבחרות"
 
-#: ../data/gtkpod.glade.h:278
+#: ../data/gtkpod.glade.h:276
 msgid "Selected Tracks from Database"
 msgstr "הרצועות הנבחרות ממסד הנתונים"
 
-#: ../data/gtkpod.glade.h:279
+#: ../data/gtkpod.glade.h:277
 msgid "Selected Tracks from Hard Disk"
 msgstr "הרצועות הנבחרות מהדיסק הקשיח"
 
-#: ../data/gtkpod.glade.h:280
+#: ../data/gtkpod.glade.h:278
 msgid "Selected Tracks from Playlist"
 msgstr "הרצועות הנבחרות מרשימות הניגון"
 
-#: ../data/gtkpod.glade.h:281
+#: ../data/gtkpod.glade.h:279
 msgid "Selected Tracks from iPod"
 msgstr "הרצועות הנבחרות מה־iPod"
 
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:280
 msgid "Selected _Playlist"
 msgstr "_רשימות השמעה נבחרות"
 
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:281
 msgid "Selected _Tracks"
 msgstr "ר_צועות נבחרות"
 
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:282
 msgid "Selected playlist"
 msgstr "רשימות השמעה נבחרות"
 
-#: ../data/gtkpod.glade.h:285
-msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
-msgstr "רשימת מופרדת נקודה־פסיק של מסכות שלילה, לדוגמה: \"*.mp3"
-
-#: ../data/gtkpod.glade.h:286
+#: ../data/gtkpod.glade.h:283
 msgid "Set Cover Art from _File"
 msgstr "קבע עטיפה מתוך _קובץ"
 
-#: ../data/gtkpod.glade.h:287
-msgid "Set mountpoint or edit repository options"
-msgstr "קבע נקודות עגינה או ערוך אפשרויות מאגר"
+#: ../data/gtkpod.glade.h:284
+msgid "Set still missing tags to file name"
+msgstr "קבע תגיות חסרות עבור שם קובץ"
 
-#: ../data/gtkpod.glade.h:288
-msgid "Set options for Calendar/Contacts/Notes"
-msgstr "קבע אפשרויות עבור יומן/אנשי קשר/תזכורות"
+#: ../data/gtkpod.glade.h:285
+msgid "Settings..."
+msgstr "אפשרויות..."
 
-#: ../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 "קבע את זה ל־'aacgain -q -k' על מנת להשתמש ב'נרמול עוצת קול' בתפריט הכלים. אם זה סומן, מידע נרמול מקבצי m4a ו m4b יחושב ויכתב לקבצי המוזיקה שלך תוך שימוש בפקודה הזאת."
-
-#: ../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 "קבע את זה ל־'mp3gain -q -k' על מנת להשתמש ב'נרמול עוצת קול' בתפריט הכלים. אם זה סומן, מידע נרמול מקבצי mp3 יחושב ויכתב לקבצי המוזיקה שלך תוך שימוש בפקודה הזאת."
-
-#: ../data/gtkpod.glade.h:291
-msgid "Set this to your last.fm password"
-msgstr "הכנס כאן את הסיסמה שלך עבור last.fm"
-
-#: ../data/gtkpod.glade.h:292
-msgid "Set this to your last.fm username"
-msgstr "הכנס כאן את שם המשתמש שלך עבור 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 "קבע ל־0 על מנת לבטל שימוש במטמון (מקסימום של רצועה אחת תהיה במטמון ביחידת זמן אחת)."
-
-#: ../data/gtkpod.glade.h:294
-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 "Show information about problems when accessing mserv"
-msgstr "הצג מידע על בעיות בגישה ל-mserv"
-
-#: ../data/gtkpod.glade.h:296
+#: ../data/gtkpod.glade.h:286
 msgid "Show summary of sync result"
 msgstr "הצג סיכום של תוצאות סינכרון"
 
-#: ../data/gtkpod.glade.h:297
-#: ../src/misc_playlist.c:96
-#: ../src/repository.c:1356
+#: ../data/gtkpod.glade.h:287
+msgid "Skip the track"
+msgstr "דלג על הרצועה"
+
+#: ../data/gtkpod.glade.h:288 ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
 msgid "Smart Playlist"
 msgstr "רשימת השמעה חכמה"
 
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:289
+msgid "Sort by:"
+msgstr "מיין על פי:"
+
+#: ../data/gtkpod.glade.h:290
 msgid "Sort tracks according to: "
 msgstr "מיין רצועות לפי:"
 
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:291
 msgid "Sorting Options"
 msgstr "אפשרויות מיון"
 
-#: ../data/gtkpod.glade.h:300
-msgid "Sorting case sensitive"
-msgstr "מיון עם תלות בגודל (case)"
+#: ../data/gtkpod.glade.h:292
+msgid "Sorting..."
+msgstr "ממיין..."
 
-#: ../data/gtkpod.glade.h:301
-msgid "Sorttab: "
-msgstr "כרטיסייה מיון:"
-
-#: ../data/gtkpod.glade.h:302
-msgid "Sorttabs"
-msgstr "כרטיסיות מיון"
-
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:293
 msgid "Source:"
 msgstr "מקור:"
 
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:295
 #, 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:306
+#: ../data/gtkpod.glade.h:296
 msgid "Specify interval"
 msgstr "ציין מרווח"
 
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:297
 msgid "Start display automatically"
 msgstr "התחל תצוגה אוטומטית"
 
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:298
 msgid "Synchronise Contacts, Calendar and Notes"
 msgstr "סנכרן אנשי קשר, יומן ופתקים"
 
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:299
 msgid "Synchronize All"
 msgstr "סנכרן הכל"
 
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:300
 msgid "Synchronize Calendar"
 msgstr "סנכרן יומן"
 
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:301
 msgid "Synchronize Contacts"
 msgstr "סנכרן אנשי קשר"
 
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:302
 msgid "Synchronize Notes"
 msgstr "סנכרן פתקים"
 
-#: ../data/gtkpod.glade.h:313
-msgid "Template for info field: "
-msgstr "תבנית עבור שדה המידע:"
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
+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:304
+msgid "Text color"
+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:305
+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 tags are written to the files on your harddrive and on the iPod (if available)."
-msgstr "התגיות נכתבות לקבצים על הדיסק הקשיח ועל ה-iPod (אם זמין)."
+#: ../data/gtkpod.glade.h:306
+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
+#: ../data/gtkpod.glade.h:307
 msgid "The track on the iPod is referenced in the playlist file."
 msgstr "הרצועה על ה-iPod מקושרת בקובץ רשימת ההשמעה."
 
-#: ../data/gtkpod.glade.h:318
-msgid "This is the same option as in 'Edit/Delete Confirmation'"
-msgstr "זוהי אופציה זהה לזו שב- 'עריכה/ווידוא מחיקה'"
-
-#: ../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:320
-msgid "This option will be re-activated when you upgrade gtkpod."
-msgstr "האפשרות הזאת תופעל מחדש בזמן שדרוג gtkpod."
-
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:308
 msgid "Time:"
 msgstr "זמן:"
 
-#: ../data/gtkpod.glade.h:322
-#: ../src/display_sorttabs.c:2991
-#: ../src/display_spl.c:83
-#: ../src/misc_conversion.c:62
+#: ../data/gtkpod.glade.h:309 ../src/display_sorttabs.c:3004
+#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
 msgid "Title"
 msgstr "שם הרצועה"
 
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:310
 msgid ""
-"Total\n"
-"(iPod)"
+"To fill additional information, <i>gtkpod</i> can use a database provided by "
+"the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, "
+"leave this alone."
 msgstr ""
-"סך הכל\n"
-"(iPod)"
+"על מנת למלא מידע נוסף, <i>gtkpod</i> יכול להשתמש במסד נתונים המסופק על ידי "
+"שרת המוזיקה <i>mserv</i>. אם אתה לא יודע מה זה <i>mserv</i>, אל תשנה אפשרות "
+"זאת."
 
-#: ../data/gtkpod.glade.h:325
-msgid ""
-"Total\n"
-"(local)"
-msgstr ""
-"סך הכל\n"
-"(מקומי)"
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
+msgstr "למעלה"
 
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:312
 msgid "Tracks"
 msgstr "רצועות"
 
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:313
 msgid "Tracks Most Often Listened To"
 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:330
+#: ../data/gtkpod.glade.h:314
 msgid "Tracks in Selected Tab _Entry"
 msgstr "רצועות ב_רשומות כרטיסיות נבחרות"
 
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:315
 msgid "Tracks in Selected _Playlist"
 msgstr "רצועות ב_רשימות השמעה נבחרות"
 
-#: ../data/gtkpod.glade.h:332
-msgid "Transfer tracks to the iPod in the background"
-msgstr "העבר רצועות אל ה־iPod ברקע"
+#: ../data/gtkpod.glade.h:316
+msgid "Transfer tracks in background mode"
+msgstr "העבר רצועות במצב רקע"
 
-#: ../data/gtkpod.glade.h:333
-msgid "Translators"
-msgstr "מתרגמים"
+#: ../data/gtkpod.glade.h:317
+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:335
+#: ../data/gtkpod.glade.h:318
 msgid "Undo _Track"
 msgstr "בטל _רצועה"
 
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:319
 msgid "Update _mserv Data from File"
 msgstr "עדכון _נתוני mserv מקובץ"
 
-#: ../data/gtkpod.glade.h:337
-msgid "Update/Sync all playlists now"
-msgstr "עדכן/סנכרן את כל רשימות ההשמעה עכשיו"
+#: ../data/gtkpod.glade.h:320
+msgid "Update information about the existing track"
+msgstr "עדכן מידע על אודות הרצועות הקיימות"
 
-#: ../data/gtkpod.glade.h:338
-msgid "Update/Sync playlist now"
-msgstr "עדכן/סנכרן את רשימת הניגון עכשיו"
+#: ../data/gtkpod.glade.h:321
+msgid "Update/Sync All Playlists"
+msgstr "עדכן/סנכרן את כל רשימות ההשמעה"
 
-#: ../data/gtkpod.glade.h:339
-msgid "Upper margin"
-msgstr "שוליים עליונים"
+#: ../data/gtkpod.glade.h:322
+msgid "Update/Sync Playlist"
+msgstr "עדכן/סנכרן את רשימת ההשמעה"
 
-#: ../data/gtkpod.glade.h:340
-msgid "Use 'Multi-Edit' also for title field"
-msgstr "השתמש ב-'עריכה מרובה' גם עבור שדה שם הרצועה"
+#: ../data/gtkpod.glade.h:323
+msgid "Use legacy format for MP3 tags"
+msgstr "השתמש בפורמט נורש עבור תגיות MP3"
 
-#: ../data/gtkpod.glade.h:341
-msgid "Use 'Multi-Edit' for tracks selections"
-msgstr "השתמש ב-'עריכה מרובה' עבור בחירת רצועות"
+#: ../data/gtkpod.glade.h:324
+msgid "Use mserv database to fill track information"
+msgstr "השתמש במסד נתונים של mserv על מנת למלא מידע רצועה"
 
-#: ../data/gtkpod.glade.h:342
-msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
-msgstr "השתמש ב־ <i>&lt;Album&gt;.jpg</i> בתוך תיקיית האב"
-
-#: ../data/gtkpod.glade.h:343
-msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-msgstr "רשימת מופרדת נקודה־פסיק של מסכות שלילה, לדוגמה: \"*.mp3"
-
-#: ../data/gtkpod.glade.h:344
-msgid "Use <i>folder.jpg</i> as cover art."
-msgstr "השתמש ב <i>folder.jpg</i> בתור עטיפה."
-
-#: ../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:346
-msgid "Use mserv database to fill additional information"
-msgstr "השתמש במסד נתונים של mserv על מנת למלא מידע נוסף"
-
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:325
 msgid ""
 "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
 "for this filename."
@@ -1443,180 +1420,222 @@
 "השתמש בערכת התווים הנבחרת (אפשרויות/'הוספה/עדכון/סנכרון')\n"
 "עבור הקובץ הזה."
 
-#: ../data/gtkpod.glade.h:349
-msgid ""
-"Use selected encoding (on the 'General' page)\n"
-"when writing tags"
-msgstr ""
-"השתמש בערכת תווים הנבחרת (בעמוד 'כללי')\n"
-"בזמן כתיבת התגיות"
-
-#: ../data/gtkpod.glade.h:351
-msgid "Use selected encoding also when updating or syncing tracks"
-msgstr "השתמש בערכת תווים נבחרת גם בזמן עדכון או סנכרון רצועות"
-
-#: ../data/gtkpod.glade.h:352
-msgid "Use this template to parse filename for tag information:"
-msgstr "השתמש בתבנית הזאת על מנת לנתח את הקובץ למידע תגית:"
-
-#: ../data/gtkpod.glade.h:353
-msgid "Username to be used for mserv database lookup."
-msgstr "שם משתמש הנועד לשימוש במסד הנתונים של mserv."
-
-#: ../data/gtkpod.glade.h:354
+#: ../data/gtkpod.glade.h:327
 msgid "Username:"
 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:328
+msgid "Video Thumbnail Generation"
+msgstr "יצירת תמונות וידאו ממוזערות"
 
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
+msgstr "תוכנת יצירת תמונות וידאו ממוזערות:"
+
+#: ../data/gtkpod.glade.h:330
 msgid "View Full Size"
 msgstr "הצג בגודל מלא"
 
-#: ../data/gtkpod.glade.h:357
-msgid "WAV with :"
-msgstr "סוג WAV עם :"
-
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:331
 msgid ""
-"When adding dirs/files, update information of\n"
-"existing tracks with identical filenames"
+"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 ""
-"בזמן הוספת תיקיות/קבצים, עדכן את המידע על\n"
-"רצועות קיימות עם שמות קבצים זהים"
+"בזמן ההעתקה מה-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:332
+msgid "When updating tracks, display information:"
+msgstr "הזמן עדכון ברצועה, הצג מידע:"
 
-#: ../data/gtkpod.glade.h:361
-msgid "When syncing playlists"
-msgstr "בזמן סנכרון רשימות השמעה"
+#: ../data/gtkpod.glade.h:333
+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:363
-msgid "Write ID3 tags to disk when modified in gtkpod"
-msgstr "כתוב תגיות ID3 לדיסק כאשר הן משתנות ב-gtkpod"
-
-#: ../data/gtkpod.glade.h:364
+#: ../data/gtkpod.glade.h:334
 msgid "Write all changes made to the disk and the iPod(s)."
 msgstr "שמור את כל השינויים שנעשו אל הדיסק ואל ה־iPod-ים."
 
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:335
+msgid "Write tags to disk when edited"
+msgstr "כתוב תגיות לדיסק בזמן עריכה"
+
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
 msgid ""
-"Write extended information (PC filenames, SHA1 hashes,\n"
-"encoding...). Recommended."
-msgstr "השתמש ב־ <i>&lt;Album&gt;.jpg</i> בתוך תיקיית האב"
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
+msgstr ""
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- אמן: %a\n"
+"- כותר: %A\n"
+"- מלחין: %c\n"
+"- כותרת: %t\n"
+"- סגנון: %G\n"
+"- מספר רצועה: %T\n"
+"- מספר תקליטור: %C\n"
+"- שנה: %Y\n"
+"- מידע דילוג: %*\n"
+"- התו '%': %%."
 
-#: ../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:352
+#, no-c-format
+msgid ""
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
+msgstr ""
+"תוכל להפריד מספר תבניות על ידי \";\". הראשונה המתאימה לשם הקובץ יעשה בה "
+"שימוש.\n"
+"\n"
+"דוגמאות:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- אמן: %a\n"
+"- כותר: %A\n"
+"- מלחין: %c\n"
+"- כותרת: %t\n"
+"- סגנון: %G\n"
+"- מספר רצועה: %T\n"
+"- מספר תקליטור: %C\n"
+"- שנה: %Y\n"
+"- מידע דילוג: %*\n"
+"- התו '%': %%."
 
-#: ../data/gtkpod.glade.h:368
+#: ../data/gtkpod.glade.h:371
 msgid "_About gtkpod"
 msgstr "_אודות gtkpod"
 
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:372
 msgid "_Add Album"
 msgstr "_הוסף כותר"
 
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:373
 msgid "_Add Image"
 msgstr "_הוסף תמונה"
 
-#: ../data/gtkpod.glade.h:371
+#: ../data/gtkpod.glade.h:374
 msgid "_Album"
 msgstr "_כותר"
 
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:375
 msgid "_All Tracks"
 msgstr "_כל הרצועות"
 
-#: ../data/gtkpod.glade.h:373
-msgid "_Arrange Sort Tabs"
-msgstr "_סדר כרטיסיות מיון"
+#: ../data/gtkpod.glade.h:376
+msgid "_Arrange Filter Tabs"
+msgstr "_סדר כרטיסיות סינון"
 
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:377
 msgid "_Check iPod's Files"
 msgstr "_בדיקת קבצי iPod"
 
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:378
+msgid "_Contents"
+msgstr "_תוכן"
+
+#: ../data/gtkpod.glade.h:379
 msgid "_Conversion Log"
 msgstr "_יומן המרות"
 
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:380
 msgid "_Create Playlists"
 msgstr "_יצירת רשימות השמעה"
 
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:381
 msgid "_Create iPod's Directories"
 msgstr "_יצירת תיקיות iPod"
 
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:382
 msgid "_Delete"
 msgstr "_מחק"
 
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:383
 msgid "_Display"
 msgstr "_תצוגה"
 
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:384
 msgid "_Displayed Tracks"
 msgstr "_הראה רצועות"
 
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:385
 msgid "_Edit"
 msgstr "_עריכה"
 
-#: ../data/gtkpod.glade.h:382
-msgid "_Encoding (ID3, files):"
-msgstr "_ערכת תווים (ID3, קבצים):"
-
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:386
 msgid "_Enqueue"
 msgstr "_הכנס לתור"
 
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:387
 msgid "_Export Tracks from Database"
 msgstr "_ייצא רצועות ממסד הנתונים"
 
-#: ../data/gtkpod.glade.h:385
-msgid "_File"
-msgstr "_קובץ"
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr "_פחות כרטיסיות מסנן"
 
-#: ../data/gtkpod.glade.h:386
+#: ../data/gtkpod.glade.h:389
+msgid "_Filter Bar"
+msgstr "_סרגל סינון"
+
+#: ../data/gtkpod.glade.h:390
 msgid "_General"
 msgstr "_כללי"
 
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:391
 msgid "_Help"
 msgstr "_עזרה"
 
-#: ../data/gtkpod.glade.h:388
-msgid "_Ignore rules"
-msgstr "_התעלם מחוקים"
-
-#: ../data/gtkpod.glade.h:389
-msgid "_Image"
-msgstr "_תמונה"
-
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:392
 msgid "_Info Window"
 msgstr "_חלון מידע"
 
-#: ../data/gtkpod.glade.h:391
-msgid "_Last.FM"
-msgstr "_Last.FM"
-
-#: ../data/gtkpod.glade.h:392
-msgid "_Less Sort Tabs"
-msgstr "_פחות כרטיסיות מיון"
-
 #: ../data/gtkpod.glade.h:393
 msgid "_Limit to"
 msgstr "_הגבל ל"
@@ -1630,148 +1649,131 @@
 msgstr "_מקומי"
 
 #: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+msgstr "_מילים"
+
+#: ../data/gtkpod.glade.h:397
 msgid "_M3U"
 msgstr "_M3U"
 
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:398
 msgid "_Misc."
 msgstr "_אחר"
 
-#: ../data/gtkpod.glade.h:398
-msgid "_More Sort Tabs"
-msgstr "_יותר כרטיסיות מיון"
+#: ../data/gtkpod.glade.h:399
+msgid "_More Filter Tabs"
+msgstr "_יותר כרטיסיות סינון"
 
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:400
+msgid "_Music"
+msgstr "_מוסיקה"
+
+#: ../data/gtkpod.glade.h:401
 msgid "_Newly Added Tracks"
 msgstr "_רצועות חדשות שהוספו"
 
-#: ../data/gtkpod.glade.h:400
+#: ../data/gtkpod.glade.h:402
 msgid "_Normalize Volume"
 msgstr "_נרמל עוצמת קול"
 
-#: ../data/gtkpod.glade.h:401
-msgid "_Number of sort tabs:"
-msgstr "_מספר כרטיסיות המיון:"
-
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
 msgid "_PLS"
 msgstr "_PLS"
 
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
+msgid "_Photos"
+msgstr "_תמונות"
+
+#: ../data/gtkpod.glade.h:405
 msgid "_Play Now"
 msgstr "_נגן עכשיו"
 
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:406
 msgid "_Podcasts"
 msgstr "_פודקסטים"
 
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:407
 msgid "_Prefer Local"
 msgstr "_העדף מקומי"
 
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:408
 msgid "_Remove Album"
 msgstr "ה_סרת כותר"
 
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:409
 msgid "_Remove Cover Art"
 msgstr "הצג בגודל מלא"
 
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:410
 msgid "_Remove Images"
 msgstr "ה_סר תמונות"
 
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:411
 msgid "_Save Changes"
 msgstr "_שמור שינויים"
 
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:412
 msgid "_Save Displayed Track Order"
 msgstr "_שמירת סדר רצועות נראות"
 
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:413
 msgid "_Sorting"
 msgstr "_מיון"
 
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:414
 msgid "_Synchronize Playlist with Dir(s)"
 msgstr "סנכרן את רשימת ההשמעה עם התיקיה(יות)"
 
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:415
 msgid "_Toolbar"
 msgstr "_סרגל כלים"
 
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:416
 msgid "_Tools"
 msgstr "_כלים"
 
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:417
 msgid "_Tooltips"
 msgstr "_תוויות מידע"
 
-#: ../data/gtkpod.glade.h:416
-msgid "_Track Info"
-msgstr "_מידע רצועה"
-
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:418
 msgid "_Undo All"
 msgstr "_בטל הכל"
 
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:419
 msgid "_Update Tracks from File"
 msgstr "_סנכרון רצועות מקובץ"
 
-#: ../data/gtkpod.glade.h:419
+#: ../data/gtkpod.glade.h:420
 msgid "_Video"
 msgstr "_וידאו"
 
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:421
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:422
+msgid "_Zoom"
+msgstr "_זום"
+
+#: ../data/gtkpod.glade.h:423
 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'."
+#: ../data/gtkpod.glade.h:424
+msgid "checkbutton"
 msgstr ""
-"אמן: a%, כותר: A%, יוצר: c%, שם הרצועה: t%, סגנון: G%, מספר רצועה: T%, מספר תקליטור: C%, שנה: Y%, מידע דילוג: *%, האות '%': %%.\n"
-"אפשר להפריד בין מספר תבניות על ידי ';'. הראשון שיתאים לקובץ יבחר. לדוגמה:\n"
-" '%a - %A/%T %t.mp3;%t.wav'."
 
-#: ../data/gtkpod.glade.h:424
-msgid "folder"
-msgstr "תיקיה"
-
 #: ../data/gtkpod.glade.h:425
-msgid "folder.jpg"
-msgstr "folder.jpg"
+msgid "gtk-revert-to-saved"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:427
-#, no-c-format
-msgid "folder.jpg;%a.jpg"
-msgstr "folder.jpg;%a.jpg"
-
-#: ../data/gtkpod.glade.h:428
-msgid "gtkpod"
-msgstr "gtkpod"
-
-#: ../data/gtkpod.glade.h:429
-msgid "gtkpod Info"
+#: ../data/gtkpod.glade.h:426
+msgid "gtkpod Information"
 msgstr "מידע 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 מצפה שהתגיות של הID3 והקבצים יהיו בקידוד המצוין כאן. תוכל לשנות זאת בשביל פעולות עוקבות של 'הוספת קבצים' ו 'הוספת תיקיות'. 'ערכת התווים של המערכת' היא ערכת התווים בשימוש עבור הלוקל הנוכחי שלך."
-
-#: ../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:433
+#: ../data/gtkpod.glade.h:429
 msgid ""
 "iPod\n"
 "Local Repository (Standard)\n"
@@ -1781,28 +1783,27 @@
 "מאגר מקומי (סטנדרטי)\n"
 "מאגר מקומי (פודקסטים)\n"
 
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:433
 msgid "iPod mountpoint:"
 msgstr "נקודת העגינה של ה-iPod:"
 
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:434
 msgid "iTunesDB backup:"
 msgstr "גיבוי ה־iTunesDB:"
 
-#: ../data/gtkpod.glade.h:439
-msgid "mserv Root:"
+#: ../data/gtkpod.glade.h:435
+msgid "mserv Preferences"
+msgstr "הגדרות ,mserv"
+
+#: ../data/gtkpod.glade.h:436
+msgid "mserv root:"
 msgstr "שורש ה-mserv:"
 
-#: ../data/gtkpod.glade.h:440
-msgid "mserv database lookup will be done for music in this directory."
-msgstr "החיפוש במסד הנתונים mserv יתבצע בתיקייה זאת עבור מוזיקה."
-
-#: ../data/gtkpod.glade.h:441
-#: ../src/details.c:1347
+#: ../data/gtkpod.glade.h:437 ../src/details.c:1352
 msgid "n/a"
 msgstr "ל/ז"
 
-#: ../data/gtkpod.glade.h:442
+#: ../data/gtkpod.glade.h:438
 msgid "special_sorttab -- Don't translate!"
 msgstr "special_sorttab -- Don't translate!"
 
@@ -2034,171 +2035,172 @@
 
 #. sanity!
 #. check for "System Charset" and return NULL
-#: ../src/charset.c:160
-#: ../src/charset.c:170
-#: ../src/charset.c:223
+#: ../src/charset.c:163 ../src/charset.c:173 ../src/charset.c:232
+#: ../src/charset.c:248 ../src/charset.c:332
 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"
+#: ../src/clientserver.c:215
+msgid ""
+"Another instance of gtkpod was detected. Playcount server not started.\n"
 msgstr "עותק ריצה נוסף של gtkpod נמצא. שרת ספירה לא יופעל.\n"
 
-#: ../src/confirmation.c:377
-msgid "Confirmation Dialogue"
-msgstr "תיבת דו שיח לאישור"
+#: ../src/confirmation.c:389
+msgid "Confirmation"
+msgstr "אישור"
 
-#: ../src/context_menus.c:362
+#: ../src/context_menus.c:364
 #, c-format
 msgid "Copied \"%s\" playlist to %s"
 msgstr "הועתקה רשימת השמעה '%s' אל '%s'."
 
-#: ../src/context_menus.c:401
+#: ../src/context_menus.c:403
 #, c-format
 msgid "Copied %d track to '%s'"
 msgid_plural "Copied %d tracks to '%s'"
 msgstr[0] "הועתקה %d רצועה אל '%s'."
 msgstr[1] "הועתקו %d רצועות אל '%s'."
 
-#: ../src/context_menus.c:429
+#: ../src/context_menus.c:431
 #, c-format
 msgid "Copied '%s' playlist to '%s' in '%s'"
 msgstr "הועתקה רצועת השמעה '%s' אל '%s' בתוך '%s'."
 
-#: ../src/context_menus.c:462
+#: ../src/context_menus.c:464
 #, c-format
 msgid "Copied %d track to '%s' in '%s'"
 msgid_plural "Copied %d tracks to %s in '%s'"
 msgstr[0] "הועתקה %d רצועה אל '%s' בתוך '%s'"
 msgstr[1] "הועתקו %d רצועות אל '%s' בתוך '%s'"
 
-#: ../src/context_menus.c:622
-#: ../src/tools.c:854
+#: ../src/context_menus.c:624 ../src/tools.c:854
 msgid "Play Now"
 msgstr "נגן עכשיו"
 
-#: ../src/context_menus.c:628
-#: ../src/tools.c:867
+#: ../src/context_menus.c:630 ../src/tools.c:867
 msgid "Enqueue"
 msgstr "הכנס לתור"
 
-#: ../src/context_menus.c:634
+#: ../src/context_menus.c:636
 msgid "Copy Tracks to Filesystem"
 msgstr "העתק רצועות אל מערכת הקבצים"
 
-#: ../src/context_menus.c:641
-#: ../src/file_export.c:1085
+#: ../src/context_menus.c:643 ../src/file_export.c:1085
 msgid "Create Playlist File"
 msgstr "יצירת קובץ רשימת השמעה"
 
-#: ../src/context_menus.c:648
+#: ../src/context_menus.c:650
 msgid "Create new Playlist"
 msgstr "יצירת רשימת השמעה חדשה"
 
-#: ../src/context_menus.c:655
+#: ../src/context_menus.c:657
 msgid "Update Tracks from File"
 msgstr "עדכן רצועות מקובץ"
 
-#: ../src/context_menus.c:669
+#: ../src/context_menus.c:671
 msgid "Sync Playlist with Dir(s)"
 msgstr "סנכרן את רשימת ההשמעה עם התיקיה(יות)"
 
-#: ../src/context_menus.c:679
+#: ../src/context_menus.c:681
 msgid "Remove All Tracks from iPod"
 msgstr "מחק את כל הרצועות מה-iPod"
 
-#: ../src/context_menus.c:697
+#: ../src/context_menus.c:687 ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr "אני בטוח"
+
+#: ../src/context_menus.c:699
 msgid "Remove All Podcasts from iPod"
 msgstr "מחק את כל הפודקסטים מה-iPod"
 
-#: ../src/context_menus.c:712
+#: ../src/context_menus.c:714
 msgid "Delete Including Tracks"
 msgstr "מחק כולל רצועות"
 
-#: ../src/context_menus.c:720
+#: ../src/context_menus.c:722
 msgid "Delete But Keep Tracks"
 msgstr "מחק אבל שמור רצועות"
 
-#: ../src/context_menus.c:728
+#: ../src/context_menus.c:730
 msgid "Edit iPod Properties"
 msgstr "ערוך מאפייני iPod"
 
-#: ../src/context_menus.c:735
+#: ../src/context_menus.c:737
 msgid "Edit Repository Properties"
 msgstr "ערוך מאפייני מאגר"
 
-#: ../src/context_menus.c:742
+#: ../src/context_menus.c:744
 msgid "Edit Playlist Properties"
 msgstr "ערוך מאפייני רשימת השמעה"
 
-#: ../src/context_menus.c:770
+#: ../src/context_menus.c:772
 msgid "View Full Size Artwork"
 msgstr "הצג תמונות בגודל מלא"
 
-#: ../src/context_menus.c:777
+#: ../src/context_menus.c:779
 msgid "Select Cover From File"
 msgstr "בחירת עטיפה מקובץ"
 
-#: ../src/context_menus.c:790
+#: ../src/context_menus.c:792
 msgid "Load iPod"
 msgstr "טען iPod"
 
-#: ../src/context_menus.c:797
+#: ../src/context_menus.c:799
 msgid "Eject iPod"
 msgstr "נתק iPod"
 
-#: ../src/context_menus.c:814
+#: ../src/context_menus.c:816
 msgid "Remove All Tracks from Database"
 msgstr "מחק את כל הרצועות ממסד הנתונים"
 
-#: ../src/context_menus.c:829
+#: ../src/context_menus.c:831
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "מחק כולל רצועות (דיסק קשיח)"
 
-#: ../src/context_menus.c:837
+#: ../src/context_menus.c:839
 msgid "Delete Including Tracks (Database)"
 msgstr "מחק כולל רצועות (מסד נתונים)"
 
-#: ../src/context_menus.c:845
+#: ../src/context_menus.c:847
 msgid "Delete From iPod"
 msgstr "מחק מה-iPod"
 
-#: ../src/context_menus.c:853
+#: ../src/context_menus.c:855
 msgid "Delete From Playlist"
 msgstr "מחק מרשימת ההשמעה"
 
-#: ../src/context_menus.c:861
+#: ../src/context_menus.c:863
 msgid "Delete From Harddisk"
 msgstr "מחק מהדיסק הקשיח"
 
-#: ../src/context_menus.c:869
+#: ../src/context_menus.c:871
 msgid "Delete From Database"
 msgstr "מחק ממסד הנתונים"
 
-#: ../src/context_menus.c:877
+#: ../src/context_menus.c:879
 msgid "Alphabetize"
 msgstr "סדר אלפאבתי"
 
-#: ../src/context_menus.c:895
+#: ../src/context_menus.c:897
 msgid "Remove Album"
 msgstr "הסרת כותר"
 
-#: ../src/context_menus.c:905
+#: ../src/context_menus.c:907
 msgid "Remove Photo"
 msgstr "הסרת תמונה"
 
-#: ../src/context_menus.c:922
+#: ../src/context_menus.c:924
 msgid "Rename Album"
 msgstr "שנה שם אלבום"
 
-#: ../src/context_menus.c:981
-#: ../src/context_menus.c:1030
+#: ../src/context_menus.c:983 ../src/context_menus.c:1032
 msgid "Copy selected playlist to..."
 msgstr "העתק רשימות השמעה נבחרות אל..."
 
-#: ../src/context_menus.c:1083
+#: ../src/context_menus.c:1085
 msgid "Copy selected track(s) to..."
 msgstr "העתק רצועה/ות נבחרת/ות אל..."
 
@@ -2231,17 +2233,12 @@
 msgid "Audiobook"
 msgstr "ספר שמע"
 
-#: ../src/details.c:88
-#: ../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 "וידאו מוזיקה"
 
-#: ../src/details.c:89
-#: ../src/display_spl.c:107
-#: ../src/display_spl.c:210
-#: ../src/display_spl.c:219
-#: ../src/misc_conversion.c:101
+#: ../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 "תוכנית טלויזיה"
 
@@ -2249,17 +2246,17 @@
 msgid "TV Show & Music Video"
 msgstr "תוכנית טלויזיה & וידאו מוזיקה"
 
-#: ../src/details.c:836
+#: ../src/details.c:837
 #, c-format
 msgid "%s (image data corrupted or unreadable)"
 msgstr "(מידע תמונה הושחת או לא קריא) %s"
 
-#: ../src/details.c:973
+#: ../src/details.c:975
 #, c-format
 msgid "Please report unknown mediatype %x\n"
 msgstr "אנא דווח על מדיות לא ידועות %x\n"
 
-#: ../src/details.c:1418
+#: ../src/details.c:1417
 msgid "<b>n/a</b>"
 msgstr "<b>לא זמין</b>"
 
@@ -2268,55 +2265,48 @@
 msgid "Error occurred dropping an image onto the details window: %s\n"
 msgstr "תקלה אירעה בעת הורדת תמונה אל חלון הפרטים: %s\n"
 
-#: ../src/details.c:1952
-#: ../src/display_coverart.c:2128
+#: ../src/details.c:1952 ../src/display_coverart.c:2297
 msgid "Successfully set new coverart for selected tracks"
 msgstr "תמונת עטיפה חדשה עבור הרצועה הנבחרת נקבעה בהצלחה"
 
-#: ../src/display.c:490
+#. Set the resolution in the label
+#: ../src/display.c:570
 #, c-format
-msgid "<b>Image Dimensions: %s</b>"
-msgstr "<b>גודל התמונה:: %s</b>"
+msgid "<b>Image Dimensions: %d x %d</b>"
+msgstr "<b>גודל התמונה: %d x %d</b>"
 
-#: ../src/display.c:744
+#: ../src/display.c:814
 msgid "Edit selected entry of which sort tab?"
 msgstr "מאיזה כרטיסיית מיון לערוך את הרשומה הנבחרת?"
 
 #. no entry selected
-#: ../src/display.c:751
-#: ../src/misc_confirm.c:435
-#: ../src/misc_track.c:2138
+#: ../src/display.c:821 ../src/misc_confirm.c:469 ../src/misc_track.c:2158
 msgid "No entry selected."
 msgstr "לא נבחרה רשומה."
 
-#: ../src/display.c:910
-#: ../src/display.c:1230
-#: ../src/display.c:1286
-#: ../src/display.c:1340
-#: ../src/display.c:1395
-#: ../src/display.c:1656
+#: ../src/display.c:974 ../src/display.c:1320 ../src/display.c:1376
+#: ../src/display.c:1430 ../src/display.c:1485 ../src/display.c:1746
 #, c-format
 msgid "No entry selected in Sort Tab %d"
 msgstr "לא נבחרה רשומה בכרטיסיית מיון %d"
 
-#: ../src/display.c:949
+#: ../src/display.c:1015
 msgid "Remove entry of which sort tab from database?"
 msgstr "הסר רשומה מאיזה כרטיסיית מיון במסד הנתונים?"
 
-#: ../src/display.c:957
+#: ../src/display.c:1024
 msgid "Remove tracks in selected entry of which filter tab from the iPod?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת להסיר רצועות מה־iPod?"
 
-#: ../src/display.c:979
+#: ../src/display.c:1049
 msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת להסיר רצועות מהדיסק הקשיח?"
 
-#: ../src/display.c:1009
+#: ../src/display.c:1082
 msgid "Remove tracks in selected entry of which filter tab from playlist?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת להסיר רצועות מרשימת ההשמעה?"
 
-#: ../src/display.c:1036
-#: ../src/display.c:1074
+#: ../src/display.c:1109 ../src/display.c:1147
 #, c-format
 msgid ""
 "iPod at '%s' is not loaded.\n"
@@ -2325,103 +2315,102 @@
 "ה־iPod ב־'%s' לא טעון.\n"
 "אנא טען אותו תחילה."
 
-#: ../src/display.c:1111
-#: ../src/display.c:1138
+#: ../src/display.c:1184 ../src/display.c:1218
 msgid "Update selected entry of which sort tab?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת לעדכן?"
 
-#: ../src/display.c:1224
+#: ../src/display.c:1314
 msgid "Export selected entry of which sort tab?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת לייצא?"
 
-#: ../src/display.c:1280
+#: ../src/display.c:1370
 msgid "Create playlist file from selected entry of which sort tab?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת ליצור קובץ רשימת השמעה?"
 
-#: ../src/display.c:1334
+#: ../src/display.c:1424
 msgid "Play tracks in selected entry of which sort tab?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת לנגן רצועות?"
 
-#: ../src/display.c:1389
+#: ../src/display.c:1479
 msgid "Enqueue tracks in selected entry of which sort tab?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת להוסיף רצועות לתור?"
 
-#: ../src/display.c:1646
+#: ../src/display.c:1736
 msgid "Normalize tracks in selected entry of which sort tab?"
 msgstr "באיזה כרטיסיית מיון של רשומה נבחרת לנרמל רצועות?"
 
-#: ../src/display_coverart.c:1713
+#: ../src/display_coverart.c:1874
 msgid "Failed to remove the album from the album hash store."
 msgstr "נכשלה ההסרה של האלבום מתוך מקום האיכסון של האלבומים."
 
-#: ../src/display_coverart.c:2098
+#: ../src/display_coverart.c:2262
 #, c-format
 msgid "Error occurred dropping an image onto the coverart display: %s\n"
 msgstr "תקלה אירעה בעת הורדת תמונה אל חלון העטיפות: %s\n"
 
-#: ../src/display_itdb.c:376
+#: ../src/display_itdb.c:385
 #, 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 "מקומי"
+#: ../src/display_itdb.c:871
+msgid "Music Library"
+msgstr "ספריית מוסיקה"
 
 #. add podcast playlist
-#: ../src/display_itdb.c:866
-#: ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1025
+#: ../src/display_itdb.c:879 ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
 msgid "Podcasts"
 msgstr "פודקסטים"
 
-#: ../src/display_itdb.c:875
-#: ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:888 ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
 msgid "iPod"
 msgstr "iPod"
 
-#: ../src/display_itdb.c:1084
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr "מקומי"
+
+#: ../src/display_itdb.c:1098
 #, c-format
 msgid "Increased playcount for '%s'"
 msgstr "הועלתה ספירת השמעות עבור '%s'"
 
-#: ../src/display_photo.c:163
+#: ../src/display_photo.c:158
 #, c-format
 msgid "Error reading iPod photo database (%s).\n"
 msgstr "תקלה בזמן קריאת מסד הנתונים של התמונות (%s) על ה־iPod.\n"
 
-#: ../src/display_photo.c:168
+#: ../src/display_photo.c:161
 msgid "Error reading iPod photo database.\n"
 msgstr "תקלה בזמן קריאת מסד הנתונים של התמונות על ה־iPod.\n"
 
-#: ../src/display_photo.c:238
+#: ../src/display_photo.c:201
 msgid "Could not access the iPod's photo database."
 msgstr "אי אפשר לגשת אל מסד הנתונים של התמונות ב־iPod."
 
-#: ../src/display_photo.c:441
+#: ../src/display_photo.c:404
 msgid "Photo Albums"
 msgstr "אלבומי תמונות"
 
-#: ../src/display_photo.c:451
-#: ../src/display_photo.c:1685
+#: ../src/display_photo.c:414 ../src/display_photo.c:1587
 msgid "<Unnamed>"
 msgstr "<ללא שם>"
 
-#: ../src/display_photo.c:939
+#: ../src/display_photo.c:848
 msgid "The Photo Library album cannot be removed"
 msgstr "אי אפשר היה להסיר את אלבום ספריית התמונות"
 
-#: ../src/display_photo.c:961
+#: ../src/display_photo.c:870
 msgid "Do you want to remove the album's photos too?"
 msgstr "האם אתה בטוח שאתה רוצה להסיר את כל אלבומי התמונות גם כן?"
 
-#: ../src/display_photo.c:967
+#: ../src/display_photo.c:876
 msgid "Yes. Do Not Display Again"
 msgstr "כן. אל תציג שנית"
 
-#: ../src/display_photo.c:1038
+#: ../src/display_photo.c:947
 msgid ""
 "This will remove the photo selection from the selected album.\n"
 " Do you want to delete them from the database as well?"
@@ -2429,130 +2418,116 @@
 "זה יסיר את בחירת התמונה מהאלבום הנבחר.\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:962
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr ""
+"פעולה זו תמחק את בחירת התמונות מספריית התמונות וכל האלבומים. האם אתה בטוח?"
 
-#: ../src/display_photo.c:1128
+#: ../src/display_photo.c:1036
 msgid "New Photo Album Name"
 msgstr "שם אלבום תמונות חדש"
 
-#: ../src/display_photo.c:1129
+#: ../src/display_photo.c:1037
 msgid "Please enter a new name for the photo album"
 msgstr "הכנס בבקשה את השם של אלבום התמונות"
 
-#: ../src/display_photo.c:1141
-#: ../src/display_photo.c:1223
+#: ../src/display_photo.c:1050 ../src/display_photo.c:1133
 msgid "An album with that name already exists."
 msgstr "אלבום בשם זה כבר קיים."
 
-#: ../src/display_photo.c:1210
+#: ../src/display_photo.c:1119
 msgid "New Photo Album"
 msgstr "אלבום תמונות חדש"
 
-#: ../src/display_photo.c:1211
+#: ../src/display_photo.c:1120
 msgid "Please enter a name for the new photo album"
 msgstr "הכנס בבקשה את השם של אלבום התמונות החדש"
 
-#: ../src/display_photo.c:1232
+#: ../src/display_photo.c:1142
 msgid "The new album failed to be created."
 msgstr "כשלון ביצירת האלבום החדש."
 
-#: ../src/display_photo.c:1256
+#: ../src/display_photo.c:1166
 msgid "Add Image to iPod"
 msgstr "הוסף תמונה ל־iPod"
 
 #. Open a dialog directory chooser window
-#: ../src/display_photo.c:1311
+#: ../src/display_photo.c:1221
 msgid "Add a Directory of Images to the iPod. Select the Directory."
 msgstr "הוספת תיקיית תמונות אל ה־iPod. בחר את התיקייה."
 
-#: ../src/display_photo.c:1699
+#: ../src/display_photo.c:1601
 #, 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
+#: ../src/display_playlists.c:537 ../src/display_playlists.c:579
 msgid "Error: drag from iPod not possible in offline mode."
 msgstr "שגיאה: גרירה מה-iPod היא לא אפשרית במצב לא מקוון."
 
-#: ../src/display_playlists.c:585
-#: ../src/display_tracks.c:286
+#: ../src/display_playlists.c:606 ../src/display_tracks.c:403
 #, c-format
 msgid "Copied one track"
 msgid_plural "Copied %d tracks"
 msgstr[0] "רצועה אחת הועתקה"
 msgstr[1] "הועתקו %d רצועות"
 
-#: ../src/display_playlists.c:865
-#: ../src/display_playlists.c:877
+#: ../src/display_playlists.c:886 ../src/display_playlists.c:898
 msgid "Can't reorder sorted treeview."
 msgstr "אי אפשר לסדר מחדש עץ ממוין."
 
-#: ../src/display_playlists.c:954
+#: ../src/display_playlists.c:975
 #, 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
+#: ../src/display_playlists.c:2039
 msgid "Photos"
 msgstr "תמונות"
 
-#: ../src/display_sorttabs.c:473
+#: ../src/display_sorttabs.c:479
 msgid "'Played' condition ignored because of error."
 msgstr "התעלמות ממצב 'הושמע' עקב תקלה"
 
-#: ../src/display_sorttabs.c:476
+#: ../src/display_sorttabs.c:482
 msgid "'Modified' condition ignored because of error."
 msgstr "התעלמות ממצב 'שונה' עקב תקלה"
 
-#: ../src/display_sorttabs.c:479
+#: ../src/display_sorttabs.c:485
 msgid "'Added' condition ignored because of error."
 msgstr "התעלמות ממצב 'הוספה' עקב תקלה"
 
-#: ../src/display_sorttabs.c:1562
-#: ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1568 ../src/misc_conversion.c:59
 msgid "All"
 msgstr "הכל"
 
-#: ../src/display_sorttabs.c:1588
+#: ../src/display_sorttabs.c:1594
 msgid "Compilations"
 msgstr "יצירות"
 
-#: ../src/display_sorttabs.c:2988
+#: ../src/display_sorttabs.c:3001
 msgid "Comp."
 msgstr "יצירה"
 
-#: ../src/display_sorttabs.c:2994
-#: ../src/display_spl.c:88
-#: ../src/display_tracks.c:2109
-#: ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:3007 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333 ../src/misc_conversion.c:84
 msgid "Year"
 msgstr "שנה"
 
-#: ../src/display_sorttabs.c:2997
+#: ../src/display_sorttabs.c:3010
 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 "ימים"
@@ -2573,9 +2548,7 @@
 msgid "Hz"
 msgstr "הרץ"
 
-#: ../src/display_spl.c:75
-#: ../src/display_spl.c:179
-#: ../src/info.c:780
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:794
 msgid "MB"
 msgstr "מ\"ב"
 
@@ -2583,14 +2556,12 @@
 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 "קצב דגימה"
 
@@ -2598,8 +2569,7 @@
 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 "תאריך שינוי"
 
@@ -2611,16 +2581,22 @@
 msgid "Size"
 msgstr "גודל"
 
-#: ../src/display_spl.c:95
-#: ../src/misc_conversion.c:64
+#: ../src/display_spl.c:94 ../src/infodlg.c:78
+msgid "Play time"
+msgstr "זמן השמעה"
+
+#: ../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 "תאריך הוספה"
 
+#: ../src/display_spl.c:98 ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "מספור השמעות"
+
 #: ../src/display_spl.c:99
 msgid "Last played"
 msgstr "הושמע לאחרונה"
@@ -2629,18 +2605,19 @@
 msgid "Disc number"
 msgstr "מספר דיסק"
 
-#: ../src/display_spl.c:102
-#: ../src/misc_conversion.c:87
+#: ../src/display_spl.c:101 ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "מדרוג"
+
+#: ../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 "קיבוץ"
 
@@ -2676,19 +2653,13 @@
 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 "לא קיים"
 
@@ -2708,8 +2679,7 @@
 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 "בטווח "
 
@@ -2753,11 +2723,6 @@
 msgid "hours"
 msgstr "שעות"
 
-#: ../src/display_spl.c:182
-#: ../src/info.c:780
-msgid "GB"
-msgstr "ג\"ב"
-
 #: ../src/display_spl.c:189
 msgid "random order"
 msgstr "סדר אקראי"
@@ -2810,106 +2775,132 @@
 msgid "lowest rating"
 msgstr "מדרוג נמוך ביותר"
 
-#: ../src/display_spl.c:208
-#: ../src/display_spl.c:217
+#: ../src/display_spl.c:208 ../src/display_spl.c:217
 msgid "Movie"
 msgstr "סרט"
 
-#: ../src/display_spl.c:1192
-#: ../src/display_spl.c:1207
+#: ../src/display_spl.c:1143 ../src/display_spl.c:1158
 msgid "to"
 msgstr "אל "
 
-#: ../src/display_spl.c:1485
+#: ../src/display_spl.c:1436
 msgid "-"
 msgstr "-"
 
-#: ../src/display_spl.c:1500
+#: ../src/display_spl.c:1451
 msgid "+"
 msgstr "+"
 
-#: ../src/display_tracks.c:281
+#: ../src/display_tracks.c:398
 #, c-format
 msgid "Moved one track"
 msgid_plural "Moved %d tracks"
 msgstr[0] "רצועה אחת הועברה"
 msgstr[1] "הועברו %d רצועות"
 
-#: ../src/display_tracks.c:1810
+#: ../src/display_tracks.c:2022
 #, 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:2069
+#: ../src/display_tracks.c:2288
 msgid "Rtng"
 msgstr "מדרוג"
 
-#: ../src/display_tracks.c:2072
+#: ../src/display_tracks.c:2291
 msgid "#"
 msgstr "#"
 
-#: ../src/display_tracks.c:2075
+#: ../src/display_tracks.c:2294
 msgid "CD"
 msgstr "דיסק שמע"
 
-#: ../src/display_tracks.c:2078
+#: ../src/display_tracks.c:2297
 msgid "ID"
 msgstr "מזהה"
 
-#: ../src/display_tracks.c:2081
+#: ../src/display_tracks.c:2300
 msgid "Trnsfrd"
 msgstr "העברה"
 
-#: ../src/display_tracks.c:2085
+#: ../src/display_tracks.c:2309
 msgid "Cmpl"
 msgstr "יצירה"
 
-#: ../src/display_tracks.c:2091
+#: ../src/display_tracks.c:2315
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/display_tracks.c:2094
+#: ../src/display_tracks.c:2318
 msgid "Plycnt"
 msgstr "ספירת שמע"
 
-#: ../src/display_tracks.c:2106
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "הושמע"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "שונה"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "הוספו"
+
+#: ../src/display_tracks.c:2330
 msgid "Released"
 msgstr "שוחרר"
 
-#: ../src/display_tracks.c:2112
+#: ../src/display_tracks.c:2336
 msgid "Vol."
 msgstr "עוצמה"
 
-#: ../src/display_tracks.c:2115
+#: ../src/display_tracks.c:2339
 msgid "Sndchk."
 msgstr "בדיקת קול"
 
-#: ../src/fetchcover.c:358
-msgid "Coverart file already exists"
-msgstr "קובץ עטיפה כבר קיים"
-
-#: ../src/fetchcover.c:371
+#: ../src/fetchcover.c:359
 #, 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."
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to abort the fetchcover "
+"operation?"
 msgstr ""
 "קובץ התמונה %s כבר קיים.\n"
-"הוא עשוי להיות מקושר עם קובץ מוזיקה אחר בתיקייה זו.\n"
+"הוא עשוי להיות משייך לקובץ מוזיקה אחר בתיקייה זו.\n"
 "\n"
-"- לחיצה על \"כן\" תדרוס את הקובץ הקיים, ועלולה לקשר קבצי מוזיקה אחרים בתיקייה זו אם קובץ עטיפה זה.\n"
-"- לחיצה על \"לא\" תשמור את הקובץ עם שם ייחודי./n- לחיצה על \"בטל\" תבטל את פעולה הבאת העטיפה."
+"האם תרצה לדרוס את הקובץ הקיים, ובכך כנראה לשייך\n"
+"קובץ מוזיקה אחר באותה תיקייה עם קובץ עטיפה זה,\n"
+"לשמור את הקובץ עם שם קובץ ייחודי, או לבטל את פעולת יבוא העטיפה?"
 
-#: ../src/file.c:236
+#: ../src/fetchcover.c:368
+msgid "Cover art file already exists"
+msgstr "קובץ עטיפה כבר קיים"
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr "כתיבה על"
+
+#: ../src/fetchcover.c:371
+msgid "Rename"
+msgstr "שנה שם"
+
+#: ../src/fetchcover.c:372
+msgid "Abort"
+msgstr "בטל"
+
+#: ../src/file.c:238
 #, c-format
 msgid ""
 "'%s' is a directory, not a playlist file.\n"
@@ -2918,7 +2909,7 @@
 "'%s' הוא תיקייה, לא קובץ רשימת השמעה.\n"
 "\n"
 
-#: ../src/file.c:266
+#: ../src/file.c:268
 #, c-format
 msgid ""
 "'%s' is a not a known playlist file.\n"
@@ -2927,92 +2918,120 @@
 "'%s' הוא לא קובץ רשימת השמעה מוכר.\n"
 "\n"
 
-#: ../src/file.c:283
-#: ../src/file_export.c:217
-#: ../src/oggfile.c:62
+#: ../src/file.c:285 ../src/file_export.c:217 ../src/oggfile.c:62
 #: ../src/wavfile.c:107
 #, c-format
 msgid "Could not open '%s' for reading.\n"
 msgstr "לא מסוגל לפתוח את '%s' לכתיבה.\n"
 
-#: ../src/file.c:369
+#: ../src/file.c:371
 #, c-format
 msgid "Skipping '%s' because it is a directory.\n"
 msgstr "מדלג על '%s' בגלל שהוא תיקייה.\n"
 
-#: ../src/file.c:374
+#: ../src/file.c:376
 #, c-format
 msgid "Skipping '%s' to avoid adding playlist file recursively\n"
 msgstr "מדלג על '%s' על מנת להתחמק מהוספת קובץ רשימת השמעה רקורסיבי\n"
 
-#: ../src/file.c:629
+#: ../src/file.c:631
 #, c-format
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "הסימן '%s' בתבנית '%s' לא ידוע\n"
 
-#: ../src/file.c:923
+#: ../src/file.c:939
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "שם קובץ מקומי לא תקין (%s)"
 
-#: ../src/file.c:982
+#: ../src/file.c:998
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "לא קיים מידע למשתמש '%s' ב- '%s'"
 
-#: ../src/file.c:991
+#: ../src/file.c:1007
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr "מידע קובץ mserv (%s) לא זמין עבור רצועה (%s)"
 
-#: ../src/file.c:999
+#: ../src/file.c:1015
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr "הרצועה (%s) לא קיימת בתיקיית השורש של mserv (%s)"
 
-#: ../src/file.c:1123
+#: ../src/file.c:1046
 #, c-format
-msgid "The following track could not be processed (file does not exist): '%s'\n"
+msgid "Could not create '%s'"
+msgstr "אי אפשר ליצור את  \"%s\""
+
+#: ../src/file.c:1083
+msgid "Error creating thumbnail file"
+msgstr "תקלה ביצירת קובץ תמונות ממוזערות"
+
+#: ../src/file.c:1114 ../src/misc.c:1018
+#, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "אסימון לא ידוע '%%%c' בתבנית '%s'"
+
+#: ../src/file.c:1138
+#, c-format
+msgid ""
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
+msgstr ""
+"אי אפשר היה להפעיל את יוצר תמונות הווידאו הממוזערות\n"
+"(שורת הפקודה הייתה: '%s')"
+
+#: ../src/file.c:1142
+#, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr "יוצר התמונות הממוזערות החזיר סטטוס %d"
+
+#: ../src/file.c:1291
+#, c-format
+msgid ""
+"The following track could not be processed (file does not exist): '%s'\n"
 msgstr "אי אפשר לעבד את הרצועה הבאה (הקובץ לא קיים): '%s'\n"
 
-#: ../src/file.c:1209
+#: ../src/file.c:1377
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr "אי אפשר לעבד את הרצועה הבאה (סוג קובץ לא ידוע): '%s'\n"
 
-#: ../src/file.c:1307
+#: ../src/file.c:1476
 #, 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:1337
-#: ../src/file.c:1391
+#: ../src/file.c:1506 ../src/file.c:1560
 msgid "Nothing to update"
 msgstr "אין מה לעדכן"
 
-#: ../src/file.c:1358
+#: ../src/file.c:1527
 #, c-format
 msgid "Updating %s"
 msgstr "מעדכן %s"
 
-#: ../src/file.c:1372
+#: ../src/file.c:1541
 msgid "Updated selected tracks with info from file."
 msgstr "מעדכן רצועות נבחרות עם מידע מקובץ."
 
-#: ../src/file.c:1406
+#: ../src/file.c:1575
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "מאחזר נתוני mserv %s"
 
-#: ../src/file.c:1411
+#: ../src/file.c:1580
 msgid "no filename available"
 msgstr "קובץ לא קיים"
 
-#: ../src/file.c:1416
+#: ../src/file.c:1585
 msgid "Updated selected tracks with data from mserv."
 msgstr "עודכנו רצועות נבחרות עם נתונים מ-mserv"
 
-#: ../src/file.c:1437
+#: ../src/file.c:1606
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -3021,11 +3040,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1443
+#: ../src/file.c:1612
 msgid "Failed Track Update"
 msgstr "עדכון רצועה נכשל"
 
-#: ../src/file.c:1501
+#: ../src/file.c:1670
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -3034,63 +3053,60 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1507
+#: ../src/file.c:1676
 msgid "Successful Track Update"
 msgstr "הרצועה עודכנה בהצלחה"
 
-#: ../src/file.c:1566
+#: ../src/file.c:1735
 #, 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:1572
+#: ../src/file.c:1741
 msgid "mserv data retrieval problem"
 msgstr "בעיה בהשגת מידע מ-mserv"
 
-#: ../src/file.c:1661
+#: ../src/file.c:1829
 msgid "no local filename available, file on the iPod will be used instead"
 msgstr "קובץ מקומי לא זמין, יעשה שימוש בקובץ על ה־iPod"
 
-#: ../src/file.c:1667
+#: ../src/file.c:1835
 msgid "no local filename available and copy on iPod cannot be found"
 msgstr "קובץ מקומי לא זמין ועותק על ה־iPod גם כן לא זמין"
 
-#: ../src/file.c:1671
-#: ../src/file.c:1689
+#: ../src/file.c:1839 ../src/file.c:1857
 msgid "no local filename available"
 msgstr "קובץ מקומי לא זמין"
 
-#: ../src/file.c:1679
+#: ../src/file.c:1847
 msgid "local file could not be found, file on the iPod will be used instead"
 msgstr "קובץ מקומי לא קיים, יעשה שימוש בקובץ על ה־iPod"
 
-#: ../src/file.c:1685
+#: ../src/file.c:1853
 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
+#: ../src/file.c:1956
 msgid "update failed (format not supported?)"
 msgstr "העדכון נכשל (התבנית לא נתמכת?)"
 
-#: ../src/file.c:1873
-#: ../src/misc_playlist.c:916
+#: ../src/file.c:2041 ../src/misc_playlist.c:936
 #, c-format
 msgid "Processing '%s'..."
 msgstr "מעבד '%s'..."
 
-#: ../src/file.c:1879
+#: ../src/file.c:2047
 #, 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
+#: ../src/file.c:2167 ../src/misc_track.c:1793 ../src/misc_track.c:1898
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
@@ -3099,7 +3115,7 @@
 "הפודקסט כבר קיים: '%s'\n"
 "\n"
 
-#: ../src/file.c:2064
+#: ../src/file.c:2232
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
@@ -3108,49 +3124,48 @@
 "כתיבת קבצי וידאו עדיין לא נתמך (%s).\n"
 "\n"
 
-#: ../src/file.c:2116
-#: ../src/file.c:2130
+#: ../src/file.c:2284 ../src/file.c:2298
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "לא מסוגל לשנות תג של קובץ: %s\n"
 
-#: ../src/file.c:2232
+#: ../src/file.c:2400
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "אי אפשר לפתוח את '%s' לקריאה וכתיבה.\n"
 
-#: ../src/file.c:2239
+#: ../src/file.c:2407
 #, 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
+#: ../src/file.c:2424 ../src/file.c:2433 ../src/file.c:2444 ../src/file.c:2454
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "שורה לא תקינה ב '%s' : %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:2315
+#: ../src/file.c:2483
 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. לחץ על 'אישור' להסיר אותן ממספור ההשמעה הלא מקוון, ועל 'ביטול' להשאיר אותן."
+#: ../src/file.c:2484
+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:2333
+#: ../src/file.c:2501
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "תקלה בכתיבה ל-'%s'.\n"
 
-#: ../src/file.c:2390
-#: ../src/tools.c:270
+#: ../src/file.c:2558 ../src/tools.c:270
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
@@ -3159,8 +3174,7 @@
 "נרמול נכשל: סוג קובץ לא נתמך(%s).\n"
 "\n"
 
-#: ../src/file.c:2406
-#: ../src/tools.c:287
+#: ../src/file.c:2574 ../src/tools.c:287
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -3169,61 +3183,91 @@
 "נרמול נכשל: קובץ לא קיים (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:316
+#: ../src/file.c:2631
+#, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr ""
+"מילים לא נמצאו, הקובץ לא זמין (%s).\n"
+"\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save "
+"lyrics to: %s.\n"
+"\n"
+msgstr ""
+"קובץ iPod לא זמין ושמירת ID3 לא מאופשרת באפשרויות, אין אפשרות לשמור מילים "
+"אל: \"%s\".\n"
+"\n"
+
+#: ../src/file.c:2712
+#, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr ""
+"המילים לא נכתבו, שם הקובץ לא זמינים (%s).\n"
+"\n"
+
+#: ../src/file_convert.c:328
 msgid "Summary status of conversion processes"
 msgstr "סיכום עבור תהליך ההמרה"
 
-#: ../src/file_convert.c:564
+#: ../src/file_convert.c:576
 msgid "active"
 msgstr "פעיל"
 
-#: ../src/file_convert.c:569
+#: ../src/file_convert.c:581
 msgid "inactive"
 msgstr "לא פעיל"
 
-#: ../src/file_convert.c:580
+#: ../src/file_convert.c:592
 #, c-format
 msgid "Active threads: %d. Scheduled tracks: %d."
 msgstr "תהליכים פעילים: %d. רצועות מתוזמנות: %d."
 
-#: ../src/file_convert.c:1071
+#: ../src/file_convert.c:1090
 #, c-format
 msgid "Original filename not available for '%s.'\n"
 msgstr "קובץ מקורי לא זמין עבור '%s'.\n"
 
-#: ../src/file_convert.c:1086
+#: ../src/file_convert.c:1105
 #, c-format
 msgid "Filename '%s' is no longer valid for '%s'.\n"
 msgstr "הקובץ '%s' כבר לא זמין עבור '%s'.\n"
 
-#: ../src/file_convert.c:1137
+#: ../src/file_convert.c:1156
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
-#: ../src/file_convert.c:1143
+#: ../src/file_convert.c:1162
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/file_convert.c:1198
+#: ../src/file_convert.c:1217
 #, 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"
+"קבצים מסוג '%s' לא נתמכים על ידי ה־iPod. אנא גש אל ההגדרות והגדר תסריט המרה "
+"מתאים עבור '%s'.\n"
 "\n"
 
-#: ../src/file_convert.c:1284
+#: ../src/file_convert.c:1303
 msgid "No information available"
 msgstr "לא קיים מידע"
 
-#: ../src/file_convert.c:1323
+#: ../src/file_convert.c:1342
 #, 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
+#: ../src/file_convert.c:1667 ../src/file_convert.c:3119
 #, c-format
 msgid ""
 "Transfer of '%s' failed. %s\n"
@@ -3232,8 +3276,7 @@
 "ההעברה של '%s' נכשלה. %s\n"
 "\n"
 
-#: ../src/file_convert.c:2047
-#: ../src/file_convert.c:2325
+#: ../src/file_convert.c:2073 ../src/file_convert.c:2352
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s'.\n"
@@ -3242,7 +3285,7 @@
 "ההמרה של '%s' נכשלה: '%s'\n"
 "\n"
 
-#: ../src/file_convert.c:2062
+#: ../src/file_convert.c:2088
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
@@ -3251,16 +3294,17 @@
 "ההמרה של '%s' נכשלה: '%s %s' החזיר ערך יציאה %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2091
+#: ../src/file_convert.c:2117
 #, 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:2167
+#: ../src/file_convert.c:2193
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
@@ -3269,7 +3313,7 @@
 "ההמרה של '%s' נכשלה: לא ניתן לגשת אל הקובץ המקורי '%s (%s)'.\n"
 "\n"
 
-#: ../src/file_convert.c:2222
+#: ../src/file_convert.c:2248
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not create directory '%s'.\n"
@@ -3278,7 +3322,7 @@
 "ההמרה של '%s' נכשלה: לא ניתן ליצור תיקייה '%s'.\n"
 "\n"
 
-#: ../src/file_convert.c:2356
+#: ../src/file_convert.c:2383
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s' returned exit status %d.\n"
@@ -3287,7 +3331,7 @@
 "ההמרה של '%s' נכשלה: '%s' החזיר ערך יציאה %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2395
+#: ../src/file_convert.c:2422
 #, c-format
 msgid ""
 "Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -3322,13 +3366,11 @@
 msgstr "אי אפשר למצוא את הקובץ '%s' על ה-iPod\n"
 
 #. create the dialog window
-#: ../src/file_export.c:395
-#: ../src/tools.c:360
+#: ../src/file_export.c:395 ../src/tools.c:360
 msgid "Information"
 msgstr "מידע"
 
-#: ../src/file_export.c:406
-#: ../src/tools.c:372
+#: ../src/file_export.c:406 ../src/tools.c:372
 msgid "Press button to abort."
 msgstr "לביטול לחץ על הכפתור."
 
@@ -3348,8 +3390,7 @@
 msgstr[0] "הועתק %d מתוך %d רצועה."
 msgstr[1] "הועתקו %d מתוך %d רצועות."
 
-#: ../src/file_export.c:505
-#: ../src/tools.c:518
+#: ../src/file_export.c:505 ../src/tools.c:518
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr "%d%% (%d:%02d:%02d נותרו)"
@@ -3376,10 +3417,12 @@
 
 #: ../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
@@ -3407,37 +3450,40 @@
 "אי אפשר לפתוח את '%s' לכתיבה (%s).\n"
 "\n"
 
-#: ../src/file_itunesdb.c:129
+#: ../src/file_itunesdb.c:133
 #, c-format
 msgid "Matching SHA1 checksum for file %d/%d"
 msgstr "מתאים בדיקות סכומים SHA1 עבור קובץ %d/%d"
 
-#: ../src/file_itunesdb.c:236
+#: ../src/file_itunesdb.c:249
 #, c-format
 msgid "Could not open \"%s\" for reading extended info.\n"
 msgstr "אי אפשר לפתוח \"%s\" לקריאת מידע מורחב.\n"
 
-#: ../src/file_itunesdb.c:243
+#: ../src/file_itunesdb.c:256
 msgid "Could not create hash value from itunesdb\n"
 msgstr "אי אפשר ליצור ערך ערבוב עבור itunesdb\n"
 
-#: ../src/file_itunesdb.c:259
+#: ../src/file_itunesdb.c:272
 #, c-format
 msgid "Error while reading extended info: %s\n"
 msgstr "תקלה בזמן קריאת מידע מורחב: %s\n"
 
-#: ../src/file_itunesdb.c:276
+#: ../src/file_itunesdb.c:289
 #, 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 ינסה להתאים את המידע תוך שימוש בחישובי סכומים של SHA1. זה עלול לקחת זה רב.\n"
+"סכום הביקורת (checksum) של iTunesDB '%s' לא תואם את הסכום בקובץ המידע המורחב "
+"'%s'\n"
+"היישום gtkpod ינסה להתאים את המידע תוך שימוש בחישובי סכומים של SHA1. זה עלול "
+"לקחת זה רב.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:288
+#: ../src/file_itunesdb.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -3446,7 +3492,7 @@
 "%s:\n"
 "מצפים ל \"itunesdb_hash=\" אבל קיבלנו:\"%s\"\n"
 
-#: ../src/file_itunesdb.c:348
+#: ../src/file_itunesdb.c:363
 #, c-format
 msgid ""
 "%s:\n"
@@ -3455,17 +3501,19 @@
 "%s:\n"
 "תקלת פורמט: %s\n"
 
-#: ../src/file_itunesdb.c:393
+#: ../src/file_itunesdb.c:408
 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 ""
 "אי אפשר להסיר את הקובץ: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:457
+#: ../src/file_itunesdb.c:474
 msgid ""
 "Extended info will not be used. If you have non-transferred tracks,\n"
 "these will be lost.\n"
@@ -3473,15 +3521,15 @@
 "מידע מורחב לא יהיה בשימוש. אם יש לך רצועות שלא הועברו,\n"
 "הן ילכו לאיבוד.\n"
 
-#: ../src/file_itunesdb.c:465
+#: ../src/file_itunesdb.c:482
 msgid "Offline iPod database successfully imported"
 msgstr "מסד נתונים לא מקוון של iPod יובא בהצלחה."
 
-#: ../src/file_itunesdb.c:468
+#: ../src/file_itunesdb.c:485
 msgid "Local database successfully imported"
 msgstr "מסד נתונים מקומי יובא בהצלחה"
 
-#: ../src/file_itunesdb.c:476
+#: ../src/file_itunesdb.c:493
 #, c-format
 msgid ""
 "Offline iPod database import failed: '%s'\n"
@@ -3490,7 +3538,7 @@
 "כישלון ביבוא מסד נתונים לא מקוון של iPod: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:480
+#: ../src/file_itunesdb.c:497
 #, c-format
 msgid ""
 "Local database import failed: '%s'\n"
@@ -3499,7 +3547,7 @@
 "כישלון ביבוא מסד נתונים מקומי: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:487
+#: ../src/file_itunesdb.c:504
 msgid ""
 "Offline iPod database import failed: \n"
 "\n"
@@ -3507,7 +3555,7 @@
 "כישלון ביבוא מסד נתונים לא מקוון של iPod: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:490
+#: ../src/file_itunesdb.c:507
 msgid ""
 "Local database import failed: \n"
 "\n"
@@ -3515,7 +3563,7 @@
 "כישלון ביבוא מסד נתונים מקומי: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:497
+#: ../src/file_itunesdb.c:514
 #, c-format
 msgid ""
 "'%s' does not exist. Import aborted.\n"
@@ -3524,15 +3572,15 @@
 "יבוא בוטל. לא קיים '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:520
+#: ../src/file_itunesdb.c:536
 msgid "Extended info will not be used.\n"
 msgstr "מידע מורחב לא יהיה בשימוש.\n"
 
-#: ../src/file_itunesdb.c:527
+#: ../src/file_itunesdb.c:543
 msgid "iPod Database Successfully Imported"
 msgstr "מסד נתונים של iPod יובא בהצלחה."
 
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:550
 #, c-format
 msgid ""
 "iPod Database Import Failed: '%s'\n"
@@ -3541,7 +3589,7 @@
 "כישלון ביבוא מסד נתונים של iPod: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:540
+#: ../src/file_itunesdb.c:556
 msgid ""
 "iPod Database Import Failed.\n"
 "\n"
@@ -3549,7 +3597,7 @@
 "כישלון ביבוא מסד נתונים של iPod: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:549
+#: ../src/file_itunesdb.c:565
 #, c-format
 msgid ""
 "'%s' (or similar) does not exist. Import aborted.\n"
@@ -3558,43 +3606,55 @@
 "ה־'%s' לא קיים. היבוא בוטל.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:865
+#: ../src/file_itunesdb.c:886
 #, 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"
+"If you are sure that the iPod is properly mounted at '%s', it may not be "
+"initialized for use. In this case, gtkpod can initialize it for you.\n"
+"\n"
+"Do you want to create the directory structure now?"
 msgstr ""
 "אי אפשר היה למצוא מבנה תיקיות של iPod ב־'%s'.\n"
-"אם אתה בטוח שה־iPod שלך מעוגן בצורה תקינה ב־'%s', היישום gtkpod יכול ליצור עבורך את מבנה התיקיות.\n"
 "\n"
-"האם אתה רוצה ליצור את מבנה התיקיות עכשיו?\n"
+"אם אתה בטוח שה־iPod שלך מעוגן בצורה תקינה ב־'%s', יכול להיות שהוא לא מאותחל "
+"לשימוש. במקרה זה, היישום gtkpod יכול לאתחל אותו עבורך.\n"
+"\n"
+"האם אתה רוצה ליצור את מבנה התיקיות עכשיו?"
 
-#: ../src/file_itunesdb.c:1180
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr "לא נמצא מבנה תיקיות של iPod"
+
+#: ../src/file_itunesdb.c:892
+msgid "Create directory structure"
+msgstr "צור מבנה תיקיה"
+
+#: ../src/file_itunesdb.c:1198
 #, c-format
 msgid "Could not open \"%s\" for writing extended info.\n"
 msgstr "אי אפשר לפתוח \"%s\" לכתיבת מידע מורחב.\n"
 
-#: ../src/file_itunesdb.c:1195
+#: ../src/file_itunesdb.c:1213
 msgid "Aborted writing of extended info.\n"
 msgstr "כתיבת מידע מורחב בוטלה.\n"
 
-#: ../src/file_itunesdb.c:1397
+#: ../src/file_itunesdb.c:1415
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/file_itunesdb.c:1411
+#: ../src/file_itunesdb.c:1429
 #, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
 msgstr "%d%% (%d/%d  %d:%02d:%02d נותרו)"
 
-#: ../src/file_itunesdb.c:1463
+#: ../src/file_itunesdb.c:1481
 msgid "Status: Deleting File"
 msgstr "מצב: מוחק קובץ"
 
-#: ../src/file_itunesdb.c:1524
+#: ../src/file_itunesdb.c:1542
 #, c-format
 msgid ""
 "Could not remove the following file: '%s'\n"
@@ -3603,7 +3663,7 @@
 "אי אפשר להסיר את הקובץ: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1632
+#: ../src/file_itunesdb.c:1651
 msgid ""
 "The following track could not be converted successfully:\n"
 "\n"
@@ -3617,7 +3677,7 @@
 "לא היה ניתן להמיר את הרצועות הבאות בהצלחה:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1642
+#: ../src/file_itunesdb.c:1661
 msgid ""
 "The following track could not be transferred successfully:\n"
 "\n"
@@ -3635,136 +3695,146 @@
 #. modal,
 #. gint id,
 #. gboolean modal,
-#: ../src/file_itunesdb.c:1651
-#: ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1670 ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
 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."
+#: ../src/file_itunesdb.c:1671
+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:1715
+#: ../src/file_itunesdb.c:1734
 #, c-format
 msgid "Status: Copying track"
 msgstr "מצב: מעתיק רצועה"
 
-#: ../src/file_itunesdb.c:1721
+#: ../src/file_itunesdb.c:1740
 #, c-format
 msgid "Status: Waiting for conversion to complete"
 msgstr "מצב: ממתין לסיום ההמרה"
 
-#: ../src/file_itunesdb.c:1725
+#: ../src/file_itunesdb.c:1744
 #, c-format
 msgid "Status: Finished transfer"
 msgstr "מצב: העברה הסתיימה"
 
-#: ../src/file_itunesdb.c:1770
+#: ../src/file_itunesdb.c:1789
 #, 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] "אי אפשר להעביר רצועה אחת בעקבות זה שה־iPod שלך מלא. מחק מספר רצועות או לחילופין פנה מקום על ה־iPod לפני שתנתק את ה־iPod שוב."
-msgstr[1] "אי אפשר להעביר %d רצועות בעקבות זה שה־iPod שלך מלא. מחק מספר רצועות או לחילופין פנה מקום על ה־iPod לפני שתנתק את ה־iPod שוב."
+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:1852
+#: ../src/file_itunesdb.c:1871
 #, 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"
+"If you skip storing, 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:1887
-msgid "iPod directory structure must be present before synching to the iPod can be performed.\n"
+#: ../src/file_itunesdb.c:1875 ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr "מסד הנתונים של ה-iTunes לא יובא"
+
+#: ../src/file_itunesdb.c:1877 ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr "המשך בכל מקרה"
+
+#: ../src/file_itunesdb.c:1878
+msgid "Skip storing"
+msgstr "דילוג על השמירה"
+
+#: ../src/file_itunesdb.c:1909
+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
+#: ../src/file_itunesdb.c:1918
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr "מספר רצועות לא יכלו להימחק מה-iPod. יצוא בוטל!"
 
-#: ../src/file_itunesdb.c:1914
+#: ../src/file_itunesdb.c:1936
 #, c-format
 msgid "Now writing database '%s'. Please wait..."
 msgstr "כותב כעת מסד נתונים '%s'. אנא המתן..."
 
-#: ../src/file_itunesdb.c:1963
+#: ../src/file_itunesdb.c:1985
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "קובץ מידע מורחב לא נמחק: '%s'"
 
-#: ../src/file_itunesdb.c:2070
+#: ../src/file_itunesdb.c:2092
 #, c-format
 msgid "%s: Database saved"
 msgstr "מסד נתונים של iPod נשמר :%s"
 
-#: ../src/file_itunesdb.c:2074
+#: ../src/file_itunesdb.c:2096
 #, c-format
 msgid "%s: Changes saved"
 msgstr "%s: שינויים נשמרו"
 
-#: ../src/fileselection.c:129
+#: ../src/fileselection.c:142 ../src/fileselection.c:583
 msgid "Successfully added files"
 msgstr "קבצים הוספו בהצלחה"
 
-#: ../src/fileselection.c:131
+#: ../src/fileselection.c:144 ../src/fileselection.c:585
 msgid "Some files were not added successfully"
 msgstr "מספר קבצים לא הוספו בהצלחה"
 
-#: ../src/fileselection.c:164
-#: ../src/fileselection.c:305
-#: ../src/fileselection.c:792
+#: ../src/fileselection.c:176 ../src/fileselection.c:276
+#: ../src/fileselection.c:601
 msgid "Please select a playlist or repository before adding tracks."
 msgstr "אנא בחר רשימת השמעה או מאגר לפני הוספת רצועות."
 
-#: ../src/fileselection.c:175
-#: ../src/fileselection.c:314
-#: ../src/fileselection.c:803
+#: ../src/fileselection.c:187 ../src/fileselection.c:285
 msgid "Please load the iPod before adding tracks."
 msgstr "אנא טען את ה־iPod לפני הוספת רצועות."
 
-#: ../src/fileselection.c:185
+#: ../src/fileselection.c:197
 #, c-format
 msgid "Add files to '%s'"
 msgstr "הוספת קבצים אל '%s'"
 
-#: ../src/fileselection.c:189
+#: ../src/fileselection.c:201
 #, c-format
 msgid "Add files to '%s/%s'"
 msgstr "הוסף קבצים אל '%s/%s'"
 
 #. Create window title
-#: ../src/fileselection.c:322
+#: ../src/fileselection.c:293
 #, c-format
 msgid "Add playlist files to '%s'"
 msgstr "הוספת קבצי רשימות ניגון אל '%s'"
 
 #. Create the file chooser, and handle the response
-#: ../src/fileselection.c:378
+#: ../src/fileselection.c:319
 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 "אישור"
-
-#: ../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"
@@ -3775,15 +3845,23 @@
 msgid "Error retrieving tags for '%s'.\n"
 msgstr "תקלה באחזור התגיות עבור '%s'.\n"
 
-#: ../src/flacfile.c:165
+#: ../src/flacfile.c:193
 #, 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"
+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
+#: ../src/flacfile.c:199
 #, 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"
+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
@@ -3800,8 +3878,7 @@
 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"
@@ -3830,8 +3907,7 @@
 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"
@@ -3846,97 +3922,8 @@
 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
+#: ../src/help.c:48
 msgid ""
-"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"
-
-#: ../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"
@@ -3945,138 +3932,178 @@
 "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 "טלאים סופקו על ידי האנשים הבאים (הרשימה עלולה להיות לא מושלמת -- אנא צרו איתי קשר)\n"
+#: ../src/help.c:52
+msgid ""
+"Patches were supplied by the following people (list may be incomplete -- "
+"please contact me)\n"
+msgstr ""
+"טלאים סופקו על ידי האנשים הבאים (הרשימה עלולה להיות לא מושלמת -- אנא צרו "
+"איתי קשר)\n"
 
-#: ../src/misc.c:75
+#: ../src/help.c:53
 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
+#: ../src/help.c:54
 msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
 msgstr "Hiroshi Kawashima: Japanese charset autodetection feature"
 
-#: ../src/misc.c:77
+#: ../src/help.c:55
 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/help.c:56
+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
+#: ../src/help.c:57
 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
+#: ../src/help.c:58
 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/help.c:59
+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/help.c:60
+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
+#: ../src/help.c:61
 msgid "Jens Lautenbach: some optical improvements"
 msgstr "Jens Lautenbach: some optical improvements"
 
-#: ../src/misc.c:84
+#: ../src/help.c:62
 msgid "Alex Tribble: iPod eject patch"
 msgstr "Alex Tribble: iPod eject patch"
 
-#: ../src/misc.c:85
+#: ../src/help.c:63
 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/help.c:64
+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/help.c:65
+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
+#: ../src/help.c:66
 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
+#: ../src/help.c:67
 msgid "Armando Atienza: Support with external playcounts"
 msgstr "Armando Atienza: Support with external playcounts"
 
-#: ../src/misc.c:90
+#: ../src/help.c:68
 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
+#: ../src/help.c:69
 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"
+#: ../src/help.c:70
+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
+#: ../src/help.c:71
 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/help.c:72
+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
+#: ../src/help.c:73
 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/help.c:75
+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
+#: ../src/help.c:77
 msgid ""
 "James Liggett:\n"
-"replacement of old GTK file selection dialogs with new GTK filechooser dialogs\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"
+"replacement of old GTK file selection dialogs with new GTK filechooser "
+"dialogs\n"
 "refactored user preferences system."
 
-#: ../src/misc.c:103
+#: ../src/help.c:81
 msgid "Daniel Kercher: sync scripts for abook and webcalendar"
 msgstr "Daniel Kercher: sync scripts for abook and webcalendar"
 
-#: ../src/misc.c:105
+#: ../src/help.c:83
 msgid "Clinton Gormley: sync scripts for thunderbird"
 msgstr "Clinton Gormley: sync scripts for thunderbird"
 
-#: ../src/misc.c:107
+#: ../src/help.c:85
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
 msgstr "Sebastien Beridot: sync script for ldif addressbook format"
 
-#: ../src/misc.c:109
+#: ../src/help.c:87
 msgid "Sebastian Scherer: sync script for kNotes"
 msgstr "Sebastian Scherer: sync script for kNotes"
 
-#: ../src/misc.c:111
+#: ../src/help.c:89
 msgid "Nick Piper: sync script for Palm, type-ahead search"
 msgstr "Nick Piper: sync script for Palm, type-ahead search"
 
-#: ../src/misc.c:113
+#: ../src/help.c:91
 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/help.c:93
+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
+#: ../src/help.c:94
 msgid ""
 "Nicolas Chariot: icons of buttons\n"
 "\n"
@@ -4084,79 +4111,89 @@
 "Nicolas Chariot: icons of buttons\n"
 "\n"
 
-#: ../src/misc.c:118
+#: ../src/help.c:96
 msgid "This program borrows code from the following projects:"
 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/help.c:97
+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/help.c:98
+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
+#: ../src/help.c:99
 msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
 msgstr "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
 
-#: ../src/misc.c:122
+#: ../src/help.c:100
 msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
 msgstr "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
 
-#: ../src/misc.c:124
+#: ../src/help.c:102
 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:128
+#: ../src/help.c:106
 msgid "French: David Le Brun (david at dyn-ns dot net)"
 msgstr "צרפתית: David Le Brun (david at dyn-ns dot net)"
 
-#: ../src/misc.c:129
+#: ../src/help.c:107
 msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
 msgstr "צרפתית: Éric Lassauge (rpmfarm at free dot fr)"
 
-#: ../src/misc.c:130
+#: ../src/help.c:108
 msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
 msgstr "גרמנית: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
 
-#: ../src/misc.c:131
+#: ../src/help.c:109
 msgid "German: Kai-Ove"
 msgstr "גרמנית: Kai-Ove"
 
-#: ../src/misc.c:132
+#: ../src/help.c:110
 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/help.c:111
+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
+#: ../src/help.c:112
 msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
 msgstr "איטלקית: Daniele Forsi (dforsi at gmail dot com)"
 
-#: ../src/misc.c:135
+#: ../src/help.c:113
 msgid "Japanese: Ayako Sano"
 msgstr "יפנית: Ayako Sano"
 
-#: ../src/misc.c:136
+#: ../src/help.c:114
 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
+#: ../src/help.c:115
 msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
 msgstr "רומנית: Alex Eftimie (alexeftimie at gmail dot com)"
 
-#: ../src/misc.c:138
+#: ../src/help.c:116
 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
+#: ../src/help.c:117
 msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
 msgstr "שוודית: Stefan Asserhall (stefan.asserhall at comhem dot se)"
 
-#: ../src/misc.c:144
+#: ../src/help.c:122
 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"
@@ -4174,7 +4211,7 @@
 "02111-1307, USA."
 msgstr ""
 
-#: ../src/misc.c:159
+#: ../src/help.c:137
 msgid ""
 "© 2002-2007\n"
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
@@ -4184,31 +4221,191 @@
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
 "Corey Donohoe <atmos at atmos.org>"
 
-#: ../src/misc.c:167
+#: ../src/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr "(שימוש ב-libgpod %s)"
+
+#: ../src/help.c:143 ../src/help.c:148
 msgid "Cross-platform multilingual interface to Apple's iPod™"
 msgstr "ממשק חוצה-פלטפורמות רב-שפות עבור iPod™ של אפל."
 
-#: ../src/misc.c:934
+#: ../src/info.c:359 ../src/infodlg.c:190
+msgid "n/c"
+msgstr "n/c"
+
+#: ../src/info.c:364 ../src/info.c:852 ../src/infodlg.c:193
+msgid "offline"
+msgstr "לא מקוון"
+
+#: ../src/info.c:500
 #, c-format
+msgid " P:%d T:%d/%d"
+msgstr " P:%d T:%d/%d"
+
+#: ../src/info.c:794
+msgid "B"
+msgstr "בתים"
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr "ק\"ב"
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr "ט\"ב"
+
+#: ../src/info.c:837
+#, c-format
+msgid " %s Free"
+msgstr " %s זמין"
+
+#: ../src/info.c:842
+#, c-format
+msgid " %s Pending"
+msgstr " %s ממתין"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr " מנותק"
+
+#: ../src/info.c:898
+msgid "No database or playlist selected"
+msgstr "לא נבחרו מסד נתונים את רשימת השמעה"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "לא נבחרו רצועות"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "לא נבחרה רשימת השמעה"
+
+#: ../src/info.c:913
+msgid "No iPod or iPod playlist selected"
+msgstr "לא נבחר iPod או לא נבחרה רשימת השמעה של iPod"
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"סך הכל\n"
+"(iPod)"
+
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"סך הכל\n"
+"(מקומי)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"רשימות השמעה\n"
+"נבחרות"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"רצועות\n"
+"מוצגות"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"רצועות\n"
+"נבחרות"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "מספר רצועות"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "גודל קובץ"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "מספר רשימות ההשמעה"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "רצועות נמחקות"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "גודל קובץ (נמחק)"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "רצועות לא מועברות"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "גודל קובץ (לא-מועבר)"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "מקום פנוי אפקטיבי"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "בחר או הכנס את הדגם שלך"
+
+#: ../src/ipod_init.c:81 ../src/repository.c:560 ../src/repository.c:2374
+msgid "Select mountpoint"
+msgstr "בחר נקודת עגינה"
+
+#: ../src/ipod_init.c:362
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "תקלה באתחול ה־iPod: %s\n"
+
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr "תקלה באתחול ה־iPod, תקלה בלתי ידועה\n"
+
+#: ../src/ipod_init.c:425
+#, 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:466
+msgid ""
+"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"
+
+#: ../src/misc.c:864
+#, c-format
 msgid "Could not process '%s' (no filename available)"
 msgstr "אי אפשר לעבד את '%s' (קובץ לא זמין)"
 
-#: ../src/misc.c:1088
+#: ../src/misc.c:1101
 #, c-format
-msgid "Unknown token '%%%c' in template '%s'"
-msgstr "אסימון לא ידוע '%%%c' בתבנית '%s'"
-
-#: ../src/misc.c:1171
-#, c-format
 msgid "Template ('%s') does not match file type '%s'\n"
 msgstr "התבנית ('%s') לא מתאימה לסוג הקובץ '%s'\n"
 
-#: ../src/misc.c:1257
+#: ../src/misc.c:1187
 #, c-format
 msgid "Error creating %s: %s\n"
 msgstr "תקלה ביצירת %s: %s\n"
 
-#: ../src/misc.c:1691
+#: ../src/misc.c:1642
 #, c-format
 msgid ""
 "Writing preferences file '%s' failed (%s).\n"
@@ -4217,14 +4414,15 @@
 "כתיבת קובץ הגדרות '%s' נכשלה (%s).\n"
 "\n"
 
-#: ../src/misc.c:1693
+#: ../src/misc.c:1644
 msgid "unspecified error"
 msgstr "תקלה לא מוגדרת"
 
-#: ../src/misc.c:1701
+#: ../src/misc.c:1652
 #, 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"
@@ -4235,102 +4433,131 @@
 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? מספר רשימות ההשמעה שהרצועות האלו חברות בהן מצוינות בסוגריים."
+#: ../src/misc_confirm.c:156
+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
+#: ../src/misc_confirm.c:160
 msgid "Delete Track Completely from iPod?"
 msgid_plural "Delete Tracks Completely from iPod?"
 msgstr[0] "מחק את הרצועה לגמרי מה-iPod?"
 msgstr[1] "מחק את הרצועות לגמרי מה-iPod?"
 
-#: ../src/misc_confirm.c:137
-#: ../src/misc_confirm.c:178
+#: ../src/misc_confirm.c:171 ../src/misc_confirm.c:212
 #, 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:175 ../src/misc_confirm.c:216
 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] "האם אתה בטוח שברצונך למחוק את הרצועות הבאות לגמרי מהדיסק הקשיח? מספר רשימות ההשמעה שהרצועות האלו חברות בהן מצוינות בסוגריים."
+#: ../src/misc_confirm.c:197
+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
+#: ../src/misc_confirm.c:201
 msgid "Delete Track from Harddisk?"
 msgid_plural "Delete Tracks from Harddisk?"
 msgstr[0] "מחק את הרצועה מהדיסק הקשיח?"
 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] "האם אתה בטוח שברצונך למחוק את הרצועות הבאות לגמרי ממסד הנתונים המקומי? מספר רשימות ההשמעה שהרצועות האלו חברות בהן מצוינות בסוגריים."
+#: ../src/misc_confirm.c:226
+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
+#: ../src/misc_confirm.c:230
 msgid "Remove Track from Local Database?"
 msgid_plural "Remove Tracks from Local Database?"
 msgstr[0] "הסר את הרצועה ממסד הנתונים המקומי?"
 msgstr[1] "הסר את הרצועות ממסד הנתונים המקומי?"
 
-#: ../src/misc_confirm.c:261
+#: ../src/misc_confirm.c:295
 #, c-format
 msgid "Deleted one track completely from iPod"
 msgid_plural "Deleted %d tracks completely from iPod"
 msgstr[0] "הרצועה נמחקה לגמרי מה-iPod"
 msgstr[1] "הרצועות %d נמחקו לגמרי מה-iPod"
 
-#: ../src/misc_confirm.c:267
-#: ../src/misc_confirm.c:291
+#: ../src/misc_confirm.c:301 ../src/misc_confirm.c:325
 #, c-format
 msgid "Deleted %d track from playlist '%s'"
 msgid_plural "Deleted %d tracks from playlist '%s'"
 msgstr[0] "נמחקה %d רצועה מרשימת ההשמעה '%s'"
 msgstr[1] "נמחקו %d רצועות מרשימת ההשמעה '%s'"
 
-#: ../src/misc_confirm.c:285
+#: ../src/misc_confirm.c:319
 #, c-format
 msgid "Deleted one track from harddisk"
 msgid_plural "Deleted %d tracks from harddisk"
 msgstr[0] "נמחקה רצועה אחת מהדיסק הקשיח"
 msgstr[1] "נמחקו %d רצועות מהדיסק הקשיח"
 
-#: ../src/misc_confirm.c:297
+#: ../src/misc_confirm.c:331
 #, c-format
 msgid "Deleted track from local database"
 msgid_plural "Deleted %d tracks from local database"
 msgstr[0] "נמחקה רצועה ממסד הנתונים המקומי"
 msgstr[1] "נמחקו %d רצועות ממסד הנתונים המקומי"
 
-#: ../src/misc_confirm.c:442
+#: ../src/misc_confirm.c:476
 msgid "Cannot remove entry 'All'"
 msgstr "לא מסוגל להסיר רשומה 'הכל'"
 
-#: ../src/misc_confirm.c:536
+#: ../src/misc_confirm.c:570
 #, c-format
 msgid "Removed all %d tracks from the iPod"
 msgstr "הוסרו כל %d הרצועות מה-iPod"
 
-#: ../src/misc_confirm.c:541
+#: ../src/misc_confirm.c:575
 #, 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:584 ../src/misc_confirm.c:658
 #, c-format
 msgid "Deleted playlist '%s' including %d member track"
 msgid_plural "Deleted playlist '%s' including %d member tracks"
@@ -4338,74 +4565,113 @@
 msgstr[1] "נמחקה רשימת השמעה '%s' כולל %d רצועות"
 
 #. first use playlist name
-#: ../src/misc_confirm.c:566
-#: ../src/misc_confirm.c:640
+#: ../src/misc_confirm.c:600 ../src/misc_confirm.c:674
 #, c-format
 msgid "Deleted playlist '%s'"
 msgstr "נמחקה רשומה '%s'"
 
-#: ../src/misc_confirm.c:600
+#: ../src/misc_confirm.c:634
 #, 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[1] "נמחקה רשימת השמעה '%s' כולל %d רצועות מהדיסק הקשיח"
 
-#: ../src/misc_confirm.c:617
+#: ../src/misc_confirm.c:651
 #, c-format
 msgid "Removed all %d tracks from the database"
 msgstr "הסר את כל %d הרצועות ממסד הנתונים"
 
-#: ../src/misc_confirm.c:695
+#: ../src/misc_confirm.c:729
 #, c-format
 msgid "Are you sure you want to remove all tracks from your iPod?"
 msgstr "האם אתה בטוח שאתה רוצה להסיר את כל הרצועות מה-iPod?"
 
-#: ../src/misc_confirm.c:700
+#: ../src/misc_confirm.c:734
 #, c-format
 msgid "Are you sure you want to remove all podcasts from your iPod?"
 msgstr "האם אתה בטוח שאתה רוצה להסיר את כל הפודקסטים מה-iPod שלך?"
 
-#: ../src/misc_confirm.c:708
+#: ../src/misc_confirm.c:742
 #, 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:753 ../src/misc_confirm.c:808
 #, c-format
 msgid "Are you sure you want to delete the playlist '%s'?"
 msgstr "האם אתה בטח שאתה רוצה למחוק את רשימת ההשמעה '%s'?"
 
-#: ../src/misc_confirm.c:745
+#: ../src/misc_confirm.c:779
 #, 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
+#: ../src/misc_confirm.c:787
 #, c-format
 msgid "Are you sure you want to remove all tracks from the database?"
 msgstr "האם אתה בטוח שאתה רוצה להסיר את כל הרצועות ממסד הנתונים?"
 
-#: ../src/misc_confirm.c:762
+#: ../src/misc_confirm.c:796
 #, 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
+#: ../src/misc_confirm.c:869
 msgid ""
-"Data has been changed and not been saved.\n"
-"OK to exit gtkpod?"
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
+"changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
 msgstr ""
-"המידע שונה ולא נשמר.\n"
-"האם לצאת מ-gtkpod?"
+"המידע השתנה ולא נשמר. אם תצא מ gtkpod, כל השינויים שלא נשמרו יאבדו.\n"
+"\n"
+"האם תרצה לשמור את השינויים קודם?"
 
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr "שמירת שינויים לפני היציאה?"
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr "יציאה ללא שמירה"
+
 #: ../src/misc_conversion.c:66
 msgid "File type"
 msgstr "סוג קובץ"
@@ -4562,144 +4828,152 @@
 msgid "Gapless Track Flag"
 msgstr "דגל רצועה ללא מרווח"
 
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
+msgstr "מילים"
+
+#: ../src/misc_conversion.c:127
 msgid "Name of file on PC, if available"
 msgstr "שם הקובץ על ה-PC, אם קיים"
 
-#: ../src/misc_conversion.c:127
+#: ../src/misc_conversion.c:128
 msgid "Name of file on the iPod"
 msgstr "שם הקובץ על ה-iPod"
 
 #. 10
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
 msgid "Track Nr. and total number of tracks on CD"
 msgstr "מספר רצועה וסך כל מספר הרצועות על דיסק השמע"
 
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:131
 msgid "Whether the file has already been transferred to the iPod or not"
 msgstr "האם הקובץ הועבר כבר אל ה-iPod או לא"
 
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:137
 msgid "Beats per minute"
 msgstr "דפקים לדקה"
 
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
 msgid "Number of times the track has been played"
 msgstr "מספר הפעמים שהרצועה הושמעה"
 
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
 msgid "Star rating from 0 to 5"
 msgstr "דירוג כוכבים החל מ 0 עד 5"
 
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
 msgid "Date and time track has been added"
 msgstr "תאריך ושעה שהרצועה הוספה"
 
 #. 20
-#: ../src/misc_conversion.c:140
+#: ../src/misc_conversion.c:141
 msgid "Date and time track has last been played"
 msgstr "תאריך ושעה שהרצועה הושמעה לאחרונה"
 
-#: ../src/misc_conversion.c:141
+#: ../src/misc_conversion.c:142
 msgid "Date and time track has last been modified"
 msgstr "תאריך ושעה שהרצועה שונתה לאחרונה"
 
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:143
 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 "תיקון עוצמת קול בדציבלים (הגבר השמעה) -- צריך להפעיל 'soundcheck' על ה-iPod"
+#: ../src/misc_conversion.c:144
+msgid ""
+"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
+"the iPod"
+msgstr ""
+"תיקון עוצמת קול בדציבלים (הגבר השמעה) -- צריך להפעיל 'soundcheck' על ה-iPod"
 
 #. 25
-#: ../src/misc_conversion.c:146
+#: ../src/misc_conversion.c:147
 msgid "CD Nr. and total number of CDS in set"
 msgstr "מספר דיסק שמע וסך כל דיסקי השמע בקבוצה"
 
-#: ../src/misc_conversion.c:149
-msgid "The category (e.g. 'Technology' or 'Music') where the podcast was located."
+#: ../src/misc_conversion.c:150
+msgid ""
+"The category (e.g. 'Technology' or 'Music') where the podcast was located."
 msgstr "הקטגוריה (לדוגמה \"טכנולוגיה\" או מוזיקה) שבה הפודקסט מוקם."
 
-#: ../src/misc_conversion.c:150
+#: ../src/misc_conversion.c:151
 msgid "Accessible by selecting the center button on the iPod."
 msgstr "זמין על ידי לחיצה על הכפתור המרכזי של ה־iPod."
 
-#: ../src/misc_conversion.c:154
+#: ../src/misc_conversion.c:155
 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
+#: ../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 ../src/misc_conversion.c:174
 msgid "Used for sorting on the iPod"
 msgstr "משמש למיון ב-iPod"
 
-#: ../src/misc_conversion.c:735
+#: ../src/misc_conversion.c:737
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the file scheme"
 msgstr "הנתיב '%s' הוא נתיב לא מוחלט המשתמש בתבנית הקובץ"
 
-#: ../src/misc_conversion.c:745
+#: ../src/misc_conversion.c:747
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "שם הקובץ המקומי בנתיב '%s' לא יכול לכלול '#'"
 
-#: ../src/misc_conversion.c:762
+#: ../src/misc_conversion.c:764
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "הנתיב '%s' הוא לא חוקי"
 
-#: ../src/misc_conversion.c:774
+#: ../src/misc_conversion.c:776
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "שם השרת של הנתיב '%s' הוא לא חוקי."
 
-#: ../src/misc_conversion.c:790
+#: ../src/misc_conversion.c:792
 #, 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:429
+#: ../src/misc_playlist.c:71 ../src/misc_playlist.c:108
+msgid "Please load the iPod before adding playlists."
+msgstr "אנא טען את ה־iPod לפני הוספת רצועות."
+
+#: ../src/misc_playlist.c:77 ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
 msgid "Please enter a name for the new playlist"
 msgstr "הכנס בבקשה את השם של רשימת ההשמעה החדשה"
 
-#: ../src/misc_playlist.c:154
+#: ../src/misc_playlist.c:174
 msgid "AR:"
 msgstr "ביצוע:"
 
-#: ../src/misc_playlist.c:157
+#: ../src/misc_playlist.c:177
 msgid "AL:"
 msgstr "כותר:"
 
-#: ../src/misc_playlist.c:160
+#: ../src/misc_playlist.c:180
 msgid "GE:"
 msgstr "סוג:"
 
-#: ../src/misc_playlist.c:163
+#: ../src/misc_playlist.c:183
 msgid "CO:"
 msgstr "מחבר:"
 
-#: ../src/misc_playlist.c:166
+#: ../src/misc_playlist.c:186
 msgid "YE:"
 msgstr "שנה:"
 
-#: ../src/misc_playlist.c:194
+#: ../src/misc_playlist.c:214
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../src/misc_playlist.c:272
+#: ../src/misc_playlist.c:292
 #, c-format
 msgid "Random (%d)"
 msgstr "אקראי (%d)"
 
-#: ../src/misc_playlist.c:297
+#: ../src/misc_playlist.c:317
 msgid ""
 "Auto Store of track view disabled.\n"
 "\n"
@@ -4707,11 +4981,11 @@
 "שמירה אוטומטית של תצוגת הרצועות בוטלה.\n"
 "\n"
 
-#: ../src/misc_playlist.c:356
+#: ../src/misc_playlist.c:376
 msgid "Not Listed"
 msgstr "לא רשום"
 
-#: ../src/misc_playlist.c:406
+#: ../src/misc_playlist.c:426
 #, c-format
 msgid "Created playlist '%s' with %d track."
 msgid_plural "Created playlist '%s' with %d tracks."
@@ -4719,89 +4993,98 @@
 msgstr[1] "נוצרה רשימת השמעה '%s' עם %d רצועות."
 
 #. n==0
-#: ../src/misc_playlist.c:417
+#: ../src/misc_playlist.c:437
 msgid "No tracks available, playlist not created"
 msgstr "רצועות לא זמינות, לא נוצרה רשימת השמעה"
 
-#: ../src/misc_playlist.c:543
+#: ../src/misc_playlist.c:563
 #, c-format
 msgid "Most Listened (%d)"
 msgstr "הכי הרבה הושמע (%d)"
 
-#: ../src/misc_playlist.c:584
+#: ../src/misc_playlist.c:604
 #, c-format
 msgid "Never Listened"
 msgstr "לא הושמע אף פעם"
 
-#: ../src/misc_playlist.c:624
+#: ../src/misc_playlist.c:644
 #, c-format
 msgid "Best Rated (%d)"
 msgstr "דורג הכי טוב (%d)"
 
-#: ../src/misc_playlist.c:666
+#: ../src/misc_playlist.c:686
 msgid "Unrated tracks"
 msgstr "רצועות לא דורגו"
 
-#: ../src/misc_playlist.c:671
+#: ../src/misc_playlist.c:691
 #, c-format
 msgid "Rated %d"
 msgstr "דורגו %d"
 
-#: ../src/misc_playlist.c:714
+#: ../src/misc_playlist.c:734
 #, c-format
 msgid "Recent (%d)"
 msgstr "לאחרונה (%d)"
 
-#: ../src/misc_playlist.c:753
+#: ../src/misc_playlist.c:773
 msgid "Last Time"
 msgstr "בפעם האחרונה"
 
-#: ../src/misc_playlist.c:844
+#: ../src/misc_playlist.c:864
 msgid "Removal of dangling tracks with no files on PC was canceled."
 msgstr "הסרה של רצועות מתנדנדות ללא קבצים על ה-PC בוטלה."
 
-#: ../src/misc_playlist.c:854
+#: ../src/misc_playlist.c:874
 msgid "Handling of dangling tracks with files on PC was canceled."
 msgstr "טיפול ברצועות מתנדנדות ללא קבצים על ה-PC בוטל."
 
-#: ../src/misc_playlist.c:882
+#: ../src/misc_playlist.c:902
 msgid "Dangling tracks with no files on PC were removed."
 msgstr "רצועות מתנדנדות ללא קבצים על ה-PC הוסרו."
 
-#: ../src/misc_playlist.c:943
+#: ../src/misc_playlist.c:963
 msgid "Dangling tracks with files on PC were handled."
 msgstr "רצועות מתנדנדות עם קבצים על ה-PC טופלו."
 
-#: ../src/misc_playlist.c:976
+#: ../src/misc_playlist.c:996
 msgid "Track"
 msgstr "רצועה"
 
-#: ../src/misc_playlist.c:1019
+#: ../src/misc_playlist.c:1035
 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"
+"If you abort the operation, 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
+#: ../src/misc_playlist.c:1042
+msgid "Abort operation"
+msgstr "בטל פעולה"
+
+#: ../src/misc_playlist.c:1056
 msgid "Creating a tree of known files"
 msgstr "יוצר עץ של קבצים ידועים"
 
-#: ../src/misc_playlist.c:1077
+#: ../src/misc_playlist.c:1100
 msgid "Checking iPOD files against known files in DB"
 msgstr "בודק קבצים על ה-iPod כנגד קבצים ידועים במסד הנתונים"
 
-#: ../src/misc_playlist.c:1120
+#: ../src/misc_playlist.c:1143
 msgid "Orphaned"
 msgstr "יתום"
 
-#: ../src/misc_playlist.c:1147
+#: ../src/misc_playlist.c:1170
 #, 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 ""
@@ -4809,19 +5092,21 @@
 "%s\n"
 "\n"
 
-#: ../src/misc_playlist.c:1175
+#: ../src/misc_playlist.c:1198
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Processing..."
 msgstr "נמצאו %d קבצים יתומים ו-%d קבצים מתנדנדים. מעבד..."
 
-#: ../src/misc_playlist.c:1199
+#: ../src/misc_playlist.c:1222
 #, 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"
 "לחץ אישור להעביר אותה מהקובץ בסנכרון הבא, וביטול לעזוב את זה כמו שזה."
@@ -4829,7 +5114,7 @@
 "הרצועות המתנדנדות (%d) הבאות הן בעלות קבצים על ה-PC\n"
 "לחץ אישור להעביר אותן מהקבצים בסנכרון הבא, וביטול לעזוב את זה כמו שזה."
 
-#: ../src/misc_playlist.c:1204
+#: ../src/misc_playlist.c:1227
 #, c-format
 msgid ""
 "The following dangling track doesn't have file on PC. \n"
@@ -4846,11 +5131,11 @@
 
 #. we want unique window for each
 #. gboolean modal,
-#: ../src/misc_playlist.c:1211
+#: ../src/misc_playlist.c:1234
 msgid "Dangling Tracks"
 msgstr "רצועות מתנדנדות"
 
-#: ../src/misc_playlist.c:1234
+#: ../src/misc_playlist.c:1257
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Done."
 msgstr "נמצאו %d קבצים יתומים ו-%d קבצים מתנדנדים. בוצע."
@@ -4872,8 +5157,11 @@
 
 #: ../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) הבאות לא הוספו לרשימת ההשמעה הראשית."
 
@@ -4883,89 +5171,101 @@
 msgid "Duplicate detection"
 msgstr "זיהוי כפילויות"
 
-#: ../src/misc_track.c:1339
+#: ../src/misc_track.c:1347
 msgid "Local Database"
 msgstr "מסד נתונים מקומי"
 
 #. artwork is set
-#: ../src/misc_track.c:1350
+#: ../src/misc_track.c:1358
 msgid "Embedded or filename was lost"
 msgstr "מוטבע או ששם הקובץ אבד"
 
-#: ../src/misc_track.c:1354
+#: ../src/misc_track.c:1362
 msgid "Artwork not set"
 msgstr "לא נקבעו תמונות"
 
-#: ../src/misc_track.c:1816
+#: ../src/misc_track.c:1836
 #, c-format
 msgid "Could not find source file for '%s'. Track not copied."
 msgstr "אי אפשר למצוא את הקובץ עבור '%s'. הרצועה לא הועתקה."
 
-#: ../src/misc_track.c:2052
+#: ../src/misc_track.c:2072
 #, c-format
 msgid "drag and drop: ignored '%s'\n"
 msgstr "גרור ושחרר: התעלמות מ '%s'\n"
 
-#: ../src/mp3file.c:1336
+#: ../src/mp3file.c:1344
 #, 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
+#: ../src/mp3file.c:1368 ../src/mp3file.c:1552 ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870 ../src/mp3file.c:2929 ../src/mp3file.c:2956
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "שגיאה בזמן פתיחת קובץ: '%s' (%s).\n"
 
-#: ../src/mp3file.c:1688
+#: ../src/mp3file.c:1793 ../src/mp3file.c:2993
 #, 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
+#: ../src/mp3file.c:2907
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "הקובץ \"%s\" בעל זמן אפס. מתעלם.\n"
 
-#: ../src/mp4file.c:243
-#: ../src/mp4file.c:404
+#: ../src/mp4file.c:243 ../src/mp4file.c:475
 #, 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
+#: ../src/mp4file.c:253 ../src/mp4file.c:485
 #, 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
+#: ../src/mp4file.c:607
 #, c-format
 msgid "'%s' does not appear to be a mp4 audio file.\n"
 msgstr "הקובץ '%s' הוא כנראה לא קובץ שמע mp4.\n"
 
-#: ../src/mp4file.c:540
+#: ../src/mp4file.c:618
 #, 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
+#: ../src/mp4file.c:631
 #, 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:559
+#: ../src/mp4file.c:637
 #, 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:565
+#: ../src/mp4file.c:643
 #, 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:73
 #, c-format
@@ -4974,161 +5274,153 @@
 
 #: ../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"
+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 "עדכון מטא-מידע של ogg עבור '%s' נכשל: הסוג ogg לא נתמך ללא הספריה ogg. אתה חייב להדר את קוד המקור של gtkpod ביחד עם ספריית ogg.\n"
+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:357
+#: ../src/prefs.c:365
 #, c-format
 msgid "gtkpod version %s usage:\n"
 msgstr "גרסה %s של gtkpod, שימוש:\n"
 
-#: ../src/prefs.c:358
+#: ../src/prefs.c:366
 msgid "  -h, --help:   display this message\n"
 msgstr "  -h, --help:   display this message\n"
 
-#: ../src/prefs.c:359
+#: ../src/prefs.c:367
 msgid "  -p <file>:    increment playcount for file by one\n"
 msgstr "  -p <file>:    increment playcount for file by one\n"
 
-#: ../src/prefs.c:360
+#: ../src/prefs.c:368
 msgid "  --hash <file>:print gtkpod hash for file\n"
 msgstr "  --hash <file>:print gtkpod hash for file\n"
 
-#: ../src/prefs.c:361
+#: ../src/prefs.c:369
 msgid "  -m path:      define the mountpoint of your iPod\n"
 msgstr "  -m path:      define the mountpoint of your iPod\n"
 
-#: ../src/prefs.c:362
+#: ../src/prefs.c:370
 msgid "  --mountpoint: same as '-m'.\n"
 msgstr "  --mountpoint: same as '-m'.\n"
 
-#: ../src/prefs.c:363
+#: ../src/prefs.c:371
 msgid "  -a:           import database automatically after start.\n"
 msgstr "  -a:           import database automatically after start.\n"
 
-#: ../src/prefs.c:364
+#: ../src/prefs.c:372
 msgid "  --auto:       same as '-a'.\n"
 msgstr "  --auto:       same as '-a'.\n"
 
-#: ../src/prefs.c:561
+#: ../src/prefs.c:569
 #, c-format
-msgid "Couldn't create ~/.gtkpod\n"
-msgstr "אי אפשר ליצור את  ~/.gtkpod\n"
+msgid "Couldn't create '%s'\n"
+msgstr "אי אפשר ליצור את  \"%s\"\n"
 
-#: ../src/prefs_window.c:133
-msgid "Please select command for 'Play Now'"
-msgstr "בחר בבקשה פקודה ל 'נגן עכשיו'"
+#: ../src/prefsdlg.c:51
+msgid "Hide"
+msgstr "הסתר"
 
-#: ../src/prefs_window.c:134
-msgid "Please select command for 'Enqueue'"
-msgstr "בחר בבקשה פקודה ל 'הכנס לתור'"
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
+msgstr "צלמיות בלבד"
 
-#: ../src/prefs_window.c:135
-msgid "Please select the mp3gain executable"
-msgstr "בחר בבקשה את קובץ ההרצה ל-mp3gain"
+#: ../src/prefsdlg.c:53
+msgid "Text only"
+msgstr "טקסט בלבד"
 
-#: ../src/prefs_window.c:136
-msgid "Please select the aacgain executable"
-msgstr "בחר בבקשה את קובץ ההרצה ל־aacgain"
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
+msgstr "טקסט מתחת לצלמיות"
 
-#: ../src/prefs_window.c:137
-msgid "Select the mserv music root directory"
-msgstr "בחר את תיקיית השורש ל mserv music"
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
+msgstr "טקסט ליד הצלמיות"
 
-#: ../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
+#: ../src/repository.c:527
 #, 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>"
+msgid ""
+"Are you sure you want to delete repository \"%s\"? This action cannot be "
+"undone!"
+msgstr ""
+"האם אתה בטוח שאתה רוצה למחוק את המאגר \"%s\"? אי אפשר לבטל את הפעולה ברגע "
+"שנעשתה!"
 
-#: ../src/prefs_window.c:1205
-#: ../src/prefs_window.c:1223
-msgid "Preferences not updated"
-msgstr "העדפות לא עודכנו"
+#: ../src/repository.c:531
+msgid "Delete repository?"
+msgstr "מחק את המאגר?"
 
-#: ../src/prefs_window.c:1232
-msgid "Preferences applied"
-msgstr "העדפות עודכנו"
-
-#: ../src/repository.c:573
-#: ../src/repository.c:2395
+#: ../src/repository.c:587 ../src/repository.c:2400
 msgid "Set backup file"
 msgstr "קבע קובץ גיבוי"
 
-#: ../src/repository.c:612
+#: ../src/repository.c:626
 msgid "Select directory for synchronization"
 msgstr "בחר תיקייה עבור הסנכרון"
 
-#: ../src/repository.c:638
+#: ../src/repository.c:652
 msgid "Please select command to sync contacts"
 msgstr "בחר בבקשה פקודה לסנכרון אנשי קשר"
 
-#: ../src/repository.c:644
+#: ../src/repository.c:658
 msgid "Please select command to sync calendar"
 msgstr "בחר בבקשה פקודה לסנכרון יומן"
 
-#: ../src/repository.c:650
+#: ../src/repository.c:664
 msgid "Please select command to sync notes"
 msgstr "בחר בבקשה פקודה לסנכרון תזכורות"
 
-#: ../src/repository.c:729
+#: ../src/repository.c:676
+#, 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/repository.c:743
 msgid "Smart playlist updated."
 msgstr "רשימת השמעה חכמה עודכנה."
 
-#: ../src/repository.c:1190
+#: ../src/repository.c:1204
 msgid "Podcasts Repository"
 msgstr "מאגר פודקסטים"
 
-#: ../src/repository.c:1194
+#: ../src/repository.c:1208
 msgid "Local Repository"
 msgstr "מאגר מקומי"
 
-#: ../src/repository.c:1348
+#: ../src/repository.c:1358
 msgid "Master Playlist"
 msgstr "רשימת השמעה ראשית"
 
-#: ../src/repository.c:1352
+#: ../src/repository.c:1362
 msgid "Podcasts Playlist"
 msgstr "רשימות השמעה של פודקסטים"
 
-#: ../src/repository.c:1360
+#: ../src/repository.c:1370
 msgid "Regular Playlist"
 msgstr "רשימת השמעה רגילות"
 
-#: ../src/repository.c:2423
+#: ../src/repository.c:2428
 msgid "Set local repository file"
 msgstr "קבע קובץ מאגר מקומי"
 
-#: ../src/repository.c:2522
+#: ../src/repository.c:2526
 msgid "New Repository"
 msgstr "מאגר חדש"
 
@@ -5141,40 +5433,53 @@
 msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
 msgstr "לא יכול לפתוח את '%s' על מנת לחשב סכומי ביקורת: %s\n"
 
-#: ../src/syncdir.c:237
+#: ../src/sort_window.c:237
+msgid "No sorting"
+msgstr "ללא מיון"
+
+#: ../src/sort_window.c:271
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr ""
+"אתה גם יכול להשתמש בכותרות הטבלאות, אבל זה יאפשר לך למיין רק לפי העמודה "
+"המוצגת."
+
+#: ../src/syncdir.c:246
 #, c-format
 msgid "Sync summary for %s/%s\n"
 msgstr "סיכום סנכרון עבור %s/%s\n"
 
-#: ../src/syncdir.c:246
+#: ../src/syncdir.c:255
 msgid "The following track has been added or updated:\n"
 msgid_plural "The following tracks have been added or updated:\n"
 msgstr[0] "הרצועה הבאה עודכנה או התווספה:\n"
 msgstr[1] "הרצועות הבאות עודכנו או התווספו:\n"
 
-#: ../src/syncdir.c:255
+#: ../src/syncdir.c:264
 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"
 
-#: ../src/syncdir.c:264
+#: ../src/syncdir.c:273
 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] "הרצועה הבאה הוסרה מהמאגר:\n"
 msgstr[1] "הרצועות הבאות הוסרו מהמאגר:\n"
 
-#: ../src/syncdir.c:271
+#: ../src/syncdir.c:280
 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] "הרצועה הבאה הוסרה מרשימת ההשמעה:\n"
 msgstr[1] "הרצועות הבאות הוסרו מרשימת ההשמעה:\n"
 
-#: ../src/syncdir.c:277
+#: ../src/syncdir.c:286
 msgid "Nothing was changed.\n"
 msgstr "כלום לא השתנה.\n"
 
-#: ../src/syncdir.c:282
+#: ../src/syncdir.c:291
 msgid "Sync summary"
 msgstr "סיכום הסנכרון"
 
@@ -5182,11 +5487,13 @@
 #, 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:203
@@ -5200,13 +5507,21 @@
 
 #: ../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: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:385
 msgid "Normalizing..."
@@ -5242,7 +5557,9 @@
 msgstr[1] "נורמלו %d מתוך %d רצועות."
 
 #: ../src/tools.c:633
-msgid "Please specify the command to be called on the 'Tools' section of the preferences dialog.\n"
+msgid ""
+"Please specify the command to be called on the 'Tools' section of the "
+"preferences dialog.\n"
 msgstr "אנא ציין את הפקודה שיקראו לה בחלק 'כלים' בחלון הדו-שיח העדפות.\n"
 
 #: ../src/tools.c:645
@@ -5281,4 +5598,3 @@
 #, c-format
 msgid "%s does not appear to be a supported wav file.\n"
 msgstr "הקובץ %s הוא כנראה לא קובץ wav נתמך.\n"
-

Modified: gtkpod/branches/upstream/current/po/it.po
===================================================================
--- gtkpod/branches/upstream/current/po/it.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/it.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,33 +1,31 @@
 # Italian language translation for gtkpod.
 # Copyright (C) 2003 Edward Matteucci
-# Copyright (C) 2007 Daniele Forsi
+# Copyright (C) 2007-2008 Daniele Forsi <daniele at forsi.it>
 # This file is distributed under the same license as the gtkpod package.
 #
-#
 # Edward Matteucci <edward.matteucci at libero.it>, 2003, 2005.
-# Daniele Forsi <dforsi at gmail.com>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \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"
+"POT-Creation-Date: 2008-12-09 19:55+0900\n"
+"PO-Revision-Date: 2008-12-12 18:14+0100\n"
+"Last-Translator: Daniele Forsi <daniele at forsi.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: KBabel 1.11.4\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 "Gestisci musica e video negli iPod Apple"
 
+#: ../data/gtkpod.desktop.in.h:2
+#: ../data/gtkpod.glade.h:427
+msgid "gtkpod iPod Manager"
+msgstr "Gestore di iPod"
+
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
 msgstr "Gestore di iPod"
@@ -41,413 +39,424 @@
 msgstr "    "
 
 #: ../data/gtkpod.glade.h:3
-msgid "     "
-msgstr "     "
+msgid " <= cts <= "
+msgstr " <= cts <= "
 
 #: ../data/gtkpod.glade.h:4
-msgid "      "
-msgstr "      "
+msgid "'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when finished."
+msgstr "«GG/MM/AAAA HH:MM < d < GG/MM/AAAA HH:MM» o simile. Premere «Invio» alla fine."
 
 #: ../data/gtkpod.glade.h:5
-msgid "   Sort by:"
-msgstr "   Ordina per:"
+msgid "(Checked)"
+msgstr "(selezionato)"
 
 #: ../data/gtkpod.glade.h:6
-msgid " <= cts <= "
-msgstr " <= cts <= "
+msgid "0"
+msgstr "0"
 
 #: ../data/gtkpod.glade.h:7
-msgid " Logic: "
-msgstr " Logica: "
+msgid "1"
+msgstr "1"
 
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr "2"
+
 #: ../data/gtkpod.glade.h:9
-#, no-c-format
-msgid "%A"
-msgstr "%A"
+msgid "3"
+msgstr "3"
 
 #: ../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» o simile. Premere «Invio» alla "
-"fine."
+msgid "4"
+msgstr "4"
 
 #: ../data/gtkpod.glade.h:11
-msgid "'aacgain' executable:"
-msgstr "Eseguibile «aacgain»:"
+msgid "5"
+msgstr "5"
 
 #: ../data/gtkpod.glade.h:12
-msgid "'mp3gain' executable:"
-msgstr "Eseguibile «mp3gain»:"
+msgid ":"
+msgstr ":"
 
 #: ../data/gtkpod.glade.h:13
-msgid "(Checked)"
-msgstr "(selezionato)"
+msgid "<"
+msgstr "<"
 
 #: ../data/gtkpod.glade.h:14
-msgid "...as icons"
-msgstr "...con icone"
+msgid "<b>Advanced Options</b>"
+msgstr "<b>Opzioni avanzate</b>"
 
 #: ../data/gtkpod.glade.h:15
-msgid "...as text"
-msgstr "...con testo"
+msgid "<b>Ascending</b>"
+msgstr "<b>Crescente</b>"
 
 #: ../data/gtkpod.glade.h:16
-msgid "...both as icons and text"
-msgstr "...con icone e testo"
+msgid "<b>Auto Store</b>"
+msgstr "<b>Salvataggio automatico</b>"
 
 #: ../data/gtkpod.glade.h:17
-msgid "...entry 'All' in sort tab..."
-msgstr "...la voce «Tutti» nella scheda di ordinamento..."
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>Playlist generate automaticamente</b>"
 
 #: ../data/gtkpod.glade.h:18
-msgid "...master playlist"
-msgstr "...la playlist principale"
+msgid "<b>Available Columns</b>"
+msgstr "<b>Colonne disponibili</b>"
 
+#: ../data/gtkpod.glade.h:19
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>Formati compatibili</b>"
+
 #: ../data/gtkpod.glade.h:20
-#, no-c-format
-msgid "../%A.jpg"
-msgstr "../%A.jpg"
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>Impostazioni per la conversione</b>"
 
 #: ../data/gtkpod.glade.h:21
-msgid "0"
-msgstr "0"
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>Riquadro della copertina</b>"
 
 #: ../data/gtkpod.glade.h:22
-msgid "1"
-msgstr "1"
+msgid "<b>Cover Art</b>"
+msgstr "<b>Copertina</b>"
 
 #: ../data/gtkpod.glade.h:23
-msgid "2"
-msgstr "2"
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>Messaggi di conferma eliminazione</b>"
 
 #: ../data/gtkpod.glade.h:24
-msgid "3"
-msgstr "3"
+msgid "<b>Descending</b>"
+msgstr "<b>Decrescente</b>"
 
 #: ../data/gtkpod.glade.h:25
-msgid "4"
-msgstr "4"
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>Colonne visualizzate</b>"
 
 #: ../data/gtkpod.glade.h:26
-msgid "5"
-msgstr "5"
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>Schede di ordinamento</b>"
 
 #: ../data/gtkpod.glade.h:27
-msgid ":"
-msgstr ":"
+msgid "<b>General Options</b>"
+msgstr "<b>Opzioni generali</b>"
 
 #: ../data/gtkpod.glade.h:28
-msgid "<"
-msgstr "<"
+msgid "<b>General</b>"
+msgstr "<b>Generale</b>"
 
 #: ../data/gtkpod.glade.h:29
-msgid "<b>Account Information</b>"
-msgstr "<b>Informazioni sull'account</b>"
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>Ignora parole frequenti</b>"
 
 #: ../data/gtkpod.glade.h:30
-msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>Aggiungi/Aggiorna/Sincronizza</b>"
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>Importazione e sincronizzazione</b>"
 
 #: ../data/gtkpod.glade.h:31
-msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Audioscrobbler</b>"
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>Formati incompatibili</b>"
 
 #: ../data/gtkpod.glade.h:32
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>Playlist generate automaticamente</b>"
+msgid "<b>Information Messages</b>"
+msgstr "<b>Messaggi informativi</b>"
 
 #: ../data/gtkpod.glade.h:33
-msgid "<b>Automatically select...</b>"
-msgstr "<b>Seleziona automaticamente...</b>"
+msgid "<b>Lower Margin</b>"
+msgstr "<b>Margine inferiore</b>"
 
 #: ../data/gtkpod.glade.h:34
-msgid "<b>Calendar/Contacts/Notes</b>"
-msgstr "<b>Calendario/Contatti/Note</b>"
+msgid "<b>None</b>"
+msgstr "<b>Nessuno</b>"
 
 #: ../data/gtkpod.glade.h:35
-msgid "<b>Coverart</b>"
-msgstr "<b>Copertina</b>"
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Conversione al volo</b>"
 
 #: ../data/gtkpod.glade.h:36
-msgid "<b>Delete Confirmation</b>"
-msgstr "<b>Conferma l'eliminazione</b>"
+msgid "<b>Playback</b>"
+msgstr "<b>Riproduzione</b>"
 
 #: ../data/gtkpod.glade.h:37
-msgid "<b>Examples</b>"
-msgstr "<b>Esempi</b>"
+msgid "<b>Playlist Options</b>"
+msgstr "<b>Opzioni playlist</b>"
 
 #: ../data/gtkpod.glade.h:38
-msgid "<b>Ignore Frequent Words</b>"
-msgstr "<b>Ignora parole frequenti</b>"
+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:39
-msgid "<b>Misc</b>"
-msgstr "<b>Miscellanea</b>"
+msgid "<b>Rules</b>"
+msgstr "<b>Regole</b>"
 
 #: ../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>"
+msgid "<b>Sort Order</b>"
+msgstr "<b>Tipo di ordinamento</b>"
 
 #: ../data/gtkpod.glade.h:41
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Conversione al volo</b>"
+msgid "<b>Synchronization</b>"
+msgstr "<b>Sincronizzazione</b>"
 
 #: ../data/gtkpod.glade.h:42
-msgid "<b>Play</b>"
-msgstr "<b>Riproduzione</b>"
+msgid "<b>Tag Editing</b>"
+msgstr "<b>Modifica dell'etichetta</b>"
 
 #: ../data/gtkpod.glade.h:43
-msgid "<b>Playlists</b>"
-msgstr "<b>Playlist</b>"
+msgid "<b>Tags</b>"
+msgstr "<b>Etichette</b>"
 
 #: ../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>"
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>Stile barra degli strumenti</b>"
 
 #: ../data/gtkpod.glade.h:45
-msgid "<b>Repositories</b>"
-msgstr "<b>Archivi</b>"
+msgid "<b>Tooltips</b>"
+msgstr "<b>Suggerimenti</b>"
 
 #: ../data/gtkpod.glade.h:46
-msgid "<b>Sort Order</b>"
-msgstr "<b>Tipo di ordinamento</b>"
+msgid "<b>Upper Margin</b>"
+msgstr "<b>Margine superiore</b>"
 
 #: ../data/gtkpod.glade.h:47
-msgid "<b>Sort Tabs</b>"
-msgstr "<b>Schede di ordinamento</b>"
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>Normalizzazione del volume</b>"
 
 #: ../data/gtkpod.glade.h:48
-msgid "<b>Sync</b>"
-msgstr "<b>Sincronizza</b>"
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr "<b>Quando si tenta di aggiungere una traccia già esistente</b>"
 
 #: ../data/gtkpod.glade.h:49
-msgid "<b>Synchronization</b>"
-msgstr "<b>Sincronizzazione</b>"
+msgid "<b>gtkpod Options</b>"
+msgstr "<b>Opzioni di gtkpod</b>"
 
 #: ../data/gtkpod.glade.h:50
-msgid "<b>Tag Reading</b>"
-msgstr "<b>Lettura delle etichette</b>"
+msgid "<b>mserv Settings</b>"
+msgstr "<b>Impostazioni di mserv</b>"
 
 #: ../data/gtkpod.glade.h:51
-msgid "<b>Toolbar</b>"
-msgstr "<b>Barra degli strumenti</b>"
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:52
-msgid "<b>Tooltips</b>"
-msgstr "<b>Suggerimenti</b>"
+msgid "<i>aacgain</i> executable:"
+msgstr "Eseguibile <i>aacgain</i>:"
 
 #: ../data/gtkpod.glade.h:53
-msgid "<b>Track Attributes</b>"
-msgstr "<b>Attributi della traccia</b>"
+msgid "<i>mp3gain</i> executable:"
+msgstr "Eseguibile <i>mp3gain</i>:"
 
 #: ../data/gtkpod.glade.h:54
-msgid "<b>Track Editing</b>"
-msgstr "<b>Modifica della traccia</b>"
+msgid "<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Specificare un intervallo di tempo</span>"
 
 #: ../data/gtkpod.glade.h:55
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>Normalizzazione del volume</b>"
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:56
-msgid "<b>mserv</b>"
-msgstr "<b>mserv</b>"
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
+msgstr "<span weight='bold' size='larger'>Nessuna playlist selezionata</span>"
 
-#: ../data/gtkpod.glade.h:57
+#: ../data/gtkpod.glade.h:59
 msgid ">"
 msgstr ">"
 
-#: ../data/gtkpod.glade.h:58
-msgid "About gtkpod"
-msgstr "Informazioni su gtkpod"
+#: ../data/gtkpod.glade.h:60
+msgid "About unupdated tracks"
+msgstr "Sulle tracce non aggiornate"
 
-#: ../data/gtkpod.glade.h:59
+#: ../data/gtkpod.glade.h:61
+msgid "About updated tracks"
+msgstr "Sulle tracce aggiornate"
+
+#: ../data/gtkpod.glade.h:62
+msgid "Add Column"
+msgstr "Aggiungi colonna"
+
+#: ../data/gtkpod.glade.h:63
 msgid "Add Directories Recursively"
 msgstr "Aggiunge directory ricorsivamente"
 
-#: ../data/gtkpod.glade.h:60
+#: ../data/gtkpod.glade.h:64
 msgid "Add Files"
 msgstr "Aggiungi file"
 
-#: ../data/gtkpod.glade.h:61
+#: ../data/gtkpod.glade.h:65
 msgid "Add Files or Directories"
 msgstr "Aggiunge un file o una directory"
 
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:66
 msgid "Add Fol_der"
 msgstr "Aggiungi _cartella"
 
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:67
+#: ../src/fileselection.c:606
 msgid "Add Folder"
 msgstr "Aggiungi cartella"
 
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:68
 msgid "Add Image_s"
 msgstr "Aggiungi _immagini"
 
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:69
 msgid "Add Images from a Directory"
 msgstr "Aggiunge immagini da una directory"
 
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:70
 msgid "Add Playlist"
 msgstr "Aggiungi playlist"
 
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:71
 msgid "Add _Files"
 msgstr "Aggiungi _file"
 
-#: ../data/gtkpod.glade.h:68
+#: ../data/gtkpod.glade.h:72
 msgid "Add _Playlist"
 msgstr "Aggiungi _playlist"
 
-#: ../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:73
+msgid "Add cover art using file name template"
+msgstr "Aggiungi la copertina usando un modello di nome di file"
 
-#: ../data/gtkpod.glade.h:70
-msgid "Add directories recursively"
-msgstr "Aggiungi le directory ricorsivamente"
+#: ../data/gtkpod.glade.h:74
+msgid "Add file masks to be excluded from import and synchronization, for example, <i>*.mp3</i>."
+msgstr "Aggiungere le maschere dei file da escludere dall'importazione e dalla sincronizzazione, ad esempio <i>*.mp3</i>."
 
-#: ../data/gtkpod.glade.h:71
-msgid "Add new repository/iPod"
-msgstr "Aggiungi un nuovo archivio o iPod"
+#: ../data/gtkpod.glade.h:75
+msgid "Add new repository/iPod..."
+msgstr "Aggiungi nuovo archivio o iPod..."
 
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:76
 msgid "Add playlist from file"
 msgstr "Aggiunge una playlist da un file"
 
-#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
-#: ../src/display_tracks.c:2103
-msgid "Added"
-msgstr "Aggiunto"
+#: ../data/gtkpod.glade.h:77
+msgid "Add subfolders recursively"
+msgstr "Aggiungi le sottocartelle ricorsivamente"
 
-#: ../data/gtkpod.glade.h:74
-msgid "Advanced Sorting Options"
-msgstr "Opzioni avanzate di ordinamento"
+#: ../data/gtkpod.glade.h:78
+msgid "Added:"
+msgstr "Aggiunti:"
 
 #. 0
-#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
-#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
+#: ../data/gtkpod.glade.h:79
+#: ../src/display_sorttabs.c:2995
+#: ../src/display_spl.c:84
+#: ../src/misc_conversion.c:60
 msgid "Album"
 msgstr "Album"
 
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:80
 msgid "Album Art"
 msgstr "Copertina dell'album"
 
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:81
 msgid "All (AND)"
 msgstr "Tutti (AND)"
 
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:82
 msgid "All Tracks Never Listened To"
 msgstr "Tutte le tracce mai ascoltate"
 
-#: ../data/gtkpod.glade.h:79
+#: ../data/gtkpod.glade.h:83
 msgid "All Tracks Played Since Last Time"
 msgstr "Tutte le tracce riprodotte dall'ultima volta"
 
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:84
 msgid "All Tracks not Listed in any Playlist"
 msgstr "Tutte le tracce non contenute in una playlist"
 
-#: ../data/gtkpod.glade.h:81
-msgid "Also include tracks never played in \"Best Rated\" playlist"
-msgstr "Includi le tracce mai ascoltate nella playlist «Voti migliori»"
-
-#: ../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:83
-msgid "Any (OR)"
-msgstr "Qualsiasi (OR)"
-
-#: ../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:85
-msgid "Artwork Preview"
-msgstr "Anteprima artwork"
+msgid "Allow duplicate files"
+msgstr "Permetti file duplicati"
 
 #: ../data/gtkpod.glade.h:86
-msgid ""
-"As a last resort set the following tags to the\n"
-"filename if they are (still) empty:"
-msgstr ""
-"Come ultimo tentativo riempi le etichette seguenti con\n"
-"il nome del file se sono (ancora) vuote:"
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr "Usa questa codifica anche durante l'aggiornamento e la sincronizzazione delle tracce"
 
+#: ../data/gtkpod.glade.h:87
+msgid "Also use this encoding when writing tracks"
+msgstr "Usa la codifica selezionata anche durante la scrittura delle tracce"
+
 #: ../data/gtkpod.glade.h:88
-msgid "Ascending"
-msgstr "Crescente"
+msgid "Any (OR)"
+msgstr "Qualsiasi (OR)"
 
 #: ../data/gtkpod.glade.h:89
-msgid "Auto Store"
-msgstr "Salvataggio automatico"
-
-#: ../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."
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
 msgstr ""
-"Visualizza automaticamente le tracce che corrispondono ai criteri inseriti "
-"sopra. Se non selezionato, si deve premere «Mostra» per attivare la "
-"visualizzazione."
+"Qualsiasi regola\n"
+"Tutte le regole\n"
+"Ignora le regole"
 
-#: ../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"
+#: ../src/display_sorttabs.c:2992
+#: ../src/display_spl.c:85
+#: ../src/misc_conversion.c:61
+msgid "Artist"
+msgstr "Artista"
 
 #: ../data/gtkpod.glade.h:93
-msgid "Before removing tracks from the harddisk"
-msgstr "Prima di rimuovere le tracce dal disco fisso"
+msgid "Artwork Preview"
+msgstr "Anteprima artwork"
 
 #: ../data/gtkpod.glade.h:94
-msgid "Before removing tracks from the iPod"
-msgstr "Prima di rimuovere le tracce dall'iPod"
+msgid "Automatically generate video thumbnails"
+msgstr "Genera automaticamente le miniature dei video"
 
 #: ../data/gtkpod.glade.h:95
-msgid "Before removing tracks from the local database"
-msgstr "Prima di rimuovere le tracce dal database locale"
+msgid "Automatically start displaying tracks that match the criteria entered above. If not selected, you must press 'Display' to start displaying."
+msgstr "Visualizza automaticamente le tracce che corrispondono ai criteri inseriti sopra. Se non selezionato, si deve premere «Mostra» per attivare la visualizzazione."
 
 #: ../data/gtkpod.glade.h:96
+msgid "Background color"
+msgstr "Colore di sfondo"
+
+#: ../data/gtkpod.glade.h:97
 msgid "Best Rated Tracks"
 msgstr "Tracce con il voto migliore"
 
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:98
+msgid "Bottom"
+msgstr "In basso"
+
+#: ../data/gtkpod.glade.h:99
+#: ../src/prefsdlg.c:588
 msgid "Browse"
 msgstr "Sfoglia"
 
-#: ../data/gtkpod.glade.h:98
-msgid "Cache directory:"
-msgstr "Directory per la cache:"
+#: ../data/gtkpod.glade.h:100
+msgid "Browse..."
+msgstr "Sfoglia..."
 
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:101
+msgid "Cache folder:"
+msgstr "Cartella per la cache:"
+
+#: ../data/gtkpod.glade.h:102
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:103
 msgid "Calendar sync command:"
 msgstr "Comando per sincronizzare il calendario:"
 
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:104
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Chiama automaticamente mentre sincronizzi iTunesDB"
 
-#: ../data/gtkpod.glade.h:102
-msgid "Category: "
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr "Distingui MAIUSCOLE/minuscole nell'ordinamento"
+
+#: ../data/gtkpod.glade.h:106
+msgid "Category:"
 msgstr "Categoria: "
 
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:107
 msgid ""
 "Change all tracks\n"
 "simultaneously"
@@ -455,441 +464,325 @@
 "Cambia tutte le tracce\n"
 "simultaneamente"
 
-#: ../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
+#: ../data/gtkpod.glade.h:109
 msgid "Check for existing files when copying from iPod."
 msgstr "Controlla se i file esistono durante la copia dall'iPod."
 
-#: ../data/gtkpod.glade.h:108
-msgid "Command for 'Enqueue':"
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr "Scegliere un colore diverso per lo sfondo del riquadro della copertina"
+
+#: ../data/gtkpod.glade.h:111
+msgid "Command for \"Enqueue\":"
 msgstr "Comando per «Metti in coda»:"
 
-#: ../data/gtkpod.glade.h:109
-msgid "Command for 'Play now':"
+#: ../data/gtkpod.glade.h:112
+msgid "Command for \"Play now\":"
 msgstr "Comando per «Riproduci ora»:"
 
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr "Comandi..."
+
 #. 5
-#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:114
+#: ../src/display_spl.c:97
 #: ../src/misc_conversion.c:65
 msgid "Composer"
 msgstr "Compositore"
 
-#: ../data/gtkpod.glade.h:111
+#: ../data/gtkpod.glade.h:115
 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:112
-msgid ""
-"Confirm before removing tracks from the iPod or repository\n"
-"when syncing playlists"
-msgstr ""
-"Chiedi conferma prima di rimuovere le tracce dall'iPod o dall'archivio\n"
-"durante la sincronizzazione delle playlist"
-
-#: ../data/gtkpod.glade.h:114
-msgid "Confirm lists of directories"
-msgstr "Conferma la lista delle directory"
-
-#: ../data/gtkpod.glade.h:115
-msgid "Contacts sync command:"
-msgstr "Comando per sincronizzare i contatti:"
-
 #: ../data/gtkpod.glade.h:116
-msgid "Containing Displayed Tracks"
-msgstr "Contenente le tracce visualizzate"
+msgid "Confirm deletion of playlists or tracks from a playlist"
+msgstr "Conferma l'eliminazione di playlist o tracce da una playlist"
 
 #: ../data/gtkpod.glade.h:117
-msgid "Containing Selected Tracks"
-msgstr "Contenente le tracce selezionate"
+msgid "Confirm deletion of tracks during synchronization"
+msgstr "Conferma l'eliminazione delle tracce durante la sincronizzazione"
 
 #: ../data/gtkpod.glade.h:118
-msgid "Conversion Progress Display"
-msgstr "Visualizzazione dell'avanzamento della conversione"
+msgid "Confirm deletion of tracks:"
+msgstr "Conferma l'eliminazione delle tracce:"
 
 #: ../data/gtkpod.glade.h:119
-msgid "Cover"
-msgstr "Copertina"
+msgid "Contacts sync command:"
+msgstr "Comando per sincronizzare i contatti:"
 
 #: ../data/gtkpod.glade.h:120
-msgid "Create New Playlist"
-msgstr "Crea una nuova playlist"
+msgid "Containing Displayed Tracks"
+msgstr "Contenente le tracce visualizzate"
 
 #: ../data/gtkpod.glade.h:121
-msgid "Create Repository"
-msgstr "Crea archivio"
+msgid "Containing Selected Tracks"
+msgstr "Contenente le tracce selezionate"
 
 #: ../data/gtkpod.glade.h:122
-msgid "Create _Playlist File"
-msgstr "Crea un file di _playlist"
+msgid "Conversion Preferences"
+msgstr "Preferenze di conversione"
 
 #: ../data/gtkpod.glade.h:123
-msgid "Credits"
-msgstr "Riconoscimenti"
+msgid "Conversion Progress Display"
+msgstr "Visualizzazione dell'avanzamento della conversione"
 
 #: ../data/gtkpod.glade.h:124
-msgid "Currently only rating is supported."
-msgstr "Attualmente solo il voto è supportato."
+msgid "Conversion Settings..."
+msgstr "Impostazioni di conversione"
 
 #: ../data/gtkpod.glade.h:125
-msgid "Delete repository"
-msgstr "Elimina l'archivio"
+msgid "Convert AAC (M4A)"
+msgstr "Converti AAC (M4A)"
 
 #: ../data/gtkpod.glade.h:126
-msgid ""
-"Delete tracks that are no longer present from the\n"
-"iPod or repository"
-msgstr ""
-"Elimina dall'iPod o dall'archivio\n"
-"le tracce che non sono più presenti"
+msgid "Convert FLAC"
+msgstr "Converti FLAC"
 
+#: ../data/gtkpod.glade.h:127
+msgid "Convert MP3"
+msgstr "Converti MP3"
+
 #: ../data/gtkpod.glade.h:128
-msgid "Deleted tracks"
-msgstr "Tracce eliminate"
+msgid "Convert Ogg Vorbis"
+msgstr "Converti Ogg Vorbis"
 
 #: ../data/gtkpod.glade.h:129
-msgid "Descending"
-msgstr "Decrescente"
+msgid "Convert WAV"
+msgstr "Converti WAV"
 
 #: ../data/gtkpod.glade.h:130
-msgid "Details"
-msgstr "Dettagli"
+msgid "Convert compatible formats to a single format"
+msgstr "Converti formati compatibili in un singolo formato"
 
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr "Converti formati musicali incompatibili in:"
+
 #: ../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 ""
-"Determina come costruire la stringa per il campo di informazioni. es. «%a/%A/"
-"%T - %t.mp3» o «%o». Si possono separare diversi modelli con punto e virgola "
-"-- gtkopd determinerà quale usare a seconda dell'estensione data al file. "
-"Artista: %a, album: %A, compositore: %c, titolo: %t, genere: %G, numero "
-"traccia: %T, numero CD: %C, anno: %Y, nome file originale (necessita del "
-"file con le informazioni estese): %o, il carattere «%»: %%."
+msgid "Cover"
+msgstr "Copertina"
 
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr "Preferenze ricerca copertine"
+
 #: ../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 ""
-"Determina il nome del file delle tracce copiate dall'iPod, es. «%a/%A/%T -%t."
-"mp3» o «%o». Si possono separare diversi modelli con punto e virgola -- "
-"gtkopd determinerà quale usare a seconda dell'estensione data al file. "
-"Artista: %a, album: %A, compositore: %c, titolo: %t, genere: %G, numero "
-"traccia: %T, numero CD: %C, anno: %Y, nome del file originale (necessita del "
-"file con le informazioni estese): %o, playlist attuale: %p, il carattere "
-"«%»: %%."
+msgid "Cover art file pattern:"
+msgstr "Modello del file della copertina:"
 
+#: ../data/gtkpod.glade.h:135
+msgid "Create New Playlist"
+msgstr "Crea una nuova playlist"
+
 #: ../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 ""
-"Determina il nome del file con la copertina. Si possono separare diversi "
-"modelli con punto e virgola che verranno provati nell'ordine. Artista: %a, "
-"album: %A, compositore: %c, titolo: %t, genere: %G, numero traccia: %T, "
-"numero CD: %C, anno: %Y, nome del file originale (necessita del file con le "
-"informazioni estese): %o, nome del file originale senza estensione: %O, "
-"playlist attuale: %p, il carattere «%»: %%."
+msgid "Create Repository"
+msgstr "Crea archivio"
 
 #: ../data/gtkpod.glade.h:137
-msgid ""
-"Directories to sync with are determined from the filenames of the tracks in "
-"the playlist."
-msgstr ""
-"Le directory da sincronizzare sono determinate a partire dal nome dei file "
-"delle tracce nella playlist."
+msgid "Create _Playlist File"
+msgstr "Crea un file di _playlist"
 
 #: ../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."
+msgid "Customize..."
+msgstr "Personalizza..."
 
 #: ../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."
+msgid "Delete Repository"
+msgstr "Elimina archivio"
 
 #: ../data/gtkpod.glade.h:140
-msgid "Display conversion log"
-msgstr "Mostra il registro della conversione"
+msgid "Delete missing tracks from the iPod or repository"
+msgstr "Elimina le tracce mancanti dall'iPod o dall'archivio"
 
 #: ../data/gtkpod.glade.h:141
-msgid "Display info about detected duplicates"
-msgstr "Mostra informazioni sui duplicati individuati"
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "Elimina le tracce mancanti durante la sincronizzazione delle playlist"
 
 #: ../data/gtkpod.glade.h:142
-msgid "Display info about non-updated tracks"
-msgstr "Mostra informazioni sulle tracce non aggiornate"
+msgid "Details"
+msgstr "Dettagli"
 
-#: ../data/gtkpod.glade.h:143
-msgid "Display info about updated tracks"
-msgstr "Mostra informazioni sulle tracce aggiornate"
-
 #: ../data/gtkpod.glade.h:144
-msgid "Display messages and warnings at startup"
-msgstr "Mostra messaggi e avvertimenti all'avvio"
+#, 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 "Determina come costruire la stringa per il campo di informazioni. es. «%a/%A/%T - %t.mp3» o «%o». Si possono separare diversi modelli con punto e virgola -- gtkopd determinerà quale usare a seconda dell'estensione data al file. Artista: %a, album: %A, compositore: %c, titolo: %t, genere: %G, numero traccia: %T, numero CD: %C, anno: %Y, nome file originale (necessita del file con le informazioni estese): %o, il carattere «%»: %%."
 
-#: ../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:146
-msgid "Display toolbar..."
-msgstr "Mostra la barra degli strumenti..."
+#, 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 "Determina il nome del file delle tracce copiate dall'iPod, es. «%a/%A/%T -%t.mp3» o «%o». Si possono separare diversi modelli con punto e virgola -- gtkopd determinerà quale usare a seconda dell'estensione data al file. Artista: %a, album: %A, compositore: %c, titolo: %t, genere: %G, numero traccia: %T, numero CD: %C, anno: %Y, nome del file originale (necessita del file con le informazioni estese): %o, playlist attuale: %p, il carattere «%»: %%."
 
 #: ../data/gtkpod.glade.h:147
-msgid "Display tooltips in main window"
-msgstr "Mostra i suggerimenti nella finestra principale"
+msgid "Directories to sync with are determined from the filenames of the tracks in the playlist."
+msgstr "Le directory da sincronizzare sono determinate a partire dal nome dei file delle tracce nella playlist."
 
 #: ../data/gtkpod.glade.h:148
-msgid "Display tooltips in prefs window"
-msgstr "Mostra i suggerimenti nella finestra delle preferenze"
+msgid "Display"
+msgstr "Mostra"
 
 #: ../data/gtkpod.glade.h:149
-msgid "Display tracks that match the criteria entered above."
-msgstr "Mostra le tracce che corrispondono ai criteri inseriti sopra."
+msgid "Display conversion log"
+msgstr "Mostra il registro della conversione"
 
 #: ../data/gtkpod.glade.h:150
-msgid ""
-"Displayed\n"
-"Tracks"
-msgstr ""
-"Tracce\n"
-"visualizzate"
+msgid "Display information about detected duplicate files"
+msgstr "Mostra informazioni sui file duplicati individuati"
 
+#: ../data/gtkpod.glade.h:151
+msgid "Display messages and warnings at startup"
+msgstr "Mostra messaggi e avvertimenti all'avvio"
+
 #: ../data/gtkpod.glade.h:152
-msgid "Displayed:"
-msgstr "Visualizzati:"
+msgid "Display synchronization results"
+msgstr "Mostra i risultati della sincronizzazione"
 
 #: ../data/gtkpod.glade.h:153
-msgid "Don't allow file duplication"
-msgstr "Non permettere i file duplicati"
+msgid "Display tooltips in main window"
+msgstr "Mostra i suggerimenti nella finestra principale"
 
 #: ../data/gtkpod.glade.h:154
+msgid "Display tracks that match the criteria entered above."
+msgstr "Mostra le tracce che corrispondono ai criteri inseriti sopra."
+
+#: ../data/gtkpod.glade.h:155
 msgid "Don't automatically sync on startup"
 msgstr "Non sincronizzare automaticamente all'avvio"
 
-#: ../data/gtkpod.glade.h:155
-msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+#: ../data/gtkpod.glade.h:156
+msgid "Dummy\n"
 msgstr ""
-"Il riconoscimento dei file duplicati è basato su un hash sha1 (modificato) "
-"sul file."
 
-#: ../data/gtkpod.glade.h:156
-msgid "Edit Repository/iPod Options"
-msgstr "Modifica le opzioni dell'archivio e dell'iPod"
-
-#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
+#: ../data/gtkpod.glade.h:158
+#: ../src/context_menus.c:664
 msgid "Edit Smart Playlist"
 msgstr "Modifica la playlist intelligente"
 
-#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
+#: ../data/gtkpod.glade.h:159
+#: ../src/context_menus.c:751
 msgid "Edit Track Details"
 msgstr "Modifica i dettagli della traccia"
 
-#: ../data/gtkpod.glade.h:159
-msgid "Edit _Preferences"
-msgstr "Modifica le _preferenze"
-
 #: ../data/gtkpod.glade.h:160
-msgid "Effective free space"
-msgstr "Spazio libero effettivo"
-
-#: ../data/gtkpod.glade.h:161
 msgid "Empty Playlist"
 msgstr "Playlist vuota"
 
+#: ../data/gtkpod.glade.h:161
+msgid "Encoding Preferences"
+msgstr "Preferenze di codifica"
+
 #: ../data/gtkpod.glade.h:162
-msgid "Exclude file mask(s)"
-msgstr "Maschera per i file da escludere"
+msgid "Encoding..."
+msgstr "Codifica..."
 
 #: ../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."
+msgid "Excluded files..."
+msgstr "File esclusi..."
 
 #: ../data/gtkpod.glade.h:164
-msgid "File size"
-msgstr "Dimensione file"
+msgid "Exclusions List"
+msgstr "Elenco esclusioni"
 
 #: ../data/gtkpod.glade.h:165
-msgid "File size (deleted)"
-msgstr "Dimensione dei file (eliminati)"
+msgid "Expand columns beyond the track list width"
+msgstr "Espandi colonne oltre la larghezza dell'elenco tracce"
 
 #: ../data/gtkpod.glade.h:166
-msgid "File size (non-transferred)"
-msgstr "Dimensione dei file (non trasferiti)"
+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:167
-msgid "Filename Format: "
-msgstr "Formato del nome del file: "
+msgid "Feedback"
+msgstr "Commenti"
 
 #: ../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 ""
-"Trova i file orfani (file senza informazioni sulla traccia nel DB) e tracce "
-"fantasma (tracce senza file corrispondenti sull'iPod)"
+msgid "Filename Parse Preferences"
+msgstr "Preferenze per la scansione del nome del file"
 
 #: ../data/gtkpod.glade.h:169
-msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
-msgstr "Prima prova <i>folder.jpg</i>, poi <i>&lt;artista&gt;.jpg</i>"
+msgid "Filename format: "
+msgstr "Formato del nome del file: "
 
 #: ../data/gtkpod.glade.h:170
-msgid "Flac with :"
-msgstr "Flac con :"
+msgid "Filename parse pattern:"
+msgstr "Modello per la scansione del nome del file:"
 
+#: ../data/gtkpod.glade.h:171
+msgid "Filter tab:"
+msgstr "Scheda di filtro:"
+
 #: ../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 ""
-"Per esempio, «xmms %s» cancellerà la playlist attuale di xmms, aggiungerà la "
-"traccia selezionata e comincerà a suonarla."
+msgid "Filter tabs"
+msgstr "Schede di filtro"
 
+#: ../data/gtkpod.glade.h:173
+msgid "Filter:"
+msgstr "Filtro:"
+
 #: ../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 ""
-"Per esempio, «xmms -e %s» appenderà (in coda) la traccia selezionata alla "
-"playlist corrente di xmms."
+msgid "Find orphan files (files with no track info in DB) and dangling tracks (tracks with no corresponding files on iPod)"
+msgstr "Trova i file orfani (file senza informazioni sulla traccia nel DB) e tracce fantasma (tracce senza file corrispondenti sull'iPod)"
 
-#: ../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:175
+msgid "From the hard disk"
+msgstr "Dal disco fisso"
 
 #: ../data/gtkpod.glade.h:176
-msgid "Group artists on compilation CDs"
-msgstr "Raggruppa gli artisti nei CD di compilation"
+msgid "From the iPod"
+msgstr "Dall'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 ""
-"È altamente consigliato per importazioni più veloci se si usa il "
-"riconoscimento dei duplicati. Inoltre, avere il nome del file sul PC "
-"permette di scrivere sul disco le etichette ID3 cambiate e perfino di "
-"ricostruire il contenuto dell'iPod nel caso di corruzione del filesystem "
-"(cambiare le voci «transferred=» nel backup del database)."
+msgid "From the local database"
+msgstr "Dal database locale"
 
-#: ../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:178
+#: ../src/display_spl.c:182
+#: ../src/info.c:794
+msgid "GB"
+msgstr "GB"
 
 #: ../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 ""
-"Se disponibile, la playlist fa riferimento alla copia locale della traccia. "
-"Altrimenti è usato il file sul iPod."
+#: ../src/display_sorttabs.c:2998
+#: ../src/display_spl.c:89
+#: ../src/misc_conversion.c:63
+msgid "Genre"
+msgstr "Genere"
 
 #: ../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."
+msgid "Get Help _Online"
+msgstr "_Ottieni aiuto online"
 
 #: ../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 ""
-"Se selezionata, l'ordinamento sarà sensibile alle maiuscole. Nota: "
-"l'ordinamento sensibile alle maiuscole non funziona bene con la maggior "
-"parte delle codifiche."
+msgid "Group artist filter tab by compilation CDs"
+msgstr "Raggruppa la scheda di filtro degli artisti in base ai CD con compilation"
 
 #: ../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 ""
-"Se il nome del file (percorso completo) di una traccia esistente corrisponde "
-"a quella di una traccia che deve essere aggiunta, questa opzione permette di "
-"aggiornare le informazioni della traccia esistente piuttosto che ignorare "
-"del tutto la traccia. Nessun aggiornamento avrà luogo se il file non è "
-"cambiato e l'opzione precedente «Non permettere i file duplicati» è "
-"selezionata."
+msgid "If available, the local copy of the track is referenced in the playlist. Otherwise the file on the iPod is used."
+msgstr "Se disponibile, la playlist fa riferimento alla copia locale della traccia. Altrimenti è usato il file sul iPod."
 
 #: ../data/gtkpod.glade.h:183
-msgid "If you check this, gtkpod will descend into subdirectories recursively."
-msgstr "Selezionando questo, gtkpod discenderà nelle directory ricorsivamente."
+msgid "If checked, sorting will be case sensitive. Please note that case sensitive sorting will not work well with most charsets."
+msgstr "Se selezionata, l'ordinamento sarà sensibile alle maiuscole. Nota: l'ordinamento sensibile alle maiuscole non funziona bene con la maggior parte delle codifiche."
 
 #: ../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 ""
-"Se si seleziona questa casella, le informazioni (copertina e meta "
-"informazioni) cambiate per questa traccia saranno copiate anche in tutte le "
-"altre tracce selezionate. Usare con cautela."
+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 "Se si seleziona questa casella, le informazioni (copertina e meta informazioni) cambiate per questa traccia saranno copiate anche in tutte le altre tracce selezionate. Usare con cautela."
 
 #: ../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 ""
-"Se non si seleziona automaticamente la playlist principale, l'importazione "
-"iniziale del database sarà molto più veloce perché non verrà aggiornata "
-"l'interfaccia."
+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: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 ""
-"Se si selezionano diverse tracce nella lista delle tracce e si modifica "
-"un'etichetta della prima traccia, saranno aggiornate anche le etichette "
-"delle altre tracce."
+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 "Per memorizzare sull'iPod l'ordine delle tracce come visualizzato, scegliere «Salva l'ordine visualizzato delle tracce» dal menù «Modifica» o selezionare «Salvataggio automatico» sotto."
 
 #: ../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:"
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr "Includi le tracce mai ascoltate nella playlist «Voti migliori»"
 
 #: ../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 ""
-"Per memorizzare sull'iPod l'ordine delle tracce come visualizzato scegliere "
-"«Salva l'ordine visualizzato delle tracce» dal menù «Modifica» o selezionare "
-"«Salvataggio automatico» sotto."
+msgid "Info field template:"
+msgstr "Modello campo informazioni:"
 
 #: ../data/gtkpod.glade.h:189
 msgid "Initialize iPod"
@@ -904,756 +797,528 @@
 "Inserisci dopo"
 
 #: ../data/gtkpod.glade.h:192
-msgid "Keeps all compilation CDs grouped together in the artists sort tab."
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
 msgstr ""
-"Mantiene raggruppati tutti i CD di compilation nelle schede di ordinamento "
-"degli artisti."
+"Ultimo ascolto\n"
+"Ultima modifica\n"
+"Aggiunto\n"
 
-#: ../data/gtkpod.glade.h:193
+#: ../data/gtkpod.glade.h:196
 msgid "Live _updating"
 msgstr "Aggiornamento contin_uo"
 
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:197
 msgid "Load iPod(s)"
 msgstr "Leggi gli iPod"
 
-#: ../data/gtkpod.glade.h:195
-msgid "Lower Margin"
-msgstr "Limite inferiore"
-
-#: ../data/gtkpod.glade.h:196
-msgid "M4A with :"
-msgstr "M4A con :"
-
-#: ../data/gtkpod.glade.h:197
-msgid "MP3 with :"
-msgstr "MP3 con :"
-
 #: ../data/gtkpod.glade.h:198
-msgid "Match al_l of the following"
-msgstr "Verifica _tutti i seguenti"
+msgid "Logic:"
+msgstr "Logica: "
 
 #: ../data/gtkpod.glade.h:199
-msgid "Match an_y of the following"
-msgstr "Verifica _uno qualsiasi dei seguenti"
+msgid ""
+"MP3\n"
+"AAC\n"
+msgstr ""
+"MP3\n"
+"AAC\n"
 
-#: ../data/gtkpod.glade.h:200
-msgid "Match only _checked tracks"
-msgstr "Confronta solo le tracce _selezionate"
-
-#: ../data/gtkpod.glade.h:201
-msgid "Maximum number of background threads:"
-msgstr "Numero massimo di thread sullo sfondo:"
-
 #: ../data/gtkpod.glade.h:202
-msgid "Maximum size of cache directory (in GB):"
-msgstr "Dimensione massima della directory della cache (in GB):"
+msgid "Mass-modify tags when multiple tracks are selected"
+msgstr "Modifica le etichette in massa quando sono selezionate più tracce"
 
 #: ../data/gtkpod.glade.h:203
-msgid "Model:"
-msgstr "Modello:"
+msgid "Match only _checked tracks"
+msgstr "Confronta solo le tracce _selezionate"
 
-#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
-msgid "Modified"
-msgstr "Modificato"
+#: ../data/gtkpod.glade.h:204
+msgid "Match:"
+msgstr "Confronto:"
 
 #: ../data/gtkpod.glade.h:205
-msgid "Most Recently Played Tracks"
-msgstr "Tracce riprodotte più recentemente"
+msgid "Maximum cache size:"
+msgstr "Dimensione massima cache:"
 
 #: ../data/gtkpod.glade.h:206
-msgid "Move selected attributes to the displayed list"
-msgstr "Sposta gli attributi selezionati nella lista di quelli visualizzati"
+msgid "Maximum threads:"
+msgstr "Numero massimo di thread:"
 
 #: ../data/gtkpod.glade.h:207
-msgid "Music Root:"
-msgstr "Radice della musica:"
+msgid "Metadata"
+msgstr "Metadati"
 
 #: ../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 ""
-"I file musicali possono avere delle immagini incorporate nell'etichetta "
-"APIC. Attualmente questo è supportato solo per i file MP3."
+msgid "Model:"
+msgstr "Modello:"
 
 #: ../data/gtkpod.glade.h:209
-msgid "Never show this dialogue again"
-msgstr "Non mostrare più questa finestra di dialogo"
+msgid "Modified:"
+msgstr "Modificato:"
 
-#: ../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:210
+msgid "Most Recently Played Tracks"
+msgstr "Tracce riprodotte più recentemente"
 
 #: ../data/gtkpod.glade.h:211
-msgid "No lower margin"
-msgstr "Nessun limite inferiore"
+msgid "Music"
+msgstr "Musica"
 
 #: ../data/gtkpod.glade.h:212
-msgid "No upper margin"
-msgstr "Nessun limite superiore"
+msgid "Music root:"
+msgstr "Radice della musica:"
 
 #: ../data/gtkpod.glade.h:213
-msgid "Non-transferred tracks"
-msgstr "Tracce non trasferite"
+msgid "Never show this dialogue again"
+msgstr "Non mostrare più questa finestra di dialogo"
 
 #: ../data/gtkpod.glade.h:214
-msgid "None"
-msgstr "Nessuno"
+#: ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76
+#: ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113
+#: ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448
+#: ../src/misc_playlist.c:450
+msgid "New Playlist"
+msgstr "Nuova playlist"
 
 #: ../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 ""
-"Normalmente la codifica specificata la prima volta che si importa una "
-"traccia viene utilizzata per il nome del file. Se si sceglie questa opzione "
-"si può impostare una codifica differente con il selettore delle codifiche "
-"(Preferenze/«Aggiungi/Aggiorna/Sincronizza»). Nota: la codifica è "
-"memorizzata nel file con le informazioni estese (vedere "
-"Preferenze/«Scrittura di iTunesDB»). Le tracce importate prima della V0.51 "
-"non avranno alcuna codifica memorizzata. Verrà usata invece la codifica "
-"specificata."
+msgid "No lower margin"
+msgstr "Nessun limite inferiore"
 
 #: ../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 ""
-"Normalmente la codifica specificata al momento di importare la traccia verrà "
-"usata per aggiornare le informazioni sulla traccia. Se si è scelta la "
-"codifica sbagliata al momento della prima importazione di una traccia e si "
-"vuole correggerla usando la funzione «Aggiorna traccia», si deve selezionare "
-"questa opzione. Nota: le informazioni sulla codifica sono memorizzate nel "
-"file con le informazioni estese (vedere «Scrittura di iTunesDB» sotto) e le "
-"tracce importate prima della V0.51 non avranno una codifica memorizzata. "
-"Verrà usata invece la codifica specificata qui sopra."
+msgid "No upper margin"
+msgstr "Nessun limite superiore"
 
 #: ../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 ""
-"Normalmente la codifica specificata al momento di importare la traccia verrà "
-"usata per scrivere l'etichetta. Se si è scelta la codifica sbagliata al "
-"momento della prima importazione, si deve selezionare questa opzione insieme "
-"alla codifica giusta. Nota: le informazioni sulla codifica sono memorizzate "
-"nel file con le informazioni estese (vedere «Scrittura di iTunesDB» nella "
-"pagina «Input/Output») e le tracce importate prima della V0.51 non avranno "
-"una codifica memorizzata, verrà usata la codifica specificata nella nella "
-"pagina «Input/Output»."
+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 "Normalmente la codifica specificata la prima volta che si importa una traccia viene utilizzata per il nome del file. Se si sceglie questa opzione si può impostare una codifica differente con il selettore delle codifiche (Preferenze/«Aggiungi/Aggiorna/Sincronizza»). Nota: la codifica è memorizzata nel file con le informazioni estese (vedere Preferenze/«Scrittura di iTunesDB»). Le tracce importate prima della V0.51 non avranno alcuna codifica memorizzata. Verrà usata invece la codifica specificata."
 
 #: ../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."
+"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 ""
-"Normalmente, se una traccia non è più presente nella directory di "
-"sincronizzazione, verrà rimossa dalla playlist, ma non dall'archivio "
-"dell'iPod o da quello locale.\n"
-"Se questa opzione è selezionata, le tracce saranno rimosse completamente "
-"dall'archivio dell'iPod o da quello locale, a meno che la traccia non faccia "
-"parte anche di altre playlist.\n"
-"NOTA: se si sincronizza con la playlist principale, si deve selezionare "
-"questa opzione se si vuole che le tracce siano rimosse perché rimuovere "
-"dalla playlist principale significa rimuovere dall'iPod."
+"Normalmente, se una traccia non è più presente nella directory di sincronizzazione, verrà rimossa dalla playlist, ma non dall'archivio dell'iPod o da quello locale.\n"
+"Se questa opzione è selezionata, le tracce saranno rimosse completamente dall'archivio dell'iPod o da quello locale, a meno che la traccia non faccia parte anche di altre playlist.\n"
+"NOTA: se si sincronizza con la playlist principale, si deve selezionare questa opzione se si vuole che le tracce siano rimosse perché rimuovere dalla playlist principale significa rimuovere dall'iPod."
 
 #: ../data/gtkpod.glade.h:221
+msgid "Normally, the encoding specified above will only be used when importing new tracks, and for any operations involving existing tracks, the encoding specified when the file was first imported will be used. You can use the options below to override this behavior, in case you specified the encoding incorrectly for the first import."
+msgstr "Normalmente la codifica specificata sopra viene usata solo per l'importazione di nuove tracce, mentre per qualsiasi operazione che coinvolge tracce esistenti viene usata la codifica specificata quando il file venne importato per la prima volta. Si possono usare le opzioni sottostanti per modificare questo comportamento, nel caso si sia specificata una codifica sbagliata per la prima importazione."
+
+#: ../data/gtkpod.glade.h:222
 msgid "Notes sync command:"
 msgstr "Comando per sincronizzare le note:"
 
-#: ../data/gtkpod.glade.h:222
-msgid "Number of playlists"
-msgstr "Numero di playlist"
-
 #: ../data/gtkpod.glade.h:223
-msgid "Number of tracks"
-msgstr "Numero di tracce"
+msgid "Number of filter tabs:"
+msgstr "Numero di schede di ordinamento:"
 
 #: ../data/gtkpod.glade.h:224
-msgid "Number of tracks in generated playlists:"
-msgstr "Numero di tracce nelle playlist generate:"
+msgid "Number of tracks:"
+msgstr "Numero di tracce:"
 
 #: ../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», «Voti "
-"migliori» e «Riprodotte più recentemente». Scegliere «0» per «nessun limite»."
-
-#: ../data/gtkpod.glade.h:226
-msgid "Ogg with :"
-msgstr "Ogg con :"
-
-#: ../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:228
+#: ../data/gtkpod.glade.h:226
 msgid "On startup automatically sync with the following directory"
 msgstr "All'avvio sincronizza automaticamente con la seguente directory"
 
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically update (Live Playlist)"
 msgstr "All'avvio aggiorna automaticamente (Live Playlist)"
 
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:228
 msgid "One for each Album"
 msgstr "Una per ogni album"
 
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:229
 msgid "One for each Artist"
 msgstr "Una per ogni artista"
 
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:230
 msgid "One for each Composer"
 msgstr "Una per ogni compositore"
 
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:231
 msgid "One for each Genre"
 msgstr "Una per ogni genere"
 
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:232
 msgid "One for each Rating"
 msgstr "Una per ogni voto"
 
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:233
 msgid "One for each Year"
 msgstr "Una per ogni anno"
 
-#: ../data/gtkpod.glade.h:236
-msgid "Overwrite tags that are already set"
-msgstr "Sovrascrivi le etichette che sono già impostate"
+#: ../data/gtkpod.glade.h:234
+msgid "Overwrite existing tags"
+msgstr "Sovrascrivi le etichette esistenti"
 
-#: ../data/gtkpod.glade.h:237
-msgid "Password:"
-msgstr "Password:"
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
+msgstr "Scansiona il nome del file per impostare le etichette mancanti"
 
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:236
 msgid "Path:"
 msgstr "Percorso:"
 
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:237
 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:238
+msgid "Playcount:"
+msgstr "Contatore riproduzioni:"
 
-#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
-#: ../src/misc_conversion.c:77
-msgid "Playcount"
-msgstr "Contatore riproduzioni"
+#: ../data/gtkpod.glade.h:239
+msgid "Played:"
+msgstr "Riprodotto:"
 
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
-msgid "Played"
-msgstr "Riprodotto"
-
-#: ../data/gtkpod.glade.h:243
+#: ../data/gtkpod.glade.h:240
 msgid "Playlist name:"
 msgstr "Nome della playlist:"
 
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:241
 msgid "Playlist type:"
 msgstr "Tipo di playlist:"
 
-#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
+#: ../data/gtkpod.glade.h:242
+#: ../src/display_playlists.c:2397
 msgid "Playlists"
 msgstr "Playlist"
 
-#: ../data/gtkpod.glade.h:246
+#: ../data/gtkpod.glade.h:243
 msgid "Please refer to the notice below."
 msgstr "Consultare l'avviso seguente."
 
-#: ../data/gtkpod.glade.h:247
-msgid "Please specify a time interval"
-msgstr "Specificare un intervallo di tempo"
+#: ../data/gtkpod.glade.h:244
+msgid "Position:"
+msgstr "Posizione:"
 
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:245
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:246
 msgid "Progress Information"
 msgstr "Informazioni sull'avanzamento"
 
-#: ../data/gtkpod.glade.h:250
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
+msgstr ""
+"Fornire un comando della shell per generare una miniatura per i file video. Le seguenti stringhe di formato saranno espanse:\n"
+"- %f: il file di input\n"
+"- %o: il file di output (generato automaticamente)\n"
+
+#: ../data/gtkpod.glade.h:252
 msgid "R_ename Album"
 msgstr "R_inomina album"
 
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:253
 msgid "Random Playlist from Displayed Tracks"
 msgstr "Playlist casuale dalle tracce mostrate"
 
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:254
 msgid "Randomize Current Playlist"
 msgstr "Rendi casuale la playlist corrente"
 
-#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
-#: ../src/misc_conversion.c:78
-msgid "Rating"
-msgstr "Voto"
-
-#: ../data/gtkpod.glade.h:254
-msgid "Read coverart from embedded APIC data"
-msgstr "Leggi la copertina dai dati APIC incorporati"
-
 #: ../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)"
+msgid "Rating:"
+msgstr "Voto:"
 
 #: ../data/gtkpod.glade.h:256
-msgid "Remove selected attributes from the displayed list"
-msgstr "Rimuove gli attributi selezionati dalla lista di quelli visualizzati"
+msgid "Read embedded cover art information"
+msgstr "Leggi informazioni incorporate sulle copertine"
 
 #: ../data/gtkpod.glade.h:257
-msgid "Repository Options"
-msgstr "Opzioni dell'archivio"
+msgid "Read embedded tags from music files"
+msgstr "Leggi dai file musicali le etichette incorporate"
 
 #: ../data/gtkpod.glade.h:258
-msgid "Repository name:"
-msgstr "Nome dell'archivio:"
+msgid "Report a _Problem"
+msgstr "Segnala un _problema"
 
 #: ../data/gtkpod.glade.h:259
-msgid "Repository type:"
-msgstr "Tipo di archivio:"
+msgid "Report problems when accessing mserv"
+msgstr "Notifica problemi nell'accedere a mserv"
 
 #: ../data/gtkpod.glade.h:260
-msgid "Root directory of mserv database (trackinfo root)."
-msgstr "Directory radice del database mserv (radice di trackinfo)."
+msgid "Repository"
+msgstr "Archivio"
 
 #: ../data/gtkpod.glade.h:261
-msgid "Rules"
-msgstr "Regole"
+msgid "Repository Options"
+msgstr "Opzioni dell'archivio"
 
-#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
-msgid "Save Changes"
-msgstr "Salva le modifiche"
+#: ../data/gtkpod.glade.h:262
+msgid "Repository name:"
+msgstr "Nome dell'archivio:"
 
 #: ../data/gtkpod.glade.h:263
-msgid "Scrobble Tracks?"
-msgstr "Invia le tracce a Audioscrobbler?"
+msgid "Repository type:"
+msgstr "Tipo di archivio:"
 
 #: ../data/gtkpod.glade.h:264
+msgid "Repository/iPod Options"
+msgstr "Opzioni di archivi e iPod"
+
+#: ../data/gtkpod.glade.h:265
+#: ../src/context_menus.c:806
+msgid "Save Changes"
+msgstr "Salva le modifiche"
+
+#: ../data/gtkpod.glade.h:266
 msgid "Select '-1' for no upper limit."
 msgstr "Scegliere «-1» per nessun limite superiore."
 
-#: ../data/gtkpod.glade.h:265
+#: ../data/gtkpod.glade.h:267
 msgid "Select '0' for no lower limit."
 msgstr "Scegliere «0» per nessun limite inferiore."
 
-#: ../data/gtkpod.glade.h:266
-msgid ""
-"Selected\n"
-"Playlist"
-msgstr ""
-"Playlist\n"
-"selezionata"
-
 #: ../data/gtkpod.glade.h:268
-msgid ""
-"Selected\n"
-"Tracks"
-msgstr ""
-"Tracce\n"
-"selezionate"
-
-#: ../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:271
+#: ../data/gtkpod.glade.h:269
 msgid "Selected Filter Tab Entry from Hard Disk"
 msgstr "Voce selezionata nella scheda di filtro dal disco fisso"
 
-#: ../data/gtkpod.glade.h:272
+#: ../data/gtkpod.glade.h:270
 msgid "Selected Filter Tab Entry from Playlist"
 msgstr "Voce selezionata nella scheda di filtro dalla playlist"
 
-#: ../data/gtkpod.glade.h:273
+#: ../data/gtkpod.glade.h:271
 msgid "Selected Filter Tab Entry from iPod"
 msgstr "Voce selezionata nella scheda di filtro dall'iPod"
 
-#: ../data/gtkpod.glade.h:274
+#: ../data/gtkpod.glade.h:272
 msgid "Selected Playlist Including Tracks from Database"
 msgstr "Playlist selezionata comprese tracce dal database"
 
-#: ../data/gtkpod.glade.h:275
+#: ../data/gtkpod.glade.h:273
 msgid "Selected Playlist Including Tracks from Hard Disk"
 msgstr "Playlist selezionata comprese tracce dal disco fisso"
 
-#: ../data/gtkpod.glade.h:276
+#: ../data/gtkpod.glade.h:274
 msgid "Selected Playlist Including Tracks from iPod"
 msgstr "Playlist selezionata comprese tracce dall'iPod"
 
-#: ../data/gtkpod.glade.h:277
+#: ../data/gtkpod.glade.h:275
 msgid "Selected Tab _Entry"
 msgstr "Voc_e nella scheda selezionata"
 
-#: ../data/gtkpod.glade.h:278
+#: ../data/gtkpod.glade.h:276
 msgid "Selected Tracks from Database"
 msgstr "Tracce selezionate dal database"
 
-#: ../data/gtkpod.glade.h:279
+#: ../data/gtkpod.glade.h:277
 msgid "Selected Tracks from Hard Disk"
 msgstr "Tracce selezionate dal disco fisso"
 
-#: ../data/gtkpod.glade.h:280
+#: ../data/gtkpod.glade.h:278
 msgid "Selected Tracks from Playlist"
 msgstr "Tracce selezionate dalla playlist"
 
-#: ../data/gtkpod.glade.h:281
+#: ../data/gtkpod.glade.h:279
 msgid "Selected Tracks from iPod"
 msgstr "Tracce selezionate dall'iPod"
 
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:280
 msgid "Selected _Playlist"
 msgstr "_Playlist selezionata"
 
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:281
 msgid "Selected _Tracks"
 msgstr "_Tracce selezionate"
 
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:282
 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:286
+#: ../data/gtkpod.glade.h:283
 msgid "Set Cover Art from _File"
 msgstr "Imposta la copertina da un _file"
 
-#: ../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:284
+msgid "Set still missing tags to file name"
+msgstr "Imposta dal nome del file le etichette mancanti"
 
-#: ../data/gtkpod.glade.h:288
-msgid "Set options for Calendar/Contacts/Notes"
-msgstr "Imposta le opzioni per Calendario/Contatti/Note"
+#: ../data/gtkpod.glade.h:285
+msgid "Settings..."
+msgstr "Impostazioni..."
 
-#: ../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 ""
-"Impostare a «aacgain -q -k» per usare la funzionalità «Normalizza volume» "
-"nel menù «Strumenti». Se impostato, i dati mancanti per la normalizzazione "
-"dei file .m4a e .m4b saranno calcolati e scritti nel file musicale usando "
-"questo comando."
-
-#: ../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 ""
-"Impostare a «mp3gain -q -k» per usare la funzionalità «Normalizza volume» "
-"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:291
-msgid "Set this to your last.fm password"
-msgstr "Impostare la propria password su last.fm"
-
-#: ../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:293
-msgid ""
-"Set to 0 to effectively disable caching (a maximum of one track will be "
-"cached at a time)."
-msgstr ""
-"Impostare a 0 per disabilitare la cache (al massimo una traccia per volta "
-"sarà mantenuta nella cache)."
-
-#: ../data/gtkpod.glade.h:294
-msgid ""
-"Set to 0 to use as many background threads as CPUs are available on your "
-"system."
-msgstr ""
-"Impostare a 0 per usare tanti thread sullo sfondo quante sono le CPU "
-"disponibili nel sistema."
-
-#: ../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:296
+#: ../data/gtkpod.glade.h:286
 msgid "Show summary of sync result"
 msgstr "Mostra un riassunto dei risultati della sincronizzazione"
 
-#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
-#: ../src/repository.c:1356
+#: ../data/gtkpod.glade.h:287
+msgid "Skip the track"
+msgstr "Salta la traccia"
+
+#: ../data/gtkpod.glade.h:288
+#: ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
 msgid "Smart Playlist"
 msgstr "Playlist intelligente"
 
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:289
+msgid "Sort by:"
+msgstr "Ordina per:"
+
+#: ../data/gtkpod.glade.h:290
 msgid "Sort tracks according to: "
 msgstr "Ordina le tracce secondo: "
 
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:291
 msgid "Sorting Options"
 msgstr "Opzioni di ordinamento"
 
-#: ../data/gtkpod.glade.h:300
-msgid "Sorting case sensitive"
-msgstr "Ordinamento sensibile alle maiuscole"
+#: ../data/gtkpod.glade.h:292
+msgid "Sorting..."
+msgstr "Ordinamento..."
 
-#: ../data/gtkpod.glade.h:301
-msgid "Sorttab: "
-msgstr "Scheda di ordinamento: "
-
-#: ../data/gtkpod.glade.h:302
-msgid "Sorttabs"
-msgstr "Schede di ordinamento"
-
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:293
 msgid "Source:"
 msgstr "Sorgente:"
 
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:295
 #, 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 mount dell'iPod."
+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 mount dell'iPod."
 
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:296
 msgid "Specify interval"
 msgstr "Specificare l'intervallo"
 
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:297
 msgid "Start display automatically"
 msgstr "Mostra automaticamente"
 
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:298
 msgid "Synchronise Contacts, Calendar and Notes"
 msgstr "Sincronizza contatti, calendario e note"
 
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:299
 msgid "Synchronize All"
 msgstr "Sincronizza tutto"
 
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:300
 msgid "Synchronize Calendar"
 msgstr "Sincronizza il calendario"
 
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:301
 msgid "Synchronize Contacts"
 msgstr "Sincronizza i contatti"
 
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:302
 msgid "Synchronize Notes"
 msgstr "Sincronizza le note"
 
-#: ../data/gtkpod.glade.h:313
-msgid "Template for info field: "
-msgstr "Modello per il campo delle informazioni: "
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
+msgstr "Codifica nomi file ed etichette:"
 
-#: ../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 ""
-"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:304
+msgid "Text color"
+msgstr "Colore del testo"
 
-#: ../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 ""
-"L'output degli script di conversione sullo sfondo è copiato sotto. Ogni "
-"linguetta corrisponde ad un thread sullo sfondo."
+#: ../data/gtkpod.glade.h:305
+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 "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:316
-msgid ""
-"The tags are written to the files on your harddrive and on the iPod (if "
-"available)."
-msgstr ""
-"Le etichette vengono scritte sui file nel disco fisso e sull'iPod (se "
-"disponibile)."
+#: ../data/gtkpod.glade.h:306
+msgid "The output of the background conversion scripts is copied below. Each page of the notebook corresponds to one background thread."
+msgstr "L'output degli script di conversione sullo sfondo è copiato sotto. Ogni linguetta corrisponde ad un thread sullo sfondo."
 
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:307
 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: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: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 ""
-"Questa è la strada da seguire, ma non tutti i programmi probabilmente la "
-"supportano già. ID3v2.4 usa unicode per memorizzare le etichette, quindi non "
-"c'è più  bisogno di preoccuparsi delle codifiche. gtkpod userà la codifica "
-"UTF8 perché questa non incrementerà la dimensione delle etichette ASCII "
-"pure. Le etichette ID3v2.2/4 verranno scritte se sono già presenti sul file "
-"su cui si va a scrivere."
-
-#: ../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:321
+#: ../data/gtkpod.glade.h:308
 msgid "Time:"
 msgstr "Ora:"
 
-#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
-#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
+#: ../data/gtkpod.glade.h:309
+#: ../src/display_sorttabs.c:3004
+#: ../src/display_spl.c:83
+#: ../src/misc_conversion.c:62
 msgid "Title"
 msgstr "Titolo"
 
-#: ../data/gtkpod.glade.h:323
-msgid ""
-"Total\n"
-"(iPod)"
-msgstr ""
-"Totale\n"
-"(iPod)"
+#: ../data/gtkpod.glade.h:310
+msgid "To fill additional information, <i>gtkpod</i> can use a database provided by the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, leave this alone."
+msgstr "Per inserire informazioni aggiuntive, il programma può usare un database fornito dal server musicale <i>mserv</i>. Se non si sa cosa è <i>mserv</i>, ignorare questa opzione."
 
-#: ../data/gtkpod.glade.h:325
-msgid ""
-"Total\n"
-"(local)"
-msgstr ""
-"Totale\n"
-"(locale)"
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
+msgstr "In alto"
 
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:312
 msgid "Tracks"
 msgstr "Tracce"
 
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:313
 msgid "Tracks Most Often Listened To"
 msgstr "Tracce ascoltate più spesso"
 
-#: ../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 ""
-"Le tracce possono essere trasferite sullo sfondo non appena sono aggiunte "
-"all'archivio di un iPod. Altrimenti saranno trasferite al momento "
-"dell'espulsione; il contenuto dell'iPod è completamente intatto fino a quel "
-"momento."
-
-#: ../data/gtkpod.glade.h:330
+#: ../data/gtkpod.glade.h:314
 msgid "Tracks in Selected Tab _Entry"
 msgstr "Tracce nella scheda s_elezionata"
 
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:315
 msgid "Tracks in Selected _Playlist"
 msgstr "Tracce nella _playlist selezionata"
 
-#: ../data/gtkpod.glade.h:332
-msgid "Transfer tracks to the iPod in the background"
+#: ../data/gtkpod.glade.h:316
+msgid "Transfer tracks in background mode"
 msgstr "Trasferisci le tracce all'iPod sullo sfondo"
 
-#: ../data/gtkpod.glade.h:333
-msgid "Translators"
-msgstr "Traduttori"
+#: ../data/gtkpod.glade.h:317
+msgid "Try to load contents of all connected iPods. For each iPod a separate repository must be set up."
+msgstr "Tenta di caricare i contenuti di tutti gli iPod connessi. Per ogni iPod deve essere impostato un archivio separato."
 
-#: ../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 ""
-"Tenta di caricare i contenuti di tutti gli iPod connessi. Per ogni iPod deve "
-"essere impostato un archivio separato."
-
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:318
 msgid "Undo _Track"
 msgstr "Annulla _traccia"
 
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:319
 msgid "Update _mserv Data from File"
 msgstr "Aggiorna i dati _mserv da file"
 
-#: ../data/gtkpod.glade.h:337
-msgid "Update/Sync all playlists now"
-msgstr "Aggiorna/sincronizza tutte le playlist ora"
+#: ../data/gtkpod.glade.h:320
+msgid "Update information about the existing track"
+msgstr "Aggiorna informazioni relative alla traccia esistente"
 
-#: ../data/gtkpod.glade.h:338
-msgid "Update/Sync playlist now"
-msgstr "Aggiorna/sincronizza la playlist ora"
+#: ../data/gtkpod.glade.h:321
+msgid "Update/Sync All Playlists"
+msgstr "Aggiorna/sincronizza tutte le playlist"
 
-#: ../data/gtkpod.glade.h:339
-msgid "Upper margin"
-msgstr "Limite superiore"
+#: ../data/gtkpod.glade.h:322
+msgid "Update/Sync Playlist"
+msgstr "Aggiorna/sincronizza la playlist"
 
-#: ../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:323
+msgid "Use legacy format for MP3 tags"
+msgstr "Usa il vecchio formato per le etichette MP3"
 
-#: ../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:324
+msgid "Use mserv database to fill track information"
+msgstr "Usa il database mserv per riempire informazioni sulla traccia"
 
-#: ../data/gtkpod.glade.h:342
-msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
-msgstr "Usa <i>&lt;Album&gt;.jpg</i> nella directory superiore"
-
-#: ../data/gtkpod.glade.h:343
-msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-msgstr "Usa <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-
-#: ../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: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:346
-msgid "Use mserv database to fill additional information"
-msgstr "Usa il database mserv per aggiungere ulteriori informazioni"
-
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:325
 msgid ""
 "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
 "for this filename."
@@ -1661,209 +1326,206 @@
 "Usare la codifica selezionata (Preferenze/«Aggiungi/Aggiorna/ Sincronizza»)\n"
 " per questo nome di file."
 
-#: ../data/gtkpod.glade.h:349
-msgid ""
-"Use selected encoding (on the 'General' page)\n"
-"when writing tags"
-msgstr ""
-"Usa la codifica selezionata (nella pagina «Generale»)\n"
-"per la scrittura delle etichette"
-
-#: ../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: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: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:354
+#: ../data/gtkpod.glade.h:327
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: ../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 ""
-"Di solito non è desiderabile usare lo stesso titolo per diverse tracce. "
-"Questa opzione può evitare effetti non voluti (specialmente vista l'assenza "
-"della opzione «Annulla»)."
+#: ../data/gtkpod.glade.h:328
+msgid "Video Thumbnail Generation"
+msgstr "Generazione miniature dei video"
 
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
+msgstr "Programma per generare le miniature dei video"
+
+#: ../data/gtkpod.glade.h:330
 msgid "View Full Size"
 msgstr "Mostra a piena grandezza"
 
-#: ../data/gtkpod.glade.h:357
-msgid "WAV with :"
-msgstr "WAV con :"
+#: ../data/gtkpod.glade.h:331
+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 "Durante la copia dall'iPod non viene controllato se il file di destinazione esiste. Selezionare questa opzione farà in modo che gtkpod controlli se la dimensione del file di destinazione è la stessa del file sull'iPod. Se fosse così il file verrà saltato, permettendo una veloce sincronizzazione del contenuto dell'iPod."
 
-#: ../data/gtkpod.glade.h:358
-msgid ""
-"When adding dirs/files, update information of\n"
-"existing tracks with identical filenames"
-msgstr ""
-"Aggiorna le informazioni sulle tracce esistenti con\n"
-"nomi identici durante l'aggiunta di directory e file"
+#: ../data/gtkpod.glade.h:332
+msgid "When updating tracks, display information:"
+msgstr "Durante l'aggiornamento delle tracce, mostra informazioni:"
 
-#: ../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 ""
-"Durante la copia dall'iPod non viene controllato se il file di destinazione "
-"esiste. Selezionare questa opzione farà in modo che gtkpod controlli se la "
-"dimensione del file di destinazione è la stessa del file sull'iPod. Se fosse "
-"così il file verrà saltato, permettendo una veloce sincronizzazione del "
-"contenuto dell'iPod."
+#: ../data/gtkpod.glade.h:333
+msgid "Will show a list of tracks removed and a list of tracks newly added or updated."
+msgstr "Mostra una lista delle tracce rimosse e una lista di tracce nuove aggiunte o aggiornate."
 
-#: ../data/gtkpod.glade.h:361
-msgid "When syncing playlists"
-msgstr "Durante la sincronizzazione delle playlist"
-
-#: ../data/gtkpod.glade.h:362
-msgid ""
-"Will show a list of tracks removed and a list of tracks newly added or "
-"updated."
-msgstr ""
-"Mostra una lista delle tracce rimosse e una lista di tracce nuove aggiunte o "
-"aggiornate."
-
-#: ../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:364
+#: ../data/gtkpod.glade.h:334
 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:365
+#: ../data/gtkpod.glade.h:335
+msgid "Write tags to disk when edited"
+msgstr "Scrivi le etichette sul disco quando vengono modificate"
+
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
 msgid ""
-"Write extended information (PC filenames, SHA1 hashes,\n"
-"encoding...). Recommended."
+"You can separate several templates by a ';'. The first one matching the filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"Scrivi informazioni estese (nome del file sul PC,\n"
-" hash SHA1, codifica). Consigliato."
+"È possibile separare diversi modelli con «;». Verrà usato il primo che corrisponde al nome del file.\n"
+"\n"
+"Esempio: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artista: %a\n"
+"- album: %A\n"
+"- compositore: %c\n"
+"- titolo: %t\n"
+"- genere: %G\n"
+"- n° traccia: %T\n"
+"- n° CD: %C\n"
+"- anno: %Y\n"
+"- salta un dato: %*\n"
+"- il carattere '%': %%."
 
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:352
+#, no-c-format
 msgid ""
-"You can also use the table headers, but this allows you to sort according to "
-"a column that is not displayed."
+"You can separate several templates by a ';'. The first one matching the filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"Si possono usare le intestazioni della tabella, ma questo metodo permette "
-"l'ordinamento secondo una colonna non visualizzata."
+"È possibile separare diversi modelli con «;». Verrà usato il primo che corrisponde al nome del file.\n"
+"\n"
+"Esempi:\n"
+"- <i>folder.jpg</i>: Usa <i>folder.jpg</i> come copertina.\n"
+"- <i>folder</i>: Usa <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Usa <i>&lt;Album&gt;.jpg</i> nella directory superiore\n"
+"- <i>%a</i>: Usa <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: Prima prova <i>folder.jpg</i>, poi <i>&lt;artista&gt;.jpg</i>\n"
+"\n"
+"- artista: %a\n"
+"- album: %A\n"
+"- compositore: %c\n"
+"- titolo: %t\n"
+"- genere: %G\n"
+"- n° traccia: %T\n"
+"- n° CD: %C\n"
+"- anno: %Y\n"
+"- salta un dato: %*\n"
+"- il carattere '%': %%."
 
-#: ../data/gtkpod.glade.h:368
+#: ../data/gtkpod.glade.h:371
 msgid "_About gtkpod"
 msgstr "Informazioni _su gtkpod"
 
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:372
 msgid "_Add Album"
 msgstr "_Aggiungi album"
 
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:373
 msgid "_Add Image"
 msgstr "_Aggiungi immagine"
 
-#: ../data/gtkpod.glade.h:371
+#: ../data/gtkpod.glade.h:374
 msgid "_Album"
 msgstr "_Album"
 
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:375
 msgid "_All Tracks"
-msgstr "_Tutte le tracce"
+msgstr "Tutte le tr_acce"
 
-#: ../data/gtkpod.glade.h:373
-msgid "_Arrange Sort Tabs"
+#: ../data/gtkpod.glade.h:376
+msgid "_Arrange Filter Tabs"
 msgstr "_Sistema le schede di ordinamento"
 
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:377
 msgid "_Check iPod's Files"
 msgstr "_Controlla i file dell'iPod"
 
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:378
+msgid "_Contents"
+msgstr "_Sommario"
+
+#: ../data/gtkpod.glade.h:379
 msgid "_Conversion Log"
 msgstr "Registro di _conversione"
 
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:380
 msgid "_Create Playlists"
 msgstr "_Crea playlist"
 
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:381
 msgid "_Create iPod's Directories"
 msgstr "_Crea le directory dell'iPod"
 
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:382
 msgid "_Delete"
 msgstr "_Elimina"
 
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:383
 msgid "_Display"
 msgstr "_Mostra"
 
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:384
 msgid "_Displayed Tracks"
-msgstr "_Tracce visualizzate"
+msgstr "Tracce _visualizzate"
 
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:385
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../data/gtkpod.glade.h:382
-msgid "_Encoding (ID3, files):"
-msgstr "_Codifica (ID3, file):"
-
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:386
 msgid "_Enqueue"
 msgstr "_Metti in coda"
 
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:387
 msgid "_Export Tracks from Database"
 msgstr "_Esporta le tracce dal database"
 
-#: ../data/gtkpod.glade.h:385
-msgid "_File"
-msgstr "_File"
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr "_Meno schede di ordinamento"
 
-#: ../data/gtkpod.glade.h:386
+#: ../data/gtkpod.glade.h:389
+msgid "_Filter Bar"
+msgstr "Barra del _filtro"
+
+#: ../data/gtkpod.glade.h:390
 msgid "_General"
 msgstr "_Generale"
 
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:391
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../data/gtkpod.glade.h:388
-msgid "_Ignore rules"
-msgstr "_Ignora le regole"
-
-#: ../data/gtkpod.glade.h:389
-msgid "_Image"
-msgstr "_Immagine"
-
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:392
 msgid "_Info Window"
 msgstr "_Finestra di informazioni"
 
-#: ../data/gtkpod.glade.h:391
-msgid "_Last.FM"
-msgstr "_Last.FM"
-
-#: ../data/gtkpod.glade.h:392
-msgid "_Less Sort Tabs"
-msgstr "_Meno schede di ordinamento"
-
 #: ../data/gtkpod.glade.h:393
 msgid "_Limit to"
 msgstr "_Limita a"
@@ -1877,160 +1539,131 @@
 msgstr "_Locale"
 
 #: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+msgstr "_Testi"
+
+#: ../data/gtkpod.glade.h:397
 msgid "_M3U"
 msgstr "_M3U"
 
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:398
 msgid "_Misc."
 msgstr "_Misc."
 
-#: ../data/gtkpod.glade.h:398
-msgid "_More Sort Tabs"
+#: ../data/gtkpod.glade.h:399
+msgid "_More Filter Tabs"
 msgstr "_Più schede di ordinamento"
 
-#: ../data/gtkpod.glade.h:399
-msgid "_Newly Added Tracks"
-msgstr "_Tracce nuove aggiunte"
-
 #: ../data/gtkpod.glade.h:400
-msgid "_Normalize Volume"
-msgstr "_Normalizza il volume"
+msgid "_Music"
+msgstr "_Musica"
 
 #: ../data/gtkpod.glade.h:401
-msgid "_Number of sort tabs:"
-msgstr "_Numero di schede di ordinamento:"
+msgid "_Newly Added Tracks"
+msgstr "Tracce _nuove aggiunte"
 
 #: ../data/gtkpod.glade.h:402
+msgid "_Normalize Volume"
+msgstr "_Normalizza il volume"
+
+#: ../data/gtkpod.glade.h:403
 msgid "_PLS"
 msgstr "_PLS"
 
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
+msgid "_Photos"
+msgstr "_Fotografie"
+
+#: ../data/gtkpod.glade.h:405
 msgid "_Play Now"
 msgstr "_Riproduci ora"
 
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:406
 msgid "_Podcasts"
 msgstr "_Podcast"
 
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:407
 msgid "_Prefer Local"
 msgstr "_Preferisci locali"
 
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:408
 msgid "_Remove Album"
 msgstr "_Rimuovi album"
 
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:409
 msgid "_Remove Cover Art"
 msgstr "_Rimuovi la copertina"
 
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:410
 msgid "_Remove Images"
 msgstr "_Rimuovi immagini"
 
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:411
 msgid "_Save Changes"
 msgstr "_Salva le modifiche"
 
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:412
 msgid "_Save Displayed Track Order"
 msgstr "_Salva l'ordine visualizzato delle tracce"
 
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:413
 msgid "_Sorting"
 msgstr "_Ordinamento"
 
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:414
 msgid "_Synchronize Playlist with Dir(s)"
 msgstr "_Sincronizza la playlist con le directory"
 
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:415
 msgid "_Toolbar"
 msgstr "_Barra degli strumenti"
 
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:416
 msgid "_Tools"
 msgstr "_Strumenti"
 
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:417
 msgid "_Tooltips"
 msgstr "_Suggerimenti"
 
-#: ../data/gtkpod.glade.h:416
-msgid "_Track Info"
-msgstr "Informazioni sulla _traccia"
-
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:418
 msgid "_Undo All"
 msgstr "Ann_ulla tutto"
 
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:419
 msgid "_Update Tracks from File"
 msgstr "_Aggiorna tracce da file"
 
-#: ../data/gtkpod.glade.h:419
+#: ../data/gtkpod.glade.h:420
 msgid "_Video"
 msgstr "_Video"
 
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:421
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:422
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../data/gtkpod.glade.h:423
 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'."
+#: ../data/gtkpod.glade.h:424
+msgid "checkbutton"
 msgstr ""
-"artista: %a, album: %A, compositore: %c, titolo: %t, genere: %G, numero "
-"traccia: %T, numero CD: %C, anno: %Y, ignora un dato: %*, il carattere «%»: %"
-"%. 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:424
-msgid "folder"
-msgstr "folder"
-
 #: ../data/gtkpod.glade.h:425
-msgid "folder.jpg"
-msgstr "folder.jpg"
+msgid "gtk-revert-to-saved"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:427
-#, no-c-format
-msgid "folder.jpg;%a.jpg"
-msgstr "folder.jpg;%a.jpg"
-
-#: ../data/gtkpod.glade.h:428
-msgid "gtkpod"
-msgstr "gtkpod"
-
-#: ../data/gtkpod.glade.h:429
-msgid "gtkpod Info"
+#: ../data/gtkpod.glade.h:426
+msgid "gtkpod Information"
 msgstr "Informazioni su 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 si aspetta che le etichette ID3 e i nomi dei file siano nella stessa "
-"codifica specificata qui. Si può cambiare per i successivi «Aggiungi file» e "
-"«Aggiungi directory». «Codifica di sistema» è la codifica usata dalla "
-"localizzazione attuale."
-
-#: ../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:433
+#: ../data/gtkpod.glade.h:429
 msgid ""
 "iPod\n"
 "Local Repository (Standard)\n"
@@ -2040,27 +1673,28 @@
 "Archivio locale (standard)\n"
 "Archivio locale (podcast)\n"
 
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:433
 msgid "iPod mountpoint:"
 msgstr "Punto di mount dell'iPod:"
 
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:434
 msgid "iTunesDB backup:"
 msgstr "Copia di iTunesDB:"
 
-#: ../data/gtkpod.glade.h:439
-msgid "mserv Root:"
+#: ../data/gtkpod.glade.h:435
+msgid "mserv Preferences"
+msgstr "Preferenze di mserv"
+
+#: ../data/gtkpod.glade.h:436
+msgid "mserv root:"
 msgstr "Radice di mserv:"
 
-#: ../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:441 ../src/details.c:1347
+#: ../data/gtkpod.glade.h:437
+#: ../src/details.c:1352
 msgid "n/a"
 msgstr "n.d."
 
-#: ../data/gtkpod.glade.h:442
+#: ../data/gtkpod.glade.h:438
 msgid "special_sorttab -- Don't translate!"
 msgstr "special_sorttab -- Don't translate!"
 
@@ -2292,168 +1926,179 @@
 
 #. sanity!
 #. check for "System Charset" and return NULL
-#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+#: ../src/charset.c:163
+#: ../src/charset.c:173
+#: ../src/charset.c:232
+#: ../src/charset.c:248
+#: ../src/charset.c:332
 msgid "System Charset"
 msgstr "Codifica di sistema"
 
 #. 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 ""
-"È stata rilevata un'altra istanza di gtkpod. Server conta riproduzioni non "
-"avviato.\n"
+#: ../src/clientserver.c:215
+msgid "Another instance of gtkpod was detected. Playcount server not started.\n"
+msgstr "È stata rilevata un'altra istanza di gtkpod. Server conta riproduzioni non avviato.\n"
 
-#: ../src/confirmation.c:377
-msgid "Confirmation Dialogue"
-msgstr "Finestra di dialogo di conferma"
+#: ../src/confirmation.c:389
+msgid "Confirmation"
+msgstr "Conferma"
 
-#: ../src/context_menus.c:362
+#: ../src/context_menus.c:364
 #, c-format
 msgid "Copied \"%s\" playlist to %s"
 msgstr "Playlist «%s» copiata in %s"
 
-#: ../src/context_menus.c:401
+#: ../src/context_menus.c:403
 #, 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:429
+#: ../src/context_menus.c:431
 #, c-format
 msgid "Copied '%s' playlist to '%s' in '%s'"
 msgstr "Playlist «%s» copiata su «%s» in «%s»"
 
-#: ../src/context_menus.c:462
+#: ../src/context_menus.c:464
 #, 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:622 ../src/tools.c:854
+#: ../src/context_menus.c:624
+#: ../src/tools.c:854
 msgid "Play Now"
 msgstr "Riproduci ora"
 
-#: ../src/context_menus.c:628 ../src/tools.c:867
+#: ../src/context_menus.c:630
+#: ../src/tools.c:867
 msgid "Enqueue"
 msgstr "Metti in coda"
 
-#: ../src/context_menus.c:634
+#: ../src/context_menus.c:636
 msgid "Copy Tracks to Filesystem"
 msgstr "Copia le tracce sul filesystem"
 
-#: ../src/context_menus.c:641 ../src/file_export.c:1085
+#: ../src/context_menus.c:643
+#: ../src/file_export.c:1085
 msgid "Create Playlist File"
 msgstr "Crea un file di playlist"
 
-#: ../src/context_menus.c:648
+#: ../src/context_menus.c:650
 msgid "Create new Playlist"
 msgstr "Crea una nuova playlist"
 
-#: ../src/context_menus.c:655
+#: ../src/context_menus.c:657
 msgid "Update Tracks from File"
 msgstr "Aggiorna tracce da file"
 
-#: ../src/context_menus.c:669
+#: ../src/context_menus.c:671
 msgid "Sync Playlist with Dir(s)"
 msgstr "Sincronizza la playlist con le directory"
 
-#: ../src/context_menus.c:679
+#: ../src/context_menus.c:681
 msgid "Remove All Tracks from iPod"
 msgstr "Rimuovi tutte le tracce dall'iPod"
 
-#: ../src/context_menus.c:697
+#: ../src/context_menus.c:687
+#: ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr "Sono sicuro"
+
+#: ../src/context_menus.c:699
 msgid "Remove All Podcasts from iPod"
 msgstr "Rimuovi tutti i podcast dall'iPod"
 
-#: ../src/context_menus.c:712
+#: ../src/context_menus.c:714
 msgid "Delete Including Tracks"
 msgstr "Elimina anche le tracce"
 
-#: ../src/context_menus.c:720
+#: ../src/context_menus.c:722
 msgid "Delete But Keep Tracks"
 msgstr "Elimina, ma preserva le tracce"
 
-#: ../src/context_menus.c:728
+#: ../src/context_menus.c:730
 msgid "Edit iPod Properties"
 msgstr "Modifica le proprietà dell'iPod"
 
-#: ../src/context_menus.c:735
+#: ../src/context_menus.c:737
 msgid "Edit Repository Properties"
 msgstr "Modifica le proprietà dell'archivio"
 
-#: ../src/context_menus.c:742
+#: ../src/context_menus.c:744
 msgid "Edit Playlist Properties"
 msgstr "Modifica le proprietà della playlist"
 
-#: ../src/context_menus.c:770
+#: ../src/context_menus.c:772
 msgid "View Full Size Artwork"
 msgstr "Mostra l'artwork a piena grandezza"
 
-#: ../src/context_menus.c:777
+#: ../src/context_menus.c:779
 msgid "Select Cover From File"
 msgstr "Seleziona copertina da file"
 
-#: ../src/context_menus.c:790
+#: ../src/context_menus.c:792
 msgid "Load iPod"
 msgstr "Leggi l'iPod"
 
-#: ../src/context_menus.c:797
+#: ../src/context_menus.c:799
 msgid "Eject iPod"
 msgstr "Espelli l'iPod"
 
-#: ../src/context_menus.c:814
+#: ../src/context_menus.c:816
 msgid "Remove All Tracks from Database"
 msgstr "Rimuovi tutte le tracce dal database"
 
-#: ../src/context_menus.c:829
+#: ../src/context_menus.c:831
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Elimina anche le tracce (disco fisso)"
 
-#: ../src/context_menus.c:837
+#: ../src/context_menus.c:839
 msgid "Delete Including Tracks (Database)"
 msgstr "Elimina anche le tracce (database)"
 
-#: ../src/context_menus.c:845
+#: ../src/context_menus.c:847
 msgid "Delete From iPod"
 msgstr "Elimina dall'iPod"
 
-#: ../src/context_menus.c:853
+#: ../src/context_menus.c:855
 msgid "Delete From Playlist"
 msgstr "Elimina dalla playlist"
 
-#: ../src/context_menus.c:861
+#: ../src/context_menus.c:863
 msgid "Delete From Harddisk"
 msgstr "Elimina dal disco fisso"
 
-#: ../src/context_menus.c:869
+#: ../src/context_menus.c:871
 msgid "Delete From Database"
 msgstr "Elimina dal database"
 
-#: ../src/context_menus.c:877
+#: ../src/context_menus.c:879
 msgid "Alphabetize"
 msgstr "Ordine alfabetico"
 
-#: ../src/context_menus.c:895
+#: ../src/context_menus.c:897
 msgid "Remove Album"
 msgstr "Rimuovi album"
 
-#: ../src/context_menus.c:905
+#: ../src/context_menus.c:907
 msgid "Remove Photo"
 msgstr "Rimuovi foto"
 
-#: ../src/context_menus.c:922
+#: ../src/context_menus.c:924
 msgid "Rename Album"
 msgstr "Rinomina album"
 
-#: ../src/context_menus.c:981 ../src/context_menus.c:1030
+#: ../src/context_menus.c:983
+#: ../src/context_menus.c:1032
 msgid "Copy selected playlist to..."
 msgstr "Copia la playlist selezionata su..."
 
-#: ../src/context_menus.c:1083
+#: ../src/context_menus.c:1085
 msgid "Copy selected track(s) to..."
 msgstr "Copia le tracce selezionate su..."
 
@@ -2486,12 +2131,17 @@
 msgid "Audiobook"
 msgstr "Audiolibro"
 
-#: ../src/details.c:88 ../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:89 ../src/display_spl.c:107 ../src/display_spl.c:210
-#: ../src/display_spl.c:219 ../src/misc_conversion.c:101
+#: ../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"
 
@@ -2499,74 +2149,75 @@
 msgid "TV Show & Music Video"
 msgstr "Programma TV e video musicale"
 
-#: ../src/details.c:836
+#: ../src/details.c:837
 #, c-format
 msgid "%s (image data corrupted or unreadable)"
 msgstr "%s (dati dell'immagine corrotti o non leggibili)"
 
-#: ../src/details.c:973
+#: ../src/details.c:975
 #, c-format
 msgid "Please report unknown mediatype %x\n"
 msgstr "Segnalare il mediatype sconosciuto %x\n"
 
-#: ../src/details.c:1418
+#: ../src/details.c:1417
 msgid "<b>n/a</b>"
 msgstr "<b>n/d</b>"
 
 #: ../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"
+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
+#: ../src/details.c:1952
+#: ../src/display_coverart.c:2297
 msgid "Successfully set new coverart for selected tracks"
 msgstr "La copertina per le tracce selezionate è stata impostata con successo"
 
-#: ../src/display.c:490
+#. Set the resolution in the label
+#: ../src/display.c:570
 #, c-format
-msgid "<b>Image Dimensions: %s</b>"
-msgstr "<b>Dimensioni dell'immagine: %s</b>"
+msgid "<b>Image Dimensions: %d x %d</b>"
+msgstr "<b>Dimensioni dell'immagine: %d x %d</b>"
 
-#: ../src/display.c:744
+#: ../src/display.c:814
 msgid "Edit selected entry of which sort tab?"
 msgstr "Modificare la voce selezionata di quale scheda di ordinamento?"
 
 #. no entry selected
-#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
+#: ../src/display.c:821
+#: ../src/misc_confirm.c:469
+#: ../src/misc_track.c:2158
 msgid "No entry selected."
 msgstr "Nessuna voce selezionata."
 
-#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
-#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
+#: ../src/display.c:974
+#: ../src/display.c:1320
+#: ../src/display.c:1376
+#: ../src/display.c:1430
+#: ../src/display.c:1485
+#: ../src/display.c:1746
 #, c-format
 msgid "No entry selected in Sort Tab %d"
 msgstr "Nessuna voce selezionata nella scheda di ordinamento %d"
 
-#: ../src/display.c:949
+#: ../src/display.c:1015
 msgid "Remove entry of which sort tab from database?"
 msgstr "Rimuovere dal database la voce di quale scheda di ordinamento?"
 
-#: ../src/display.c:957
+#: ../src/display.c:1024
 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?"
+msgstr "Rimuovere dall'iPod le tracce nella voce selezionata di quale scheda di filtro?"
 
-#: ../src/display.c:979
+#: ../src/display.c:1049
 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?"
+msgstr "Rimuovere dal disco fisso le tracce nella voce selezionata di quale scheda di filtro?"
 
-#: ../src/display.c:1009
+#: ../src/display.c:1082
 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?"
+msgstr "Rimuovere dalla playlist le tracce nella voce selezionata di quale scheda di filtro?"
 
-#: ../src/display.c:1036 ../src/display.c:1074
+#: ../src/display.c:1109
+#: ../src/display.c:1147
 #, c-format
 msgid ""
 "iPod at '%s' is not loaded.\n"
@@ -2575,105 +2226,106 @@
 "L'iPod in «%s» non è caricato.\n"
 "Prima è necessario caricarlo."
 
-#: ../src/display.c:1111 ../src/display.c:1138
+#: ../src/display.c:1184
+#: ../src/display.c:1218
 msgid "Update selected entry of which sort tab?"
 msgstr "Aggiornare la voce selezionata di quale scheda di ordinamento?"
 
-#: ../src/display.c:1224
+#: ../src/display.c:1314
 msgid "Export selected entry of which sort tab?"
 msgstr "Esportare la voce selezionata di quale scheda di ordinamento?"
 
-#: ../src/display.c:1280
+#: ../src/display.c:1370
 msgid "Create playlist file from selected entry of which sort tab?"
-msgstr ""
-"Creare la playlist dalle voci selezionate di quale scheda di ordinamento?"
+msgstr "Creare la playlist dalle voci selezionate di quale scheda di ordinamento?"
 
-#: ../src/display.c:1334
+#: ../src/display.c:1424
 msgid "Play tracks in selected entry of which sort tab?"
-msgstr ""
-"Riprodurre le tracce nella voce selezionata di quale scheda di ordinamento?"
+msgstr "Riprodurre le tracce nella voce selezionata di quale scheda di ordinamento?"
 
-#: ../src/display.c:1389
+#: ../src/display.c:1479
 msgid "Enqueue tracks in selected entry of which sort tab?"
-msgstr ""
-"Mettere in coda le tracce nella voce selezionata di quale scheda di "
-"ordinamento?"
+msgstr "Mettere in coda le tracce nella voce selezionata di quale scheda di ordinamento?"
 
-#: ../src/display.c:1646
+#: ../src/display.c:1736
 msgid "Normalize tracks in selected entry of which sort tab?"
-msgstr ""
-"Normalizzare le tracce nella voce selezionata di quale scheda di ordinamento?"
+msgstr "Normalizzare le tracce nella voce selezionata di quale scheda di ordinamento?"
 
-#: ../src/display_coverart.c:1713
+#: ../src/display_coverart.c:1874
 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
+#: ../src/display_coverart.c:2262
 #, 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"
+msgstr "Si è verificato un errore durante il rilascio di un'immagine sulla visualizzazione della copertina: %s\n"
 
-#: ../src/display_itdb.c:376
+#: ../src/display_itdb.c:385
 #, c-format
 msgid "Failed to set cover art: '%s'\n"
 msgstr "Impossibile impostare la copertina: «%s»\n"
 
-#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
-msgid "Local"
-msgstr "Locale"
+#: ../src/display_itdb.c:871
+msgid "Music Library"
+msgstr "Archivio musicale"
 
 #. add podcast playlist
-#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1025
+#: ../src/display_itdb.c:879
+#: ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
 msgid "Podcasts"
 msgstr "Podcast"
 
-#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:888
+#: ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
 msgid "iPod"
 msgstr "iPod"
 
-#: ../src/display_itdb.c:1084
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr "Locale"
+
+#: ../src/display_itdb.c:1098
 #, c-format
 msgid "Increased playcount for '%s'"
 msgstr "Incrementato conta-riproduzione per «%s»"
 
-#: ../src/display_photo.c:163
+#: ../src/display_photo.c:158
 #, 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
+#: ../src/display_photo.c:161
 msgid "Error reading iPod photo database.\n"
 msgstr "Errore durante la lettura del database delle foto dell'iPod.\n"
 
-#: ../src/display_photo.c:238
+#: ../src/display_photo.c:201
 msgid "Could not access the iPod's photo database."
 msgstr "Impossibile accedere al database delle foto dell'iPod."
 
-#: ../src/display_photo.c:441
+#: ../src/display_photo.c:404
 msgid "Photo Albums"
 msgstr "Album fotografici"
 
-#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+#: ../src/display_photo.c:414
+#: ../src/display_photo.c:1587
 msgid "<Unnamed>"
 msgstr "<senza_nome>"
 
-#: ../src/display_photo.c:939
+#: ../src/display_photo.c:848
 msgid "The Photo Library album cannot be removed"
 msgstr "L'album Photo Library non può essere rimosso"
 
-#: ../src/display_photo.c:961
+#: ../src/display_photo.c:870
 msgid "Do you want to remove the album's photos too?"
 msgstr "Eliminare anche le foto contenute nell'album?"
 
-#: ../src/display_photo.c:967
+#: ../src/display_photo.c:876
 msgid "Yes. Do Not Display Again"
 msgstr "Sì. Non chiedere più"
 
-#: ../src/display_photo.c:1038
+#: ../src/display_photo.c:947
 msgid ""
 "This will remove the photo selection from the selected album.\n"
 " Do you want to delete them from the database as well?"
@@ -2681,129 +2333,116 @@
 "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:962
+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
+#: ../src/display_photo.c:1036
 msgid "New Photo Album Name"
 msgstr "Nome del  nuovo album fotografico"
 
-#: ../src/display_photo.c:1129
+#: ../src/display_photo.c:1037
 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
+#: ../src/display_photo.c:1050
+#: ../src/display_photo.c:1133
 msgid "An album with that name already exists."
 msgstr "Un album con quel nome esiste già."
 
-#: ../src/display_photo.c:1210
+#: ../src/display_photo.c:1119
 msgid "New Photo Album"
 msgstr "Nuovo album fotografico"
 
-#: ../src/display_photo.c:1211
+#: ../src/display_photo.c:1120
 msgid "Please enter a name for the new photo album"
 msgstr "Inserire un nome per il nuovo album fotografico"
 
-#: ../src/display_photo.c:1232
+#: ../src/display_photo.c:1142
 msgid "The new album failed to be created."
 msgstr "La creazione del nuovo album è fallita."
 
-#: ../src/display_photo.c:1256
+#: ../src/display_photo.c:1166
 msgid "Add Image to iPod"
 msgstr "Aggiungi un'immagine all'iPod"
 
 #. Open a dialog directory chooser window
-#: ../src/display_photo.c:1311
+#: ../src/display_photo.c:1221
 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
+#: ../src/display_photo.c:1601
 #, 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:516 ../src/display_playlists.c:558
+#: ../src/display_playlists.c:537
+#: ../src/display_playlists.c:579
 msgid "Error: drag from iPod not possible in offline mode."
-msgstr ""
-"Errore: il trascinamento dall'iPod non è possibile in modalità non in linea."
+msgstr "Errore: il trascinamento dall'iPod non è possibile in modalità non in linea."
 
-#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:606
+#: ../src/display_tracks.c:403
 #, 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:865 ../src/display_playlists.c:877
+#: ../src/display_playlists.c:886
+#: ../src/display_playlists.c:898
 msgid "Can't reorder sorted treeview."
 msgstr "Impossibile riordinare la vista ad albero ordinata."
 
-#: ../src/display_playlists.c:954
+#: ../src/display_playlists.c:975
 #, 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 ""
-"Questo tipo DND (%d) non è (ancora) supportato. Se pensi che possa essere "
-"utile implementarlo, contatta l'autore.\n"
+msgstr "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
+#: ../src/display_playlists.c:2039
 msgid "Photos"
 msgstr "Fotografie"
 
-#: ../src/display_sorttabs.c:473
+#: ../src/display_sorttabs.c:479
 msgid "'Played' condition ignored because of error."
 msgstr "Condizione «Riprodotto» ignorata a causa di un errore."
 
-#: ../src/display_sorttabs.c:476
+#: ../src/display_sorttabs.c:482
 msgid "'Modified' condition ignored because of error."
 msgstr "Condizione «Modificato» ignorata a causa di un errore."
 
-#: ../src/display_sorttabs.c:479
+#: ../src/display_sorttabs.c:485
 msgid "'Added' condition ignored because of error."
 msgstr "Condizione «Aggiunta» ignorata a causa di un errore."
 
-#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1568
+#: ../src/misc_conversion.c:59
 msgid "All"
 msgstr "Tutti"
 
-#: ../src/display_sorttabs.c:1588
+#: ../src/display_sorttabs.c:1594
 msgid "Compilations"
 msgstr "Compilation"
 
-#: ../src/display_sorttabs.c:2988
+#: ../src/display_sorttabs.c:3001
 msgid "Comp."
 msgstr "Comp."
 
-#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:3007
+#: ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333
+#: ../src/misc_conversion.c:84
 msgid "Year"
 msgstr "Anno"
 
-#: ../src/display_sorttabs.c:2997
+#: ../src/display_sorttabs.c:3010
 msgid "Special"
 msgstr "Speciale"
 
-#: ../src/display_sorttabs.c:3245
-msgid "Last Played"
-msgstr "Ultimo ascolto"
-
-#: ../src/display_sorttabs.c:3246
-msgid "Last Modified"
-msgstr "Ultima modifica"
-
 #: ../src/display_spl.c:64
 msgid "days"
 msgstr "giorni"
@@ -2824,7 +2463,9 @@
 msgid "Hz"
 msgstr "Hz"
 
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+#: ../src/display_spl.c:75
+#: ../src/display_spl.c:179
+#: ../src/info.c:794
 msgid "MB"
 msgstr "MB"
 
@@ -2832,12 +2473,14 @@
 msgid "secs"
 msgstr "sec"
 
-#: ../src/display_spl.c:86 ../src/misc_conversion.c:74
+#: ../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
+#: ../src/display_spl.c:87
+#: ../src/misc_conversion.c:75
 msgid "Samplerate"
 msgstr "Frequenza di campionamento"
 
@@ -2845,7 +2488,8 @@
 msgid "Kind"
 msgstr "Tipo"
 
-#: ../src/display_spl.c:91 ../src/misc_conversion.c:81
+#: ../src/display_spl.c:91
+#: ../src/misc_conversion.c:81
 msgid "Date modified"
 msgstr "Data di modifica"
 
@@ -2857,14 +2501,26 @@
 msgid "Size"
 msgstr "Dimensione"
 
-#: ../src/display_spl.c:95 ../src/misc_conversion.c:64
+#: ../src/display_spl.c:94
+#: ../src/infodlg.c:78
+msgid "Play time"
+msgstr "Durata"
+
+#: ../src/display_spl.c:95
+#: ../src/misc_conversion.c:64
 msgid "Comment"
 msgstr "Commento"
 
-#: ../src/display_spl.c:96 ../src/misc_conversion.c:79
+#: ../src/display_spl.c:96
+#: ../src/misc_conversion.c:79
 msgid "Date added"
 msgstr "Data di aggiunta"
 
+#: ../src/display_spl.c:98
+#: ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "Contatore riproduzioni"
+
 #: ../src/display_spl.c:99
 msgid "Last played"
 msgstr "Ultimo ascolto"
@@ -2873,15 +2529,23 @@
 msgid "Disc number"
 msgstr "Numero disco"
 
-#: ../src/display_spl.c:102 ../src/misc_conversion.c:87
+#: ../src/display_spl.c:101
+#: ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "Voto"
+
+#: ../src/display_spl.c:102
+#: ../src/misc_conversion.c:87
 msgid "Compilation"
 msgstr "Compilation"
 
-#: ../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 "Raggruppamento"
 
@@ -2917,13 +2581,19 @@
 msgid "does not contain"
 msgstr "non contiene"
 
-#: ../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 "non è"
 
@@ -2943,7 +2613,8 @@
 msgid "is less than"
 msgstr "è minore di"
 
-#: ../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 "è nell'intervallo"
 
@@ -2987,10 +2658,6 @@
 msgid "hours"
 msgstr "ore"
 
-#: ../src/display_spl.c:182 ../src/info.c:780
-msgid "GB"
-msgstr "GB"
-
 #: ../src/display_spl.c:189
 msgid "random order"
 msgstr "ordine casuale"
@@ -3043,114 +2710,130 @@
 msgid "lowest rating"
 msgstr "voto peggiore"
 
-#: ../src/display_spl.c:208 ../src/display_spl.c:217
+#: ../src/display_spl.c:208
+#: ../src/display_spl.c:217
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+#: ../src/display_spl.c:1143
+#: ../src/display_spl.c:1158
 msgid "to"
 msgstr "a"
 
-#: ../src/display_spl.c:1485
+#: ../src/display_spl.c:1436
 msgid "-"
 msgstr "-"
 
-#: ../src/display_spl.c:1500
+#: ../src/display_spl.c:1451
 msgid "+"
 msgstr "+"
 
-# c-format
-#: ../src/display_tracks.c:281
+#: ../src/display_tracks.c:398
 #, c-format
 msgid "Moved one track"
 msgid_plural "Moved %d tracks"
 msgstr[0] "Spostata una traccia"
 msgstr[1] "Spostate %d tracce"
 
-#: ../src/display_tracks.c:1810
+#: ../src/display_tracks.c:2022
 #, 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 ""
-"È impossibile annullare l'ordinamento delle tracce per un bug delle librerie "
-"GTK in uso(%d.%d.%d < 2.5.4). Una volta che avrai ordinato la "
-"visualizzazione delle tracce, non sarà possibile tornare allo stato «non "
-"ordinato».\n"
+"È impossibile annullare l'ordinamento delle tracce per un bug delle librerie GTK in uso(%d.%d.%d < 2.5.4). Una volta che avrai ordinato la visualizzazione delle tracce, non sarà possibile tornare allo stato «non ordinato».\n"
 "\n"
 
-#: ../src/display_tracks.c:2069
+#: ../src/display_tracks.c:2288
 msgid "Rtng"
 msgstr "Voto"
 
-#: ../src/display_tracks.c:2072
+#: ../src/display_tracks.c:2291
 msgid "#"
 msgstr "N°"
 
-#: ../src/display_tracks.c:2075
+#: ../src/display_tracks.c:2294
 msgid "CD"
 msgstr "CD"
 
-#: ../src/display_tracks.c:2078
+#: ../src/display_tracks.c:2297
 msgid "ID"
 msgstr "ID"
 
-#: ../src/display_tracks.c:2081
+#: ../src/display_tracks.c:2300
 msgid "Trnsfrd"
 msgstr "Trasferito"
 
-#: ../src/display_tracks.c:2085
+#: ../src/display_tracks.c:2309
 msgid "Cmpl"
 msgstr "Cmpl"
 
-#: ../src/display_tracks.c:2091
+#: ../src/display_tracks.c:2315
 msgid "Time"
 msgstr "Durata"
 
-#: ../src/display_tracks.c:2094
+#: ../src/display_tracks.c:2318
 msgid "Plycnt"
 msgstr "Conta rip."
 
-#: ../src/display_tracks.c:2106
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "Riprodotto"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "Modificato"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "Aggiunto"
+
+#: ../src/display_tracks.c:2330
 msgid "Released"
 msgstr "Pubblicato"
 
-#: ../src/display_tracks.c:2112
+#: ../src/display_tracks.c:2336
 msgid "Vol."
 msgstr "Vol."
 
-# L'interfaccia italiana usa "Verifica livello"
-#: ../src/display_tracks.c:2115
+#: ../src/display_tracks.c:2339
 msgid "Sndchk."
 msgstr "Ver. livello sonoro"
 
-#: ../src/fetchcover.c:358
-msgid "Coverart file already exists"
-msgstr "Il file della copertina esiste già"
-
-#: ../src/fetchcover.c:371
+#: ../src/fetchcover.c:359
 #, 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."
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to abort the fetchcover operation?"
 msgstr ""
 "Il file immagine %s esiste già.\n"
-"Potrebbe essere già associato ad altri file musicali nella directory.\n"
+"Potrebbe essere associato ad altri file musicali nella directory.\n"
 "\n"
-"-  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."
+"Si desidera sovrascrivere il file esistente con la possibilità che si\n"
+"associno a questa copertina anche altri file musicali nella stessa directory,\n"
+"salvare il file con un nome univoco o interrompere l'operazione?"
 
-#: ../src/file.c:236
+#: ../src/fetchcover.c:368
+msgid "Cover art file already exists"
+msgstr "Il file della copertina esiste già"
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr "Sovrascrivi"
+
+#: ../src/fetchcover.c:371
+msgid "Rename"
+msgstr "Rinomina"
+
+#: ../src/fetchcover.c:372
+msgid "Abort"
+msgstr "Interrompi"
+
+#: ../src/file.c:238
 #, c-format
 msgid ""
 "'%s' is a directory, not a playlist file.\n"
@@ -3159,7 +2842,7 @@
 "«%s» è una directory. non un file di playlist.\n"
 "\n"
 
-#: ../src/file.c:266
+#: ../src/file.c:268
 #, c-format
 msgid ""
 "'%s' is a not a known playlist file.\n"
@@ -3168,97 +2851,121 @@
 "«%s» non è un file di playlist conosciuto.\n"
 "\n"
 
-#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/file.c:285
+#: ../src/file_export.c:217
+#: ../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/file.c:369
+#: ../src/file.c:371
 #, c-format
 msgid "Skipping '%s' because it is a directory.\n"
 msgstr "Salto «%s» perché è una directory.\n"
 
-#: ../src/file.c:374
+#: ../src/file.c:376
 #, c-format
 msgid "Skipping '%s' to avoid adding playlist file recursively\n"
 msgstr "Salto «%s» per evitare di aggiungere file di playlist ricorsivamente\n"
 
-#: ../src/file.c:629
+#: ../src/file.c:631
 #, c-format
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "Segnaposto «%s» sconosciuto nel modello «%s»\n"
 
-#: ../src/file.c:923
+#: ../src/file.c:939
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Nome del file locale non valido (%s)"
 
-#: ../src/file.c:982
+#: ../src/file.c:998
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "Nessuna informazione trovata per l'utente «%s» in «%s»"
 
-#: ../src/file.c:991
+#: ../src/file.c:1007
 #, 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:999
+#: ../src/file.c:1015
 #, 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:1123
+#: ../src/file.c:1046
 #, c-format
+msgid "Could not create '%s'"
+msgstr "Impossibile creare «%s»"
+
+#: ../src/file.c:1083
+msgid "Error creating thumbnail file"
+msgstr "Errore nella creazione del file per la miniatura"
+
+#: ../src/file.c:1114
+#: ../src/misc.c:1018
+#, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "Segnaposto sconosciuto «%%%c» nel modello «%s»"
+
+#: ../src/file.c:1138
+#, c-format
 msgid ""
-"The following track could not be processed (file does not exist): '%s'\n"
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
 msgstr ""
-"La traccia seguente non può essere elaborata (il file non esiste): «%s»\n"
+"Impossibile avviare il generatore di miniature dei video\n"
+"(la riga di comando era: «%s»)"
 
-#: ../src/file.c:1209
+#: ../src/file.c:1142
 #, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr "Il generatore di miniature ha ritornato lo stato %d"
+
+#: ../src/file.c:1291
+#, 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:1377
+#, 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"
+msgstr "La traccia seguente non può essere elaborata (tipo di file sconosciuto): «%s»\n"
 
-#: ../src/file.c:1307
+#: ../src/file.c:1476
 #, c-format
-msgid ""
-"The following track could not be processed (filetype is known but analysis "
-"failed): '%s'\n"
-msgstr ""
-"La traccia seguente non può essere elaborata (tipo di file conosciuto ma "
-"l'analisi è fallita): «%s»\n"
+msgid "The following track could not be processed (filetype is known but analysis failed): '%s'\n"
+msgstr "La traccia seguente non può essere elaborata (tipo di file conosciuto ma l'analisi è fallita): «%s»\n"
 
-#: ../src/file.c:1337 ../src/file.c:1391
+#: ../src/file.c:1506
+#: ../src/file.c:1560
 msgid "Nothing to update"
 msgstr "Nulla da aggiornare"
 
-#: ../src/file.c:1358
+#: ../src/file.c:1527
 #, c-format
 msgid "Updating %s"
 msgstr "Aggiornamento di %s in corso"
 
-#: ../src/file.c:1372
+#: ../src/file.c:1541
 msgid "Updated selected tracks with info from file."
 msgstr "Le tracce sono state aggiornate con le informazioni dal file."
 
-#: ../src/file.c:1406
+#: ../src/file.c:1575
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "Ricezione dei dati mserv %s"
 
-#: ../src/file.c:1411
+#: ../src/file.c:1580
 msgid "no filename available"
 msgstr "nessun nome di file disponibile"
 
-#: ../src/file.c:1416
+#: ../src/file.c:1585
 msgid "Updated selected tracks with data from mserv."
 msgstr "Le tracce sono state aggiornate con le informazioni da mserv."
 
-#: ../src/file.c:1437
+#: ../src/file.c:1606
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -3267,11 +2974,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1443
+#: ../src/file.c:1612
 msgid "Failed Track Update"
 msgstr "Aggiornamento delle tracce fallito"
 
-#: ../src/file.c:1501
+#: ../src/file.c:1670
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -3280,69 +2987,63 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1507
+#: ../src/file.c:1676
 msgid "Successful Track Update"
 msgstr "Aggiornamento delle tracce completato con successo"
 
-#: ../src/file.c:1566
+#: ../src/file.c:1735
 #, 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] ""
-"Non è stato possibile raccogliere alcuna informazione mserv per la traccia "
-"seguente"
-msgstr[1] ""
-"Non è stato possibile raccogliere alcuna informazione mserv per le %d tracce "
-"seguenti"
+msgid_plural "No mserv information could be retrieved for the following %d tracks"
+msgstr[0] "Non è stato possibile raccogliere alcuna informazione mserv per la traccia seguente"
+msgstr[1] "Non è stato possibile raccogliere alcuna informazione mserv per le %d tracce seguenti"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1572
+#: ../src/file.c:1741
 msgid "mserv data retrieval problem"
 msgstr "problemi nel raccogliere le informazioni mserv"
 
-#: ../src/file.c:1661
+#: ../src/file.c:1829
 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"
+msgstr "il nome del file locale non è disponibile, al suo posto sarà usato il file sull'iPod"
 
-#: ../src/file.c:1667
+#: ../src/file.c:1835
 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"
+msgstr "il nome del file locale non è disponibile e la copia sull'iPod non è stata trovata"
 
-#: ../src/file.c:1671 ../src/file.c:1689
+#: ../src/file.c:1839
+#: ../src/file.c:1857
 msgid "no local filename available"
 msgstr "il nome del file locale non è disponibile"
 
-#: ../src/file.c:1679
+#: ../src/file.c:1847
 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"
+msgstr "il file locale non è stato trovato, al suo posto sarà usato il file sull'iPod"
 
-#: ../src/file.c:1685
+#: ../src/file.c:1853
 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:1788
+#: ../src/file.c:1956
 msgid "update failed (format not supported?)"
 msgstr "aggiornamento fallito (formato non supportato?)"
 
-#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#: ../src/file.c:2041
+#: ../src/misc_playlist.c:936
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Elaborazione di «%s» in corso..."
 
-#: ../src/file.c:1879
+#: ../src/file.c:2047
 #, 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:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
+#: ../src/file.c:2167
+#: ../src/misc_track.c:1793
+#: ../src/misc_track.c:1898
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
@@ -3351,7 +3052,7 @@
 "Podcast già presente: «%s»\n"
 "\n"
 
-#: ../src/file.c:2064
+#: ../src/file.c:2232
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
@@ -3360,49 +3061,49 @@
 "La scrittura su file video non è ancora supportata (%s).\n"
 "\n"
 
-#: ../src/file.c:2116 ../src/file.c:2130
+#: ../src/file.c:2284
+#: ../src/file.c:2298
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Impossibile cambiare le etichette del file: %s\n"
 
-#: ../src/file.c:2232
+#: ../src/file.c:2400
 #, 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:2239
+#: ../src/file.c:2407
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "Impossibile ottenere il lock su «%s».\n"
 
 #. error!
-#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
+#: ../src/file.c:2424
+#: ../src/file.c:2433
+#: ../src/file.c:2444
+#: ../src/file.c:2454
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Linea malformata in «%s»: %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:2315
+#: ../src/file.c:2483
 msgid "Remove offline playcounts?"
 msgstr "Rimuovere i contatori di riproduzioni non in linea?"
 
 #. 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 ""
-"Alcune tracce riprodotte non in linea non sono state trovate in iTunesDB. "
-"Premere «Ok» per rimuoverle dal file conta riproduzioni non in linea, "
-"«Annulla» per mantenerle."
+#: ../src/file.c:2484
+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 "Alcune tracce riprodotte non in linea non sono state trovate in iTunesDB. Premere «Ok» per rimuoverle dal file conta riproduzioni non in linea, «Annulla» per mantenerle."
 
-#: ../src/file.c:2333
+#: ../src/file.c:2501
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Errore nella scrittura su «%s».\n"
 
-#: ../src/file.c:2390 ../src/tools.c:270
+#: ../src/file.c:2558
+#: ../src/tools.c:270
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
@@ -3411,7 +3112,8 @@
 "Normalizzazione fallita: tipo di file non supportato (%s).\n"
 "\n"
 
-#: ../src/file.c:2406 ../src/tools.c:287
+#: ../src/file.c:2574
+#: ../src/tools.c:287
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -3420,63 +3122,86 @@
 "Normalizzazione fallita: file non disponibile (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:316
+#: ../src/file.c:2631
+#, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr ""
+"Testi non trovati: file non disponibile (%s).\n"
+"\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save lyrics to: %s.\n"
+"\n"
+msgstr ""
+"Il file sull'iPod non è disponibile e il salvataggio degli ID3 è disabilitato nelle preferenze, impossibile salvare i testi su: %s.\n"
+"\n"
+
+#: ../src/file.c:2712
+#, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr "Testi non scritti, nome del file non disponibile (%s).\n"
+
+#: ../src/file_convert.c:328
 msgid "Summary status of conversion processes"
 msgstr "Riepilogo dello stato del processo di conversione"
 
-#: ../src/file_convert.c:564
+#: ../src/file_convert.c:576
 msgid "active"
 msgstr "attivo"
 
-#: ../src/file_convert.c:569
+#: ../src/file_convert.c:581
 msgid "inactive"
 msgstr "non attivo"
 
-#: ../src/file_convert.c:580
+#: ../src/file_convert.c:592
 #, c-format
 msgid "Active threads: %d. Scheduled tracks: %d."
 msgstr "Thread attivi: %d. Tracce in coda: %d."
 
-#: ../src/file_convert.c:1071
+#: ../src/file_convert.c:1090
 #, c-format
 msgid "Original filename not available for '%s.'\n"
 msgstr "Nome del file originale non disponibile per «%s».\n"
 
-#: ../src/file_convert.c:1086
+#: ../src/file_convert.c:1105
 #, 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:1137
+#: ../src/file_convert.c:1156
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
-#: ../src/file_convert.c:1143
+#: ../src/file_convert.c:1162
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/file_convert.c:1198
+#: ../src/file_convert.c:1217
 #, 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 ""
-"I file di tipo «%s» non sono supportati dall'iPod. Andare nelle Preferenze "
-"per impostare ed attivare uno script di conversione adatto per «%s».\n"
+"I file di tipo «%s» non sono supportati dall'iPod. Andare nelle Preferenze per impostare ed attivare uno script di conversione adatto per «%s».\n"
 "\n"
 
-#: ../src/file_convert.c:1284
+#: ../src/file_convert.c:1303
 msgid "No information available"
 msgstr "Nessuna informazione disponibile"
 
-#: ../src/file_convert.c:1323
+#: ../src/file_convert.c:1342
 #, 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"
+msgstr "Impossibile creare «%s». La conversione del tipo di file non funzionerà.\n"
 
-#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#: ../src/file_convert.c:1667
+#: ../src/file_convert.c:3119
 #, c-format
 msgid ""
 "Transfer of '%s' failed. %s\n"
@@ -3485,7 +3210,8 @@
 "Trasferimento di «%s» fallito. %s\n"
 "\n"
 
-#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#: ../src/file_convert.c:2073
+#: ../src/file_convert.c:2352
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s'.\n"
@@ -3494,7 +3220,7 @@
 "La conversione di «%s» è fallita: «%s».\n"
 "\n"
 
-#: ../src/file_convert.c:2062
+#: ../src/file_convert.c:2088
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
@@ -3503,28 +3229,25 @@
 "La conversione di «%s» è fallita: «%s %s» ha fornito lo stato di uscita %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2091
+#: ../src/file_convert.c:2117
 #, 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 ""
-"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:2167
+#: ../src/file_convert.c:2193
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
 "\n"
 msgstr ""
-"La 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:2222
+#: ../src/file_convert.c:2248
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not create directory '%s'.\n"
@@ -3533,7 +3256,7 @@
 "La conversione di «%s» è fallita: impossibile creare la directory «%s».\n"
 "\n"
 
-#: ../src/file_convert.c:2356
+#: ../src/file_convert.c:2383
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s' returned exit status %d.\n"
@@ -3542,14 +3265,13 @@
 "La conversione di «%s» è fallita: «%s» ha restituito lo stato %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2395
+#: ../src/file_convert.c:2422
 #, c-format
 msgid ""
 "Conversion of '%s' failed: could not stat the converted file '%s'.\n"
 "\n"
 msgstr ""
-"La 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
@@ -3578,11 +3300,13 @@
 msgstr "Impossibile trovare il file per «%s» sull'iPod\n"
 
 #. create the dialog window
-#: ../src/file_export.c:395 ../src/tools.c:360
+#: ../src/file_export.c:395
+#: ../src/tools.c:360
 msgid "Information"
 msgstr "Informazioni"
 
-#: ../src/file_export.c:406 ../src/tools.c:372
+#: ../src/file_export.c:406
+#: ../src/tools.c:372
 msgid "Press button to abort."
 msgstr "Premere il bottone per interrompere."
 
@@ -3602,7 +3326,8 @@
 msgstr[0] "Copiata traccia %d di %d."
 msgstr[1] "Copiata traccia %d di %d."
 
-#: ../src/file_export.c:505 ../src/tools.c:518
+#: ../src/file_export.c:505
+#: ../src/tools.c:518
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr "%d%% (%d:%02d:%02d rimasti)"
@@ -3613,9 +3338,7 @@
 
 #: ../src/file_export.c:579
 msgid "Export from iPod database not possible in offline mode."
-msgstr ""
-"L'esportazione dal database dell'iPod non è possibile in modalità non in "
-"linea."
+msgstr "L'esportazione dal database dell'iPod non è possibile in modalità non in linea."
 
 #: ../src/file_export.c:587
 msgid "Select Export Destination Directory"
@@ -3623,8 +3346,7 @@
 
 #: ../src/file_export.c:736
 msgid "Drag from iPod database not possible in offline mode."
-msgstr ""
-"Impossibile trascinare dal database dell'iPod in modalità non in linea."
+msgstr "Impossibile trascinare dal database dell'iPod in modalità non in linea."
 
 #: ../src/file_export.c:770
 msgid "The following tracks have to be copied to your harddisk"
@@ -3632,12 +3354,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 ""
-"Alcune tracce non sono state copiate sul disco fisso. Solo le tracce copiate "
-"saranno incluse nell'operazione attuale di trascinamento.\n"
+"Alcune tracce non sono state copiate sul disco fisso. Solo le tracce copiate saranno incluse nell'operazione attuale di trascinamento.\n"
 "\n"
 
 #: ../src/file_export.c:1010
@@ -3665,40 +3385,37 @@
 "Impossibile aprire il file «%s» in scrittura (%s).\n"
 "\n"
 
-#: ../src/file_itunesdb.c:129
+#: ../src/file_itunesdb.c:133
 #, 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:236
+#: ../src/file_itunesdb.c:249
 #, 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:243
+#: ../src/file_itunesdb.c:256
 msgid "Could not create hash value from itunesdb\n"
 msgstr "Impossibile creare il valore di hash da itunesdb\n"
 
-#: ../src/file_itunesdb.c:259
+#: ../src/file_itunesdb.c:272
 #, c-format
 msgid "Error while reading extended info: %s\n"
 msgstr "Errore nella lettura delle informazioni estese: %s\n"
 
-#: ../src/file_itunesdb.c:276
+#: ../src/file_itunesdb.c:289
 #, 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 ""
-"iTunesDB «%s» ha una somma di controllo diversa da quella nel file con le "
-"informazioni estese «%s»\n"
-" gtkpod proverà a confrontare le informazioni usando somme di controllo "
-"SHA1. Questo può richiedere molto tempo.\n"
+"iTunesDB «%s» ha una somma di controllo diversa da quella nel file con le informazioni estese «%s»\n"
+" gtkpod proverà a confrontare le informazioni usando somme di controllo SHA1. Questo può richiedere molto tempo.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:288
+#: ../src/file_itunesdb.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -3707,7 +3424,7 @@
 "%s:\n"
 "Atteso «itunesdb_hash=» ma trovato: «%s»\n"
 
-#: ../src/file_itunesdb.c:348
+#: ../src/file_itunesdb.c:363
 #, c-format
 msgid ""
 "%s:\n"
@@ -3716,39 +3433,33 @@
 "%s:\n"
 "Errore nel formato: %s\n"
 
-#: ../src/file_itunesdb.c:393
+#: ../src/file_itunesdb.c:408
 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 ""
 "Non sono disponibili somme di controllo SHA1 individuali per le tracce.\n"
 "\n"
-"Nel futuro, per evitare questa situazione, usare l'opzione di rilevamento "
-"dei duplicati (aggiungerà somme di controllo SHA1) oppure evitate di usare "
-"l'iPod con programmi diversi da gtkpod.\n"
+"Nel futuro, per evitare questa situazione, usare l'opzione di rilevamento dei duplicati (aggiungerà somme di controllo SHA1) oppure evitate di usare l'iPod con programmi diversi da gtkpod.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:457
+#: ../src/file_itunesdb.c:474
 msgid ""
 "Extended info will not be used. If you have non-transferred tracks,\n"
 "these will be lost.\n"
-msgstr ""
-"Le informazioni estese non verranno usate. Le tracce non trasferite verranno "
-"perse.\n"
+msgstr "Le informazioni estese non verranno usate. Le tracce non trasferite verranno perse.\n"
 
-#: ../src/file_itunesdb.c:465
+#: ../src/file_itunesdb.c:482
 msgid "Offline iPod database successfully imported"
 msgstr "Database non in linea dell'iPod importato con successo"
 
-#: ../src/file_itunesdb.c:468
+#: ../src/file_itunesdb.c:485
 msgid "Local database successfully imported"
 msgstr "Database locale importato con successo"
 
-#: ../src/file_itunesdb.c:476
+#: ../src/file_itunesdb.c:493
 #, c-format
 msgid ""
 "Offline iPod database import failed: '%s'\n"
@@ -3757,7 +3468,7 @@
 "Importazione del database non in linea dell'iPod fallita: «%s» \n"
 "\n"
 
-#: ../src/file_itunesdb.c:480
+#: ../src/file_itunesdb.c:497
 #, c-format
 msgid ""
 "Local database import failed: '%s'\n"
@@ -3766,7 +3477,7 @@
 "Importazione del database locale fallita: «%s»\n"
 "\n"
 
-#: ../src/file_itunesdb.c:487
+#: ../src/file_itunesdb.c:504
 msgid ""
 "Offline iPod database import failed: \n"
 "\n"
@@ -3774,7 +3485,7 @@
 "Importazione del database non in linea dell'iPod fallita: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:490
+#: ../src/file_itunesdb.c:507
 msgid ""
 "Local database import failed: \n"
 "\n"
@@ -3782,7 +3493,7 @@
 "Importazione del database locale fallita:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:497
+#: ../src/file_itunesdb.c:514
 #, c-format
 msgid ""
 "'%s' does not exist. Import aborted.\n"
@@ -3791,15 +3502,15 @@
 "«%s» non esiste. Importazione interrotta.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:520
+#: ../src/file_itunesdb.c:536
 msgid "Extended info will not be used.\n"
 msgstr "Le informazioni estese non verranno usate.\n"
 
-#: ../src/file_itunesdb.c:527
+#: ../src/file_itunesdb.c:543
 msgid "iPod Database Successfully Imported"
 msgstr "Database dell'iPod importato con successo"
 
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:550
 #, c-format
 msgid ""
 "iPod Database Import Failed: '%s'\n"
@@ -3808,7 +3519,7 @@
 "Importazione del database dell'iPod fallita: «%s»\n"
 "\n"
 
-#: ../src/file_itunesdb.c:540
+#: ../src/file_itunesdb.c:556
 msgid ""
 "iPod Database Import Failed.\n"
 "\n"
@@ -3816,7 +3527,7 @@
 "Importazione del database dell'iPod fallita.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:549
+#: ../src/file_itunesdb.c:565
 #, c-format
 msgid ""
 "'%s' (or similar) does not exist. Import aborted.\n"
@@ -3825,45 +3536,52 @@
 "«%s» (o simile) non esiste. Importazione interrotta.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:865
+#: ../src/file_itunesdb.c:886
 #, 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"
+"If you are sure that the iPod is properly mounted at '%s', it may not be initialized for use. In this case, gtkpod can initialize it for you.\n"
+"\n"
+"Do you want to create the directory structure now?"
 msgstr ""
 "Impossibile trovare la struttura delle directory dell'iPod in «%s».\n"
-"Se si è sicuri che l'iPod sia montato correttamente in «%s», gtkpod può "
-"creare la struttura delle directory.\n"
+"Se si è sicuri che l'iPod sia montato correttamente in «%s», allora potrebbe non essere inizializzato per l'uso. In questo caso il programma può inizializzarlo.\n"
 "\n"
-"Si desidera creare la struttura delle directory ora?\n"
+"Si desidera creare la struttura delle directory ora?"
 
-#: ../src/file_itunesdb.c:1180
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr "Impossibile trovare la struttura delle directory dell'iPod"
+
+#: ../src/file_itunesdb.c:892
+msgid "Create directory structure"
+msgstr "Crea struttura delle directory"
+
+#: ../src/file_itunesdb.c:1198
 #, 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:1195
+#: ../src/file_itunesdb.c:1213
 msgid "Aborted writing of extended info.\n"
 msgstr "Scrittura delle informazioni estese interrotta.\n"
 
-#: ../src/file_itunesdb.c:1397
+#: ../src/file_itunesdb.c:1415
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/file_itunesdb.c:1411
+#: ../src/file_itunesdb.c:1429
 #, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
 msgstr "%d%% (%d/%d  %d:%02d:%02d rimasti)"
 
-#: ../src/file_itunesdb.c:1463
+#: ../src/file_itunesdb.c:1481
 msgid "Status: Deleting File"
 msgstr "Status: eliminazione file in corso"
 
-#: ../src/file_itunesdb.c:1524
+#: ../src/file_itunesdb.c:1542
 #, c-format
 msgid ""
 "Could not remove the following file: '%s'\n"
@@ -3872,7 +3590,7 @@
 "Impossibile rimuovere il file seguente: «%s»\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1632
+#: ../src/file_itunesdb.c:1651
 msgid ""
 "The following track could not be converted successfully:\n"
 "\n"
@@ -3886,7 +3604,7 @@
 "Le tracce seguenti non sono state convertite con successo:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1642
+#: ../src/file_itunesdb.c:1661
 msgid ""
 "The following track could not be transferred successfully:\n"
 "\n"
@@ -3904,163 +3622,134 @@
 #. modal,
 #. gint id,
 #. gboolean modal,
-#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1670
+#: ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
 msgid "Warning"
 msgstr "Attenzione"
 
 #. 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 ""
-"Impossibile espellere l'iPod. Correggere i problemi menzionati sotto e poi "
-"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:1671
+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 "Impossibile espellere l'iPod. Correggere i problemi menzionati sotto e poi 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:1715
+#: ../src/file_itunesdb.c:1734
 #, c-format
 msgid "Status: Copying track"
 msgstr "Status: copia traccia in corso"
 
-#: ../src/file_itunesdb.c:1721
+#: ../src/file_itunesdb.c:1740
 #, c-format
 msgid "Status: Waiting for conversion to complete"
 msgstr "Status: in attesa del completamento della conversione"
 
-#: ../src/file_itunesdb.c:1725
+#: ../src/file_itunesdb.c:1744
 #, c-format
 msgid "Status: Finished transfer"
 msgstr "Status: trasferimento completato"
 
-#: ../src/file_itunesdb.c:1770
+#: ../src/file_itunesdb.c:1789
 #, 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] ""
-"Non è stato possibile trasferire una traccia perché l'iPod è pieno. "
-"Cancellare alcune tracce oppure creare spazio sull'iPod in altro modo prima "
-"di espellerlo di nuovo."
-msgstr[1] ""
-"Non è stato possibile trasferire %d tracce perché l'iPod è pieno. Cancellare "
-"alcune tracce oppure creare spazio sull'iPod in altro modo prima di "
-"espellerlo di nuovo."
+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] "Non è stato possibile trasferire una traccia perché l'iPod è pieno. Cancellare alcune tracce oppure creare spazio sull'iPod in altro modo prima di espellerlo di nuovo."
+msgstr[1] "Non è stato possibile trasferire %d tracce perché l'iPod è pieno. Cancellare alcune tracce oppure creare spazio sull'iPod in altro modo prima di espellerlo di nuovo."
 
-#: ../src/file_itunesdb.c:1852
+#: ../src/file_itunesdb.c:1871
 #, 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"
+"If you skip storing, you can import the existing database before calling this function again.\n"
 msgstr ""
-"Non si è importato l'iTunesDB esistente («%s»). Questo è quasi certamente "
-"sbagliato e porterà alla perdita del database esistente.\n"
+"L'iTunesDB esistente («%s») non è stato importato. Questo è quasi certamente sbagliato e porterà alla perdita del database esistente.\n"
 "\n"
-"Premere «Ok» se si vuole procedere comunque o «Annulla» se si vuole "
-"interrompere l'operazione. Se la si interrompe, si può importare il database "
-"esistente prima di richiamare di nuovo questa funzione.\n"
+"Se si salta l'archiviazione, si può importare il database esistente prima di richiamare di nuovo questa funzione.\n"
 
-#: ../src/file_itunesdb.c:1887
-msgid ""
-"iPod directory structure must be present before synching to the iPod can be "
-"performed.\n"
-msgstr ""
-"La struttura delle directory dell'iPod deve essere presente prima che la "
-"sincronizzazione verso l'iPod possa essere eseguita.\n"
+#: ../src/file_itunesdb.c:1875
+#: ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr "Il database di iTunes esistente non è stato impostato"
 
-#: ../src/file_itunesdb.c:1896
+#: ../src/file_itunesdb.c:1877
+#: ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr "Continua ugualmente"
+
+#: ../src/file_itunesdb.c:1878
+msgid "Skip storing"
+msgstr "Salta archiviazione"
+
+#: ../src/file_itunesdb.c:1909
+msgid "iPod directory structure must be present before synching to the iPod can be performed.\n"
+msgstr "La struttura delle directory dell'iPod deve essere presente prima che la sincronizzazione verso l'iPod possa essere eseguita.\n"
+
+#: ../src/file_itunesdb.c:1918
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
-msgstr ""
-"Alcune tracce non possono essere cancellate dall'iPod. Esportazione "
-"interrotta!"
+msgstr "Alcune tracce non possono essere cancellate dall'iPod. Esportazione interrotta!"
 
-#: ../src/file_itunesdb.c:1914
+#: ../src/file_itunesdb.c:1936
 #, c-format
 msgid "Now writing database '%s'. Please wait..."
 msgstr "Scrittura del database «%s» in corso. Attendere prego..."
 
-#: ../src/file_itunesdb.c:1963
+#: ../src/file_itunesdb.c:1985
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "Il file con le informazioni estese non è stato cancellato: «%s»"
 
-#: ../src/file_itunesdb.c:2070
+#: ../src/file_itunesdb.c:2092
 #, c-format
 msgid "%s: Database saved"
 msgstr "%s: database salvato"
 
-#: ../src/file_itunesdb.c:2074
+#: ../src/file_itunesdb.c:2096
 #, c-format
 msgid "%s: Changes saved"
 msgstr "%s: modifiche salvate"
 
-#: ../src/fileselection.c:129
+#: ../src/fileselection.c:142
+#: ../src/fileselection.c:583
 msgid "Successfully added files"
 msgstr "File aggiunti con successo"
 
-#: ../src/fileselection.c:131
+#: ../src/fileselection.c:144
+#: ../src/fileselection.c:585
 msgid "Some files were not added successfully"
 msgstr "Alcuni file non sono stati aggiunti con successo"
 
-#: ../src/fileselection.c:164 ../src/fileselection.c:305
-#: ../src/fileselection.c:792
+#: ../src/fileselection.c:176
+#: ../src/fileselection.c:276
+#: ../src/fileselection.c:601
 msgid "Please select a playlist or repository before adding tracks."
 msgstr "Selezionare una playlist o un archivio prima di aggiungere le tracce."
 
-#: ../src/fileselection.c:175 ../src/fileselection.c:314
-#: ../src/fileselection.c:803
+#: ../src/fileselection.c:187
+#: ../src/fileselection.c:285
 msgid "Please load the iPod before adding tracks."
 msgstr "Leggere l'iPod  prima di aggiungere le tracce."
 
-#: ../src/fileselection.c:185
+#: ../src/fileselection.c:197
 #, c-format
 msgid "Add files to '%s'"
 msgstr "Aggiungi file a «%s»"
 
-#: ../src/fileselection.c:189
+#: ../src/fileselection.c:201
 #, c-format
 msgid "Add files to '%s/%s'"
 msgstr "Aggiungi file a «%s/%s»"
 
 #. Create window title
-#: ../src/fileselection.c:322
+#: ../src/fileselection.c:293
 #, c-format
 msgid "Add playlist files to '%s'"
 msgstr "Aggiungi un file di playlist a «%s»"
 
 #. Create the file chooser, and handle the response
-#: ../src/fileselection.c:378
+#: ../src/fileselection.c:319
 msgid "Set Cover"
 msgstr "Imposta copertina"
 
-#: ../src/fileselection.c:816
-#, c-format
-msgid "Add directories to '%s'"
-msgstr "Aggiungi directory a «%s»"
-
-#: ../src/fileselection.c:820
-#, c-format
-msgid "Add directories to '%s/%s'"
-msgstr "Aggiungi directory a «%s/%s»"
-
-#: ../src/fileselection.c:1097
-msgid "Ok"
-msgstr "Ok"
-
-#: ../src/fileselection.c:1106
-msgid "Cancel"
-msgstr "Annulla"
-
 #: ../src/flacfile.c:62
 #, c-format
 msgid "'%s' does not appear to be an FLAC audio file.\n"
@@ -4071,24 +3760,15 @@
 msgid "Error retrieving tags for '%s'.\n"
 msgstr "Errore nel recupero delle etichette per «%s».\n"
 
-#: ../src/flacfile.c:165
+#: ../src/flacfile.c:193
 #, 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 ""
-"Importazione di «%s» fallita: FLAC non è supportato senza la libreria FLAC. "
-"Devi compilare i sorgenti di gtkpod insieme alla libreria FLAC.\n"
+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 "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:171
+#: ../src/flacfile.c:199
 #, 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 ""
-"Aggiornamento fallito dei metadati FLAC per «%s»: FLAC non è supportati "
-"senza la libreria FLAC. Devi compilare i sorgenti di gtkpod insieme alla "
-"libreria FLAC.\n"
+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 "Aggiornamento fallito dei metadati FLAC per «%s»: FLAC non è supportati senza la libreria FLAC. Devi compilare i sorgenti di gtkpod insieme alla libreria FLAC.\n"
 
 #: ../src/getopt.c:681
 #, c-format
@@ -4105,7 +3785,8 @@
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: l'opzione «%c%s» non ammette argomenti\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: l'opzione «%s» richiede un argomento\n"
@@ -4134,7 +3815,8 @@
 msgstr "%s: opzione non valida -- %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: l'opzione richiede un argomento -- %c\n"
@@ -4149,96 +3831,8 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: l'opzione «-W %s» non ammette argomenti\n"
 
-#: ../src/info.c:383
-msgid "n/c"
-msgstr "n.c."
-
-#: ../src/info.c:388 ../src/info.c:838
-msgid "offline"
-msgstr "non in linea"
-
-#: ../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 "B"
-
-#: ../src/info.c:780
-msgid "kB"
-msgstr "kB"
-
-#: ../src/info.c:780
-msgid "TB"
-msgstr "TB"
-
-#: ../src/info.c:823
-#, c-format
-msgid " %s Free"
-msgstr "%s liberi"
-
-#: ../src/info.c:828
-#, c-format
-msgid " %s Pending"
-msgstr " %s in sospeso"
-
-#: ../src/info.c:833
-msgid " disconnected"
-msgstr " scollegato"
-
-#: ../src/info.c:884
-msgid "No database or playlist selected"
-msgstr "Nessun database o playlist selezionato"
-
-#: ../src/info.c:889
-msgid "No tracks selected"
-msgstr "Nessuna traccia selezionata"
-
-#: ../src/info.c:894
-msgid "No playlist selected"
-msgstr "Nessuna playlist selezionata"
-
-#: ../src/info.c:899
-msgid "No iPod or iPod playlist selected"
-msgstr "Nessun iPod o playlist di iPod selezionato"
-
-#. Strings used several times
-#: ../src/ipod_init.c:48
-msgid "Select or enter your model"
-msgstr "Scegliere o inserire il modello"
-
-#: ../src/ipod_init.c:79 ../src/repository.c:546 ../src/repository.c:2369
-msgid "Select mountpoint"
-msgstr "Selezionare il punto di mount"
-
-#: ../src/ipod_init.c:359
-#, c-format
-msgid "Error initialising iPod: %s\n"
-msgstr "Errore nell'inizializzazione dell'iPod: «%s».\n"
-
-#: ../src/ipod_init.c:366
-msgid "Error initialising iPod, unknown error\n"
-msgstr "Errore nell'inizializzazione dell'iPod, errore sconosciuto\n"
-
-#: ../src/ipod_init.c:422
-#, c-format
-msgid "<b>Please select your iPod model at </b><i>%s</i>"
-msgstr "<b>Scegliere il modello di iPod in </b><i>%s</i>"
-
-#: ../src/ipod_init.c:463
+#: ../src/help.c:48
 msgid ""
-"Could not determine the model you selected -- this could be a bug or "
-"incompatibilty in the GTK+ or glade library.\n"
-"\n"
-msgstr ""
-"Impossibile determinare il modello che è stato selezionato -- potrebbe "
-"essere un bug o un'incompatibilità nelle librerie GTK+ o 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"
@@ -4247,188 +3841,138 @@
 "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 ""
-"Correzioni sono state fornite dalle seguenti persone (la lista potrebbe "
-"essere incompleta -- per favore contattatemi)\n"
+#: ../src/help.c:52
+msgid "Patches were supplied by the following people (list may be incomplete -- please contact me)\n"
+msgstr "Correzioni sono state fornite dalle seguenti persone (la lista potrebbe essere incompleta -- per favore contattatemi)\n"
 
-#: ../src/misc.c:75
+#: ../src/help.c:53
 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)"
+msgstr "Ramesh Dharan: Multi-Edit (modifica le etichette di diverse tracce in una volta)"
 
-#: ../src/misc.c:76
+#: ../src/help.c:54
 msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
 msgstr "Hiroshi Kawashima: riconoscimento automatico della codifica giapponese"
 
-#: ../src/misc.c:77
+#: ../src/help.c:55
 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"
+msgstr "Adrian Ulrich: porting del codice della playlist da mktunes.pl a 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 ""
-"Waiter Bell: trattamento corretto dei DND di URI con la presenza di "
-"caratteri di escape e/o cr/nuova linea alla fine"
+#: ../src/help.c:56
+msgid "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/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"
 
-#: ../src/misc.c:79
+#: ../src/help.c:57
 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"
+msgstr "Sam Clegg: nomi dei file decisi dall'utente per l'esportazione delle tracce dall'iPod"
 
-#: ../src/misc.c:80
+#: ../src/help.c:58
 msgid "Chris Cutler: automatic creation of various playlist types"
 msgstr "Chris Cutler: creazione automatica di diversi tipi di playlist"
 
-#: ../src/misc.c:81
-msgid ""
-"Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
-"dialogue during sync"
-msgstr ""
-"Graeme Wilford: lettura e scrittura dell'etichetta ID3 «Compositore», barra "
-"di avanzamento durante la sincronizzazione"
+#: ../src/help.c:59
+msgid "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress dialogue during sync"
+msgstr "Graeme Wilford: lettura e scrittura dell'etichetta ID3 «Compositore», barra di avanzamento durante la sincronizzazione"
 
-#: ../src/misc.c:82
-msgid ""
-"Edward Matteucci: debugging, special playlist creation, most of the volume "
-"normalizing code"
-msgstr ""
-"Edward Matteucci: debugging, creazione delle playlist speciali, buona parte "
-"del codice relativo alla normalizzazione"
+#: ../src/help.c:60
+msgid "Edward Matteucci: debugging, special playlist creation, most of the volume normalizing code"
+msgstr "Edward Matteucci: debugging, creazione delle playlist speciali, buona parte del codice relativo alla normalizzazione"
 
-#: ../src/misc.c:83
+#: ../src/help.c:61
 msgid "Jens Lautenbach: some optical improvements"
 msgstr "Jens Lautenbach: alcuni miglioramenti ottici"
 
-#: ../src/misc.c:84
+#: ../src/help.c:62
 msgid "Alex Tribble: iPod eject patch"
 msgstr "Alex Tribble: patch per l'espulsione dell'iPod"
 
-#: ../src/misc.c:85
+#: ../src/help.c:63
 msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
 msgstr "Yaroslav Halchenko: gestione delle tracce orfane e fantasma"
 
-#: ../src/misc.c:86
-msgid ""
-"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"
+#: ../src/help.c:64
+msgid "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"
 
-#: ../src/misc.c:87
-msgid ""
-"Ero Carrera: Filename validation and quick sync when copying tracks from the "
-"iPod"
-msgstr ""
-"Ero Carrera: validazione dei nomi dei file e sincronizzazione rapida nella "
-"copia delle tracce dall'iPod"
+#: ../src/help.c:65
+msgid "Ero Carrera: Filename validation and quick sync when copying tracks from the iPod"
+msgstr "Ero Carrera: validazione dei nomi dei file e sincronizzazione rapida nella copia delle tracce dall'iPod"
 
-#: ../src/misc.c:88
+#: ../src/help.c:66
 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"
+msgstr "Jens Taprogge: supporto per l'etichetta per il guadagno di riproduzione di LAME per normalizzare il volume"
 
-#: ../src/misc.c:89
+#: ../src/help.c:67
 msgid "Armando Atienza: Support with external playcounts"
 msgstr "Armando Atienza: supporto per i contatori di riproduzione esterni"
 
-#: ../src/misc.c:90
+#: ../src/help.c:68
 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:91
+#: ../src/help.c:69
 msgid "Jim Hall: Decent INSTALL file"
 msgstr "Jim Hall: un file INSTALL decente"
 
-#: ../src/misc.c:92
-msgid ""
-"Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
-"contacts to the iPod"
-msgstr ""
-"Juergen Helmers, Markus Gaugusch: script di conversione per sincronizzare "
-"calendari e contatti con l'iPod"
+#: ../src/help.c:70
+msgid "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/contacts to the iPod"
+msgstr "Juergen Helmers, Markus Gaugusch: script di conversione per sincronizzare calendari e contatti con l'iPod"
 
 #. J"urgen!
-#: ../src/misc.c:93
+#: ../src/help.c:71
 msgid "Flavio Stanchina: bugfixes"
 msgstr "Flavio Stanchina: correzione di bug"
 
-#: ../src/misc.c:94
-msgid ""
-"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title"
-msgstr ""
-"Chris Micacchi: ignora «the» e cose simili all'inizio del titolo durante "
-"l'ordinamento"
+#: ../src/help.c:72
+msgid "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of the title"
+msgstr "Chris Micacchi: ignora «the» e cose simili all'inizio del titolo durante l'ordinamento"
 
-#: ../src/misc.c:95
+#: ../src/help.c:73
 msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
-msgstr ""
-"Steve Jay: usa statvfs() invece di df (migliore portabilità, più veloce)"
+msgstr "Steve Jay: usa statvfs() invece di df (migliore portabilità, più veloce)"
 
-#: ../src/misc.c:97
-msgid ""
-"Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
-"tags"
-msgstr ""
-"Christoph Kunz: risoluzione dei problemi di compatibilità nella scrittura "
-"delle etichette mp3 di tipo id3v2.4"
+#: ../src/help.c:75
+msgid "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 tags"
+msgstr "Christoph Kunz: risoluzione dei problemi di compatibilità nella scrittura delle etichette mp3 di tipo id3v2.4"
 
-#: ../src/misc.c:99
+#: ../src/help.c:77
 msgid ""
 "James Liggett:\n"
-"replacement of old GTK file selection dialogs with new GTK filechooser "
-"dialogs\n"
+"replacement of old GTK file selection dialogs with new GTK filechooser dialogs\n"
 "refactored user preferences system."
 msgstr ""
 "James Ligget:\n"
-"sostituzione dei vecchi «GTK file selection dialog» con i nuovi «GTK "
-"filechooser dialog»\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:103
+#: ../src/help.c:81
 msgid "Daniel Kercher: sync scripts for abook and webcalendar"
 msgstr "Daniel Kercher: script di sincronizzazione per abook e webcalendar"
 
-#: ../src/misc.c:105
+#: ../src/help.c:83
 msgid "Clinton Gormley: sync scripts for thunderbird"
 msgstr "Clinton Gormley: script di sincronizzazione per thunderbird"
 
-#: ../src/misc.c:107
+#: ../src/help.c:85
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
-msgstr ""
-"Sebastien Beridot: script di sincronizzazione per la rubrica in formato ldif "
+msgstr "Sebastien Beridot: script di sincronizzazione per la rubrica in formato ldif "
 
-#: ../src/misc.c:109
+#: ../src/help.c:87
 msgid "Sebastian Scherer: sync script for kNotes"
 msgstr "Sebastian Scherer: script di sincronizzazione per kNotes"
 
-#: ../src/misc.c:111
+#: ../src/help.c:89
 msgid "Nick Piper: sync script for Palm, type-ahead search"
 msgstr "Nick Piper: script di sincronizzazione per Palm, ricerca type-ahead"
 
-#: ../src/misc.c:113
+#: ../src/help.c:91
 msgid "Uwe Hermann: help with support for iPod Video"
 msgstr "Uwe Hermann: aiuto nel supporto per l'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: supporto per l'etichetta compilation nei file mp3 e "
-"visualizzazione separata delle compilation nella scheda di ordinamento."
+#: ../src/help.c:93
+msgid "Iain Benson: support for compilation tag in mp3 files and separate display 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."
 
-#: ../src/misc.c:116
+#: ../src/help.c:94
 msgid ""
 "Nicolas Chariot: icons of buttons\n"
 "\n"
@@ -4436,96 +3980,79 @@
 "Nicolas Chariot: icone dei bottoni\n"
 "\n"
 
-#: ../src/misc.c:118
+#: ../src/help.c:96
 msgid "This program borrows code from the following projects:"
 msgstr "Questo programma prende in prestito codice dai seguenti progetti:"
 
-#: ../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, portato in C) lettura e scrittura di iTunesDB (http://"
-"www.gnu.org/software/gnupod/)"
+#: ../src/help.c:97
+msgid "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/)"
 
-#: ../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 di Samuel Wood (sam dot wood at gmail dot com): una "
-"partedel codice per le playlist intelligenti è basata sulle sue classi in C+"
-"+."
+#: ../src/help.c:98
+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 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:121
+#: ../src/help.c:99
 msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
-msgstr ""
-"mp3info:  rilevazione della durata dei brani mp3 (http://ibiblio.org/"
-"mp3info/)"
+msgstr "mp3info:  rilevazione della durata dei brani mp3 (http://ibiblio.org/mp3info/)"
 
-#: ../src/misc.c:122
+#: ../src/help.c:100
 msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
-msgstr ""
-"xmms: sfoglia directory, rilevazione della durata dei brani mp3 (http://www."
-"xmms.org)"
+msgstr "xmms: sfoglia directory, rilevazione della durata dei brani mp3 (http://www.xmms.org)"
 
-#: ../src/misc.c:124
+#: ../src/help.c:102
 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/)."
+msgstr "La GUI è stata creata con l'aiuto di glade-2 (http://glade.gnome.org/)."
 
-#: ../src/misc.c:128
+#: ../src/help.c:106
 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:129
+#: ../src/help.c:107
 msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
 msgstr "Francese: Éric Lassauge (rpmfarm at free dot fr)"
 
-#: ../src/misc.c:130
+#: ../src/help.c:108
 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:131
+#: ../src/help.c:109
 msgid "German: Kai-Ove"
 msgstr "Tedesco: Kai-Ove"
 
-#: ../src/misc.c:132
+#: ../src/help.c:110
 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)"
-msgstr ""
-"Italiano: Edward Matteucci (edward_matteucc at users dot sourceforge dot)"
+#: ../src/help.c:111
+msgid "Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
+msgstr "Italiano: Edward Matteucci (edward_matteucc at users dot sourceforge dot)"
 
-#: ../src/misc.c:134
+#: ../src/help.c:112
 msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
 msgstr "Italiano: Daniele Forsi (dforsi at gmail dot com)"
 
-#: ../src/misc.c:135
+#: ../src/help.c:113
 msgid "Japanese: Ayako Sano"
 msgstr "Giapponese: Ayako Sano"
 
-#: ../src/misc.c:136
+#: ../src/help.c:114
 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
+#: ../src/help.c:115
 msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
 msgstr "Rumeno: Alex Eftimie (alexeftimie at gmail dot com)"
 
-#: ../src/misc.c:138
+#: ../src/help.c:116
 msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
-msgstr ""
-"Spagnolo: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr "Spagnolo: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
 
-#: ../src/misc.c:139
+#: ../src/help.c:117
 msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
 msgstr "Svedese: Stefan Asserhall (stefan.asserhall at comhem dot se)"
 
-#: ../src/misc.c:144
+#: ../src/help.c:122
 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"
@@ -4557,7 +4084,7 @@
 "Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
 "02111-1307, USA."
 
-#: ../src/misc.c:159
+#: ../src/help.c:137
 msgid ""
 "© 2002-2007\n"
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
@@ -4567,31 +4094,195 @@
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
 "Corey Donohoe <atmos at atmos.org>"
 
-#: ../src/misc.c:167
+#: ../src/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr "(usa libgpod %s)"
+
+#: ../src/help.c:143
+#: ../src/help.c:148
 msgid "Cross-platform multilingual interface to Apple's iPod™"
 msgstr "Interfaccia multi-lingua e multi-piattaforma per Apple iPod™"
 
-#: ../src/misc.c:934
+#: ../src/info.c:359
+#: ../src/infodlg.c:190
+msgid "n/c"
+msgstr "n.c."
+
+#: ../src/info.c:364
+#: ../src/info.c:852
+#: ../src/infodlg.c:193
+msgid "offline"
+msgstr "non in linea"
+
+#: ../src/info.c:500
 #, c-format
-msgid "Could not process '%s' (no filename available)"
-msgstr "Impossibile processare «%s» (nessun nome di file disponibile)"
+msgid " P:%d T:%d/%d"
+msgstr " P:%d T:%d/%d"
 
-#: ../src/misc.c:1088
+#: ../src/info.c:794
+msgid "B"
+msgstr "B"
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr "kB"
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr "TB"
+
+#: ../src/info.c:837
 #, c-format
-msgid "Unknown token '%%%c' in template '%s'"
-msgstr "Segnaposto sconosciuto «%%%c» nel modello «%s»"
+msgid " %s Free"
+msgstr "%s liberi"
 
-#: ../src/misc.c:1171
+#: ../src/info.c:842
 #, c-format
+msgid " %s Pending"
+msgstr " %s in sospeso"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr " scollegato"
+
+#: ../src/info.c:898
+msgid "No database or playlist selected"
+msgstr "Nessun database o playlist selezionato"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "Nessuna traccia selezionata"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "Nessuna playlist selezionata"
+
+#: ../src/info.c:913
+msgid "No iPod or iPod playlist selected"
+msgstr "Nessun iPod o playlist di iPod selezionato"
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"Totale\n"
+"(iPod)"
+
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"Totale\n"
+"(locale)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"Playlist\n"
+"selezionata"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"Tracce\n"
+"visualizzate"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"Tracce\n"
+"selezionate"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "Numero di tracce"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "Dimensione file"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "Numero di playlist"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "Tracce eliminate"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "Dimensione dei file (eliminati)"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "Tracce non trasferite"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "Dimensione dei file (non trasferiti)"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "Spazio libero effettivo"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "Scegliere o inserire il modello"
+
+#: ../src/ipod_init.c:81
+#: ../src/repository.c:560
+#: ../src/repository.c:2374
+msgid "Select mountpoint"
+msgstr "Selezionare il punto di mount"
+
+#: ../src/ipod_init.c:362
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "Errore nell'inizializzazione dell'iPod: «%s».\n"
+
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr "Errore nell'inizializzazione dell'iPod, errore sconosciuto\n"
+
+#: ../src/ipod_init.c:425
+#, c-format
+msgid "<b>Please select your iPod model at </b><i>%s</i>"
+msgstr "<b>Scegliere il modello di iPod in </b><i>%s</i>"
+
+#: ../src/ipod_init.c:466
+msgid ""
+"Could not determine the model you selected -- this could be a bug or incompatibilty in the GTK+ or glade library.\n"
+"\n"
+msgstr ""
+"Impossibile determinare il modello che è stato selezionato -- potrebbe essere un bug o un'incompatibilità nelle librerie GTK+ o glade.\n"
+"\n"
+
+#: ../src/misc.c:864
+#, c-format
+msgid "Could not process '%s' (no filename available)"
+msgstr "Impossibile processare «%s» (nessun nome di file disponibile)"
+
+#: ../src/misc.c:1101
+#, 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:1257
+#: ../src/misc.c:1187
 #, c-format
 msgid "Error creating %s: %s\n"
 msgstr "Errore nella creazione di %s: %s\n"
 
-#: ../src/misc.c:1691
+#: ../src/misc.c:1642
 #, c-format
 msgid ""
 "Writing preferences file '%s' failed (%s).\n"
@@ -4600,19 +4291,17 @@
 "La scrittura del file delle preferenze «%s» è fallita (%s).\n"
 "\n"
 
-#: ../src/misc.c:1693
+#: ../src/misc.c:1644
 msgid "unspecified error"
 msgstr "errore non specificato"
 
-#: ../src/misc.c:1701
+#: ../src/misc.c:1652
 #, 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 ""
-"La scrittura delle preferenze sull'iPod (%s) è fallita: impossibile "
-"raggiungere il percorso per la Control Directory.\n"
+"La scrittura delle preferenze sull'iPod (%s) è fallita: impossibile raggiungere il percorso per la Control Directory.\n"
 "\n"
 
 #. title
@@ -4620,137 +4309,102 @@
 msgid "The following has occurred:"
 msgstr "Si è verificato l'errore seguente:"
 
-#: ../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] ""
-"Sei sicuro di voler eliminare completamente la seguente traccia dal tuo "
-"iPod? Il numero di playlist di cui questa traccia fa parte è indicato tra "
-"parentesi."
-msgstr[1] ""
-"Sei sicuro di voler eliminare completamente le seguenti tracce dall'iPod? Il "
-"numero di playlist di cui ognuna di queste tracce fa parte è indicato tra "
-"parentesi."
+#: ../src/misc_confirm.c:156
+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] "Sei sicuro di voler eliminare completamente la seguente traccia dal tuo iPod? Il numero di playlist di cui questa traccia fa parte è indicato tra parentesi."
+msgstr[1] "Sei sicuro di voler eliminare completamente le seguenti tracce dall'iPod? Il numero di playlist di cui ognuna di queste tracce fa parte è indicato tra parentesi."
 
-#: ../src/misc_confirm.c:126
+#: ../src/misc_confirm.c:160
 msgid "Delete Track Completely from iPod?"
 msgid_plural "Delete Tracks Completely from iPod?"
 msgstr[0] "Cancellare completamente la traccia dall'iPod?"
 msgstr[1] "Cancellare completamente le tracce dall'iPod?"
 
-#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#: ../src/misc_confirm.c:171
+#: ../src/misc_confirm.c:212
 #, 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] "Eliminare veramente la seguente traccia dalla playlist «%s»?"
 msgstr[1] "Eliminare veramente le seguenti tracce dalla playlist «%s»?"
 
-#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+#: ../src/misc_confirm.c:175
+#: ../src/misc_confirm.c:216
 msgid "Remove Track From Playlist?"
 msgid_plural "Remove Tracks From Playlist?"
 msgstr[0] "Rimuovere la traccia dalla playlist?"
 msgstr[1] "Rimuovere le tracce dalla playlist?"
 
-#: ../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] ""
-"Sei sicuro di voler eliminare completamente la seguente traccia dal tuo "
-"disco fisso? Il numero di playlist di cui questa traccia fa parte è indicato "
-"tra parentesi."
-msgstr[1] ""
-"Sei sicuro di voler eliminare completamente le seguenti tracce dal tuo disco "
-"fisso? Il numero di playlist di cui ognuna di queste tracce fa parte è "
-"indicato tra parentesi."
+#: ../src/misc_confirm.c:197
+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] "Sei sicuro di voler eliminare completamente la seguente traccia dal tuo disco fisso? Il numero di playlist di cui questa traccia fa parte è indicato tra parentesi."
+msgstr[1] "Sei sicuro di voler eliminare completamente le seguenti tracce dal tuo disco fisso? Il numero di playlist di cui ognuna di queste tracce fa parte è indicato tra parentesi."
 
-#: ../src/misc_confirm.c:167
+#: ../src/misc_confirm.c:201
 msgid "Delete Track from Harddisk?"
 msgid_plural "Delete Tracks from Harddisk?"
 msgstr[0] "Cancellare la traccia dal disco fisso?"
 msgstr[1] "Cancellare le tracce dal disco fisso?"
 
-#: ../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] ""
-"Sei sicuro di voler eliminare completamente la seguente traccia dal tuo "
-"database locale? Il numero di playlist di cui questa traccia fa parte è "
-"indicato tra parentesi."
-msgstr[1] ""
-"Sei sicuro di voler eliminare completamente le seguenti tracce dal tuo "
-"database locale? Il numero di playlist di cui ognuna di queste tracce fa "
-"parte è indicato tra parentesi."
+#: ../src/misc_confirm.c:226
+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] "Sei sicuro di voler eliminare completamente la seguente traccia dal tuo database locale? Il numero di playlist di cui questa traccia fa parte è indicato tra parentesi."
+msgstr[1] "Sei sicuro di voler eliminare completamente le seguenti tracce dal tuo database locale? Il numero di playlist di cui ognuna di queste tracce fa parte è indicato tra parentesi."
 
-#: ../src/misc_confirm.c:196
+#: ../src/misc_confirm.c:230
 msgid "Remove Track from Local Database?"
 msgid_plural "Remove Tracks from Local Database?"
 msgstr[0] "Rimuovere la traccia dal database locale?"
 msgstr[1] "Rimuovere le tracce dal database locale?"
 
-#: ../src/misc_confirm.c:261
+#: ../src/misc_confirm.c:295
 #, c-format
 msgid "Deleted one track completely from iPod"
 msgid_plural "Deleted %d tracks completely from iPod"
 msgstr[0] "Cancellata completamente una traccia dall'iPod"
 msgstr[1] "Cancellate completamente %d tracce dall'iPod"
 
-#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#: ../src/misc_confirm.c:301
+#: ../src/misc_confirm.c:325
 #, c-format
 msgid "Deleted %d track from playlist '%s'"
 msgid_plural "Deleted %d tracks from playlist '%s'"
 msgstr[0] "Cancellata %d traccia dalla playlist «%s»"
 msgstr[1] "Cancellate %d tracce dalla playlist «%s»"
 
-#: ../src/misc_confirm.c:285
+#: ../src/misc_confirm.c:319
 #, c-format
 msgid "Deleted one track from harddisk"
 msgid_plural "Deleted %d tracks from harddisk"
 msgstr[0] "Cancellata una traccia dal disco fisso"
 msgstr[1] "Cancellate %d tracce dal disco fisso"
 
-#: ../src/misc_confirm.c:297
+#: ../src/misc_confirm.c:331
 #, c-format
 msgid "Deleted track from local database"
 msgid_plural "Deleted %d tracks from local database"
 msgstr[0] "Cancellata la traccia dal database locale"
 msgstr[1] "Cancellate %d tracce dal database locale"
 
-#: ../src/misc_confirm.c:442
+#: ../src/misc_confirm.c:476
 msgid "Cannot remove entry 'All'"
 msgstr "Impossibile rimuovere la voce «Tutti»"
 
-#: ../src/misc_confirm.c:536
+#: ../src/misc_confirm.c:570
 #, c-format
 msgid "Removed all %d tracks from the iPod"
 msgstr "Eliminate tutte le %d tracce dall'iPod"
 
-#: ../src/misc_confirm.c:541
+#: ../src/misc_confirm.c:575
 #, c-format
 msgid "Removed all podcasts from the iPod"
 msgstr "Eliminati tutti i podcast dall'iPod"
 
-#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#: ../src/misc_confirm.c:584
+#: ../src/misc_confirm.c:658
 #, c-format
 msgid "Deleted playlist '%s' including %d member track"
 msgid_plural "Deleted playlist '%s' including %d member tracks"
@@ -4758,113 +4412,87 @@
 msgstr[1] "Cancellata la playlist «%s» con le %d tracce appartenenti"
 
 #. first use playlist name
-#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#: ../src/misc_confirm.c:600
+#: ../src/misc_confirm.c:674
 #, c-format
 msgid "Deleted playlist '%s'"
 msgstr "Playlist «%s» eliminata"
 
-#: ../src/misc_confirm.c:600
+#: ../src/misc_confirm.c:634
 #, 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] ""
-"Cancellata la playlist «%s» con %d traccia appartenente sul disco fisso"
-msgstr[1] ""
-"Cancellata la playlist «%s» con le %d tracce appartenenti sul disco fisso"
+msgstr[0] "Cancellata la playlist «%s» con %d traccia appartenente sul disco fisso"
+msgstr[1] "Cancellata la playlist «%s» con le %d tracce appartenenti sul disco fisso"
 
-#: ../src/misc_confirm.c:617
+#: ../src/misc_confirm.c:651
 #, c-format
 msgid "Removed all %d tracks from the database"
 msgstr "Rimosse tutte le %d tracce dal database"
 
-#: ../src/misc_confirm.c:695
+#: ../src/misc_confirm.c:729
 #, 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
+#: ../src/misc_confirm.c:734
 #, c-format
 msgid "Are you sure you want to remove all podcasts from your iPod?"
 msgstr "Eliminare veramente tutti i podcast dall'iPod?"
 
-#: ../src/misc_confirm.c:708
+#: ../src/misc_confirm.c:742
 #, 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] ""
-"Sei sicuro di voler eliminare completamente la playlist «%s» e la traccia "
-"seguente dall'iPod? Il numero di playlist di cui questa traccia fa parte è "
-"indicato tra parentesi."
-msgstr[1] ""
-"Sei sicuro di voler eliminare completamente la playlist «%s» e le tracce "
-"seguenti dall'iPod? Il numero di playlist di cui ogni traccia fa parte è "
-"indicato tra parentesi."
+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] "Sei sicuro di voler eliminare completamente la playlist «%s» e la traccia seguente dall'iPod? Il numero di playlist di cui questa traccia fa parte è indicato tra parentesi."
+msgstr[1] "Sei sicuro di voler eliminare completamente la playlist «%s» e le tracce seguenti dall'iPod? Il numero di playlist di cui ogni traccia fa parte è indicato tra parentesi."
 
-#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#: ../src/misc_confirm.c:753
+#: ../src/misc_confirm.c:808
 #, c-format
 msgid "Are you sure you want to delete the playlist '%s'?"
 msgstr "Cancellare veramente la playlist «%s»?"
 
-#: ../src/misc_confirm.c:745
+#: ../src/misc_confirm.c:779
 #, 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] ""
-"Sei sicuro di voler eliminare la playlist «%s» e la traccia seguente dal tuo "
-"disco fisso? Il numero di playlist di cui questa traccia fa parte è indicato "
-"tra parentesi."
-msgstr[1] ""
-"Sei sicuro di voler eliminare la playlist «%s» e le tracce seguenti dal tuo "
-"disco fisso? Il numero di playlist di cui ogni traccia fa parte è indicato "
-"tra parentesi."
+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] "Sei sicuro di voler eliminare la playlist «%s» e la traccia seguente dal tuo disco fisso? Il numero di playlist di cui questa traccia fa parte è indicato tra parentesi."
+msgstr[1] "Sei sicuro di voler eliminare la playlist «%s» e le tracce seguenti dal tuo disco fisso? Il numero di playlist di cui ogni traccia fa parte è indicato tra parentesi."
 
-#: ../src/misc_confirm.c:753
+#: ../src/misc_confirm.c:787
 #, c-format
 msgid "Are you sure you want to remove all tracks from the database?"
 msgstr "Eliminare veramente tutte le tracce dal database?"
 
-#: ../src/misc_confirm.c:762
+#: ../src/misc_confirm.c:796
 #, 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] ""
-"Sei sicuro di voler eliminare completamente la playlist «%s» e la traccia "
-"seguente dal database? Il numero di playlist di cui questa traccia fa parte "
-"è indicato tra parentesi."
-msgstr[1] ""
-"Sei sicuro di voler eliminare completamente la playlist «%s» e le tracce "
-"seguenti dal database? Il numero di playlist di cui ogni traccia fa parte è "
-"indicato tra parentesi."
+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] "Sei sicuro di voler eliminare completamente la playlist «%s» e la traccia seguente dal database? Il numero di playlist di cui questa traccia fa parte è indicato tra parentesi."
+msgstr[1] "Sei sicuro di voler eliminare completamente la playlist «%s» e le tracce seguenti dal database? Il numero di playlist di cui ogni traccia fa parte è indicato tra parentesi."
 
-#: ../src/misc_confirm.c:841
+#: ../src/misc_confirm.c:869
 msgid ""
-"Data has been changed and not been saved.\n"
-"OK to exit gtkpod?"
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
 msgstr ""
-"Ci sono dei dati modificati e non salvati.\n"
-"Uscire comunque da gtkpod?"
+"Esistono dei dati cambiati che non sono stati ancora salvati. Se si esce dal programma tutti i cambiamenti non salvati saranno persi.\n"
+"\n"
+"Salvare i cambiamenti?"
 
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr "Salvare i cambiamenti prima di uscire?"
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr "Chiudi senza salvare"
+
 #: ../src/misc_conversion.c:66
 msgid "File type"
-msgstr "Tipo file"
+msgstr "Tipo di file"
 
 #: ../src/misc_conversion.c:67
 msgid "PC File"
@@ -4876,7 +4504,7 @@
 
 #: ../src/misc_conversion.c:69
 msgid "iPod ID"
-msgstr "iPod ID"
+msgstr "ID iPod"
 
 #. 10
 #: ../src/misc_conversion.c:70
@@ -4889,7 +4517,7 @@
 
 #: ../src/misc_conversion.c:72
 msgid "File Size"
-msgstr "Dimensione file"
+msgstr "Dimensione del file"
 
 #: ../src/misc_conversion.c:73
 msgid "Play Time"
@@ -4898,7 +4526,7 @@
 #. 20
 #: ../src/misc_conversion.c:80
 msgid "Date played"
-msgstr "Data riproduzione"
+msgstr "Data di riproduzione"
 
 #: ../src/misc_conversion.c:82
 msgid "Volume"
@@ -4936,7 +4564,7 @@
 
 #: ../src/misc_conversion.c:93
 msgid "Date released"
-msgstr "Data pubblicazione"
+msgstr "Data di pubblicazione"
 
 #: ../src/misc_conversion.c:94
 msgid "Checked"
@@ -5018,147 +4646,153 @@
 msgid "Gapless Track Flag"
 msgstr "Traccia senza pause"
 
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
+msgstr "Testi"
+
+#: ../src/misc_conversion.c:127
 msgid "Name of file on PC, if available"
 msgstr "Nome del file sul PC, se disponibile"
 
-#: ../src/misc_conversion.c:127
+#: ../src/misc_conversion.c:128
 msgid "Name of file on the iPod"
 msgstr "Nome del file sull'iPod"
 
 #. 10
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
 msgid "Track Nr. and total number of tracks on CD"
 msgstr "N° traccia e numero totale di tracce sul CD"
 
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:131
 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:136
+#: ../src/misc_conversion.c:137
 msgid "Beats per minute"
 msgstr "Battute al minuto"
 
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
 msgid "Number of times the track has been played"
 msgstr "Numero di volte in cui la traccia è stata riprodotta"
 
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
 msgid "Star rating from 0 to 5"
 msgstr "Votazione a stelle da 0 a 5"
 
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
 msgid "Date and time track has been added"
 msgstr "Data e ora in cui la traccia è stata aggiunta"
 
 #. 20
-#: ../src/misc_conversion.c:140
+#: ../src/misc_conversion.c:141
 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:141
+#: ../src/misc_conversion.c:142
 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:142
+#: ../src/misc_conversion.c:143
 msgid "Manual volume adjust"
 msgstr "Regolazione manuale del volume"
 
-#: ../src/misc_conversion.c:143
-msgid ""
-"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
-"the iPod"
-msgstr ""
-"Regolazione del volume in dB (guadagno di riproduzione) -- bisogna anche "
-"attivare «Ver. livello sonoro» sull'iPod"
+#: ../src/misc_conversion.c:144
+msgid "Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on the iPod"
+msgstr "Regolazione del volume in dB (guadagno di riproduzione) -- bisogna anche attivare «Ver. livello sonoro» sull'iPod"
 
 #. 25
-#: ../src/misc_conversion.c:146
+#: ../src/misc_conversion.c:147
 msgid "CD Nr. and total number of CDS in set"
 msgstr "N° CD e numero totale dei CD nel cofanetto"
 
-#: ../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:150
+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:151
 msgid "Accessible by selecting the center button on the iPod."
 msgstr "Accessibile selezionando il bottone centrale sull'iPod."
 
-#: ../src/misc_conversion.c:154
+#: ../src/misc_conversion.c:155
 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)"
+msgstr "Data di pubblicazione (per i podcast è mostrata accanto al titolo sull'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
+#: ../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
+#: ../src/misc_conversion.c:174
 msgid "Used for sorting on the iPod"
 msgstr "Usato per l'ordinamento sull'iPod"
 
-#: ../src/misc_conversion.c:735
+#: ../src/misc_conversion.c:737
 #, 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:745
+#: ../src/misc_conversion.c:747
 #, 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:762
+#: ../src/misc_conversion.c:764
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "L'URI «%s» non è valido"
 
-#: ../src/misc_conversion.c:774
+#: ../src/misc_conversion.c:776
 #, 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:790
+#: ../src/misc_conversion.c:792
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "L'URI «%s» contiene caratteri di escape non validi"
 
-#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
-#: ../src/misc_playlist.c:429
+#: ../src/misc_playlist.c:71
+#: ../src/misc_playlist.c:108
+msgid "Please load the iPod before adding playlists."
+msgstr "Leggere l'iPod prima di aggiungere le playlist."
+
+#: ../src/misc_playlist.c:77
+#: ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
 msgid "Please enter a name for the new playlist"
 msgstr "Inserire un nome per la nuova playlist"
 
-#: ../src/misc_playlist.c:154
+#: ../src/misc_playlist.c:174
 msgid "AR:"
 msgstr "AR:"
 
-#: ../src/misc_playlist.c:157
+#: ../src/misc_playlist.c:177
 msgid "AL:"
 msgstr "AL:"
 
-#: ../src/misc_playlist.c:160
+#: ../src/misc_playlist.c:180
 msgid "GE:"
 msgstr "GE:"
 
-#: ../src/misc_playlist.c:163
+#: ../src/misc_playlist.c:183
 msgid "CO:"
 msgstr "CO:"
 
-#: ../src/misc_playlist.c:166
+#: ../src/misc_playlist.c:186
 msgid "YE:"
 msgstr "AN:"
 
-#: ../src/misc_playlist.c:194
+#: ../src/misc_playlist.c:214
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/misc_playlist.c:272
+#: ../src/misc_playlist.c:292
 #, c-format
 msgid "Random (%d)"
 msgstr "Casuale (%d)"
 
-#: ../src/misc_playlist.c:297
+#: ../src/misc_playlist.c:317
 msgid ""
 "Auto Store of track view disabled.\n"
 "\n"
@@ -5166,11 +4800,11 @@
 "Salvataggio automatico dell'ordine delle tracce disabilitato.\n"
 "\n"
 
-#: ../src/misc_playlist.c:356
+#: ../src/misc_playlist.c:376
 msgid "Not Listed"
 msgstr "Non elencati"
 
-#: ../src/misc_playlist.c:406
+#: ../src/misc_playlist.c:426
 #, c-format
 msgid "Created playlist '%s' with %d track."
 msgid_plural "Created playlist '%s' with %d tracks."
@@ -5178,131 +4812,121 @@
 msgstr[1] "Creata la playlist «%s» con %d tracce."
 
 #. n==0
-#: ../src/misc_playlist.c:417
+#: ../src/misc_playlist.c:437
 msgid "No tracks available, playlist not created"
 msgstr "Nessuna traccia disponibile, la playlist non è stata creata"
 
-#: ../src/misc_playlist.c:543
+#: ../src/misc_playlist.c:563
 #, c-format
 msgid "Most Listened (%d)"
 msgstr "Più ascoltate (%d)"
 
-#: ../src/misc_playlist.c:584
+#: ../src/misc_playlist.c:604
 #, c-format
 msgid "Never Listened"
 msgstr "Mai ascoltate"
 
-#: ../src/misc_playlist.c:624
+#: ../src/misc_playlist.c:644
 #, c-format
 msgid "Best Rated (%d)"
 msgstr "Voti migliori (%d)"
 
-#: ../src/misc_playlist.c:666
+#: ../src/misc_playlist.c:686
 msgid "Unrated tracks"
 msgstr "Tracce senza voto"
 
-#: ../src/misc_playlist.c:671
+#: ../src/misc_playlist.c:691
 #, c-format
 msgid "Rated %d"
 msgstr "Voto (%d)"
 
-#: ../src/misc_playlist.c:714
+#: ../src/misc_playlist.c:734
 #, c-format
 msgid "Recent (%d)"
 msgstr "Recenti (%d)"
 
-#: ../src/misc_playlist.c:753
+#: ../src/misc_playlist.c:773
 msgid "Last Time"
 msgstr "Ultima volta"
 
-#: ../src/misc_playlist.c:844
+#: ../src/misc_playlist.c:864
 msgid "Removal of dangling tracks with no files on PC was canceled."
-msgstr ""
-"La rimozione delle tracce fantasma senza file sul PC è stata annullata."
+msgstr "La rimozione delle tracce fantasma senza file sul PC è stata annullata."
 
-#: ../src/misc_playlist.c:854
+#: ../src/misc_playlist.c:874
 msgid "Handling of dangling tracks with files on PC was canceled."
-msgstr ""
-"La gestione delle tracce fantasma con file presenti sul PC è stata annullata."
+msgstr "La gestione delle tracce fantasma con file presenti sul PC è stata annullata."
 
-#: ../src/misc_playlist.c:882
+#: ../src/misc_playlist.c:902
 msgid "Dangling tracks with no files on PC were removed."
 msgstr "Le tracce fantasma senza file sul PC sono state rimosse."
 
-#: ../src/misc_playlist.c:943
+#: ../src/misc_playlist.c:963
 msgid "Dangling tracks with files on PC were handled."
 msgstr "Le tracce fantasma con i file sul PC sono state gestite."
 
-#: ../src/misc_playlist.c:976
+#: ../src/misc_playlist.c:996
 msgid "Track"
 msgstr "Traccia"
 
-#: ../src/misc_playlist.c:1019
+#: ../src/misc_playlist.c:1035
 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"
+"If you abort the operation, you can import the existing database before calling this function again.\n"
 msgstr ""
-"Non si è importato l'iTunesDB esistente. Questo è quasi certamente sbagliato "
-"e porterà alla perdita del database esistente.\n"
+"Non si è importato l'iTunesDB esistente. Questo è quasi certamente sbagliato e porterà alla perdita del database esistente.\n"
 "\n"
-"Premere «Ok» se si vuole procedere comunque o «Annulla» se si vuole "
-"interrompere l'operazione. Se la si interrompe, si può importare il database "
-"esistente prima di richiamare di nuovo questa funzione.\n"
+"Se si interrompe l'operazione. si può importare il database esistente prima di richiamare di nuovo questa funzione.\n"
 
-#: ../src/misc_playlist.c:1033
+#: ../src/misc_playlist.c:1042
+msgid "Abort operation"
+msgstr "Interrompi l'operazione"
+
+#: ../src/misc_playlist.c:1056
 msgid "Creating a tree of known files"
 msgstr "Creazione di un albero di file conosciuti"
 
-#: ../src/misc_playlist.c:1077
+#: ../src/misc_playlist.c:1100
 msgid "Checking iPOD files against known files in DB"
 msgstr "Confronto dei file dell'iPod con i file conosciuti nel DB"
 
-#: ../src/misc_playlist.c:1120
+#: ../src/misc_playlist.c:1143
 msgid "Orphaned"
 msgstr "Orfani"
 
-#: ../src/misc_playlist.c:1147
+#: ../src/misc_playlist.c:1170
 #, 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 ""
-"Il seguente file orfano era già stato aggiunto di nuovo all'iPod. Verrà "
-"rimosso alla prossima sincronizzazione:\n"
+"Il seguente file orfano era già stato aggiunto di nuovo all'iPod. Verrà rimosso alla prossima sincronizzazione:\n"
 "%s\n"
 "\n"
 
-#: ../src/misc_playlist.c:1175
+#: ../src/misc_playlist.c:1198
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Processing..."
 msgstr "Trovati %d file orfani e %d fantasma. Elaborazione in corso..."
 
-#: ../src/misc_playlist.c:1199
+#: ../src/misc_playlist.c:1222
 #, 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] ""
 "La seguente traccia fantasma ha un file sul PC.\n"
-"Premere Ok per trasferirla dal file nella prossima sincronizzazione, Annulla "
-"per lasciare tutto così."
+"Premere Ok per trasferirla dal file nella prossima sincronizzazione, Annulla per lasciare tutto così."
 msgstr[1] ""
 "Le seguenti %d tracce fantasma hanno file sul PC.\n"
-"Premere Ok per trasferirle dai file nella prossima sincronizzazione, Annulla "
-"per lasciare tutto così."
+"Premere Ok per trasferirle dai file nella prossima sincronizzazione, Annulla per lasciare tutto così."
 
-#: ../src/misc_playlist.c:1204
+#: ../src/misc_playlist.c:1227
 #, c-format
 msgid ""
 "The following dangling track doesn't have file on PC. \n"
@@ -5319,11 +4943,11 @@
 
 #. we want unique window for each
 #. gboolean modal,
-#: ../src/misc_playlist.c:1211
+#: ../src/misc_playlist.c:1234
 msgid "Dangling Tracks"
 msgstr "Tracce fantasma"
 
-#: ../src/misc_playlist.c:1234
+#: ../src/misc_playlist.c:1257
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Done."
 msgstr "Trovati %d file orfani e %d fantasma. Terminato."
@@ -5345,16 +4969,10 @@
 
 #: ../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] ""
-"La seguente traccia duplicata non è stata aggiunta alla playlist principale."
-msgstr[1] ""
-"Le seguenti %d tracce duplicate non sono state aggiunte alla playlist "
-"principale."
+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] "La seguente traccia duplicata non è stata aggiunta alla playlist principale."
+msgstr[1] "Le seguenti %d tracce duplicate non sono state aggiunte alla playlist principale."
 
 #. gint id,
 #. gboolean modal,
@@ -5362,102 +4980,92 @@
 msgid "Duplicate detection"
 msgstr "Rilevazione dei duplicati"
 
-#: ../src/misc_track.c:1339
+#: ../src/misc_track.c:1347
 msgid "Local Database"
 msgstr "Database locale"
 
 #. artwork is set
-#: ../src/misc_track.c:1350
+#: ../src/misc_track.c:1358
 msgid "Embedded or filename was lost"
 msgstr "Incorporato o il nome del file è andato perso"
 
-#: ../src/misc_track.c:1354
+#: ../src/misc_track.c:1362
 msgid "Artwork not set"
 msgstr "Artwork non impostato"
 
-#: ../src/misc_track.c:1816
+#: ../src/misc_track.c:1836
 #, 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:2052
+#: ../src/misc_track.c:2072
 #, c-format
 msgid "drag and drop: ignored '%s'\n"
 msgstr "drag and drop: ignorato «%s»\n"
 
-#: ../src/mp3file.c:1336
+#: ../src/mp3file.c:1344
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Errore nella impostazione del campo ID3: %s\n"
 
-#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
-#: ../src/mp3file.c:2733
+#: ../src/mp3file.c:1368
+#: ../src/mp3file.c:1552
+#: ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870
+#: ../src/mp3file.c:2929
+#: ../src/mp3file.c:2956
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "ERRORE nell'apertura del file: «%s» (%s).\n"
 
-#: ../src/mp3file.c:1688
+#: ../src/mp3file.c:1793
+#: ../src/mp3file.c:2993
 #, 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:2770
+#: ../src/mp3file.c:2907
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "Il file «%s» ha durata zero. Ignorato.\n"
 
-#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#: ../src/mp4file.c:243
+#: ../src/mp4file.c:475
 #, 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:253 ../src/mp4file.c:414
+#: ../src/mp4file.c:253
+#: ../src/mp4file.c:485
 #, 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:529
+#: ../src/mp4file.c:607
 #, 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:540
+#: ../src/mp4file.c:618
 #, 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:553
+#: ../src/mp4file.c:631
 #, 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 ""
-"Importazione di «%s» fallita: m4a/m4p/m4b non sono supportati senza la "
-"libreria mp4v2. Devi compilare i sorgenti di gtkpod insieme alla libreria "
-"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 "Importazione di «%s» fallita: m4a/m4p/m4b non sono supportati senza la libreria mp4v2. Devi compilare i sorgenti di gtkpod insieme alla libreria mp4v2.\n"
 
-#: ../src/mp4file.c:559
+#: ../src/mp4file.c:637
 #, 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 ""
-"Aggiornamento fallito dei metadati m4a/m4p/m4b per «%s»: m4a/m4p/m4b non "
-"sono supportati senza la libreria mp4v2. Devi compilare i sorgenti di gtkpod "
-"insieme alla libreria 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 "Aggiornamento fallito dei metadati m4a/m4p/m4b per «%s»: m4a/m4p/m4b non sono supportati senza la libreria mp4v2. Devi compilare i sorgenti di gtkpod insieme alla libreria mp4v2.\n"
 
-#: ../src/mp4file.c:565
+#: ../src/mp4file.c:643
 #, 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 ""
-"Aggiornamento fallito di soundcheck m4a/m4p/m4b per «%s»: m4a/m4p/m4b non "
-"sono supportati senza la libreria mp4v2. Devi compilare i sorgenti gtkpod "
-"insieme alla libreria 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 "Aggiornamento fallito di soundcheck m4a/m4p/m4b per «%s»: m4a/m4p/m4b non sono supportati senza la libreria mp4v2. Devi compilare i sorgenti gtkpod insieme alla libreria mp4v2.\n"
 
 #: ../src/oggfile.c:73
 #, c-format
@@ -5466,174 +5074,136 @@
 
 #: ../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 ""
-"Importazione di «%s» fallita: m4a/m4p/m4b non sono supportati senza la "
-"libreria ogg. Devi compilare i sorgenti di gtkpod insieme alla libreria "
-"ogg.\n"
+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 "Importazione di «%s» fallita: m4a/m4p/m4b non sono supportati senza la libreria ogg. Devi compilare i sorgenti di gtkpod insieme alla libreria 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 ""
-"Aggiornamento fallito dei metadati ogg per «%s»: ogg non è supportato senza "
-"la libreria ogg. Devi compilare i sorgenti di gtkpod insieme alla libreria "
-"ogg.\n"
+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 "Aggiornamento fallito dei metadati ogg per «%s»: ogg non è supportato senza la libreria ogg. Devi compilare i sorgenti di gtkpod insieme alla libreria ogg.\n"
 
-#: ../src/prefs.c:357
+#: ../src/prefs.c:365
 #, c-format
 msgid "gtkpod version %s usage:\n"
 msgstr "uso di gtkpod versione %s:\n"
 
-#: ../src/prefs.c:358
+#: ../src/prefs.c:366
 msgid "  -h, --help:   display this message\n"
 msgstr "  -h, --help:   mostra questo messaggio\n"
 
-#: ../src/prefs.c:359
+#: ../src/prefs.c:367
 msgid "  -p <file>:    increment playcount for file by one\n"
 msgstr "  -p <file>:incrementa di uno il contatore delle riproduzioni\n"
 
-#: ../src/prefs.c:360
+#: ../src/prefs.c:368
 msgid "  --hash <file>:print gtkpod hash for file\n"
 msgstr "  --hash <file>:stampa l'hash di gtkpod per il file\n"
 
-#: ../src/prefs.c:361
+#: ../src/prefs.c:369
 msgid "  -m path:      define the mountpoint of your iPod\n"
 msgstr "  -m percorso   definisce il punto di mount dell'iPod\n"
 
-#: ../src/prefs.c:362
+#: ../src/prefs.c:370
 msgid "  --mountpoint: same as '-m'.\n"
 msgstr "  --mountpoint: come «-m».\n"
 
-#: ../src/prefs.c:363
+#: ../src/prefs.c:371
 msgid "  -a:           import database automatically after start.\n"
 msgstr "  -a:           importa il database automaticamente all'avvio.\n"
 
-#: ../src/prefs.c:364
+#: ../src/prefs.c:372
 msgid "  --auto:       same as '-a'.\n"
 msgstr "  --auto:       come «-a».\n"
 
-#: ../src/prefs.c:561
+#: ../src/prefs.c:569
 #, c-format
-msgid "Couldn't create ~/.gtkpod\n"
-msgstr "Impossibile creare ~/.gtkpod\n"
+msgid "Couldn't create '%s'\n"
+msgstr "Impossibile creare «%s»\n"
 
-#: ../src/prefs_window.c:133
-msgid "Please select command for 'Play Now'"
-msgstr "Selezionare il comando per «Riproduci ora»"
+#: ../src/prefsdlg.c:51
+msgid "Hide"
+msgstr "Nascondi"
 
-#: ../src/prefs_window.c:134
-msgid "Please select command for 'Enqueue'"
-msgstr "Selezionare il comando per «Metti in coda»"
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
+msgstr "Solo icone"
 
-#: ../src/prefs_window.c:135
-msgid "Please select the mp3gain executable"
-msgstr "Selezionare l'eseguibile di mp3gain"
+#: ../src/prefsdlg.c:53
+msgid "Text only"
+msgstr "Solo testo"
 
-#: ../src/prefs_window.c:136
-msgid "Please select the aacgain executable"
-msgstr "Selezionare l'eseguibile di aacgain"
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
+msgstr "Testo sotto le icone"
 
-#: ../src/prefs_window.c:137
-msgid "Select the mserv music root directory"
-msgstr "Selezionare la directory musicale radice di mserv"
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
+msgstr "Testo accanto alle icone"
 
-#: ../src/prefs_window.c:138
-msgid "Select the mserv trackinfo root directory"
-msgstr "Selezionare la directory trackinfo radice di mserv"
-
-#: ../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:140
-msgid "Select the flac converter command"
-msgstr "Selezionare il comando per il convertitore flac"
-
-#: ../src/prefs_window.c:141
-msgid "Select the m4a converter command."
-msgstr "Selezionare il comando per il convertitore m4a."
-
-#: ../src/prefs_window.c:142
-msgid "Select the mp3 converter command."
-msgstr "Selezionare il comando per il convertitore mp3."
-
-#: ../src/prefs_window.c:143
-msgid "Select the wav converter command."
-msgstr "Selezionare il comando per il convertitore wav."
-
-#: ../src/prefs_window.c:201 ../src/repository.c:662
+#: ../src/repository.c:527
 #, 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>Consultare lo script fornito in «%s». Se scrivi un nuovo script, mandalo "
-"a jcsjcs at users.sourceforge.net per la inclusione nella prossima release.</"
-"i>"
+msgid "Are you sure you want to delete repository \"%s\"? This action cannot be undone!"
+msgstr "Eliminare veramente la playlist «%s»? Questa azione non può essere annullata."
 
-#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
-msgid "Preferences not updated"
-msgstr "Preferenze non aggiornate"
+#: ../src/repository.c:531
+msgid "Delete repository?"
+msgstr "Eliminare l'archivio?"
 
-#: ../src/prefs_window.c:1232
-msgid "Preferences applied"
-msgstr "Preferenze applicate"
-
-#: ../src/repository.c:573 ../src/repository.c:2395
+#: ../src/repository.c:587
+#: ../src/repository.c:2400
 msgid "Set backup file"
 msgstr "Impostare il file di backup"
 
-#: ../src/repository.c:612
+#: ../src/repository.c:626
 msgid "Select directory for synchronization"
 msgstr "Selezionare una directory per la sincronizzazione"
 
-#: ../src/repository.c:638
+#: ../src/repository.c:652
 msgid "Please select command to sync contacts"
 msgstr "Selezionare il comando per sincronizzare i contatti"
 
-#: ../src/repository.c:644
+#: ../src/repository.c:658
 msgid "Please select command to sync calendar"
 msgstr "Selezionare il comando per sincronizzare il calendario"
 
-#: ../src/repository.c:650
+#: ../src/repository.c:664
 msgid "Please select command to sync notes"
 msgstr "Selezionare il comando per sincronizzare le note"
 
-#: ../src/repository.c:729
+#: ../src/repository.c:676
+#, 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>Consultare lo script fornito in «%s». Se scrivi un nuovo script, mandalo a jcsjcs at users.sourceforge.net per la inclusione nella prossima release.</i>"
+
+#: ../src/repository.c:743
 msgid "Smart playlist updated."
 msgstr "Playlist intelligente aggiornata."
 
-#: ../src/repository.c:1190
+#: ../src/repository.c:1204
 msgid "Podcasts Repository"
 msgstr "Archivio dei podcast"
 
-#: ../src/repository.c:1194
+#: ../src/repository.c:1208
 msgid "Local Repository"
 msgstr "Archivio locale"
 
-#: ../src/repository.c:1348
+#: ../src/repository.c:1358
 msgid "Master Playlist"
 msgstr "Playlist principale"
 
-#: ../src/repository.c:1352
+#: ../src/repository.c:1362
 msgid "Podcasts Playlist"
 msgstr "Playlist dei podcast"
 
-#: ../src/repository.c:1360
+#: ../src/repository.c:1370
 msgid "Regular Playlist"
 msgstr "Playlist normale"
 
-#: ../src/repository.c:2423
+#: ../src/repository.c:2428
 msgid "Set local repository file"
 msgstr "Imposta il file dell'archivio locale"
 
-#: ../src/repository.c:2522
+#: ../src/repository.c:2526
 msgid "New Repository"
 msgstr "Nuovo archivio"
 
@@ -5646,43 +5216,48 @@
 msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
 msgstr "Impossibile aprire «%s» per calcolare le somme di controllo SHA1: %s\n"
 
-#: ../src/syncdir.c:237
+#: ../src/sort_window.c:237
+msgid "No sorting"
+msgstr "Nessun ordinamento"
+
+#: ../src/sort_window.c:271
+msgid "You can also use the table headers, but this allows you to sort according to a column that is not displayed."
+msgstr "Si possono usare le intestazioni della tabella, ma questo metodo permette l'ordinamento secondo una colonna non visualizzata."
+
+#: ../src/syncdir.c:246
 #, c-format
 msgid "Sync summary for %s/%s\n"
 msgstr "Riepilogo della sincronizzazione per %s/%s\n"
 
-#: ../src/syncdir.c:246
+#: ../src/syncdir.c:255
 msgid "The following track has been added or updated:\n"
 msgid_plural "The following tracks have been added or updated:\n"
 msgstr[0] "La traccia seguente è stata aggiunta o aggiornata:\n"
 msgstr[1] "Le %d tracce seguenti sono state aggiunte o aggiornate:\n"
 
-#: ../src/syncdir.c:255
+#: ../src/syncdir.c:264
 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] "La traccia seguente è stata completamente rimossa dall'iPod:\n"
 msgstr[1] "La tracce seguenti sono state completamente rimosse dall'iPod:\n"
 
-#: ../src/syncdir.c:264
+#: ../src/syncdir.c:273
 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] "La traccia seguente è stata completamente rimossa dall'archivio:\n"
-msgstr[1] ""
-"Le tracce seguenti sono state completamente rimosse dall'archivio:\n"
+msgstr[1] "Le tracce seguenti sono state completamente rimosse dall'archivio:\n"
 
-#: ../src/syncdir.c:271
+#: ../src/syncdir.c:280
 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] "La traccia seguente è stata completamente rimossa dalla playlist:\n"
-msgstr[1] ""
-"Le tracce seguenti sono state completamente rimosse dalla playlist:\n"
+msgstr[1] "Le tracce seguenti sono state completamente rimosse dalla playlist:\n"
 
-#: ../src/syncdir.c:277
+#: ../src/syncdir.c:286
 msgid "Nothing was changed.\n"
 msgstr "Nessun cambiamento.\n"
 
-#: ../src/syncdir.c:282
+#: ../src/syncdir.c:291
 msgid "Sync summary"
 msgstr "Riepilogo della sincronizzazione"
 
@@ -5690,14 +5265,11 @@
 #, 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 ""
 "Impossibile trovare «%s».\n"
-"Specificare il percorso esatto nella sezione «Strumenti» della finestra di "
-"dialogo delle preferenze o installare il programma se non è installato nel "
-"sistema.\n"
+"Specificare il percorso esatto nella sezione «Strumenti» della finestra di dialogo delle preferenze o installare il programma se non è installato nel sistema.\n"
 "\n"
 
 #: ../src/tools.c:203
@@ -5711,21 +5283,13 @@
 
 #: ../src/tools.c:248
 #, c-format
-msgid ""
-"Did not normalize '%s'. Set mp3gain path in the Tools section of the "
-"preferences.\n"
-msgstr ""
-"Non normalizzato «%s». Impostare il percorso di mp3gain nella sezione "
-"Strumenti delle preferenze.\n"
+msgid "Did not normalize '%s'. Set mp3gain path in the Tools section of the preferences.\n"
+msgstr "Non normalizzato «%s». Impostare il percorso di mp3gain nella sezione Strumenti delle preferenze.\n"
 
 #: ../src/tools.c:258
 #, c-format
-msgid ""
-"Did not normalize '%s'. Set aacgain path in the Tools section of the "
-"preferences.\n"
-msgstr ""
-"Non normalizzato «%s». Impostare il percorso di aacgain nella sezione "
-"Strumenti delle preferenze.\n"
+msgid "Did not normalize '%s'. Set aacgain path in the Tools section of the preferences.\n"
+msgstr "Non normalizzato «%s». Impostare il percorso di aacgain nella sezione Strumenti delle preferenze.\n"
 
 #: ../src/tools.c:385
 msgid "Normalizing..."
@@ -5742,9 +5306,7 @@
 
 #: ../src/tools.c:465
 msgid "Will abort after current mp3gain process ends."
-msgstr ""
-"L'operazione verrà interrotta alla conclusione del processo corrente di "
-"mp3gain."
+msgstr "L'operazione verrà interrotta alla conclusione del processo corrente di mp3gain."
 
 #: ../src/tools.c:491
 #, c-format
@@ -5763,12 +5325,8 @@
 msgstr[1] "Normalizzate %d tracce su %d."
 
 #: ../src/tools.c:633
-msgid ""
-"Please specify the command to be called on the 'Tools' section of the "
-"preferences dialog.\n"
-msgstr ""
-"Specificare il comando da richiamare nella sezione «Strumenti» della "
-"finestra di dialogo delle preferenze.\n"
+msgid "Please specify the command to be called on the 'Tools' section of the preferences dialog.\n"
+msgstr "Specificare il comando da richiamare nella sezione «Strumenti» della finestra di dialogo delle preferenze.\n"
 
 #: ../src/tools.c:645
 #, c-format
@@ -5780,8 +5338,7 @@
 msgstr ""
 "Impossibile trovare il comando «%s».\n"
 "\n"
-"Verificare le impostazioni nella sezione «Strumenti» della finestra di "
-"dialogo delle preferenze.\n"
+"Verificare le impostazioni nella sezione «Strumenti» della finestra di dialogo delle preferenze.\n"
 "\n"
 
 #: ../src/tools.c:687
@@ -5807,3 +5364,316 @@
 #, c-format
 msgid "%s does not appear to be a supported wav file.\n"
 msgstr "%s non sembra essere un file wav supportato.\n"
+
+msgid "%A"
+msgstr "%A"
+
+msgid "...as icons"
+msgstr "...con icone"
+
+msgid "...as text"
+msgstr "...con testo"
+
+msgid "...both as icons and text"
+msgstr "...con icone e testo"
+
+msgid "...entry 'All' in sort tab..."
+msgstr "...la voce «Tutti» nella scheda di ordinamento..."
+
+msgid "../%A.jpg"
+msgstr "../%A.jpg"
+
+msgid "<b>Adding/Updating/Syncing</b>"
+msgstr "<b>Aggiungi/Aggiorna/Sincronizza</b>"
+
+msgid "<b>Automatically select...</b>"
+msgstr "<b>Seleziona automaticamente...</b>"
+
+msgid "<b>Calendar/Contacts/Notes</b>"
+msgstr "<b>Calendario/Contatti/Note</b>"
+
+msgid "<b>Mountpoint and individual repository/playlist options</b>"
+msgstr "<b>Punto di mount e opzioni individuali per archivio e playlist</b>"
+
+msgid "Always write ID3v2.4 tags (only applies to MP3)"
+msgstr "Scrivi sempre le etichette ID3v2.4 (vale solo per gli MP3)"
+
+msgid ""
+"As a last resort set the following tags to the\n"
+"filename if they are (still) empty:"
+msgstr ""
+"Come ultimo tentativo riempi le etichette seguenti con\n"
+"il nome del file se sono (ancora) vuote:"
+
+msgid "Available:"
+msgstr "Disponibili:"
+
+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."
+
+msgid "Credits"
+msgstr "Riconoscimenti"
+
+msgid "Currently only rating is supported."
+msgstr "Attualmente solo il voto è supportato."
+
+msgid "Display a list of tracks that could actually be updated."
+msgstr "Mostra una lista di tracce che sono state veramente aggiornate."
+
+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."
+
+msgid "Display toolbar..."
+msgstr "Mostra la barra degli strumenti..."
+
+msgid "Don't allow file duplication"
+msgstr "Non permettere i file duplicati"
+
+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."
+
+msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
+msgstr "Prima prova <i>folder.jpg</i>, poi <i>&lt;artista&gt;.jpg</i>"
+
+msgid "Flac with :"
+msgstr "Flac con :"
+
+msgid "For example, 'xmms %s' will clear xmms' current playlist, add the selected tracks and start playing."
+msgstr "Per esempio, «xmms %s» cancellerà la playlist attuale di xmms, aggiungerà la traccia selezionata e comincerà a suonarla."
+
+msgid "For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' current playlist."
+msgstr "Per esempio, «xmms -e %s» appenderà (in coda) la traccia selezionata alla playlist corrente di xmms."
+
+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 "È altamente consigliato per importazioni più veloci se si usa il riconoscimento dei duplicati. Inoltre, avere il nome del file sul PC permette di scrivere sul disco le etichette ID3 cambiate e perfino di ricostruire il contenuto dell'iPod nel caso di corruzione del filesystem (cambiare le voci «transferred=» nel backup del database)."
+
+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."
+
+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 "Se il nome del file (percorso completo) di una traccia esistente corrisponde a quella di una traccia che deve essere aggiunta, questa opzione permette di aggiornare le informazioni della traccia esistente piuttosto che ignorare del tutto la traccia. Nessun aggiornamento avrà luogo se il file non è cambiato e l'opzione precedente «Non permettere i file duplicati» è selezionata."
+
+msgid "If you check this, gtkpod will descend into subdirectories recursively."
+msgstr "Selezionando questo, gtkpod discenderà nelle directory ricorsivamente."
+
+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 "Se non si seleziona automaticamente la playlist principale, l'importazione iniziale del database sarà molto più veloce perché non verrà aggiornata l'interfaccia."
+
+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 "Se si selezionano diverse tracce nella lista delle tracce e si modifica un'etichetta della prima traccia, saranno aggiornate anche le etichette delle altre tracce."
+
+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."
+
+msgid "M4A with :"
+msgstr "M4A con :"
+
+msgid "MP3 with :"
+msgstr "MP3 con :"
+
+msgid "Match al_l of the following"
+msgstr "Verifica _tutti i seguenti"
+
+msgid "Match an_y of the following"
+msgstr "Verifica _uno qualsiasi dei seguenti"
+
+msgid "Maximum size of cache directory (in GB):"
+msgstr "Dimensione massima della directory della cache (in GB):"
+
+msgid "Move selected attributes to the displayed list"
+msgstr "Sposta gli attributi selezionati nella lista di quelli visualizzati"
+
+msgid "Music files can have images embedded in the APIC tag. Currently this is only supported for MP3 files."
+msgstr "I file musicali possono avere delle immagini incorporate nell'etichetta APIC. Attualmente questo è supportato solo per i file MP3."
+
+msgid "None"
+msgstr "Nessuno"
+
+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», «Voti migliori» e «Riprodotte più recentemente». Scegliere «0» per «nessun limite»."
+
+msgid "Ogg with :"
+msgstr "Ogg con :"
+
+msgid "Overwrite tags that are already set"
+msgstr "Sovrascrivi le etichette che sono già impostate"
+
+msgid "Password:"
+msgstr "Password:"
+
+msgid "Read coverart from embedded APIC data"
+msgstr "Leggi la copertina dai dati APIC incorporati"
+
+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)"
+
+msgid "Root directory of mserv database (trackinfo root)."
+msgstr "Directory radice del database mserv (radice di trackinfo)."
+
+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»"
+
+msgid "Set mountpoint or edit repository options"
+msgstr "Imposta il punto di mount o modifica le opzioni dell'archivio"
+
+msgid "Set options for Calendar/Contacts/Notes"
+msgstr "Imposta le opzioni per Calendario/Contatti/Note"
+
+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 "Impostare a «aacgain -q -k» per usare la funzionalità «Normalizza volume» nel menù «Strumenti». Se impostato, i dati mancanti per la normalizzazione dei file .m4a e .m4b saranno calcolati e scritti nel file musicale usando questo comando."
+
+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 "Impostare a «mp3gain -q -k» per usare la funzionalità «Normalizza volume» nel menù «Strumenti». Se impostato, i dati mancanti per la normalizzazione dei file mp3 saranno calcolati e scritti nel file mp3 usando questo comando."
+
+msgid "Set this to your last.fm password"
+msgstr "Impostare la propria password su last.fm"
+
+msgid "Set this to your last.fm username"
+msgstr "Impostare il proprio nome utente su last.fm"
+
+msgid "Set to 0 to effectively disable caching (a maximum of one track will be cached at a time)."
+msgstr "Impostare a 0 per disabilitare la cache (al massimo una traccia per volta sarà mantenuta nella cache)."
+
+msgid "Set to 0 to use as many background threads as CPUs are available on your system."
+msgstr "Impostare a 0 per usare tanti thread sullo sfondo quante sono le CPU disponibili nel sistema."
+
+msgid "Sorting case sensitive"
+msgstr "Ordinamento sensibile alle maiuscole"
+
+msgid "Template for info field: "
+msgstr "Modello per il campo delle informazioni: "
+
+msgid "The tags are written to the files on your harddrive and on the iPod (if available)."
+msgstr "Le etichette vengono scritte sui file nel disco fisso e sull'iPod (se disponibile)."
+
+msgid "This is the same option as in 'Edit/Delete Confirmation'"
+msgstr "Questa è la stessa opzione che si trova in «Modifica/Conferma l'eliminazione»"
+
+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 "Questa è la strada da seguire, ma non tutti i programmi probabilmente la supportano già. ID3v2.4 usa unicode per memorizzare le etichette, quindi non c'è più  bisogno di preoccuparsi delle codifiche. gtkpod userà la codifica UTF8 perché questa non incrementerà la dimensione delle etichette ASCII pure. Le etichette ID3v2.2/4 verranno scritte se sono già presenti sul file su cui si va a scrivere."
+
+msgid "This option will be re-activated when you upgrade gtkpod."
+msgstr "Questa opzione verrà riattivata dopo aver aggiornato gtkpod."
+
+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 "Le tracce possono essere trasferite sullo sfondo non appena sono aggiunte all'archivio di un iPod. Altrimenti saranno trasferite al momento dell'espulsione; il contenuto dell'iPod è completamente intatto fino a quel momento."
+
+msgid "Translators"
+msgstr "Traduttori"
+
+msgid "Use 'Multi-Edit' also for title field"
+msgstr "Usa «Multi-edit» anche per il campo titolo"
+
+msgid "Use 'Multi-Edit' for tracks selections"
+msgstr "Usa «Multi-Edit» per la selezione delle tracce"
+
+msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
+msgstr "Usa <i>&lt;Album&gt;.jpg</i> nella directory superiore"
+
+msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
+msgstr "Usa <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
+
+msgid "Use <i>folder.jpg</i> as cover art."
+msgstr "Usa <i>folder.jpg</i> come copertina."
+
+msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
+msgstr "Usa <i>folder.jpg</i>, <i>folder.png</i>..."
+
+msgid ""
+"Use selected encoding (on the 'General' page)\n"
+"when writing tags"
+msgstr ""
+"Usa la codifica selezionata (nella pagina «Generale»)\n"
+"per la scrittura delle etichette"
+
+msgid "Username to be used for mserv database lookup."
+msgstr "Nome utente da utilizzare per la consultazione del database mserv."
+
+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 "Di solito non è desiderabile usare lo stesso titolo per diverse tracce. Questa opzione può evitare effetti non voluti (specialmente vista l'assenza della opzione «Annulla»)."
+
+msgid "WAV with :"
+msgstr "WAV con :"
+
+msgid ""
+"When adding dirs/files, update information of\n"
+"existing tracks with identical filenames"
+msgstr ""
+"Aggiorna le informazioni sulle tracce esistenti con\n"
+"nomi identici durante l'aggiunta di directory e file"
+
+msgid "When syncing playlists"
+msgstr "Durante la sincronizzazione delle playlist"
+
+msgid ""
+"Write extended information (PC filenames, SHA1 hashes,\n"
+"encoding...). Recommended."
+msgstr ""
+"Scrivi informazioni estese (nome del file sul PC,\n"
+" hash SHA1, codifica). Consigliato."
+
+msgid "_Encoding (ID3, files):"
+msgstr "_Codifica (ID3, file):"
+
+msgid "_Ignore rules"
+msgstr "_Ignora le regole"
+
+msgid "_Last.FM"
+msgstr "_Last.FM"
+
+msgid "_Less Sort Tabs"
+msgstr "_Meno schede di ordinamento"
+
+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 "artista: %a, album: %A, compositore: %c, titolo: %t, genere: %G, numero traccia: %T, numero CD: %C, anno: %Y, ignora un dato: %*, il carattere «%»: %%. 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»."
+
+msgid "folder.jpg"
+msgstr "folder.jpg"
+
+msgid "folder.jpg;%a.jpg"
+msgstr "folder.jpg;%a.jpg"
+
+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 si aspetta che le etichette ID3 e i nomi dei file siano nella stessa codifica specificata qui. Si può cambiare per i successivi «Aggiungi file» e «Aggiungi directory». «Codifica di sistema» è la codifica usata dalla localizzazione attuale."
+
+msgid "mserv database lookup will be done for music in this directory."
+msgstr "Verrà consultato il database mserv per la musica in questa directory."
+
+msgid "Ok"
+msgstr "Ok"
+
+msgid "Cancel"
+msgstr "Annulla"
+
+msgid ""
+"Data has been changed and not been saved.\n"
+"OK to exit gtkpod?"
+msgstr ""
+"Ci sono dei dati modificati e non salvati.\n"
+"Uscire comunque da gtkpod?"
+
+msgid "Please select the mp3gain executable"
+msgstr "Selezionare l'eseguibile di mp3gain"
+
+msgid "Please select the aacgain executable"
+msgstr "Selezionare l'eseguibile di aacgain"
+
+msgid "Select the ogg/vorbis converter command"
+msgstr "Selezionare il comando per il convertitore ogg/vorbis"
+
+msgid "Select the flac converter command"
+msgstr "Selezionare il comando per il convertitore flac"
+
+msgid "Select the m4a converter command."
+msgstr "Selezionare il comando per il convertitore m4a."
+
+msgid "Select the mp3 converter command."
+msgstr "Selezionare il comando per il convertitore mp3."
+
+msgid "Select the wav converter command."
+msgstr "Selezionare il comando per il convertitore wav."
+

Modified: gtkpod/branches/upstream/current/po/ja.po
===================================================================
--- gtkpod/branches/upstream/current/po/ja.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/ja.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -2,12 +2,12 @@
 # Copyright (C) 2003 gtkpod
 # This file is distributed under the same license as the gtkpod package.
 # Jorg Schuler <jcsjcs at users.sourceforge.net>, 2003.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gtkpod 0.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-13 18:36-0500\n"
+"POT-Creation-Date: 2008-12-09 19:55+0900\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"
@@ -17,14 +17,14 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/gtkpod.desktop.in.h:1
-#, fuzzy
-msgid "GtkPod"
-msgstr "gtkpod"
-
-#: ../data/gtkpod.desktop.in.h:2
 msgid "Manage music and video on an Apple iPod"
 msgstr ""
 
+#: ../data/gtkpod.desktop.in.h:2 ../data/gtkpod.glade.h:427
+#, fuzzy
+msgid "gtkpod iPod Manager"
+msgstr "gtkpod のオプション"
+
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
 msgstr ""
@@ -38,374 +38,421 @@
 msgstr ""
 
 #: ../data/gtkpod.glade.h:3
-msgid "     "
-msgstr ""
+msgid " <= cts <= "
+msgstr " <= 回数 <= "
 
 #: ../data/gtkpod.glade.h:4
-msgid "      "
+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:5
-msgid "   Sort by:"
-msgstr "   ソート順:"
+#, fuzzy
+msgid "(Checked)"
+msgstr "チェック済み"
 
 #: ../data/gtkpod.glade.h:6
-msgid " <= cts <= "
-msgstr " <= 回数 <= "
+msgid "0"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:7
-msgid " Logic: "
-msgstr "条件: "
+msgid "1"
+msgstr ""
 
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr ""
+
 #: ../data/gtkpod.glade.h:9
-#, no-c-format
-msgid "%A"
+msgid "3"
 msgstr ""
 
 #: ../data/gtkpod.glade.h:10
-msgid ""
-"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
-"finished."
+msgid "4"
 msgstr ""
-"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' のように設定してください. 書き込ん"
-"だら 'enter' キーを押してください."
 
 #: ../data/gtkpod.glade.h:11
-#, fuzzy
-msgid "'aacgain' executable:"
-msgstr "'mp3gain' コマンドの場所:"
+msgid "5"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:12
-msgid "'mp3gain' executable:"
-msgstr "'mp3gain' コマンドの場所:"
+msgid ":"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:13
-#, fuzzy
-msgid "(Checked)"
-msgstr "チェック済み"
+msgid "<"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:14
-msgid "...as icons"
-msgstr "アイコンのみ"
+#, fuzzy
+msgid "<b>Advanced Options</b>"
+msgstr "<b>曲の編集</b>"
 
 #: ../data/gtkpod.glade.h:15
-msgid "...as text"
-msgstr "テキストのみ"
+#, fuzzy
+msgid "<b>Ascending</b>"
+msgstr "昇順"
 
 #: ../data/gtkpod.glade.h:16
-msgid "...both as icons and text"
-msgstr "アイコンとテキスト"
+#, fuzzy
+msgid "<b>Auto Store</b>"
+msgstr "自動保存"
 
 #: ../data/gtkpod.glade.h:17
-msgid "...entry 'All' in sort tab..."
-msgstr "...以下のソートタブ内の「すべて」の項目"
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>プレイリストの自動生成</b>"
 
 #: ../data/gtkpod.glade.h:18
-msgid "...master playlist"
-msgstr "...マスタープレイリスト"
+msgid "<b>Available Columns</b>"
+msgstr ""
 
+#: ../data/gtkpod.glade.h:19
+#, fuzzy
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>インポート</b>"
+
 #: ../data/gtkpod.glade.h:20
-#, no-c-format
-msgid "../%A.jpg"
-msgstr ""
+#, fuzzy
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>インポート</b>"
 
 #: ../data/gtkpod.glade.h:21
-msgid "0"
-msgstr ""
+#, fuzzy
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>インポート</b>"
 
 #: ../data/gtkpod.glade.h:22
-msgid "1"
-msgstr ""
+#, fuzzy
+msgid "<b>Cover Art</b>"
+msgstr "<b>インポート</b>"
 
 #: ../data/gtkpod.glade.h:23
-msgid "2"
-msgstr ""
+#, fuzzy
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>削除の確認</b>"
 
 #: ../data/gtkpod.glade.h:24
-msgid "3"
-msgstr ""
+#, fuzzy
+msgid "<b>Descending</b>"
+msgstr "降順"
 
 #: ../data/gtkpod.glade.h:25
-msgid "4"
-msgstr ""
+#, fuzzy
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>削除の確認</b>"
 
 #: ../data/gtkpod.glade.h:26
-msgid "5"
-msgstr ""
+#, fuzzy
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>ソートタブ</b>"
 
 #: ../data/gtkpod.glade.h:27
-msgid ":"
-msgstr ""
+#, fuzzy
+msgid "<b>General Options</b>"
+msgstr "<b>ツールチップ</b>"
 
 #: ../data/gtkpod.glade.h:28
-msgid "<"
-msgstr ""
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>不可</b>"
 
 #: ../data/gtkpod.glade.h:29
-#, fuzzy
-msgid "<b>Account Information</b>"
-msgstr "<b>削除の確認</b>"
+msgid "<b>Ignore Frequent Words</b>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:30
-msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>登録/更新/同期</b>"
+#, fuzzy
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>同期</b>"
 
 #: ../data/gtkpod.glade.h:31
 #, fuzzy
-msgid "<b>Audioscrobbler</b>"
-msgstr "<b>ツールバー</b>"
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>インポート</b>"
 
 #: ../data/gtkpod.glade.h:32
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>プレイリストの自動生成</b>"
+#, fuzzy
+msgid "<b>Information Messages</b>"
+msgstr "<b>削除の確認</b>"
 
 #: ../data/gtkpod.glade.h:33
-msgid "<b>Automatically select...</b>"
-msgstr "<b>自動的に選択...</b>"
+#, fuzzy
+msgid "<b>Lower Margin</b>"
+msgstr "下限"
 
 #: ../data/gtkpod.glade.h:34
-msgid "<b>Calendar/Contacts/Notes</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>None</b>"
+msgstr "<b>不可</b>"
 
 #: ../data/gtkpod.glade.h:35
 #, fuzzy
-msgid "<b>Coverart</b>"
-msgstr "<b>インポート</b>"
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>削除の確認</b>"
 
 #: ../data/gtkpod.glade.h:36
-msgid "<b>Delete Confirmation</b>"
-msgstr "<b>削除の確認</b>"
+#, fuzzy
+msgid "<b>Playback</b>"
+msgstr "<b>再生</b>"
 
 #: ../data/gtkpod.glade.h:37
-msgid "<b>Examples</b>"
-msgstr "<b>例</b>"
+#, fuzzy
+msgid "<b>Playlist Options</b>"
+msgstr "<b>再生</b>"
 
 #: ../data/gtkpod.glade.h:38
-msgid "<b>Ignore Frequent Words</b>"
+msgid "<b>Please select mountpoint and your iPod model</b>"
 msgstr ""
 
 #: ../data/gtkpod.glade.h:39
-msgid "<b>Misc</b>"
-msgstr "<b>その他</b>"
+#, fuzzy
+msgid "<b>Rules</b>"
+msgstr "<b>例</b>"
 
 #: ../data/gtkpod.glade.h:40
-msgid "<b>Mountpoint and individual repository/playlist options</b>"
-msgstr ""
+msgid "<b>Sort Order</b>"
+msgstr "<b>ソート順</b>"
 
 #: ../data/gtkpod.glade.h:41
-#, fuzzy
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>削除の確認</b>"
+msgid "<b>Synchronization</b>"
+msgstr "<b>同期</b>"
 
 #: ../data/gtkpod.glade.h:42
-msgid "<b>Play</b>"
-msgstr "<b>再生</b>"
+#, fuzzy
+msgid "<b>Tag Editing</b>"
+msgstr "<b>曲の編集</b>"
 
 #: ../data/gtkpod.glade.h:43
 #, fuzzy
-msgid "<b>Playlists</b>"
-msgstr "<b>再生</b>"
+msgid "<b>Tags</b>"
+msgstr "<b>不可</b>"
 
 #: ../data/gtkpod.glade.h:44
-msgid "<b>Please select mountpoint and your iPod model</b>"
-msgstr ""
+#, fuzzy
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>ツールバー</b>"
 
 #: ../data/gtkpod.glade.h:45
-#, fuzzy
-msgid "<b>Repositories</b>"
+msgid "<b>Tooltips</b>"
 msgstr "<b>ツールチップ</b>"
 
 #: ../data/gtkpod.glade.h:46
-msgid "<b>Sort Order</b>"
-msgstr "<b>ソート順</b>"
+#, fuzzy
+msgid "<b>Upper Margin</b>"
+msgstr "上限"
 
 #: ../data/gtkpod.glade.h:47
-msgid "<b>Sort Tabs</b>"
-msgstr "<b>ソートタブ</b>"
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>音量の平均化</b>"
 
 #: ../data/gtkpod.glade.h:48
-msgid "<b>Sync</b>"
+msgid "<b>When Attempting to Add an Existing Track</b>"
 msgstr ""
 
 #: ../data/gtkpod.glade.h:49
-msgid "<b>Synchronization</b>"
-msgstr "<b>同期</b>"
+#, fuzzy
+msgid "<b>gtkpod Options</b>"
+msgstr "gtkpod のオプション"
 
 #: ../data/gtkpod.glade.h:50
-msgid "<b>Tag Reading</b>"
-msgstr "<b>タグの読み込み</b>"
+#, fuzzy
+msgid "<b>mserv Settings</b>"
+msgstr "<b>曲の編集</b>"
 
 #: ../data/gtkpod.glade.h:51
-msgid "<b>Toolbar</b>"
-msgstr "<b>ツールバー</b>"
+msgid "<b>mserv</b>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:52
-msgid "<b>Tooltips</b>"
-msgstr "<b>ツールチップ</b>"
+#, fuzzy
+msgid "<i>aacgain</i> executable:"
+msgstr "'mp3gain' コマンドの場所:"
 
 #: ../data/gtkpod.glade.h:53
 #, fuzzy
-msgid "<b>Track Attributes</b>"
-msgstr "<b>表示する曲属性</b>"
+msgid "<i>mp3gain</i> executable:"
+msgstr "'mp3gain' コマンドの場所:"
 
 #: ../data/gtkpod.glade.h:54
-msgid "<b>Track Editing</b>"
-msgstr "<b>曲の編集</b>"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:55
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>音量の平均化</b>"
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:56
-msgid "<b>mserv</b>"
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:57
+#: ../data/gtkpod.glade.h:59
 msgid ">"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:58
-msgid "About gtkpod"
-msgstr "gtkpod について"
+#: ../data/gtkpod.glade.h:60
+#, fuzzy
+msgid "About unupdated tracks"
+msgstr "更新された曲の情報を表示する"
 
-#: ../data/gtkpod.glade.h:59
+#: ../data/gtkpod.glade.h:61
+#, fuzzy
+msgid "About updated tracks"
+msgstr "更新された曲の情報を表示する"
+
+#: ../data/gtkpod.glade.h:62
+#, fuzzy
+msgid "Add Column"
+msgstr "アルバム"
+
+#: ../data/gtkpod.glade.h:63
 msgid "Add Directories Recursively"
 msgstr "ディレクトリを再帰的に追加します"
 
-#: ../data/gtkpod.glade.h:60
+#: ../data/gtkpod.glade.h:64
 #, fuzzy
 msgid "Add Files"
 msgstr "ファイルを追加する(_F)"
 
-#: ../data/gtkpod.glade.h:61
+#: ../data/gtkpod.glade.h:65
 msgid "Add Files or Directories"
 msgstr "ファイルまたはディレクトリを追加します"
 
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:66
 #, fuzzy
 msgid "Add Fol_der"
 msgstr "ファイルを追加する(_F)"
 
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:67 ../src/fileselection.c:606
 #, fuzzy
 msgid "Add Folder"
 msgstr "ファイルを追加する(_F)"
 
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:68
 msgid "Add Image_s"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:69
 #, fuzzy
 msgid "Add Images from a Directory"
 msgstr "ファイルまたはディレクトリを追加します"
 
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:70
 #, fuzzy
 msgid "Add Playlist"
 msgstr "プレイリストを追加する(_P)"
 
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:71
 msgid "Add _Files"
 msgstr "ファイルを追加する(_F)"
 
-#: ../data/gtkpod.glade.h:68
+#: ../data/gtkpod.glade.h:72
 msgid "Add _Playlist"
 msgstr "プレイリストを追加する(_P)"
 
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:73
 #, fuzzy
-msgid "Add coverart from file using the following template"
+msgid "Add cover art using file name template"
 msgstr "次のテンプレートに合うファイルをアートワークとして登録する"
 
-#: ../data/gtkpod.glade.h:70
-msgid "Add directories recursively"
-msgstr "ディレクトリを再帰的に追加する"
-
-#: ../data/gtkpod.glade.h:71
-msgid "Add new repository/iPod"
+#: ../data/gtkpod.glade.h:74
+msgid ""
+"Add file masks to be excluded from import and synchronization, for example, "
+"<i>*.mp3</i>."
 msgstr ""
 
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:75
+#, fuzzy
+msgid "Add new repository/iPod..."
+msgstr "iPodから削除"
+
+#: ../data/gtkpod.glade.h:76
 msgid "Add playlist from file"
 msgstr "プレイリストをファイルから読み込んで追加します"
 
-#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
-#: ../src/display_tracks.c:2103
-msgid "Added"
+#: ../data/gtkpod.glade.h:77
+#, fuzzy
+msgid "Add subfolders recursively"
+msgstr "ディレクトリを再帰的に追加する"
+
+#: ../data/gtkpod.glade.h:78
+#, fuzzy
+msgid "Added:"
 msgstr "登録日"
 
-#: ../data/gtkpod.glade.h:74
-msgid "Advanced Sorting Options"
-msgstr ""
-
 #. 0
-#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2995
 #: ../src/display_spl.c:84 ../src/misc_conversion.c:60
 msgid "Album"
 msgstr "アルバム"
 
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:80
 #, fuzzy
 msgid "Album Art"
 msgstr "アルバム"
 
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:81
 msgid "All (AND)"
 msgstr "すべて(AND)"
 
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:82
 msgid "All Tracks Never Listened To"
 msgstr "一度も聴いた事がない曲"
 
-#: ../data/gtkpod.glade.h:79
+#: ../data/gtkpod.glade.h:83
 msgid "All Tracks Played Since Last Time"
 msgstr "前回以降再生された曲"
 
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:84
 msgid "All Tracks not Listed in any Playlist"
 msgstr "プレイリストに載っていないすべての曲"
 
-#: ../data/gtkpod.glade.h:81
-msgid "Also include tracks never played in \"Best Rated\" playlist"
+#: ../data/gtkpod.glade.h:85
+msgid "Allow duplicate files"
 msgstr ""
-"「評価の高い曲」のリストを作る際に、一度も\n"
-"再生された事のない曲も対象とします。"
 
-#: ../data/gtkpod.glade.h:82
-msgid "Always write ID3v2.4 tags (only applies to MP3)"
-msgstr "常に ID3v2.4 タグを書き込む (MP3 のみ)"
+#: ../data/gtkpod.glade.h:86
+#, fuzzy
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr "選択された文字コードを更新・同期処理でも使用する"
 
-#: ../data/gtkpod.glade.h:83
+#: ../data/gtkpod.glade.h:87
+#, fuzzy
+msgid "Also use this encoding when writing tracks"
+msgstr "選択された文字コードを更新・同期処理でも使用する"
+
+#: ../data/gtkpod.glade.h:88
 msgid "Any (OR)"
 msgstr "いずれか(OR)"
 
-#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
+#: ../data/gtkpod.glade.h:89
+msgid ""
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:92 ../src/display_sorttabs.c:2992
 #: ../src/display_spl.c:85 ../src/misc_conversion.c:61
 msgid "Artist"
 msgstr "アーティスト"
 
-#: ../data/gtkpod.glade.h:85
+#: ../data/gtkpod.glade.h:93
 #, 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:"
+#: ../data/gtkpod.glade.h:94
+msgid "Automatically generate video thumbnails"
 msgstr ""
-"最後の手段として、以下のタグが未設定の場合にファイル名をその値として使用する:"
 
-#: ../data/gtkpod.glade.h:88
-msgid "Ascending"
-msgstr "昇順"
-
-#: ../data/gtkpod.glade.h:89
-msgid "Auto Store"
-msgstr "自動保存"
-
-#: ../data/gtkpod.glade.h:90
+#: ../data/gtkpod.glade.h:95
 msgid ""
 "Automatically start displaying tracks that match the criteria entered above. "
 "If not selected, you must press 'Display' to start displaying."
@@ -413,166 +460,210 @@
 "各項目が入力されるとすぐに表示を更新します. この項目が選択されていない時に"
 "は、「表示」ボタンを押すことで更新することができます."
 
-#: ../data/gtkpod.glade.h:91
-msgid "Available:"
+#: ../data/gtkpod.glade.h:96
+msgid "Background color"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:92
-msgid "Before removing playlists or tracks from a playlist"
-msgstr "プレイリストや、プレイリストから曲を削除する時"
-
-#: ../data/gtkpod.glade.h:93
-msgid "Before removing tracks from the harddisk"
-msgstr "曲をハードディスクから完全に削除する時"
-
-#: ../data/gtkpod.glade.h:94
-msgid "Before removing tracks from the iPod"
-msgstr "曲をiPodから完全に削除する時"
-
-#: ../data/gtkpod.glade.h:95
-msgid "Before removing tracks from the local database"
-msgstr "曲をローカルデータベースから削除する時"
-
-#: ../data/gtkpod.glade.h:96
+#: ../data/gtkpod.glade.h:97
 msgid "Best Rated Tracks"
 msgstr "評価の高い曲"
 
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:98
+msgid "Bottom"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:99 ../src/prefsdlg.c:588
 msgid "Browse"
 msgstr "ブラウズ"
 
-#: ../data/gtkpod.glade.h:98
+#: ../data/gtkpod.glade.h:100
 #, fuzzy
-msgid "Cache directory:"
+msgid "Browse..."
+msgstr "ブラウズ"
+
+#: ../data/gtkpod.glade.h:101
+#, fuzzy
+msgid "Cache folder:"
 msgstr "ディレクトリを追加する(_D)"
 
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:102
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:103
 msgid "Calendar sync command:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:104
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:102
-msgid "Category: "
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:106
+#, fuzzy
+msgid "Category:"
 msgstr "カテゴリ: "
 
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:107
 msgid ""
 "Change all tracks\n"
 "simultaneously"
 msgstr ""
 
-#: ../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
+#: ../data/gtkpod.glade.h:109
 msgid "Check for existing files when copying from iPod."
 msgstr "iPod からコピーする際に同じファイルかどうかをチェックする"
 
-#: ../data/gtkpod.glade.h:108
-msgid "Command for 'Enqueue':"
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:111
+#, fuzzy
+msgid "Command for \"Enqueue\":"
 msgstr "「演奏キューに入れる」ためのコマンド:"
 
-#: ../data/gtkpod.glade.h:109
-msgid "Command for 'Play now':"
+#: ../data/gtkpod.glade.h:112
+#, fuzzy
+msgid "Command for \"Play now\":"
 msgstr "「今すぐ演奏」のためのコマンド:"
 
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr ""
+
 #. 5
-#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:114 ../src/display_spl.c:97
 #: ../src/misc_conversion.c:65
 msgid "Composer"
 msgstr "作曲者"
 
-#: ../data/gtkpod.glade.h:111
+#: ../data/gtkpod.glade.h:115
 #, fuzzy
 msgid "Confirm before removing tracks from the iPod or repository"
 msgstr "曲をiPodから完全に削除する時"
 
-#: ../data/gtkpod.glade.h:112
-msgid ""
-"Confirm before removing tracks from the iPod or repository\n"
-"when syncing playlists"
+#: ../data/gtkpod.glade.h:116
+#, fuzzy
+msgid "Confirm deletion of playlists or tracks from a playlist"
+msgstr "プレイリストや、プレイリストから曲を削除する時"
+
+#: ../data/gtkpod.glade.h:117
+msgid "Confirm deletion of tracks during synchronization"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:114
-msgid "Confirm lists of directories"
+#: ../data/gtkpod.glade.h:118
+#, fuzzy
+msgid "Confirm deletion of tracks:"
 msgstr "ディレクトリのリストを確認する"
 
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:119
 msgid "Contacts sync command:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:120
 msgid "Containing Displayed Tracks"
 msgstr "表示されている曲から作成"
 
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:121
 msgid "Containing Selected Tracks"
 msgstr "選択されている曲から作成"
 
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:122
+#, fuzzy
+msgid "Conversion Preferences"
+msgstr "設定(_P)"
+
+#: ../data/gtkpod.glade.h:123
 msgid "Conversion Progress Display"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:124
+msgid "Conversion Settings..."
+msgstr ""
+
+#: ../data/gtkpod.glade.h:125
+msgid "Convert AAC (M4A)"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:126
+msgid "Convert FLAC"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:127
+#, fuzzy
+msgid "Convert MP3"
+msgstr "カバー"
+
+#: ../data/gtkpod.glade.h:128
+msgid "Convert Ogg Vorbis"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:129
+#, fuzzy
+msgid "Convert WAV"
+msgstr "カバー"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Convert compatible formats to a single format"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:132
 msgid "Cover"
 msgstr "カバー"
 
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:134
+msgid "Cover art file pattern:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:135
 msgid "Create New Playlist"
 msgstr "新しくプレイリストを作成します"
 
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:136
 #, fuzzy
 msgid "Create Repository"
 msgstr "iPodから削除"
 
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:137
 msgid "Create _Playlist File"
 msgstr "プレイリストファイルを作成 (_P)"
 
-#: ../data/gtkpod.glade.h:123
-msgid "Credits"
-msgstr "権利表示"
+#: ../data/gtkpod.glade.h:138
+msgid "Customize..."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:124
-msgid "Currently only rating is supported."
-msgstr "現在は評価情報のみ使用"
-
-#: ../data/gtkpod.glade.h:125
+#: ../data/gtkpod.glade.h:139
 #, fuzzy
-msgid "Delete repository"
+msgid "Delete Repository"
 msgstr "iPodから削除"
 
-#: ../data/gtkpod.glade.h:126
+#: ../data/gtkpod.glade.h:140
 #, fuzzy
-msgid ""
-"Delete tracks that are no longer present from the\n"
-"iPod or repository"
-msgstr "以下の重複した%d曲が削除されました。"
+msgid "Delete missing tracks from the iPod or repository"
+msgstr "曲をiPodから完全に削除する時"
 
-#: ../data/gtkpod.glade.h:128
-msgid "Deleted tracks"
-msgstr "削除された曲"
+#: ../data/gtkpod.glade.h:141
+#, fuzzy
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "プレイリスト '%2$s' から %1$d 曲削除しました"
 
-#: ../data/gtkpod.glade.h:129
-msgid "Descending"
-msgstr "降順"
-
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:142
 msgid "Details"
 msgstr "詳細"
 
-#: ../data/gtkpod.glade.h:132
+#: ../data/gtkpod.glade.h:144
 #, no-c-format
 msgid ""
 "Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -588,7 +679,7 @@
 "ルバム: %A, 作曲者: %c, 名前: %t, ジャンル: %G, 曲番号: %T, ディスク番号: %"
 "C, 年: %Y, 元のファイル名 (拡張情報ファイルが必要): %o, 「%」: %%."
 
-#: ../data/gtkpod.glade.h:134
+#: ../data/gtkpod.glade.h:146
 #, no-c-format
 msgid ""
 "Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -605,155 +696,129 @@
 "スク番号: %C, 年: %Y, 元のファイル名 (拡張情報ファイルが必要): %o, プレイリス"
 "ト: %p, 「%」: %%."
 
-#: ../data/gtkpod.glade.h:136
-#, fuzzy, no-c-format
+#: ../data/gtkpod.glade.h:147
 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 ""
-"iPodからコピーした曲に付けられるファイル名を設定します。例:'%A/%d%t - %n' や "
-"'%o' など。%A: アーティスト; %n: タイトル; %t: トラックNo.; %o: 元のファイル"
-"名 (拡張情報ファイルが必要)"
-
-#: ../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:138
-msgid "Display a list of tracks that could actually be updated."
-msgstr "実際に更新された曲のリストを表示します。"
+#: ../data/gtkpod.glade.h:148
+#, fuzzy
+msgid "Display"
+msgstr "表示(_D)"
 
-#: ../data/gtkpod.glade.h:139
-msgid "Display a list of tracks that could not be updated."
-msgstr "実際には更新されなかった曲のリストを表示します。"
-
-#: ../data/gtkpod.glade.h:140
+#: ../data/gtkpod.glade.h:149
 msgid "Display conversion log"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:141
-msgid "Display info about detected duplicates"
+#: ../data/gtkpod.glade.h:150
+#, fuzzy
+msgid "Display information about detected duplicate files"
 msgstr "重複を見つけた際に報告する"
 
-#: ../data/gtkpod.glade.h:142
-msgid "Display info about non-updated tracks"
-msgstr "更新されなかった曲を表示する"
-
-#: ../data/gtkpod.glade.h:143
-msgid "Display info about updated tracks"
-msgstr "更新された曲の情報を表示する"
-
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:151
 msgid "Display messages and warnings at startup"
 msgstr "起動時にメッセージや警告を表示する"
 
-#: ../data/gtkpod.glade.h:145
-msgid ""
-"Display the list of duplicates that have been detected after adding files."
-msgstr "ファイルを追加した際に発見した、重複する曲のリストを表示します。"
+#: ../data/gtkpod.glade.h:152
+msgid "Display synchronization results"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:146
-msgid "Display toolbar..."
-msgstr "ツールバーの表示..."
-
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:153
 msgid "Display tooltips in main window"
 msgstr "ツールチップをメイン画面で表示する"
 
-#: ../data/gtkpod.glade.h:148
-msgid "Display tooltips in prefs window"
-msgstr "ツールチップを設定画面で表示する"
-
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:154
 msgid "Display tracks that match the criteria entered above."
 msgstr "上で指定された条件に合致する曲を表示します."
 
-#: ../data/gtkpod.glade.h:150
-msgid ""
-"Displayed\n"
-"Tracks"
-msgstr ""
-"表示され\n"
-"ている曲"
-
-#: ../data/gtkpod.glade.h:152
+#: ../data/gtkpod.glade.h:155
 #, fuzzy
-msgid "Displayed:"
-msgstr "表示(_D)"
-
-#: ../data/gtkpod.glade.h:153
-msgid "Don't allow file duplication"
-msgstr "ファイルの重複を許さない"
-
-#: ../data/gtkpod.glade.h:154
-#, fuzzy
 msgid "Don't automatically sync on startup"
 msgstr "起動時に自動的に iTunesDB を読み込む"
 
-#: ../data/gtkpod.glade.h:155
-#, fuzzy
-msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."
-msgstr "md5を利用した重複チェックを行うようになります。"
-
 #: ../data/gtkpod.glade.h:156
-msgid "Edit Repository/iPod Options"
-msgstr "iPod の設定"
+msgid "Dummy\n"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:664
 msgid "Edit Smart Playlist"
 msgstr "スマートプレイリストの編集"
 
-#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:751
 msgid "Edit Track Details"
 msgstr "曲情報を編集"
 
-#: ../data/gtkpod.glade.h:159
-msgid "Edit _Preferences"
-msgstr "設定(_P)"
-
 #: ../data/gtkpod.glade.h:160
-msgid "Effective free space"
-msgstr "空き容量"
-
-#: ../data/gtkpod.glade.h:161
 msgid "Empty Playlist"
 msgstr "空リスト"
 
+#: ../data/gtkpod.glade.h:161
+#, fuzzy
+msgid "Encoding Preferences"
+msgstr "設定(_P)"
+
 #: ../data/gtkpod.glade.h:162
-msgid "Exclude file mask(s)"
-msgstr "適用しないファイル"
+#, fuzzy
+msgid "Encoding..."
+msgstr "コピー中..."
 
 #: ../data/gtkpod.glade.h:163
 #, fuzzy
-msgid "Export can be continued at a later time if canceled."
-msgstr ""
-"ボタンを押すと中断します。\n"
-"ファイルのエクスポートは後で再開する事ができます。"
+msgid "Excluded files..."
+msgstr "適用しないファイル"
 
 #: ../data/gtkpod.glade.h:164
-msgid "File size"
-msgstr "ファイルサイズ"
+msgid "Exclusions List"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:165
-msgid "File size (deleted)"
-msgstr "削除されたファイルサイズ"
+msgid "Expand columns beyond the track list width"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:166
-msgid "File size (non-transferred)"
-msgstr "未転送のファイルサイズ"
+#, fuzzy
+msgid "Export can be continued at a later time if canceled."
+msgstr ""
+"ボタンを押すと中断します。\n"
+"ファイルのエクスポートは後で再開する事ができます。"
 
 #: ../data/gtkpod.glade.h:167
-msgid "Filename Format: "
-msgstr "ファイル名の書式: "
+msgid "Feedback"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:168
 #, fuzzy
+msgid "Filename Parse Preferences"
+msgstr "設定(_P)"
+
+#: ../data/gtkpod.glade.h:169
+#, fuzzy
+msgid "Filename format: "
+msgstr "ファイル名の書式: "
+
+#: ../data/gtkpod.glade.h:170
+#, fuzzy
+msgid "Filename parse pattern:"
+msgstr "ファイル名の書式: "
+
+#: ../data/gtkpod.glade.h:171
+#, fuzzy
+msgid "Filter tab:"
+msgstr "ファイル形式"
+
+#: ../data/gtkpod.glade.h:172
+#, fuzzy
+msgid "Filter tabs"
+msgstr "ファイル"
+
+#: ../data/gtkpod.glade.h:173
+#, fuzzy
+msgid "Filter:"
+msgstr "ファイル(_F)"
+
+#: ../data/gtkpod.glade.h:174
+#, fuzzy
 msgid ""
 "Find orphan files (files with no track info in DB) and dangling tracks "
 "(tracks with no corresponding files on iPod)"
@@ -761,62 +826,39 @@
 "みなしごファイル (データベースに曲情報が登録されていないファイル) やぶらさが"
 "り曲 (曲情報があるのにファイル自体が iPod 上に存在しない) を探す"
 
-#: ../data/gtkpod.glade.h:169
+#: ../data/gtkpod.glade.h:175
 #, fuzzy
-msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
-msgstr "最初に <i>folder.jpg</i> を試し、無ければ <i>&lt;artist&gt;.jpg</i>"
+msgid "From the hard disk"
+msgstr "ハードディスクから削除"
 
-#: ../data/gtkpod.glade.h:170
-msgid "Flac with :"
-msgstr ""
+#: ../data/gtkpod.glade.h:176
+#, fuzzy
+msgid "From the iPod"
+msgstr "iPodから削除"
 
-#: ../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 のその時のプレイリストをクリアし、選択した"
-"曲をプレイリストの先頭に加えて演奏を始めます。"
+#: ../data/gtkpod.glade.h:177
+#, fuzzy
+msgid "From the local database"
+msgstr "ローカルデータベースから%d曲削除しました"
 
-#: ../data/gtkpod.glade.h:174
-#, no-c-format
-msgid ""
-"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
-"current playlist."
+#: ../data/gtkpod.glade.h:178 ../src/display_spl.c:182 ../src/info.c:794
+msgid "GB"
 msgstr ""
-"例えば 'xmms -e %s' とすると、選択された曲を xmms のその時のプレイリストの最"
-"後尾に追加します"
 
-#: ../data/gtkpod.glade.h:175 ../src/display_sorttabs.c:2985
+#: ../data/gtkpod.glade.h:179 ../src/display_sorttabs.c:2998
 #: ../src/display_spl.c:89 ../src/misc_conversion.c:63
 msgid "Genre"
 msgstr "ジャンル"
 
-#: ../data/gtkpod.glade.h:176
-msgid "Group artists on compilation CDs"
+#: ../data/gtkpod.glade.h:180
+msgid "Get Help _Online"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:177
-#, 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)."
+#: ../data/gtkpod.glade.h:181
+msgid "Group artist filter tab by compilation CDs"
 msgstr ""
-"重複チェックを高速化するためには、この項目を有効にする事が強く推奨されます。"
-"また、ファイル名を保持する事でID3タグの変更をiPodに反映させる事が可能になり、"
-"仮にiPodの中身が壊れたりした場合にも、再構成を容易にします。(データベースの"
-"バックアップファイルの中の \"transferred=\" の項目を変更すればよい)"
 
-#: ../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:179
+#: ../data/gtkpod.glade.h:182
 msgid ""
 "If available, the local copy of the track is referenced in the playlist. "
 "Otherwise the file on the iPod is used."
@@ -824,11 +866,7 @@
 "可能であれば, プレイリストはこの曲のハードディスク上のファイルを参照します.見"
 "つからない場合には iPod 上のファイルを参照します."
 
-#: ../data/gtkpod.glade.h:180
-msgid "If both options are selected, embedded APIC data takes precedence."
-msgstr ""
-
-#: ../data/gtkpod.glade.h:181
+#: ../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."
@@ -836,23 +874,6 @@
 "並べ換えの際に, アルファベットの大文字と小文字を区別します. この機能はアル"
 "ファベット以外のほとんどの文字には対応していません."
 
-#: ../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 you check this, gtkpod will descend into subdirectories recursively."
-msgstr "この項目を有効にすると、gtkpodはサブディレクトリを再帰的に辿ります。"
-
 #: ../data/gtkpod.glade.h:184
 msgid ""
 "If you check this, information (cover art and meta information) changed for "
@@ -861,26 +882,10 @@
 msgstr ""
 
 #: ../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: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:187
 msgid "Ignore these words when at the beginning of the following fields:"
 msgstr "これらの語が以下の項目の冒頭にあった場合には無視します:"
 
-#: ../data/gtkpod.glade.h:188
+#: ../data/gtkpod.glade.h:186
 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."
@@ -888,6 +893,17 @@
 "表示されている曲順を iPod に保存するには,「編集」メニューから「現在の曲順を保"
 "存」を選択するか, この下の「自動保存」を選択してください."
 
+#: ../data/gtkpod.glade.h:187
+#, fuzzy
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr ""
+"「評価の高い曲」のリストを作る際に、一度も\n"
+"再生された事のない曲も対象とします。"
+
+#: ../data/gtkpod.glade.h:188
+msgid "Info field template:"
+msgstr ""
+
 #: ../data/gtkpod.glade.h:189
 msgid "Initialize iPod"
 msgstr ""
@@ -899,103 +915,96 @@
 msgstr ""
 
 #: ../data/gtkpod.glade.h:192
-msgid "Keeps all compilation CDs grouped together in the artists sort tab."
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:193
+#: ../data/gtkpod.glade.h:196
 msgid "Live _updating"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:197
 msgid "Load iPod(s)"
 msgstr "iPod から読み込み"
 
-#: ../data/gtkpod.glade.h:195
-msgid "Lower Margin"
-msgstr "下限"
+#: ../data/gtkpod.glade.h:198
+#, fuzzy
+msgid "Logic:"
+msgstr "条件: "
 
-#: ../data/gtkpod.glade.h:196
-msgid "M4A with :"
+#: ../data/gtkpod.glade.h:199
+msgid ""
+"MP3\n"
+"AAC\n"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:197
-msgid "MP3 with :"
+#: ../data/gtkpod.glade.h:202
+msgid "Mass-modify tags when multiple tracks are selected"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:198
-msgid "Match al_l of the following"
-msgstr "以下のすべてに該当するもの(_l)"
+#: ../data/gtkpod.glade.h:203
+msgid "Match only _checked tracks"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:199
-msgid "Match an_y of the following"
-msgstr "以下のいずれかに該当するもの(_y)"
+#: ../data/gtkpod.glade.h:204
+msgid "Match:"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:200
-msgid "Match only _checked tracks"
+#: ../data/gtkpod.glade.h:205
+msgid "Maximum cache size:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:201
-msgid "Maximum number of background threads:"
+#: ../data/gtkpod.glade.h:206
+msgid "Maximum threads:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:202
-msgid "Maximum size of cache directory (in GB):"
+#: ../data/gtkpod.glade.h:207
+msgid "Metadata"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:208
 msgid "Model:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
-msgid "Modified"
+#: ../data/gtkpod.glade.h:209
+#, fuzzy
+msgid "Modified:"
 msgstr "変更日"
 
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:210
 msgid "Most Recently Played Tracks"
 msgstr "最近再生された曲"
 
-#: ../data/gtkpod.glade.h:206
-msgid "Move selected attributes to the displayed list"
+#: ../data/gtkpod.glade.h:211
+msgid "Music"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:207
-msgid "Music Root:"
+#: ../data/gtkpod.glade.h:212
+msgid "Music root:"
 msgstr ""
 
-#: ../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:209
+#: ../data/gtkpod.glade.h:213
 msgid "Never show this dialogue again"
 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
+#: ../data/gtkpod.glade.h:214 ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76 ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113 ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448 ../src/misc_playlist.c:450
 msgid "New Playlist"
 msgstr "新規プレイリスト"
 
-#: ../data/gtkpod.glade.h:211
+#: ../data/gtkpod.glade.h:215
 msgid "No lower margin"
 msgstr "下限を指定しない"
 
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:216
 msgid "No upper margin"
 msgstr "上限を指定しない"
 
-#: ../data/gtkpod.glade.h:213
-msgid "Non-transferred tracks"
-msgstr "未転送の曲数"
-
-#: ../data/gtkpod.glade.h:214
-msgid "None"
-msgstr "無指定"
-
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:217
 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 "
@@ -1011,41 +1020,6 @@
 "で登録された曲にはこの情報が記録されていません. この場合, 上で指定された文字"
 "コードが今後使われるようになります."
 
-#: ../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 ""
-"通常は, 曲をインポートする際に指定された文字コードがその後も使われますが, も"
-"しその時に間違った文字コードを指定してしまっていて,「曲の更新」を使ってそれを"
-"直したいのであれば, この項目を有効にしてください. 注意: 文字コードの情報は拡"
-"張情報ファイルに記録されますが(「iTunesDBへの書き込み」の項目を参照), バー"
-"ジョン0.51以前の gtkpod でインポートされた曲はこの情報が記録さていません. こ"
-"の場合, ここで指定された文字コードが今後使われるようになります."
-
-#: ../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 ""
-"通常は、最初に曲を保存した時に指定された文字コードをタグを書き込む時にも使用"
-"します。もし最初に間違った文字コードを指定してしまった場合には、正しい文字"
-"コードを選択した後にこのオプションを選択してください。注意: 文字コードの情報"
-"を保存するために、拡張情報ファイルを使用してください(「入出力」のページの"
-"「iTunesDBへの書き込み」の項を参照)。また、バージョン0.51以前に登録された曲に"
-"ついては文字コード情報が保存されていません。「入出力」の項目で指定された文字"
-"コードが適用されます。"
-
 #: ../data/gtkpod.glade.h:218
 msgid ""
 "Normally, if a track is no longer present in the sync directory, it will be "
@@ -1059,417 +1033,369 @@
 msgstr ""
 
 #: ../data/gtkpod.glade.h:221
-msgid "Notes sync command:"
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
 msgstr ""
 
 #: ../data/gtkpod.glade.h:222
-msgid "Number of playlists"
-msgstr "プレイリストの数"
+msgid "Notes sync command:"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:223
-msgid "Number of tracks"
-msgstr "曲数"
+#, fuzzy
+msgid "Number of filter tabs:"
+msgstr "ソートタブの数(_N):"
 
 #: ../data/gtkpod.glade.h:224
-msgid "Number of tracks in generated playlists:"
-msgstr "生成するプレイリストに加える曲数:"
+#, fuzzy
+msgid "Number of tracks:"
+msgstr "曲数"
 
 #: ../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'."
+msgid "On startup automatically sync with playlist directories"
 msgstr ""
-"プレイリストの新規作成で、「再生回数の多い曲」「評価の高い曲」「最近再生され"
-"た曲」を選択した際にリストに登録する曲の数を指定します。0を指定すると、曲数を"
-"制限しません。"
 
 #: ../data/gtkpod.glade.h:226
-msgid "Ogg with :"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:227
-msgid "On startup automatically sync with playlist directories"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:228
 #, fuzzy
 msgid "On startup automatically sync with the following directory"
 msgstr "以下のディレクトリで同期処理をしてもよろしいですか?"
 
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically update (Live Playlist)"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:228
 msgid "One for each Album"
 msgstr "各アルバムごとのリスト"
 
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:229
 msgid "One for each Artist"
 msgstr "各アーティストごとのリスト"
 
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:230
 msgid "One for each Composer"
 msgstr "各作曲者ごとのリスト"
 
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:231
 msgid "One for each Genre"
 msgstr "各ジャンルごとのリスト"
 
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:232
 msgid "One for each Rating"
 msgstr "各評価値ごとのリスト"
 
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:233
 msgid "One for each Year"
 msgstr "各年ごとのリスト"
 
-#: ../data/gtkpod.glade.h:236
-msgid "Overwrite tags that are already set"
-msgstr "すでにあタグ情報を上書きする"
+#: ../data/gtkpod.glade.h:234
+#, fuzzy
+msgid "Overwrite existing tags"
+msgstr "ファイルを上書きします: '%s'\n"
 
-#: ../data/gtkpod.glade.h:237
-msgid "Password:"
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:236
 msgid "Path:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:237
 #, fuzzy
 msgid "Photo Window"
 msgstr "情報(_I)"
 
-#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
-msgid "Play time"
-msgstr "演奏時間"
-
-#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
-#: ../src/misc_conversion.c:77
-msgid "Playcount"
+#: ../data/gtkpod.glade.h:238
+#, fuzzy
+msgid "Playcount:"
 msgstr "再生回数"
 
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
-msgid "Played"
+#: ../data/gtkpod.glade.h:239
+#, fuzzy
+msgid "Played:"
 msgstr "演奏日"
 
-#: ../data/gtkpod.glade.h:243
+#: ../data/gtkpod.glade.h:240
 msgid "Playlist name:"
 msgstr "プレイリストの名前:"
 
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:241
 #, fuzzy
 msgid "Playlist type:"
 msgstr "プレイリスト"
 
-#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
+#: ../data/gtkpod.glade.h:242 ../src/display_playlists.c:2397
 msgid "Playlists"
 msgstr "プレイリスト"
 
-#: ../data/gtkpod.glade.h:246
+#: ../data/gtkpod.glade.h:243
 msgid "Please refer to the notice below."
 msgstr "下記の注意を参照してください。"
 
-#: ../data/gtkpod.glade.h:247
-msgid "Please specify a time interval"
-msgstr "期間を指定してください"
+#: ../data/gtkpod.glade.h:244
+#, fuzzy
+msgid "Position:"
+msgstr "コンピレーション"
 
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:245
 msgid "Preferences"
 msgstr "設定"
 
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:246
 #, fuzzy
 msgid "Progress Information"
 msgstr "情報"
 
-#: ../data/gtkpod.glade.h:250
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:252
 msgid "R_ename Album"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:253
 msgid "Random Playlist from Displayed Tracks"
 msgstr "表示されている曲からランダムに作成"
 
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:254
 msgid "Randomize Current Playlist"
 msgstr "現在のプレイリストをランダムに並べ換える"
 
-#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
-#: ../src/misc_conversion.c:78
-msgid "Rating"
+#: ../data/gtkpod.glade.h:255
+#, fuzzy
+msgid "Rating:"
 msgstr "評価"
 
-#: ../data/gtkpod.glade.h:254
-msgid "Read coverart from embedded APIC data"
+#: ../data/gtkpod.glade.h:256
+msgid "Read embedded cover art information"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:255
-msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
-msgstr "ファイルからタグ情報を読み込む (MP3 ファイルの ID3 タグなど)"
+#: ../data/gtkpod.glade.h:257
+msgid "Read embedded tags from music files"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:256
+#: ../data/gtkpod.glade.h:258
+msgid "Report a _Problem"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:259
 #, fuzzy
-msgid "Remove selected attributes from the displayed list"
-msgstr "選択された曲をプレイリストから削除する"
+msgid "Report problems when accessing mserv"
+msgstr "mserv へアクセスするとき、問題の報告を表示する"
 
-#: ../data/gtkpod.glade.h:257
+#: ../data/gtkpod.glade.h:260
 #, fuzzy
+msgid "Repository"
+msgstr "iPodから削除"
+
+#: ../data/gtkpod.glade.h:261
+#, fuzzy
 msgid "Repository Options"
 msgstr "ソートの設定"
 
-#: ../data/gtkpod.glade.h:258
+#: ../data/gtkpod.glade.h:262
 #, fuzzy
 msgid "Repository name:"
 msgstr "ソートの設定"
 
-#: ../data/gtkpod.glade.h:259
+#: ../data/gtkpod.glade.h:263
 #, fuzzy
 msgid "Repository type:"
 msgstr "ソートの設定"
 
-#: ../data/gtkpod.glade.h:260
-msgid "Root directory of mserv database (trackinfo root)."
-msgstr "mserv データベースのあるディレクトリ。(trackinfo root)"
+#: ../data/gtkpod.glade.h:264
+#, fuzzy
+msgid "Repository/iPod Options"
+msgstr "iPod の設定"
 
-#: ../data/gtkpod.glade.h:261
-msgid "Rules"
-msgstr "ルール"
-
-#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
+#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:806
 msgid "Save Changes"
 msgstr "変更を保存"
 
-#: ../data/gtkpod.glade.h:263
-#, fuzzy
-msgid "Scrobble Tracks?"
-msgstr "選択された曲(_T)"
-
-#: ../data/gtkpod.glade.h:264
+#: ../data/gtkpod.glade.h:266
 msgid "Select '-1' for no upper limit."
 msgstr "上限を指定しない場合は '-1' を選んでください。"
 
-#: ../data/gtkpod.glade.h:265
+#: ../data/gtkpod.glade.h:267
 msgid "Select '0' for no lower limit."
 msgstr "下限を指定しない場合は '0' を選んでください."
 
-#: ../data/gtkpod.glade.h:266
-msgid ""
-"Selected\n"
-"Playlist"
-msgstr ""
-"選択された\n"
-"プレイリスト"
-
 #: ../data/gtkpod.glade.h:268
-msgid ""
-"Selected\n"
-"Tracks"
-msgstr ""
-"選択され\n"
-"ている曲"
-
-#: ../data/gtkpod.glade.h:270
 #, fuzzy
 msgid "Selected Filter Tab Entry from Database"
 msgstr "選択されたタブで指定した曲をデータベースから削除する"
 
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:269
 #, fuzzy
 msgid "Selected Filter Tab Entry from Hard Disk"
 msgstr "選択されたタブで指定した曲をハードディスクから削除する"
 
-#: ../data/gtkpod.glade.h:272
+#: ../data/gtkpod.glade.h:270
 #, fuzzy
 msgid "Selected Filter Tab Entry from Playlist"
 msgstr "選択されたタブで指定した曲をプレイリストから削除する"
 
-#: ../data/gtkpod.glade.h:273
+#: ../data/gtkpod.glade.h:271
 #, fuzzy
 msgid "Selected Filter Tab Entry from iPod"
 msgstr "選択されたタブで指定した曲を iPod から削除する"
 
-#: ../data/gtkpod.glade.h:274
+#: ../data/gtkpod.glade.h:272
 #, fuzzy
 msgid "Selected Playlist Including Tracks from Database"
 msgstr "選択されたプレイリストを曲ごとデータベースから削除する"
 
-#: ../data/gtkpod.glade.h:275
+#: ../data/gtkpod.glade.h:273
 #, fuzzy
 msgid "Selected Playlist Including Tracks from Hard Disk"
 msgstr "選択されたプレイリストを曲ごとデータベースから削除する"
 
-#: ../data/gtkpod.glade.h:276
+#: ../data/gtkpod.glade.h:274
 #, fuzzy
 msgid "Selected Playlist Including Tracks from iPod"
 msgstr "選択されたプレイリストを曲ごと iPod から削除する"
 
-#: ../data/gtkpod.glade.h:277
+#: ../data/gtkpod.glade.h:275
 msgid "Selected Tab _Entry"
 msgstr "選択されたソートタブ(_E)"
 
-#: ../data/gtkpod.glade.h:278
+#: ../data/gtkpod.glade.h:276
 #, fuzzy
 msgid "Selected Tracks from Database"
 msgstr "選択された曲をデータベースから削除する"
 
-#: ../data/gtkpod.glade.h:279
+#: ../data/gtkpod.glade.h:277
 #, fuzzy
 msgid "Selected Tracks from Hard Disk"
 msgstr "選択された曲をハードディスクから削除する"
 
-#: ../data/gtkpod.glade.h:280
+#: ../data/gtkpod.glade.h:278
 #, fuzzy
 msgid "Selected Tracks from Playlist"
 msgstr "選択された曲をプレイリストから削除する"
 
-#: ../data/gtkpod.glade.h:281
+#: ../data/gtkpod.glade.h:279
 #, fuzzy
 msgid "Selected Tracks from iPod"
 msgstr "選択された曲を iPod から削除する"
 
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:280
 msgid "Selected _Playlist"
 msgstr "選択されたプレイリスト(_P)"
 
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:281
 msgid "Selected _Tracks"
 msgstr "選択された曲(_T)"
 
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:282
 msgid "Selected playlist"
 msgstr "選択されたプレイリスト"
 
-#: ../data/gtkpod.glade.h:285
+#: ../data/gtkpod.glade.h:283
 #, fuzzy
-msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
-msgstr "セミコロンで区切られた, 適用しないファイルのマスクリスト. 例: '*.mp3'"
-
-#: ../data/gtkpod.glade.h:286
-#, fuzzy
 msgid "Set Cover Art from _File"
 msgstr "mserv データを更新する(_m)"
 
-#: ../data/gtkpod.glade.h:287
-msgid "Set mountpoint or edit repository options"
+#: ../data/gtkpod.glade.h:284
+msgid "Set still missing tags to file name"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:288
-msgid "Set options for Calendar/Contacts/Notes"
-msgstr ""
+#: ../data/gtkpod.glade.h:285
+#, fuzzy
+msgid "Settings..."
+msgstr "削除中..."
 
-#: ../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."
+#: ../data/gtkpod.glade.h:286
+msgid "Show summary of sync result"
 msgstr ""
 
-#: ../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:287
+#, fuzzy
+msgid "Skip the track"
+msgstr "%d曲コピーしました"
 
-#: ../data/gtkpod.glade.h:291
-msgid "Set this to your last.fm password"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:292
-msgid "Set this to your last.fm username"
-msgstr ""
-
-#: ../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:294
-msgid ""
-"Set to 0 to use as many background threads as CPUs are available on your "
-"system."
-msgstr ""
-
-#: ../data/gtkpod.glade.h:295
-msgid "Show information about problems when accessing mserv"
-msgstr "mserv へアクセスするとき、問題の報告を表示する"
-
-#: ../data/gtkpod.glade.h:296
-msgid "Show summary of sync result"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
-#: ../src/repository.c:1356
+#: ../data/gtkpod.glade.h:288 ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
 msgid "Smart Playlist"
 msgstr "スマートプレイリスト"
 
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:289
+#, fuzzy
+msgid "Sort by:"
+msgstr "   ソート順:"
+
+#: ../data/gtkpod.glade.h:290
 msgid "Sort tracks according to: "
 msgstr "曲順を次の順で並べ換える: "
 
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:291
 msgid "Sorting Options"
 msgstr "ソートの設定"
 
-#: ../data/gtkpod.glade.h:300
-msgid "Sorting case sensitive"
-msgstr "並べ換えの際に大文字小文字を区別する"
+#: ../data/gtkpod.glade.h:292
+#, fuzzy
+msgid "Sorting..."
+msgstr "中止処理中..."
 
-#: ../data/gtkpod.glade.h:301
-msgid "Sorttab: "
-msgstr "ソートタブ: "
-
-#: ../data/gtkpod.glade.h:302
-msgid "Sorttabs"
-msgstr "ソートタブ"
-
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:293
 msgid "Source:"
 msgstr "参照先:"
 
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:295
 #, 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:306
+#: ../data/gtkpod.glade.h:296
 msgid "Specify interval"
 msgstr "範囲を指定してください"
 
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:297
 msgid "Start display automatically"
 msgstr "自動的に表示を更新する"
 
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:298
 msgid "Synchronise Contacts, Calendar and Notes"
 msgstr "アドレスデータ,カレンダー,メモを同期する"
 
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:299
 msgid "Synchronize All"
 msgstr "すべて同期"
 
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:300
 msgid "Synchronize Calendar"
 msgstr "カレンダーを同期"
 
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:301
 msgid "Synchronize Contacts"
 msgstr "アドレスデータを同期"
 
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:302
 msgid "Synchronize Notes"
 msgstr "メモを同期"
 
-#: ../data/gtkpod.glade.h:313
-msgid "Template for info field: "
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:304
+msgid "Text color"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:305
 msgid ""
 "The local copy of the track is referenced in the playlist. If the track is "
 "not available locally, an error message is displayed."
@@ -1477,98 +1403,57 @@
 "ハードディスク上にある対応する曲を常に参照します. 見つからない場合にはエラー"
 "メッセージを表示します."
 
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:306
 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:316
-#, fuzzy
-msgid ""
-"The tags are written to the files on your harddrive and on the iPod (if "
-"available)."
-msgstr ""
-"タグは使っているハードディスクと(可能であれば)iPodの両方で修正されます。"
-
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:307
 msgid "The track on the iPod is referenced in the playlist file."
 msgstr "iPod 上の曲を常に参照します."
 
-#: ../data/gtkpod.glade.h:318
-msgid "This is the same option as in 'Edit/Delete Confirmation'"
-msgstr "「編集/削除の確認」の項目と同じです"
-
-#: ../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 ""
-
-#: ../data/gtkpod.glade.h:320
-msgid "This option will be re-activated when you upgrade gtkpod."
-msgstr ""
-
-#: ../data/gtkpod.glade.h:321
+#: ../data/gtkpod.glade.h:308
 msgid "Time:"
 msgstr "時刻:"
 
-#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
+#: ../data/gtkpod.glade.h:309 ../src/display_sorttabs.c:3004
 #: ../src/display_spl.c:83 ../src/misc_conversion.c:62
 msgid "Title"
 msgstr "タイトル"
 
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:310
 msgid ""
-"Total\n"
-"(iPod)"
+"To fill additional information, <i>gtkpod</i> can use a database provided by "
+"the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, "
+"leave this alone."
 msgstr ""
-"合計\n"
-"(iPod)"
 
-#: ../data/gtkpod.glade.h:325
-msgid ""
-"Total\n"
-"(local)"
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
 msgstr ""
-"合計\n"
-"(ローカル)"
 
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:312
 msgid "Tracks"
 msgstr "曲リスト"
 
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:313
 msgid "Tracks Most Often Listened To"
 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 ""
-
-#: ../data/gtkpod.glade.h:330
+#: ../data/gtkpod.glade.h:314
 msgid "Tracks in Selected Tab _Entry"
 msgstr "選択されたタブの曲(_E)"
 
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:315
 msgid "Tracks in Selected _Playlist"
 msgstr "選択されたプレイリストの曲(_P)"
 
-#: ../data/gtkpod.glade.h:332
-msgid "Transfer tracks to the iPod in the background"
+#: ../data/gtkpod.glade.h:316
+msgid "Transfer tracks in background mode"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:333
-msgid "Translators"
-msgstr "翻訳担当"
-
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:317
 msgid ""
 "Try to load contents of all connected iPods. For each iPod a separate "
 "repository must be set up."
@@ -1576,58 +1461,40 @@
 "接続されているすべての iPod の内容を読み込みます. それぞれの iPod ごとに個別"
 "に設定をしておく必要があります."
 
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:318
 #, fuzzy
 msgid "Undo _Track"
 msgstr "未評価の曲"
 
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:319
 msgid "Update _mserv Data from File"
 msgstr "mserv データを更新する(_m)"
 
-#: ../data/gtkpod.glade.h:337
-msgid "Update/Sync all playlists now"
-msgstr ""
+#: ../data/gtkpod.glade.h:320
+#, fuzzy
+msgid "Update information about the existing track"
+msgstr "mserv へアクセスするとき、問題の報告を表示する"
 
-#: ../data/gtkpod.glade.h:338
-msgid "Update/Sync playlist now"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:339
-msgid "Upper margin"
-msgstr "上限"
-
-#: ../data/gtkpod.glade.h:340
-msgid "Use 'Multi-Edit' also for title field"
-msgstr "タイトルの項目も「一斉編集」を可能にする"
-
-#: ../data/gtkpod.glade.h:341
-msgid "Use 'Multi-Edit' for tracks selections"
-msgstr "選択された曲を「一斉編集」する"
-
-#: ../data/gtkpod.glade.h:342
+#: ../data/gtkpod.glade.h:321
 #, fuzzy
-msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
-msgstr "親ディレクトリにある <i>&lt;Album&gt;.jpg</i> を使う"
+msgid "Update/Sync All Playlists"
+msgstr "プレイリストを作成(_C)"
 
-#: ../data/gtkpod.glade.h:343
+#: ../data/gtkpod.glade.h:322
 #, fuzzy
-msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-msgstr "<i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i> など"
+msgid "Update/Sync Playlist"
+msgstr "空リスト"
 
-#: ../data/gtkpod.glade.h:344
-msgid "Use <i>folder.jpg</i> as cover art."
-msgstr "<i>folder.jpg</i> をカバーアートに使う"
+#: ../data/gtkpod.glade.h:323
+msgid "Use legacy format for MP3 tags"
+msgstr ""
 
-#: ../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:346
-msgid "Use mserv database to fill additional information"
+#: ../data/gtkpod.glade.h:324
+#, fuzzy
+msgid "Use mserv database to fill track information"
 msgstr "mserv のデータベースから追加情報を取得する"
 
-#: ../data/gtkpod.glade.h:347
+#: ../data/gtkpod.glade.h:325
 msgid ""
 "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
 "for this filename."
@@ -1635,61 +1502,25 @@
 "指定された文字コード (「設定」内「登録/更新/同期」を参照)\n"
 "をファイル名にも使用する。"
 
-#: ../data/gtkpod.glade.h:349
-#, fuzzy
-msgid ""
-"Use selected encoding (on the 'General' page)\n"
-"when writing tags"
-msgstr ""
-"「基本設定」のページで指定された文字コードを\n"
-"タグの読み書きにも使用する"
-
-#: ../data/gtkpod.glade.h:351
-#, fuzzy
-msgid "Use selected encoding also when updating or syncing tracks"
-msgstr "選択された文字コードを更新・同期処理でも使用する"
-
-#: ../data/gtkpod.glade.h:352
-msgid "Use this template to parse filename for tag information:"
-msgstr "以下のテンプレートを、ファイル名からタグ情報を抽出するのに使用する:"
-
-#: ../data/gtkpod.glade.h:353
-msgid "Username to be used for mserv database lookup."
-msgstr "ユーザー名は mserv データベースの参照に使います。"
-
-#: ../data/gtkpod.glade.h:354
+#: ../data/gtkpod.glade.h:327
 msgid "Username:"
 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)."
+#: ../data/gtkpod.glade.h:328
+msgid "Video Thumbnail Generation"
 msgstr ""
-"普通は複数の曲のタイトルを同じものにする必要はないでしょう。このオプションを"
-"選択すると大抵は望ましくない結果を得る事になります。(特に、今のところ「やり直"
-"し」は効かないので、選択するべきではありません)"
 
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:330
 #, fuzzy
 msgid "View Full Size"
 msgstr "ファイルサイズ"
 
-#: ../data/gtkpod.glade.h:357
-msgid "WAV with :"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:331
 msgid ""
-"When adding dirs/files, update information of\n"
-"existing tracks with identical filenames"
-msgstr ""
-"ファイルやディレクトリを追加する際に、同じファイル名の\n"
-"曲がすでにあったら場合には、そちらを更新する"
-
-#: ../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 "
@@ -1700,145 +1531,165 @@
 "を iPod 上のファイルと比較して, 同じだった場合には飛ばします. 結果として同期"
 "処理を高速に行えます."
 
-#: ../data/gtkpod.glade.h:361
-#, fuzzy
-msgid "When syncing playlists"
-msgstr "ディレクトリの同期処理時"
+#: ../data/gtkpod.glade.h:332
+msgid "When updating tracks, display information:"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:333
 msgid ""
 "Will show a list of tracks removed and a list of tracks newly added or "
 "updated."
 msgstr ""
 
-#: ../data/gtkpod.glade.h:363
-msgid "Write ID3 tags to disk when modified in gtkpod"
-msgstr "gtkpod内で変更があったID3タグをディスクに書き込む"
-
-#: ../data/gtkpod.glade.h:364
+#: ../data/gtkpod.glade.h:334
 msgid "Write all changes made to the disk and the iPod(s)."
 msgstr "ハードディスクと iPod に対する変更をすべて保存します."
 
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:335
 #, fuzzy
+msgid "Write tags to disk when edited"
+msgstr "gtkpod内で変更があったID3タグをディスクに書き込む"
+
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
 msgid ""
-"Write extended information (PC filenames, SHA1 hashes,\n"
-"encoding...). Recommended."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"拡張情報(PC上のファイル名,MD5値,文字コード)を書き込む。\n"
-"推奨される設定です。"
 
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:352
+#, no-c-format
 msgid ""
-"You can also use the table headers, but this allows you to sort according to "
-"a column that is not displayed."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"表のヘッダを操作しても並べ換えはできますが, この機能を使うと表示されていない"
-"項目を使って並べ換えることができます."
 
-#: ../data/gtkpod.glade.h:368
+#: ../data/gtkpod.glade.h:371
 #, fuzzy
 msgid "_About gtkpod"
 msgstr "gtkpod について"
 
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:372
 #, fuzzy
 msgid "_Add Album"
 msgstr "アルバム"
 
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:373
 msgid "_Add Image"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:371
+#: ../data/gtkpod.glade.h:374
 #, fuzzy
 msgid "_Album"
 msgstr "アルバム"
 
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:375
 msgid "_All Tracks"
 msgstr "すべての曲(_A)"
 
-#: ../data/gtkpod.glade.h:373
-msgid "_Arrange Sort Tabs"
+#: ../data/gtkpod.glade.h:376
+#, fuzzy
+msgid "_Arrange Filter Tabs"
 msgstr "ソートタブを再配置(_A)"
 
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:377
 msgid "_Check iPod's Files"
 msgstr "iPod のファイルをチェック(_C)"
 
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:378
+#, fuzzy
+msgid "_Contents"
+msgstr "コメント"
+
+#: ../data/gtkpod.glade.h:379
 msgid "_Conversion Log"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:380
 msgid "_Create Playlists"
 msgstr "プレイリストを作成(_C)"
 
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:381
 msgid "_Create iPod's Directories"
 msgstr "iPodの初期設定(_C)"
 
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:382
 msgid "_Delete"
 msgstr "削除(_D)"
 
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:383
 msgid "_Display"
 msgstr "表示(_D)"
 
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:384
 msgid "_Displayed Tracks"
 msgstr "表示されている曲(_D)"
 
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:385
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../data/gtkpod.glade.h:382
-msgid "_Encoding (ID3, files):"
-msgstr "文字コード(_E) (ID3, ファイル):"
-
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:386
 msgid "_Enqueue"
 msgstr "演奏キューに入れる(_E)"
 
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:387
 msgid "_Export Tracks from Database"
 msgstr "データベースから曲を取り出す(_E)"
 
-#: ../data/gtkpod.glade.h:385
-msgid "_File"
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:389
+#, fuzzy
+msgid "_Filter Bar"
 msgstr "ファイル(_F)"
 
-#: ../data/gtkpod.glade.h:386
+#: ../data/gtkpod.glade.h:390
 msgid "_General"
 msgstr "基本設定(_G)"
 
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:391
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../data/gtkpod.glade.h:388
-msgid "_Ignore rules"
-msgstr "ルールを無視(_I)"
-
-#: ../data/gtkpod.glade.h:389
-msgid "_Image"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:392
 msgid "_Info Window"
 msgstr "情報(_I)"
 
-#: ../data/gtkpod.glade.h:391
-msgid "_Last.FM"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:392
-msgid "_Less Sort Tabs"
-msgstr "ソートタブの削除(_L)"
-
 #: ../data/gtkpod.glade.h:393
 msgid "_Limit to"
 msgstr "制限(_L)"
@@ -1852,193 +1703,167 @@
 msgstr "ディスク(_L)"
 
 #: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:397
 msgid "_M3U"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:398
 msgid "_Misc."
 msgstr ""
 
-#: ../data/gtkpod.glade.h:398
-msgid "_More Sort Tabs"
+#: ../data/gtkpod.glade.h:399
+#, fuzzy
+msgid "_More Filter Tabs"
 msgstr "ソートタブの追加(_M)"
 
-#: ../data/gtkpod.glade.h:399
+#: ../data/gtkpod.glade.h:400
+msgid "_Music"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:401
 msgid "_Newly Added Tracks"
 msgstr "新たに追加された曲(_N)"
 
-#: ../data/gtkpod.glade.h:400
+#: ../data/gtkpod.glade.h:402
 msgid "_Normalize Volume"
 msgstr "ボリュームの平均化"
 
-#: ../data/gtkpod.glade.h:401
-msgid "_Number of sort tabs:"
-msgstr "ソートタブの数(_N):"
-
-#: ../data/gtkpod.glade.h:402
+#: ../data/gtkpod.glade.h:403
 msgid "_PLS"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
+#, fuzzy
+msgid "_Photos"
+msgstr "アルバム"
+
+#: ../data/gtkpod.glade.h:405
 msgid "_Play Now"
 msgstr "今すぐ演奏(_P)"
 
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:406
 msgid "_Podcasts"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:407
 msgid "_Prefer Local"
 msgstr "できればディスク(_P)"
 
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:408
 #, fuzzy
 msgid "_Remove Album"
 msgstr "アルバム"
 
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:409
 #, fuzzy
 msgid "_Remove Cover Art"
 msgstr "カバーアートを削除"
 
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:410
 msgid "_Remove Images"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:411
 msgid "_Save Changes"
 msgstr "変更の保存(_S)"
 
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:412
 msgid "_Save Displayed Track Order"
 msgstr "現在の曲順を保存(_S)"
 
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:413
 msgid "_Sorting"
 msgstr "並べ換え(_S)"
 
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:414
 #, fuzzy
 msgid "_Synchronize Playlist with Dir(s)"
 msgstr "プレイリストを同期する(_S)"
 
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:415
 msgid "_Toolbar"
 msgstr "ツールバー(_T)"
 
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:416
 msgid "_Tools"
 msgstr "ツール(_T)"
 
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:417
 msgid "_Tooltips"
 msgstr "ツールチップ(_T)"
 
-#: ../data/gtkpod.glade.h:416
-msgid "_Track Info"
-msgstr "曲情報(_T)"
-
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:418
 msgid "_Undo All"
 msgstr "すべてやり直し(_U)"
 
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:419
 msgid "_Update Tracks from File"
 msgstr "ファイルを元に曲を更新する(_U)"
 
-#: ../data/gtkpod.glade.h:419
+#: ../data/gtkpod.glade.h:420
 #, fuzzy
 msgid "_Video"
 msgstr "表示(_V)"
 
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:421
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:422
+msgid "_Zoom"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:423
 msgid "_iPod"
 msgstr "iPod(_i)"
 
-#: ../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 ""
-"アーティスト: %a, アルバム: %A, 作曲者: %c, タイトル: %t, ジャンル: %G, ト"
-"ラック番号: %T, CD 番号: %C, 年: %Y, スキップ: %*, パーセント記号: %%。いくつ"
-"かのテンプレートを';' で区切って並べることができます。最初に合ったテンプレー"
-"トが使われます。例: '%a - %A/%T %t.mp3;%t.wav'."
-
 #: ../data/gtkpod.glade.h:424
-msgid "folder"
+msgid "checkbutton"
 msgstr ""
 
 #: ../data/gtkpod.glade.h:425
-msgid "folder.jpg"
+msgid "gtk-revert-to-saved"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:427
-#, no-c-format
-msgid "folder.jpg;%a.jpg"
-msgstr ""
-
-#: ../data/gtkpod.glade.h:428
-msgid "gtkpod"
-msgstr "gtkpod"
-
-#: ../data/gtkpod.glade.h:429
+#: ../data/gtkpod.glade.h:426
 #, fuzzy
-msgid "gtkpod Info"
+msgid "gtkpod Information"
 msgstr "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 はここで指定された文字コードが, ID3のタグやファイル名に使われているも"
-"のとして処理します.「ファイルの追加」や「ディレクトリごと追加」を実行する前に"
-"この設定を変更すれば, これらの処理に設定が反映されます.「システム文字」を選択"
-"すると, ロケールで指定されたコードが使われます."
-
-#: ../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:433
+#: ../data/gtkpod.glade.h:429
 msgid ""
 "iPod\n"
 "Local Repository (Standard)\n"
 "Local Repository (Podcasts)\n"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:433
 #, fuzzy
 msgid "iPod mountpoint:"
 msgstr "iPodのマウント場所(_P):"
 
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:434
 msgid "iTunesDB backup:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:439
-msgid "mserv Root:"
+#: ../data/gtkpod.glade.h:435
+#, fuzzy
+msgid "mserv Preferences"
+msgstr "設定"
+
+#: ../data/gtkpod.glade.h:436
+msgid "mserv root:"
 msgstr ""
 
-#: ../data/gtkpod.glade.h:440
-msgid "mserv database lookup will be done for music in this directory."
-msgstr "このディレクトリ内の曲に対し、mserv のデータベースを参照します。"
-
-#: ../data/gtkpod.glade.h:441 ../src/details.c:1347
+#: ../data/gtkpod.glade.h:437 ../src/details.c:1352
 msgid "n/a"
 msgstr "不可"
 
-#: ../data/gtkpod.glade.h:442
+#: ../data/gtkpod.glade.h:438
 msgid "special_sorttab -- Don't translate!"
 msgstr ""
 
@@ -2267,173 +2092,180 @@
 
 #. sanity!
 #. check for "System Charset" and return NULL
-#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+#: ../src/charset.c:163 ../src/charset.c:173 ../src/charset.c:232
+#: ../src/charset.c:248 ../src/charset.c:332
 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
+#: ../src/clientserver.c:215
 msgid ""
 "Another instance of gtkpod was detected. Playcount server not started.\n"
 msgstr "gtkpod がすでに動作中です。プレイカウントサーバーは起動しません。\n"
 
-#: ../src/confirmation.c:377
-msgid "Confirmation Dialogue"
-msgstr "確認"
+#: ../src/confirmation.c:389
+#, fuzzy
+msgid "Confirmation"
+msgstr "情報"
 
-#: ../src/context_menus.c:362
+#: ../src/context_menus.c:364
 #, c-format
 msgid "Copied \"%s\" playlist to %s"
 msgstr ""
 
-#: ../src/context_menus.c:401
+#: ../src/context_menus.c:403
 #, fuzzy, c-format
 msgid "Copied %d track to '%s'"
 msgid_plural "Copied %d tracks to '%s'"
 msgstr[0] "%2$d曲中 %1$d曲をコピーしました。"
 
-#: ../src/context_menus.c:429
+#: ../src/context_menus.c:431
 #, c-format
 msgid "Copied '%s' playlist to '%s' in '%s'"
 msgstr ""
 
-#: ../src/context_menus.c:462
+#: ../src/context_menus.c:464
 #, 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 曲削除しました"
 
-#: ../src/context_menus.c:622 ../src/tools.c:854
+#: ../src/context_menus.c:624 ../src/tools.c:854
 msgid "Play Now"
 msgstr "今すぐ演奏"
 
-#: ../src/context_menus.c:628 ../src/tools.c:867
+#: ../src/context_menus.c:630 ../src/tools.c:867
 msgid "Enqueue"
 msgstr "演奏キューに加える"
 
-#: ../src/context_menus.c:634
+#: ../src/context_menus.c:636
 msgid "Copy Tracks to Filesystem"
 msgstr "曲をファイルシステムにコピーする"
 
-#: ../src/context_menus.c:641 ../src/file_export.c:1085
+#: ../src/context_menus.c:643 ../src/file_export.c:1085
 msgid "Create Playlist File"
 msgstr "プレイリストファイルを作成"
 
-#: ../src/context_menus.c:648
+#: ../src/context_menus.c:650
 msgid "Create new Playlist"
 msgstr "プレイリストの新規作成"
 
-#: ../src/context_menus.c:655
+#: ../src/context_menus.c:657
 #, fuzzy
 msgid "Update Tracks from File"
 msgstr "ファイルを元に曲を更新する(_U)"
 
-#: ../src/context_menus.c:669
+#: ../src/context_menus.c:671
 msgid "Sync Playlist with Dir(s)"
 msgstr ""
 
-#: ../src/context_menus.c:679
+#: ../src/context_menus.c:681
 msgid "Remove All Tracks from iPod"
 msgstr "iPodから曲を削除"
 
-#: ../src/context_menus.c:697
+#: ../src/context_menus.c:687 ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr ""
+
+#: ../src/context_menus.c:699
 msgid "Remove All Podcasts from iPod"
 msgstr "すべての Podcast を iPod から削除"
 
-#: ../src/context_menus.c:712
+#: ../src/context_menus.c:714
 msgid "Delete Including Tracks"
 msgstr "中の曲ごと削除"
 
-#: ../src/context_menus.c:720
+#: ../src/context_menus.c:722
 msgid "Delete But Keep Tracks"
 msgstr "曲は残したまま削除"
 
-#: ../src/context_menus.c:728
+#: ../src/context_menus.c:730
 #, fuzzy
 msgid "Edit iPod Properties"
 msgstr "iPodの初期設定"
 
-#: ../src/context_menus.c:735
+#: ../src/context_menus.c:737
 #, fuzzy
 msgid "Edit Repository Properties"
 msgstr "iPodの初期設定"
 
-#: ../src/context_menus.c:742
+#: ../src/context_menus.c:744
 #, fuzzy
 msgid "Edit Playlist Properties"
 msgstr "プレイリストをファイルから読み込んで追加します"
 
-#: ../src/context_menus.c:770
+#: ../src/context_menus.c:772
 msgid "View Full Size Artwork"
 msgstr ""
 
-#: ../src/context_menus.c:777
+#: ../src/context_menus.c:779
 #, fuzzy
 msgid "Select Cover From File"
 msgstr "iPodから削除"
 
-#: ../src/context_menus.c:790
+#: ../src/context_menus.c:792
 #, fuzzy
 msgid "Load iPod"
 msgstr "iPod ファイル"
 
-#: ../src/context_menus.c:797
+#: ../src/context_menus.c:799
 msgid "Eject iPod"
 msgstr ""
 
-#: ../src/context_menus.c:814
+#: ../src/context_menus.c:816
 msgid "Remove All Tracks from Database"
 msgstr "すべての曲をデータベースから削除"
 
-#: ../src/context_menus.c:829
+#: ../src/context_menus.c:831
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "中の曲ごと削除 (ハードディスクから)"
 
-#: ../src/context_menus.c:837
+#: ../src/context_menus.c:839
 msgid "Delete Including Tracks (Database)"
 msgstr "中の曲ごと削除 (データベースから)"
 
-#: ../src/context_menus.c:845
+#: ../src/context_menus.c:847
 msgid "Delete From iPod"
 msgstr "iPodから削除"
 
-#: ../src/context_menus.c:853
+#: ../src/context_menus.c:855
 msgid "Delete From Playlist"
 msgstr "プレイリストから削除"
 
-#: ../src/context_menus.c:861
+#: ../src/context_menus.c:863
 msgid "Delete From Harddisk"
 msgstr "ハードディスクから削除"
 
-#: ../src/context_menus.c:869
+#: ../src/context_menus.c:871
 msgid "Delete From Database"
 msgstr "データベースから削除"
 
-#: ../src/context_menus.c:877
+#: ../src/context_menus.c:879
 msgid "Alphabetize"
 msgstr "並べ換え"
 
-#: ../src/context_menus.c:895
+#: ../src/context_menus.c:897
 #, fuzzy
 msgid "Remove Album"
 msgstr "アルバム"
 
-#: ../src/context_menus.c:905
+#: ../src/context_menus.c:907
 #, fuzzy
 msgid "Remove Photo"
 msgstr "カバーアートを削除"
 
-#: ../src/context_menus.c:922
+#: ../src/context_menus.c:924
 msgid "Rename Album"
 msgstr ""
 
-#: ../src/context_menus.c:981 ../src/context_menus.c:1030
+#: ../src/context_menus.c:983 ../src/context_menus.c:1032
 #, fuzzy
 msgid "Copy selected playlist to..."
 msgstr "選択されたプレイリスト"
 
-#: ../src/context_menus.c:1083
+#: ../src/context_menus.c:1085
 #, fuzzy
 msgid "Copy selected track(s) to..."
 msgstr "削除された曲"
@@ -2481,17 +2313,17 @@
 msgid "TV Show & Music Video"
 msgstr ""
 
-#: ../src/details.c:836
+#: ../src/details.c:837
 #, c-format
 msgid "%s (image data corrupted or unreadable)"
 msgstr ""
 
-#: ../src/details.c:973
+#: ../src/details.c:975
 #, c-format
 msgid "Please report unknown mediatype %x\n"
 msgstr ""
 
-#: ../src/details.c:1418
+#: ../src/details.c:1417
 msgid "<b>n/a</b>"
 msgstr "<b>不可</b>"
 
@@ -2500,217 +2332,222 @@
 msgid "Error occurred dropping an image onto the details window: %s\n"
 msgstr ""
 
-#: ../src/details.c:1952 ../src/display_coverart.c:2128
+#: ../src/details.c:1952 ../src/display_coverart.c:2297
 msgid "Successfully set new coverart for selected tracks"
 msgstr ""
 
-#: ../src/display.c:490
+#. Set the resolution in the label
+#: ../src/display.c:570
 #, c-format
-msgid "<b>Image Dimensions: %s</b>"
+msgid "<b>Image Dimensions: %d x %d</b>"
 msgstr ""
 
-#: ../src/display.c:744
+#: ../src/display.c:814
 msgid "Edit selected entry of which sort tab?"
 msgstr "どのソートタブで選択されたものを編集しますか?"
 
 #. no entry selected
-#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
+#: ../src/display.c:821 ../src/misc_confirm.c:469 ../src/misc_track.c:2158
 msgid "No entry selected."
 msgstr "何も選択されていません。"
 
-#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
-#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
+#: ../src/display.c:974 ../src/display.c:1320 ../src/display.c:1376
+#: ../src/display.c:1430 ../src/display.c:1485 ../src/display.c:1746
 #, c-format
 msgid "No entry selected in Sort Tab %d"
 msgstr "ソートタブ %d 内では何も選択されていません。"
 
-#: ../src/display.c:949
+#: ../src/display.c:1015
 msgid "Remove entry of which sort tab from database?"
 msgstr "どのソートタブで選択されたものをデータベースから削除しますか?"
 
-#: ../src/display.c:957
+#: ../src/display.c:1024
 msgid "Remove tracks in selected entry of which filter tab from the iPod?"
 msgstr "どのソートタブで選択された曲をiPodから削除しますか?"
 
-#: ../src/display.c:979
+#: ../src/display.c:1049
 msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
 msgstr "どのソートタブで選択された曲をハードディスクから削除しますか?"
 
-#: ../src/display.c:1009
+#: ../src/display.c:1082
 msgid "Remove tracks in selected entry of which filter tab from playlist?"
 msgstr "どのソートタブで選択された曲をプレイリストから削除しますか?"
 
-#: ../src/display.c:1036 ../src/display.c:1074
+#: ../src/display.c:1109 ../src/display.c:1147
 #, c-format
 msgid ""
 "iPod at '%s' is not loaded.\n"
 "Please load it first."
 msgstr ""
 
-#: ../src/display.c:1111 ../src/display.c:1138
+#: ../src/display.c:1184 ../src/display.c:1218
 msgid "Update selected entry of which sort tab?"
 msgstr "どのソートタブで選択されたものを更新しますか?"
 
-#: ../src/display.c:1224
+#: ../src/display.c:1314
 msgid "Export selected entry of which sort tab?"
 msgstr "どのソートタブで選択されたものをエクスポートしますか?"
 
-#: ../src/display.c:1280
+#: ../src/display.c:1370
 msgid "Create playlist file from selected entry of which sort tab?"
 msgstr "どのソートタブで選択されたものからプレイリストを作成しますか?"
 
-#: ../src/display.c:1334
+#: ../src/display.c:1424
 msgid "Play tracks in selected entry of which sort tab?"
 msgstr "どのソートタブで選択された曲を演奏しますか?"
 
-#: ../src/display.c:1389
+#: ../src/display.c:1479
 msgid "Enqueue tracks in selected entry of which sort tab?"
 msgstr "どのソートタブで選択された曲を演奏キューに加えますか?"
 
-#: ../src/display.c:1646
+#: ../src/display.c:1736
 msgid "Normalize tracks in selected entry of which sort tab?"
 msgstr "どのソートタブで選択された曲を平均化しますか?"
 
-#: ../src/display_coverart.c:1713
+#: ../src/display_coverart.c:1874
 msgid "Failed to remove the album from the album hash store."
 msgstr ""
 
-#: ../src/display_coverart.c:2098
+#: ../src/display_coverart.c:2262
 #, c-format
 msgid "Error occurred dropping an image onto the coverart display: %s\n"
 msgstr ""
 
-#: ../src/display_itdb.c:376
+#: ../src/display_itdb.c:385
 #, fuzzy, c-format
 msgid "Failed to set cover art: '%s'\n"
 msgstr "カバーアートが設定できません: '%s'"
 
-#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
-msgid "Local"
+#: ../src/display_itdb.c:871
+msgid "Music Library"
 msgstr ""
 
 #. add podcast playlist
-#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1025
+#: ../src/display_itdb.c:879 ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
 msgid "Podcasts"
 msgstr ""
 
-#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:888 ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
 #, fuzzy
 msgid "iPod"
 msgstr "iPod ファイル"
 
-#: ../src/display_itdb.c:1084
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr ""
+
+#: ../src/display_itdb.c:1098
 #, c-format
 msgid "Increased playcount for '%s'"
 msgstr "'%s' の再生回数を増やしました"
 
-#: ../src/display_photo.c:163
+#: ../src/display_photo.c:158
 #, c-format
 msgid "Error reading iPod photo database (%s).\n"
 msgstr ""
 
-#: ../src/display_photo.c:168
+#: ../src/display_photo.c:161
 msgid "Error reading iPod photo database.\n"
 msgstr ""
 
-#: ../src/display_photo.c:238
+#: ../src/display_photo.c:201
 msgid "Could not access the iPod's photo database."
 msgstr ""
 
-#: ../src/display_photo.c:441
+#: ../src/display_photo.c:404
 #, fuzzy
 msgid "Photo Albums"
 msgstr "アルバム"
 
-#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+#: ../src/display_photo.c:414 ../src/display_photo.c:1587
 msgid "<Unnamed>"
 msgstr ""
 
-#: ../src/display_photo.c:939
+#: ../src/display_photo.c:848
 msgid "The Photo Library album cannot be removed"
 msgstr ""
 
-#: ../src/display_photo.c:961
+#: ../src/display_photo.c:870
 #, fuzzy
 msgid "Do you want to remove the album's photos too?"
 msgstr "すべての Podcast を iPod から削除しても本当によろしいですか?"
 
-#: ../src/display_photo.c:967
+#: ../src/display_photo.c:876
 msgid "Yes. Do Not Display Again"
 msgstr ""
 
-#: ../src/display_photo.c:1038
+#: ../src/display_photo.c:947
 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
+#: ../src/display_photo.c:962
 msgid ""
 "This will delete the photo selection from the Photo Library and all albums. "
 "Are you sure?"
 msgstr ""
 
-#: ../src/display_photo.c:1128
+#: ../src/display_photo.c:1036
 msgid "New Photo Album Name"
 msgstr ""
 
-#: ../src/display_photo.c:1129
+#: ../src/display_photo.c:1037
 #, fuzzy
 msgid "Please enter a new name for the photo album"
 msgstr "新しいプレイリストの名前を入力してください"
 
-#: ../src/display_photo.c:1141 ../src/display_photo.c:1223
+#: ../src/display_photo.c:1050 ../src/display_photo.c:1133
 msgid "An album with that name already exists."
 msgstr ""
 
-#: ../src/display_photo.c:1210
+#: ../src/display_photo.c:1119
 #, fuzzy
 msgid "New Photo Album"
 msgstr "アルバム"
 
-#: ../src/display_photo.c:1211
+#: ../src/display_photo.c:1120
 #, fuzzy
 msgid "Please enter a name for the new photo album"
 msgstr "新しいプレイリストの名前を入力してください"
 
-#: ../src/display_photo.c:1232
+#: ../src/display_photo.c:1142
 msgid "The new album failed to be created."
 msgstr ""
 
-#: ../src/display_photo.c:1256
+#: ../src/display_photo.c:1166
 msgid "Add Image to iPod"
 msgstr ""
 
 #. Open a dialog directory chooser window
-#: ../src/display_photo.c:1311
+#: ../src/display_photo.c:1221
 msgid "Add a Directory of Images to the iPod. Select the Directory."
 msgstr ""
 
-#: ../src/display_photo.c:1699
+#: ../src/display_photo.c:1601
 #, 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:516 ../src/display_playlists.c:558
+#: ../src/display_playlists.c:537 ../src/display_playlists.c:579
 msgid "Error: drag from iPod not possible in offline mode."
 msgstr "エラー: オフラインモードでは iPod からのドラッグ操作はできません。"
 
-#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:606 ../src/display_tracks.c:403
 #, c-format
 msgid "Copied one track"
 msgid_plural "Copied %d tracks"
 msgstr[0] "%d曲コピーしました"
 
-#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
+#: ../src/display_playlists.c:886 ../src/display_playlists.c:898
 msgid "Can't reorder sorted treeview."
 msgstr "ソートされている順番を変更することはできません"
 
-#: ../src/display_playlists.c:954
+#: ../src/display_playlists.c:975
 #, c-format
 msgid ""
 "This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2721,55 +2558,43 @@
 "トすることが有用だとお考えでしたら、作者に連絡してください。\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
+#: ../src/display_playlists.c:2039
 msgid "Photos"
 msgstr ""
 
-#: ../src/display_sorttabs.c:473
+#: ../src/display_sorttabs.c:479
 msgid "'Played' condition ignored because of error."
 msgstr "「演奏日」の条件はエラーのために無視されました。"
 
-#: ../src/display_sorttabs.c:476
+#: ../src/display_sorttabs.c:482
 msgid "'Modified' condition ignored because of error."
 msgstr "「変更日」の条件はエラーのために無視されました。"
 
-#: ../src/display_sorttabs.c:479
+#: ../src/display_sorttabs.c:485
 msgid "'Added' condition ignored because of error."
 msgstr "「登録日」の条件はエラーのために無視されました。"
 
-#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1568 ../src/misc_conversion.c:59
 msgid "All"
 msgstr "すべて"
 
-#: ../src/display_sorttabs.c:1588
+#: ../src/display_sorttabs.c:1594
 msgid "Compilations"
 msgstr "コンピレーション"
 
-#: ../src/display_sorttabs.c:2988
+#: ../src/display_sorttabs.c:3001
 msgid "Comp."
 msgstr "作曲者"
 
-#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:3007 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333 ../src/misc_conversion.c:84
 msgid "Year"
 msgstr "年"
 
-#: ../src/display_sorttabs.c:2997
+#: ../src/display_sorttabs.c:3010
 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 "日"
@@ -2790,7 +2615,7 @@
 msgid "Hz"
 msgstr ""
 
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:794
 msgid "MB"
 msgstr ""
 
@@ -2823,6 +2648,10 @@
 msgid "Size"
 msgstr "サイズ"
 
+#: ../src/display_spl.c:94 ../src/infodlg.c:78
+msgid "Play time"
+msgstr "演奏時間"
+
 #: ../src/display_spl.c:95 ../src/misc_conversion.c:64
 msgid "Comment"
 msgstr "コメント"
@@ -2831,6 +2660,10 @@
 msgid "Date added"
 msgstr "登録日"
 
+#: ../src/display_spl.c:98 ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "再生回数"
+
 #: ../src/display_spl.c:99
 msgid "Last played"
 msgstr "最後に演奏した日"
@@ -2839,6 +2672,10 @@
 msgid "Disc number"
 msgstr "CD 番号"
 
+#: ../src/display_spl.c:101 ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "評価"
+
 #: ../src/display_spl.c:102 ../src/misc_conversion.c:87
 msgid "Compilation"
 msgstr "コンピレーション"
@@ -2957,10 +2794,6 @@
 msgid "hours"
 msgstr "時間"
 
-#: ../src/display_spl.c:182 ../src/info.c:780
-msgid "GB"
-msgstr ""
-
 #: ../src/display_spl.c:189
 msgid "random order"
 msgstr "ランダムな順"
@@ -3018,25 +2851,25 @@
 msgid "Movie"
 msgstr "変更日"
 
-#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+#: ../src/display_spl.c:1143 ../src/display_spl.c:1158
 msgid "to"
 msgstr "から"
 
-#: ../src/display_spl.c:1485
+#: ../src/display_spl.c:1436
 msgid "-"
 msgstr ""
 
-#: ../src/display_spl.c:1500
+#: ../src/display_spl.c:1451
 msgid "+"
 msgstr ""
 
-#: ../src/display_tracks.c:281
+#: ../src/display_tracks.c:398
 #, c-format
 msgid "Moved one track"
 msgid_plural "Moved %d tracks"
 msgstr[0] "%d曲を移動しました"
 
-#: ../src/display_tracks.c:1810
+#: ../src/display_tracks.c:2022
 #, c-format
 msgid ""
 "Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -3049,67 +2882,93 @@
 "はできません。\n"
 "\n"
 
-#: ../src/display_tracks.c:2069
+#: ../src/display_tracks.c:2288
 msgid "Rtng"
 msgstr "評価"
 
-#: ../src/display_tracks.c:2072
+#: ../src/display_tracks.c:2291
 msgid "#"
 msgstr "#"
 
-#: ../src/display_tracks.c:2075
+#: ../src/display_tracks.c:2294
 msgid "CD"
 msgstr ""
 
-#: ../src/display_tracks.c:2078
+#: ../src/display_tracks.c:2297
 msgid "ID"
 msgstr "ID"
 
-#: ../src/display_tracks.c:2081
+#: ../src/display_tracks.c:2300
 msgid "Trnsfrd"
 msgstr "転送済み"
 
-#: ../src/display_tracks.c:2085
+#: ../src/display_tracks.c:2309
 msgid "Cmpl"
 msgstr "コンピ"
 
-#: ../src/display_tracks.c:2091
+#: ../src/display_tracks.c:2315
 msgid "Time"
 msgstr "演奏時間"
 
-#: ../src/display_tracks.c:2094
+#: ../src/display_tracks.c:2318
 msgid "Plycnt"
 msgstr "再生回数"
 
-#: ../src/display_tracks.c:2106
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "演奏日"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "変更日"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "登録日"
+
+#: ../src/display_tracks.c:2330
 msgid "Released"
 msgstr "公開日"
 
-#: ../src/display_tracks.c:2112
+#: ../src/display_tracks.c:2336
 msgid "Vol."
 msgstr "音量"
 
-#: ../src/display_tracks.c:2115
+#: ../src/display_tracks.c:2339
 msgid "Sndchk."
 msgstr "サウンドチェック"
 
-#: ../src/fetchcover.c:358
-msgid "Coverart file already exists"
-msgstr ""
-
-#: ../src/fetchcover.c:371
+#: ../src/fetchcover.c:359
 #, 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."
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to abort the fetchcover "
+"operation?"
 msgstr ""
 
-#: ../src/file.c:236
+#: ../src/fetchcover.c:368
+msgid "Cover art file already exists"
+msgstr ""
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr ""
+
+#: ../src/fetchcover.c:371
+#, fuzzy
+msgid "Rename"
+msgstr "ユーザー名:"
+
+#: ../src/fetchcover.c:372
+#, fuzzy
+msgid "Abort"
+msgstr "gtkpodについて(_A)"
+
+#: ../src/file.c:238
 #, c-format
 msgid ""
 "'%s' is a directory, not a playlist file.\n"
@@ -3118,7 +2977,7 @@
 "'%s' はプレイリストファイルではなく、ディレクトリです。\n"
 "\n"
 
-#: ../src/file.c:266
+#: ../src/file.c:268
 #, c-format
 msgid ""
 "'%s' is a not a known playlist file.\n"
@@ -3127,59 +2986,86 @@
 "'%s' は プレイリストファイルではないようです。\n"
 "\n"
 
-#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/file.c:285 ../src/file_export.c:217 ../src/oggfile.c:62
 #: ../src/wavfile.c:107
 #, c-format
 msgid "Could not open '%s' for reading.\n"
 msgstr "ファイル '%s' を読み込もうとしましたが、開くことができません。\n"
 
-#: ../src/file.c:369
+#: ../src/file.c:371
 #, c-format
 msgid "Skipping '%s' because it is a directory.\n"
 msgstr "'%s' はディレクトリなので飛ばします。\n"
 
-#: ../src/file.c:374
+#: ../src/file.c:376
 #, c-format
 msgid "Skipping '%s' to avoid adding playlist file recursively\n"
 msgstr "プレイリストファイルの再帰的な登録を避けるため、'%s' は飛ばします。\n"
 
-#: ../src/file.c:629
+#: ../src/file.c:631
 #, c-format
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "未知のトークン '%s' がテンプレート '%s' 中にあります。\n"
 
-#: ../src/file.c:923
+#: ../src/file.c:939
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "ローカルのファイル名が不正です (%s)"
 
-#: ../src/file.c:982
+#: ../src/file.c:998
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "ユーザー '%s' の情報が '%s' 内に見つかりません"
 
-#: ../src/file.c:991
+#: ../src/file.c:1007
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr "この曲 (%2$s) 用の mserv データファイル (%1$s) がありません"
 
-#: ../src/file.c:999
+#: ../src/file.c:1015
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr "この曲 (%s) は mserv のルートディレクトリ (%s) には入っていません"
 
-#: ../src/file.c:1123
+#: ../src/file.c:1046
+#, fuzzy, c-format
+msgid "Could not create '%s'"
+msgstr "'%s' をロックすることができませんでした。\n"
+
+#: ../src/file.c:1083
+#, fuzzy
+msgid "Error creating thumbnail file"
+msgstr "'%s'の作成に失敗: %s\n"
+
+#: ../src/file.c:1114 ../src/misc.c:1018
 #, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "未知のトークン '%%%c' がテンプレート '%s' 中にあります"
+
+#: ../src/file.c:1138
+#, c-format
 msgid ""
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
+msgstr ""
+
+#: ../src/file.c:1142
+#, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr ""
+
+#: ../src/file.c:1291
+#, c-format
+msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
 msgstr "以下の曲を処理できませんでした (ファイルが存在しないため): '%s'\n"
 
-#: ../src/file.c:1209
+#: ../src/file.c:1377
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr "以下の曲を処理できませんでした (ファイル形式が不明なため): '%s'\n"
 
-#: ../src/file.c:1307
+#: ../src/file.c:1476
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -3188,33 +3074,33 @@
 "以下の曲を処理できませんでした (ファイル形式は既知だが解析に失敗したため): '%"
 "s'\n"
 
-#: ../src/file.c:1337 ../src/file.c:1391
+#: ../src/file.c:1506 ../src/file.c:1560
 msgid "Nothing to update"
 msgstr "更新されるデータはありません"
 
-#: ../src/file.c:1358
+#: ../src/file.c:1527
 #, c-format
 msgid "Updating %s"
 msgstr "%s を更新中"
 
-#: ../src/file.c:1372
+#: ../src/file.c:1541
 msgid "Updated selected tracks with info from file."
 msgstr "選択された曲の情報を、ファイルを元に更新しました。"
 
-#: ../src/file.c:1406
+#: ../src/file.c:1575
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "mserv data %s を取得中"
 
-#: ../src/file.c:1411
+#: ../src/file.c:1580
 msgid "no filename available"
 msgstr "ファイル名がわかりません"
 
-#: ../src/file.c:1416
+#: ../src/file.c:1585
 msgid "Updated selected tracks with data from mserv."
 msgstr "選択された曲を mserv のデータを元に更新しました。"
 
-#: ../src/file.c:1437
+#: ../src/file.c:1606
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -3222,11 +3108,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1443
+#: ../src/file.c:1612
 msgid "Failed Track Update"
 msgstr "曲の更新に失敗"
 
-#: ../src/file.c:1501
+#: ../src/file.c:1670
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -3234,11 +3120,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1507
+#: ../src/file.c:1676
 msgid "Successful Track Update"
 msgstr "曲の更新を完了"
 
-#: ../src/file.c:1566
+#: ../src/file.c:1735
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -3247,48 +3133,48 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1572
+#: ../src/file.c:1741
 msgid "mserv data retrieval problem"
 msgstr "mserv からのデータ取得に問題があります"
 
-#: ../src/file.c:1661
+#: ../src/file.c:1829
 msgid "no local filename available, file on the iPod will be used instead"
 msgstr ""
 
-#: ../src/file.c:1667
+#: ../src/file.c:1835
 msgid "no local filename available and copy on iPod cannot be found"
 msgstr ""
 
-#: ../src/file.c:1671 ../src/file.c:1689
+#: ../src/file.c:1839 ../src/file.c:1857
 #, fuzzy
 msgid "no local filename available"
 msgstr "ファイル名がわかりません"
 
-#: ../src/file.c:1679
+#: ../src/file.c:1847
 msgid "local file could not be found, file on the iPod will be used instead"
 msgstr ""
 
-#: ../src/file.c:1685
+#: ../src/file.c:1853
 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:1788
+#: ../src/file.c:1956
 #, fuzzy
 msgid "update failed (format not supported?)"
 msgstr "対応していない形式です"
 
-#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#: ../src/file.c:2041 ../src/misc_playlist.c:936
 #, c-format
 msgid "Processing '%s'..."
 msgstr "'%s' の処理中..."
 
-#: ../src/file.c:1879
+#: ../src/file.c:2047
 #, fuzzy, 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
+#: ../src/file.c:2167 ../src/misc_track.c:1793 ../src/misc_track.c:1898
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
@@ -3297,7 +3183,7 @@
 "Podcast はすでに存在します: '%s'\n"
 "\n"
 
-#: ../src/file.c:2064
+#: ../src/file.c:2232
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
@@ -3306,35 +3192,35 @@
 "ビデオファイルへの書き込みはまだできません (%s).\n"
 "\n"
 
-#: ../src/file.c:2116 ../src/file.c:2130
+#: ../src/file.c:2284 ../src/file.c:2298
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "次のファイルのタグを変更できません: %s\n"
 
-#: ../src/file.c:2232
+#: ../src/file.c:2400
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "ファイル '%s' の読み込みおよび書き込みができません。\n"
 
-#: ../src/file.c:2239
+#: ../src/file.c:2407
 #, 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
+#: ../src/file.c:2424 ../src/file.c:2433 ../src/file.c:2444 ../src/file.c:2454
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "'%s' におかしな行があります: %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:2315
+#: ../src/file.c:2483
 msgid "Remove offline playcounts?"
 msgstr "オフラインでの再生回数を削除しますか"
 
 #. title
-#: ../src/file.c:2316
+#: ../src/file.c:2484
 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."
@@ -3343,12 +3229,12 @@
 "とそれらの曲の再生回数はファイルから削除されます。'キャンセル' を押せば削除さ"
 "れず残ります。"
 
-#: ../src/file.c:2333
+#: ../src/file.c:2501
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "'%s'の書き込み中にエラーが発生しました。\n"
 
-#: ../src/file.c:2390 ../src/tools.c:270
+#: ../src/file.c:2558 ../src/tools.c:270
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
@@ -3357,7 +3243,7 @@
 "平均化に失敗: このファイル形式は扱えません (%s).\n"
 "\n"
 
-#: ../src/file.c:2406 ../src/tools.c:287
+#: ../src/file.c:2574 ../src/tools.c:287
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -3366,44 +3252,70 @@
 "平均化に失敗: ファイルが取得できません (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:316
+#: ../src/file.c:2631
+#, fuzzy, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr ""
+"平均化に失敗: ファイルが取得できません (%s).\n"
+"\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save "
+"lyrics to: %s.\n"
+"\n"
+msgstr ""
+
+#: ../src/file.c:2712
+#, fuzzy, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr ""
+"平均化に失敗: ファイルが取得できません (%s).\n"
+"\n"
+
+#: ../src/file_convert.c:328
 msgid "Summary status of conversion processes"
 msgstr ""
 
-#: ../src/file_convert.c:564
+#: ../src/file_convert.c:576
 msgid "active"
 msgstr ""
 
-#: ../src/file_convert.c:569
+#: ../src/file_convert.c:581
 msgid "inactive"
 msgstr ""
 
-#: ../src/file_convert.c:580
+#: ../src/file_convert.c:592
 #, c-format
 msgid "Active threads: %d. Scheduled tracks: %d."
 msgstr ""
 
-#: ../src/file_convert.c:1071
+#: ../src/file_convert.c:1090
 #, fuzzy, c-format
 msgid "Original filename not available for '%s.'\n"
 msgstr ""
 "平均化に失敗: ファイルが取得できません (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:1086
+#: ../src/file_convert.c:1105
 #, c-format
 msgid "Filename '%s' is no longer valid for '%s'.\n"
 msgstr ""
 
-#: ../src/file_convert.c:1137
+#: ../src/file_convert.c:1156
 msgid "Ogg Vorbis"
 msgstr ""
 
-#: ../src/file_convert.c:1143
+#: ../src/file_convert.c:1162
 msgid "FLAC"
 msgstr ""
 
-#: ../src/file_convert.c:1198
+#: ../src/file_convert.c:1217
 #, c-format
 msgid ""
 "Files of type '%s' are not supported by the iPod. Please go to the "
@@ -3411,38 +3323,38 @@
 "\n"
 msgstr ""
 
-#: ../src/file_convert.c:1284
+#: ../src/file_convert.c:1303
 #, fuzzy
 msgid "No information available"
 msgstr "ファイル名がわかりません"
 
-#: ../src/file_convert.c:1323
+#: ../src/file_convert.c:1342
 #, c-format
 msgid "Could not create '%s'. Filetype conversion will not work.\n"
 msgstr ""
 
-#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#: ../src/file_convert.c:1667 ../src/file_convert.c:3119
 #, c-format
 msgid ""
 "Transfer of '%s' failed. %s\n"
 "\n"
 msgstr ""
 
-#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#: ../src/file_convert.c:2073 ../src/file_convert.c:2352
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s'.\n"
 "\n"
 msgstr ""
 
-#: ../src/file_convert.c:2062
+#: ../src/file_convert.c:2088
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
 "\n"
 msgstr ""
 
-#: ../src/file_convert.c:2091
+#: ../src/file_convert.c:2117
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
@@ -3450,28 +3362,28 @@
 "\n"
 msgstr ""
 
-#: ../src/file_convert.c:2167
+#: ../src/file_convert.c:2193
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
 "\n"
 msgstr ""
 
-#: ../src/file_convert.c:2222
+#: ../src/file_convert.c:2248
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not create directory '%s'.\n"
 "\n"
 msgstr ""
 
-#: ../src/file_convert.c:2356
+#: ../src/file_convert.c:2383
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s' returned exit status %d.\n"
 "\n"
 msgstr ""
 
-#: ../src/file_convert.c:2395
+#: ../src/file_convert.c:2422
 #, c-format
 msgid ""
 "Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -3583,26 +3495,26 @@
 "'%s' を書き込み用に開くことができません。(%s)\n"
 "\n"
 
-#: ../src/file_itunesdb.c:129
+#: ../src/file_itunesdb.c:133
 #, fuzzy, c-format
 msgid "Matching SHA1 checksum for file %d/%d"
 msgstr "MD5 チェックサムの照合中 %d/%d"
 
-#: ../src/file_itunesdb.c:236
+#: ../src/file_itunesdb.c:249
 #, fuzzy, c-format
 msgid "Could not open \"%s\" for reading extended info.\n"
 msgstr "'%s' を開けないため、拡張情報を記録できません。\n"
 
-#: ../src/file_itunesdb.c:243
+#: ../src/file_itunesdb.c:256
 msgid "Could not create hash value from itunesdb\n"
 msgstr "itunesdb からハッシュ値を読み込めませんでした。\n"
 
-#: ../src/file_itunesdb.c:259
+#: ../src/file_itunesdb.c:272
 #, c-format
 msgid "Error while reading extended info: %s\n"
 msgstr "拡張情報ファイルの読み込み中に以下のエラーが発生しました: %s\n"
 
-#: ../src/file_itunesdb.c:276
+#: ../src/file_itunesdb.c:289
 #, fuzzy, c-format
 msgid ""
 "iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -3615,7 +3527,7 @@
 "ます。\n"
 "\n"
 
-#: ../src/file_itunesdb.c:288
+#: ../src/file_itunesdb.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -3624,7 +3536,7 @@
 "%s:\n"
 "\"itunesdb_hash=\" が書かれているべき箇所に違う内容が書かれています: \"%s\"\n"
 
-#: ../src/file_itunesdb.c:348
+#: ../src/file_itunesdb.c:363
 #, c-format
 msgid ""
 "%s:\n"
@@ -3633,7 +3545,7 @@
 "%s:\n"
 "書式エラー: %s\n"
 
-#: ../src/file_itunesdb.c:393
+#: ../src/file_itunesdb.c:408
 #, fuzzy
 msgid ""
 "No SHA1 checksums on individual tracks are available.\n"
@@ -3650,7 +3562,7 @@
 "にしてください。\n"
 "\n"
 
-#: ../src/file_itunesdb.c:457
+#: ../src/file_itunesdb.c:474
 msgid ""
 "Extended info will not be used. If you have non-transferred tracks,\n"
 "these will be lost.\n"
@@ -3658,15 +3570,15 @@
 "拡張情報は使用されません。iPod本体にまだ転送していない曲の情報は\n"
 "終了時に失われます。\n"
 
-#: ../src/file_itunesdb.c:465
+#: ../src/file_itunesdb.c:482
 msgid "Offline iPod database successfully imported"
 msgstr "オフラインでiPodデータベースを読み込みました"
 
-#: ../src/file_itunesdb.c:468
+#: ../src/file_itunesdb.c:485
 msgid "Local database successfully imported"
 msgstr "ローカルデータベースを読み込みました"
 
-#: ../src/file_itunesdb.c:476
+#: ../src/file_itunesdb.c:493
 #, c-format
 msgid ""
 "Offline iPod database import failed: '%s'\n"
@@ -3675,7 +3587,7 @@
 "オフラインでのiPodデータベースの読み込みに失敗しました: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:480
+#: ../src/file_itunesdb.c:497
 #, c-format
 msgid ""
 "Local database import failed: '%s'\n"
@@ -3684,7 +3596,7 @@
 "ローカルデータベースの読み込みに失敗しました: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:487
+#: ../src/file_itunesdb.c:504
 msgid ""
 "Offline iPod database import failed: \n"
 "\n"
@@ -3692,7 +3604,7 @@
 "オフラインでのiPodデータベースの読み込みに失敗しました\n"
 "\n"
 
-#: ../src/file_itunesdb.c:490
+#: ../src/file_itunesdb.c:507
 msgid ""
 "Local database import failed: \n"
 "\n"
@@ -3700,7 +3612,7 @@
 "ローカルデータベースの読み込みに失敗しました: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:497
+#: ../src/file_itunesdb.c:514
 #, c-format
 msgid ""
 "'%s' does not exist. Import aborted.\n"
@@ -3709,15 +3621,15 @@
 "'%s' は見つかりません。読み込みを中止します。\n"
 "\n"
 
-#: ../src/file_itunesdb.c:520
+#: ../src/file_itunesdb.c:536
 msgid "Extended info will not be used.\n"
 msgstr "拡張情報は使用されません。\n"
 
-#: ../src/file_itunesdb.c:527
+#: ../src/file_itunesdb.c:543
 msgid "iPod Database Successfully Imported"
 msgstr "iPod からデータベースを読み込みました"
 
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:550
 #, c-format
 msgid ""
 "iPod Database Import Failed: '%s'\n"
@@ -3726,7 +3638,7 @@
 "iPod からのデータベースの読み込みに失敗しました: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:540
+#: ../src/file_itunesdb.c:556
 msgid ""
 "iPod Database Import Failed.\n"
 "\n"
@@ -3734,7 +3646,7 @@
 "iPodからのデータベースの読み込みに失敗しました。\n"
 "\n"
 
-#: ../src/file_itunesdb.c:549
+#: ../src/file_itunesdb.c:565
 #, fuzzy, c-format
 msgid ""
 "'%s' (or similar) does not exist. Import aborted.\n"
@@ -3743,40 +3655,50 @@
 "'%s' は見つかりません。読み込みを中止します。\n"
 "\n"
 
-#: ../src/file_itunesdb.c:865
+#: ../src/file_itunesdb.c:886
 #, 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"
+"If you are sure that the iPod is properly mounted at '%s', it may not be "
+"initialized for use. In this case, gtkpod can initialize it for you.\n"
+"\n"
+"Do you want to create the directory structure now?"
 msgstr ""
 
-#: ../src/file_itunesdb.c:1180
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr ""
+
+#: ../src/file_itunesdb.c:892
+#, fuzzy
+msgid "Create directory structure"
+msgstr "再帰的に追加するディレクトリを選択してください"
+
+#: ../src/file_itunesdb.c:1198
 #, c-format
 msgid "Could not open \"%s\" for writing extended info.\n"
 msgstr "'%s' を開けないため、拡張情報を記録できません。\n"
 
-#: ../src/file_itunesdb.c:1195
+#: ../src/file_itunesdb.c:1213
 msgid "Aborted writing of extended info.\n"
 msgstr "拡張情報の書き込みは中止されました。\n"
 
-#: ../src/file_itunesdb.c:1397
+#: ../src/file_itunesdb.c:1415
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: ../src/file_itunesdb.c:1411
+#: ../src/file_itunesdb.c:1429
 #, fuzzy, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
 msgstr "%d%% (残り %d:%02d:%02d)"
 
-#: ../src/file_itunesdb.c:1463
+#: ../src/file_itunesdb.c:1481
 msgid "Status: Deleting File"
 msgstr ""
 
-#: ../src/file_itunesdb.c:1524
+#: ../src/file_itunesdb.c:1542
 #, fuzzy, c-format
 msgid ""
 "Could not remove the following file: '%s'\n"
@@ -3785,7 +3707,7 @@
 "'%s' を書き込み用に開くことができません。(%s)\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1632
+#: ../src/file_itunesdb.c:1651
 #, fuzzy
 msgid ""
 "The following track could not be converted successfully:\n"
@@ -3795,7 +3717,7 @@
 "\n"
 msgstr[0] "以下の%d曲を更新することができませんでした"
 
-#: ../src/file_itunesdb.c:1642
+#: ../src/file_itunesdb.c:1661
 #, fuzzy
 msgid ""
 "The following track could not be transferred successfully:\n"
@@ -3809,34 +3731,35 @@
 #. modal,
 #. gint id,
 #. gboolean modal,
-#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1670 ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
 msgid "Warning"
 msgstr "警告"
 
 #. title
-#: ../src/file_itunesdb.c:1652
+#: ../src/file_itunesdb.c:1671
 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:1715
+#: ../src/file_itunesdb.c:1734
 #, c-format
 msgid "Status: Copying track"
 msgstr ""
 
-#: ../src/file_itunesdb.c:1721
+#: ../src/file_itunesdb.c:1740
 #, c-format
 msgid "Status: Waiting for conversion to complete"
 msgstr ""
 
-#: ../src/file_itunesdb.c:1725
+#: ../src/file_itunesdb.c:1744
 #, c-format
 msgid "Status: Finished transfer"
 msgstr ""
 
-#: ../src/file_itunesdb.c:1770
+#: ../src/file_itunesdb.c:1789
 #, c-format
 msgid ""
 "One track could not be transferred because your iPod is full. Either delete "
@@ -3848,15 +3771,14 @@
 "again."
 msgstr[0] ""
 
-#: ../src/file_itunesdb.c:1852
-#, c-format
+#: ../src/file_itunesdb.c:1871
+#, fuzzy, 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"
+"If you skip storing, you can import the existing database before calling "
+"this function again.\n"
 msgstr ""
 "あなたは既にある iTunesDB ('%s') を読み込まずにこの操作をしています。これは普"
 "通は行わない事であり、今あるデータベースは失われることになります。\n"
@@ -3865,7 +3787,20 @@
 "さい。キャンセルした場合は、既にあるデータベースを取り込んでから再びこの操作"
 "を行うことができます。\n"
 
-#: ../src/file_itunesdb.c:1887
+#: ../src/file_itunesdb.c:1875 ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr ""
+
+#: ../src/file_itunesdb.c:1877 ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr ""
+
+#: ../src/file_itunesdb.c:1878
+#, fuzzy
+msgid "Skip storing"
+msgstr "並べ換え(_S)"
+
+#: ../src/file_itunesdb.c:1909
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -3873,87 +3808,68 @@
 "iPod への同期を行うためには、まず iPod のディレクトリ構造をあらかじめ作成して"
 "おく必要があります。\n"
 
-#: ../src/file_itunesdb.c:1896
+#: ../src/file_itunesdb.c:1918
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr "一部の曲をiPodから削除できませんでした。エクスポートを中断します。"
 
-#: ../src/file_itunesdb.c:1914
+#: ../src/file_itunesdb.c:1936
 #, fuzzy, c-format
 msgid "Now writing database '%s'. Please wait..."
 msgstr "iTunesDBの書き込み中。しばらくお待ちください..."
 
-#: ../src/file_itunesdb.c:1963
+#: ../src/file_itunesdb.c:1985
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "拡張情報ファイルを削除できません: '%s'"
 
-#: ../src/file_itunesdb.c:2070
+#: ../src/file_itunesdb.c:2092
 #, fuzzy, c-format
 msgid "%s: Database saved"
 msgstr "iPodデータベースを保存しました"
 
-#: ../src/file_itunesdb.c:2074
+#: ../src/file_itunesdb.c:2096
 #, c-format
 msgid "%s: Changes saved"
 msgstr ""
 
-#: ../src/fileselection.c:129
+#: ../src/fileselection.c:142 ../src/fileselection.c:583
 msgid "Successfully added files"
 msgstr "ファイルの追加に成功しました"
 
-#: ../src/fileselection.c:131
+#: ../src/fileselection.c:144 ../src/fileselection.c:585
 msgid "Some files were not added successfully"
 msgstr "一部のファイルの追加に失敗しました"
 
-#: ../src/fileselection.c:164 ../src/fileselection.c:305
-#: ../src/fileselection.c:792
+#: ../src/fileselection.c:176 ../src/fileselection.c:276
+#: ../src/fileselection.c:601
 msgid "Please select a playlist or repository before adding tracks."
 msgstr ""
 
-#: ../src/fileselection.c:175 ../src/fileselection.c:314
-#: ../src/fileselection.c:803
+#: ../src/fileselection.c:187 ../src/fileselection.c:285
 msgid "Please load the iPod before adding tracks."
 msgstr ""
 
-#: ../src/fileselection.c:185
+#: ../src/fileselection.c:197
 #, fuzzy, c-format
 msgid "Add files to '%s'"
 msgstr "ファイルを追加する"
 
-#: ../src/fileselection.c:189
+#: ../src/fileselection.c:201
 #, c-format
 msgid "Add files to '%s/%s'"
 msgstr ""
 
 #. Create window title
-#: ../src/fileselection.c:322
+#: ../src/fileselection.c:293
 #, fuzzy, c-format
 msgid "Add playlist files to '%s'"
 msgstr "プレイリストをファイルから読み込んで追加します"
 
 #. Create the file chooser, and handle the response
-#: ../src/fileselection.c:378
+#: ../src/fileselection.c:319
 msgid "Set Cover"
 msgstr "カバーアートを設定"
 
-#: ../src/fileselection.c:816
-#, fuzzy, c-format
-msgid "Add directories to '%s'"
-msgstr "ディレクトリを再帰的に追加する"
-
-#: ../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:1106
-msgid "Cancel"
-msgstr "キャンセル"
-
 #: ../src/flacfile.c:62
 #, fuzzy, c-format
 msgid "'%s' does not appear to be an FLAC audio file.\n"
@@ -3964,7 +3880,7 @@
 msgid "Error retrieving tags for '%s'.\n"
 msgstr "'%s'の書き込み中にエラーが発生しました。\n"
 
-#: ../src/flacfile.c:165
+#: ../src/flacfile.c:193
 #, fuzzy, c-format
 msgid ""
 "Import of '%s' failed: FLAC not supported without the FLAC library. You must "
@@ -3973,7 +3889,7 @@
 "'%s'の読み込みに失敗: m4a/m4p の取り扱いには mp4v2 ライブラリが必要です。"
 "mp4v2 ライブラリを使って gtkpod を再度コンパイルしてください。\n"
 
-#: ../src/flacfile.c:171
+#: ../src/flacfile.c:199
 #, fuzzy, c-format
 msgid ""
 "FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
@@ -4042,212 +3958,124 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: 指定されたオプション `-W %s' は引数を取りません\n"
 
-#: ../src/info.c:383
-msgid "n/c"
-msgstr ""
-
-#: ../src/info.c:388 ../src/info.c:838
-msgid "offline"
-msgstr "オフライン"
-
-#: ../src/info.c:486
-#, c-format
-msgid " P:%d T:%d/%d"
-msgstr ""
-
-#: ../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
-#, fuzzy
-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
-#, fuzzy
-msgid "No iPod or iPod playlist selected"
-msgstr "プレイリストが選択されていません"
-
-#. 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
-#, fuzzy
-msgid "Select mountpoint"
-msgstr "iPodのマウント場所(_P):"
-
-#: ../src/ipod_init.c:359
-#, fuzzy, c-format
-msgid "Error initialising iPod: %s\n"
-msgstr "'%s'の書き込み中にエラーが発生しました。\n"
-
-#: ../src/ipod_init.c:366
-msgid "Error initialising iPod, unknown error\n"
-msgstr ""
-
-#: ../src/ipod_init.c:422
-#, c-format
-msgid "<b>Please select your iPod model at </b><i>%s</i>"
-msgstr ""
-
-#: ../src/ipod_init.c:463
+#: ../src/help.c:48
 msgid ""
-"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:70
-msgid ""
 "© 2002 - 2007\n"
 "Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
 "Corey Donohoe (atmos at atmos dot org)\n"
 msgstr ""
 
-#: ../src/misc.c:74
+#: ../src/help.c:52
 msgid ""
 "Patches were supplied by the following people (list may be incomplete -- "
 "please contact me)\n"
 msgstr ""
 
-#: ../src/misc.c:75
+#: ../src/help.c:53
 msgid "Ramesh Dharan: Multi-Edit (edit tags of several tracks in one run)"
 msgstr ""
 
-#: ../src/misc.c:76
+#: ../src/help.c:54
 msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
 msgstr ""
 
-#: ../src/misc.c:77
+#: ../src/help.c:55
 msgid "Adrian Ulrich: porting of playlist code from mktunes.pl to itunesdb.c"
 msgstr ""
 
-#: ../src/misc.c:78
+#: ../src/help.c:56
 msgid ""
 "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
 "newlines at the end"
 msgstr ""
 
-#: ../src/misc.c:79
+#: ../src/help.c:57
 msgid "Sam Clegg: user defined filenames when exporting tracks from the iPod"
 msgstr ""
 
-#: ../src/misc.c:80
+#: ../src/help.c:58
 msgid "Chris Cutler: automatic creation of various playlist types"
 msgstr ""
 
-#: ../src/misc.c:81
+#: ../src/help.c:59
 msgid ""
 "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
 "dialogue during sync"
 msgstr ""
 
-#: ../src/misc.c:82
+#: ../src/help.c:60
 msgid ""
 "Edward Matteucci: debugging, special playlist creation, most of the volume "
 "normalizing code"
 msgstr ""
 
-#: ../src/misc.c:83
+#: ../src/help.c:61
 msgid "Jens Lautenbach: some optical improvements"
 msgstr ""
 
-#: ../src/misc.c:84
+#: ../src/help.c:62
 msgid "Alex Tribble: iPod eject patch"
 msgstr ""
 
-#: ../src/misc.c:85
+#: ../src/help.c:63
 msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
 msgstr ""
 
-#: ../src/misc.c:86
+#: ../src/help.c:64
 msgid ""
 "Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
 msgstr ""
 
-#: ../src/misc.c:87
+#: ../src/help.c:65
 msgid ""
 "Ero Carrera: Filename validation and quick sync when copying tracks from the "
 "iPod"
 msgstr ""
 
-#: ../src/misc.c:88
+#: ../src/help.c:66
 msgid "Jens Taprogge: Support for LAME's replay gain tag to normalize volume"
 msgstr ""
 
-#: ../src/misc.c:89
+#: ../src/help.c:67
 msgid "Armando Atienza: Support with external playcounts"
 msgstr ""
 
-#: ../src/misc.c:90
+#: ../src/help.c:68
 msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
 msgstr ""
 
-#: ../src/misc.c:91
+#: ../src/help.c:69
 msgid "Jim Hall: Decent INSTALL file"
 msgstr ""
 
-#: ../src/misc.c:92
+#: ../src/help.c:70
 msgid ""
 "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
 "contacts to the iPod"
 msgstr ""
 
 #. J"urgen!
-#: ../src/misc.c:93
+#: ../src/help.c:71
 msgid "Flavio Stanchina: bugfixes"
 msgstr ""
 
-#: ../src/misc.c:94
+#: ../src/help.c:72
 msgid ""
 "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
 "the title"
 msgstr ""
 
-#: ../src/misc.c:95
+#: ../src/help.c:73
 msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
 msgstr ""
 
-#: ../src/misc.c:97
+#: ../src/help.c:75
 msgid ""
 "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
 "tags"
 msgstr ""
 
-#: ../src/misc.c:99
+#: ../src/help.c:77
 msgid ""
 "James Liggett:\n"
 "replacement of old GTK file selection dialogs with new GTK filechooser "
@@ -4255,120 +4083,120 @@
 "refactored user preferences system."
 msgstr ""
 
-#: ../src/misc.c:103
+#: ../src/help.c:81
 msgid "Daniel Kercher: sync scripts for abook and webcalendar"
 msgstr ""
 
-#: ../src/misc.c:105
+#: ../src/help.c:83
 msgid "Clinton Gormley: sync scripts for thunderbird"
 msgstr ""
 
-#: ../src/misc.c:107
+#: ../src/help.c:85
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
 msgstr ""
 
-#: ../src/misc.c:109
+#: ../src/help.c:87
 msgid "Sebastian Scherer: sync script for kNotes"
 msgstr ""
 
-#: ../src/misc.c:111
+#: ../src/help.c:89
 msgid "Nick Piper: sync script for Palm, type-ahead search"
 msgstr ""
 
-#: ../src/misc.c:113
+#: ../src/help.c:91
 msgid "Uwe Hermann: help with support for iPod Video"
 msgstr ""
 
-#: ../src/misc.c:115
+#: ../src/help.c:93
 msgid ""
 "Iain Benson: support for compilation tag in mp3 files and separate display "
 "of compilations in the sort tab."
 msgstr ""
 
-#: ../src/misc.c:116
+#: ../src/help.c:94
 msgid ""
 "Nicolas Chariot: icons of buttons\n"
 "\n"
 msgstr ""
 
-#: ../src/misc.c:118
+#: ../src/help.c:96
 msgid "This program borrows code from the following projects:"
 msgstr ""
 
-#: ../src/misc.c:119
+#: ../src/help.c:97
 msgid ""
 "gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB  (http://"
 "www.gnu.org/software/gnupod/)"
 msgstr ""
 
-#: ../src/misc.c:120
+#: ../src/help.c:98
 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 ""
 
-#: ../src/misc.c:121
+#: ../src/help.c:99
 msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
 msgstr ""
 
-#: ../src/misc.c:122
+#: ../src/help.c:100
 msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
 msgstr ""
 
-#: ../src/misc.c:124
+#: ../src/help.c:102
 msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
 msgstr ""
 
-#: ../src/misc.c:128
+#: ../src/help.c:106
 msgid "French: David Le Brun (david at dyn-ns dot net)"
 msgstr ""
 
-#: ../src/misc.c:129
+#: ../src/help.c:107
 msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
 msgstr ""
 
-#: ../src/misc.c:130
+#: ../src/help.c:108
 msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
 msgstr ""
 
-#: ../src/misc.c:131
+#: ../src/help.c:109
 msgid "German: Kai-Ove"
 msgstr ""
 
-#: ../src/misc.c:132
+#: ../src/help.c:110
 msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
 msgstr ""
 
-#: ../src/misc.c:133
+#: ../src/help.c:111
 msgid ""
 "Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
 msgstr ""
 
-#: ../src/misc.c:134
+#: ../src/help.c:112
 msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
 msgstr ""
 
-#: ../src/misc.c:135
+#: ../src/help.c:113
 msgid "Japanese: Ayako Sano"
 msgstr ""
 
-#: ../src/misc.c:136
+#: ../src/help.c:114
 msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
 msgstr ""
 
-#: ../src/misc.c:137
+#: ../src/help.c:115
 msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
 msgstr ""
 
-#: ../src/misc.c:138
+#: ../src/help.c:116
 msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
 msgstr ""
 
-#: ../src/misc.c:139
+#: ../src/help.c:117
 msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
 msgstr ""
 
-#: ../src/misc.c:144
+#: ../src/help.c:122
 #, fuzzy
 msgid ""
 "This program is free software; you can redistribute it and/or\n"
@@ -4402,49 +4230,209 @@
 "\n"
 "\n"
 
-#: ../src/misc.c:159
+#: ../src/help.c:137
 msgid ""
 "© 2002-2007\n"
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
 "Corey Donohoe <atmos at atmos.org>"
 msgstr ""
 
-#: ../src/misc.c:167
+#: ../src/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr ""
+
+#: ../src/help.c:143 ../src/help.c:148
 msgid "Cross-platform multilingual interface to Apple's iPod™"
 msgstr ""
 
-#: ../src/misc.c:934
+#: ../src/info.c:359 ../src/infodlg.c:190
+msgid "n/c"
+msgstr ""
+
+#: ../src/info.c:364 ../src/info.c:852 ../src/infodlg.c:193
+msgid "offline"
+msgstr "オフライン"
+
+#: ../src/info.c:500
+#, c-format
+msgid " P:%d T:%d/%d"
+msgstr ""
+
+#: ../src/info.c:794
+msgid "B"
+msgstr ""
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr ""
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr ""
+
+#: ../src/info.c:837
+#, c-format
+msgid " %s Free"
+msgstr "%s 空き"
+
+#: ../src/info.c:842
+#, c-format
+msgid " %s Pending"
+msgstr "%s 不足"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr "未接続"
+
+#: ../src/info.c:898
+#, fuzzy
+msgid "No database or playlist selected"
+msgstr "プレイリストが選択されていません"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "曲が選択されていません。"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "プレイリストが選択されていません"
+
+#: ../src/info.c:913
+#, fuzzy
+msgid "No iPod or iPod playlist selected"
+msgstr "プレイリストが選択されていません"
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"合計\n"
+"(iPod)"
+
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"合計\n"
+"(ローカル)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"選択された\n"
+"プレイリスト"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"表示され\n"
+"ている曲"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"選択され\n"
+"ている曲"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "曲数"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "ファイルサイズ"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "プレイリストの数"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "削除された曲"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "削除されたファイルサイズ"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "未転送の曲数"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "未転送のファイルサイズ"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "空き容量"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr ""
+
+#: ../src/ipod_init.c:81 ../src/repository.c:560 ../src/repository.c:2374
+#, fuzzy
+msgid "Select mountpoint"
+msgstr "iPodのマウント場所(_P):"
+
+#: ../src/ipod_init.c:362
 #, fuzzy, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "'%s'の書き込み中にエラーが発生しました。\n"
+
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr ""
+
+#: ../src/ipod_init.c:425
+#, c-format
+msgid "<b>Please select your iPod model at </b><i>%s</i>"
+msgstr ""
+
+#: ../src/ipod_init.c:466
+msgid ""
+"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:864
+#, fuzzy, c-format
 msgid "Could not process '%s' (no filename available)"
 msgstr "ファイル名がわかりません"
 
-#: ../src/misc.c:1088
+#: ../src/misc.c:1101
 #, c-format
-msgid "Unknown token '%%%c' in template '%s'"
-msgstr "未知のトークン '%%%c' がテンプレート '%s' 中にあります"
-
-#: ../src/misc.c:1171
-#, c-format
 msgid "Template ('%s') does not match file type '%s'\n"
 msgstr "テンプレート ('%s') がファイル形式 '%s' に合いません。\n"
 
-#: ../src/misc.c:1257
+#: ../src/misc.c:1187
 #, c-format
 msgid "Error creating %s: %s\n"
 msgstr "'%s'の作成に失敗: %s\n"
 
-#: ../src/misc.c:1691
+#: ../src/misc.c:1642
 #, c-format
 msgid ""
 "Writing preferences file '%s' failed (%s).\n"
 "\n"
 msgstr ""
 
-#: ../src/misc.c:1693
+#: ../src/misc.c:1644
 msgid "unspecified error"
 msgstr ""
 
-#: ../src/misc.c:1701
+#: ../src/misc.c:1652
 #, c-format
 msgid ""
 "Writing preferences to the iPod (%s) failed: could not get path to Control "
@@ -4458,7 +4446,7 @@
 msgid "The following has occurred:"
 msgstr "以下の問題が発生しました:"
 
-#: ../src/misc_confirm.c:122
+#: ../src/misc_confirm.c:156
 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 "
@@ -4471,12 +4459,12 @@
 "以下の曲を iPod から完全に削除しても本当によろしいですか? 括弧の中の数字は、"
 "この曲がいくつのプレイリストに登録されているかを示しています。"
 
-#: ../src/misc_confirm.c:126
+#: ../src/misc_confirm.c:160
 msgid "Delete Track Completely from iPod?"
 msgid_plural "Delete Tracks Completely from iPod?"
 msgstr[0] "iPod から完全に削除しますか?"
 
-#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#: ../src/misc_confirm.c:171 ../src/misc_confirm.c:212
 #, c-format
 msgid ""
 "Are you sure you want to remove the following track from the playlist \"%s\"?"
@@ -4485,12 +4473,12 @@
 "\"?"
 msgstr[0] "以下の曲をプレイリスト \"%s\" から削除してもよろしいですか?"
 
-#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+#: ../src/misc_confirm.c:175 ../src/misc_confirm.c:216
 msgid "Remove Track From Playlist?"
 msgid_plural "Remove Tracks From Playlist?"
 msgstr[0] "これら曲をプレイリストから削除しますか?"
 
-#: ../src/misc_confirm.c:163
+#: ../src/misc_confirm.c:197
 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 "
@@ -4503,12 +4491,12 @@
 "以下の曲をハードディスクから完全に削除してもよろしいですか? 括弧の中の数字"
 "は、この曲がいくつのプレイリストに登録されているかを示しています。"
 
-#: ../src/misc_confirm.c:167
+#: ../src/misc_confirm.c:201
 msgid "Delete Track from Harddisk?"
 msgid_plural "Delete Tracks from Harddisk?"
 msgstr[0] "これらの曲をハードディスクから削除しますか?"
 
-#: ../src/misc_confirm.c:192
+#: ../src/misc_confirm.c:226
 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 "
@@ -4521,83 +4509,83 @@
 "以下の曲をローカルのデータベースから完全に削除してもよろしいですか? 括弧の中"
 "の数字は、これらの曲がいくつのプレイリストに登録されているかを示しています。"
 
-#: ../src/misc_confirm.c:196
+#: ../src/misc_confirm.c:230
 msgid "Remove Track from Local Database?"
 msgid_plural "Remove Tracks from Local Database?"
 msgstr[0] "これらの曲をローカルのデータベースから削除しますか?"
 
-#: ../src/misc_confirm.c:261
+#: ../src/misc_confirm.c:295
 #, c-format
 msgid "Deleted one track completely from iPod"
 msgid_plural "Deleted %d tracks completely from iPod"
 msgstr[0] "iPodから%d曲完全に削除しました"
 
-#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#: ../src/misc_confirm.c:301 ../src/misc_confirm.c:325
 #, c-format
 msgid "Deleted %d track from playlist '%s'"
 msgid_plural "Deleted %d tracks from playlist '%s'"
 msgstr[0] "プレイリスト '%2$s' から %1$d 曲削除しました"
 
-#: ../src/misc_confirm.c:285
+#: ../src/misc_confirm.c:319
 #, c-format
 msgid "Deleted one track from harddisk"
 msgid_plural "Deleted %d tracks from harddisk"
 msgstr[0] "ハードディスクから%d曲削除しました"
 
-#: ../src/misc_confirm.c:297
+#: ../src/misc_confirm.c:331
 #, c-format
 msgid "Deleted track from local database"
 msgid_plural "Deleted %d tracks from local database"
 msgstr[0] "ローカルデータベースから%d曲削除しました"
 
-#: ../src/misc_confirm.c:442
+#: ../src/misc_confirm.c:476
 msgid "Cannot remove entry 'All'"
 msgstr "'すべて' の項目を削除することはできません"
 
-#: ../src/misc_confirm.c:536
+#: ../src/misc_confirm.c:570
 #, c-format
 msgid "Removed all %d tracks from the iPod"
 msgstr "全%d曲を iPod から削除しました"
 
-#: ../src/misc_confirm.c:541
+#: ../src/misc_confirm.c:575
 #, c-format
 msgid "Removed all podcasts from the iPod"
 msgstr "すべての Podcast を iPod から削除しました"
 
-#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#: ../src/misc_confirm.c:584 ../src/misc_confirm.c:658
 #, c-format
 msgid "Deleted playlist '%s' including %d member track"
 msgid_plural "Deleted playlist '%s' including %d member tracks"
 msgstr[0] "プレイリスト '%s' (%d曲) を削除しました"
 
 #. first use playlist name
-#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#: ../src/misc_confirm.c:600 ../src/misc_confirm.c:674
 #, c-format
 msgid "Deleted playlist '%s'"
 msgstr "プレイリスト '%s' を削除"
 
-#: ../src/misc_confirm.c:600
+#: ../src/misc_confirm.c:634
 #, 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曲) を削除しました"
 
-#: ../src/misc_confirm.c:617
+#: ../src/misc_confirm.c:651
 #, c-format
 msgid "Removed all %d tracks from the database"
 msgstr "データベースから全%d曲を削除しました"
 
-#: ../src/misc_confirm.c:695
+#: ../src/misc_confirm.c:729
 #, c-format
 msgid "Are you sure you want to remove all tracks from your iPod?"
 msgstr "iPod のすべての曲を削除しても本当によろしいですか?"
 
-#: ../src/misc_confirm.c:700
+#: ../src/misc_confirm.c:734
 #, c-format
 msgid "Are you sure you want to remove all podcasts from your iPod?"
 msgstr "すべての Podcast を iPod から削除しても本当によろしいですか?"
 
-#: ../src/misc_confirm.c:708
+#: ../src/misc_confirm.c:742
 #, fuzzy, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and the following track "
@@ -4612,12 +4600,12 @@
 "しいですか? 括弧の中の数字は、それぞれの曲がいくつのプレイリストに登録されて"
 "いるかを示しています。"
 
-#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#: ../src/misc_confirm.c:753 ../src/misc_confirm.c:808
 #, c-format
 msgid "Are you sure you want to delete the playlist '%s'?"
 msgstr "プレイリスト '%s' を本当に削除してもいいですか?"
 
-#: ../src/misc_confirm.c:745
+#: ../src/misc_confirm.c:779
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4632,12 +4620,12 @@
 "当によろしいですか? 括弧の中の数字は、それぞれの曲がいくつのプレイリストに登"
 "録されているかを示しています。"
 
-#: ../src/misc_confirm.c:753
+#: ../src/misc_confirm.c:787
 #, c-format
 msgid "Are you sure you want to remove all tracks from the database?"
 msgstr "データベースからすべての曲を削除しても本当によろしいですか?"
 
-#: ../src/misc_confirm.c:762
+#: ../src/misc_confirm.c:796
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4652,14 +4640,22 @@
 "によろしいですか? 括弧の中の数字は、それぞれの曲がいくつのプレイリストに登録"
 "されているかを示しています。"
 
-#: ../src/misc_confirm.c:841
+#: ../src/misc_confirm.c:869
 msgid ""
-"Data has been changed and not been saved.\n"
-"OK to exit gtkpod?"
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
+"changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
 msgstr ""
-"変更のあったデータはセーブされていません。\n"
-"本当に終了しますか?"
 
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr ""
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr ""
+
 #: ../src/misc_conversion.c:66
 msgid "File type"
 msgstr "ファイル形式"
@@ -4824,53 +4820,57 @@
 msgid "Gapless Track Flag"
 msgstr ""
 
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
+msgstr ""
+
+#: ../src/misc_conversion.c:127
 msgid "Name of file on PC, if available"
 msgstr "PC 上でのファイル名 (登録されている場合)"
 
-#: ../src/misc_conversion.c:127
+#: ../src/misc_conversion.c:128
 msgid "Name of file on the iPod"
 msgstr "iPod 上でのファイル名"
 
 #. 10
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
 msgid "Track Nr. and total number of tracks on CD"
 msgstr "曲番号および CD の総曲数"
 
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:131
 msgid "Whether the file has already been transferred to the iPod or not"
 msgstr "このファイルが iPod に転送済みかどうかを示す"
 
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:137
 msgid "Beats per minute"
 msgstr ""
 
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
 msgid "Number of times the track has been played"
 msgstr "曲が演奏された回数"
 
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
 msgid "Star rating from 0 to 5"
 msgstr "評価 (0から5)"
 
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
 msgid "Date and time track has been added"
 msgstr "登録されたときの日付と時刻"
 
 #. 20
-#: ../src/misc_conversion.c:140
+#: ../src/misc_conversion.c:141
 msgid "Date and time track has last been played"
 msgstr "最後に演奏されたときの日付と時刻"
 
-#: ../src/misc_conversion.c:141
+#: ../src/misc_conversion.c:142
 msgid "Date and time track has last been modified"
 msgstr "最後に変更されたときの日付と時刻"
 
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:143
 msgid "Manual volume adjust"
 msgstr "音量の調整値"
 
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:144
 msgid ""
 "Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
 "the iPod"
@@ -4879,91 +4879,96 @@
 "ります"
 
 #. 25
-#: ../src/misc_conversion.c:146
+#: ../src/misc_conversion.c:147
 msgid "CD Nr. and total number of CDS in set"
 msgstr "CD 番号と、セットに含まれる CD の総枚数"
 
-#: ../src/misc_conversion.c:149
+#: ../src/misc_conversion.c:150
 msgid ""
 "The category (e.g. 'Technology' or 'Music') where the podcast was located."
 msgstr "Podcast のカテゴリ (例: '技術系' や '音楽')"
 
-#: ../src/misc_conversion.c:150
+#: ../src/misc_conversion.c:151
 msgid "Accessible by selecting the center button on the iPod."
 msgstr "iPod の真中のボタンを押すと見ることができる"
 
-#: ../src/misc_conversion.c:154
+#: ../src/misc_conversion.c:155
 msgid "Release date (for podcasts displayed next to the title on the iPod)"
 msgstr "公開日 (Podcast 用。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
+#: ../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 ../src/misc_conversion.c:174
 #, fuzzy
 msgid "Used for sorting on the iPod"
 msgstr "iPod 上でのファイル名"
 
-#: ../src/misc_conversion.c:735
+#: ../src/misc_conversion.c:737
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the file scheme"
 msgstr "指定されたURI '%s' は file スキームが設定されていない、不完全なURIです"
 
-#: ../src/misc_conversion.c:745
+#: ../src/misc_conversion.c:747
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "ローカルファイルを指すURI '%s' には '#' は含まれてはなりません"
 
-#: ../src/misc_conversion.c:762
+#: ../src/misc_conversion.c:764
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "指定されたURI '%s' は不正です"
 
-#: ../src/misc_conversion.c:774
+#: ../src/misc_conversion.c:776
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "指定されたURI '%s' のホスト名が不正です"
 
-#: ../src/misc_conversion.c:790
+#: ../src/misc_conversion.c:792
 #, 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:429
+#: ../src/misc_playlist.c:71 ../src/misc_playlist.c:108
+#, fuzzy
+msgid "Please load the iPod before adding playlists."
+msgstr "新しいプレイリストの名前を入力してください"
+
+#: ../src/misc_playlist.c:77 ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
 msgid "Please enter a name for the new playlist"
 msgstr "新しいプレイリストの名前を入力してください"
 
-#: ../src/misc_playlist.c:154
+#: ../src/misc_playlist.c:174
 msgid "AR:"
 msgstr ""
 
-#: ../src/misc_playlist.c:157
+#: ../src/misc_playlist.c:177
 msgid "AL:"
 msgstr ""
 
-#: ../src/misc_playlist.c:160
+#: ../src/misc_playlist.c:180
 msgid "GE:"
 msgstr ""
 
-#: ../src/misc_playlist.c:163
+#: ../src/misc_playlist.c:183
 msgid "CO:"
 msgstr ""
 
-#: ../src/misc_playlist.c:166
+#: ../src/misc_playlist.c:186
 msgid "YE:"
 msgstr ""
 
-#: ../src/misc_playlist.c:194
+#: ../src/misc_playlist.c:214
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/misc_playlist.c:272
+#: ../src/misc_playlist.c:292
 #, c-format
 msgid "Random (%d)"
 msgstr "ランダム (%d)"
 
-#: ../src/misc_playlist.c:297
+#: ../src/misc_playlist.c:317
 msgid ""
 "Auto Store of track view disabled.\n"
 "\n"
@@ -4971,97 +4976,108 @@
 "曲順の自動保存が無効になっています。\n"
 "\n"
 
-#: ../src/misc_playlist.c:356
+#: ../src/misc_playlist.c:376
 msgid "Not Listed"
 msgstr "リストに載ってない曲"
 
-#: ../src/misc_playlist.c:406
+#: ../src/misc_playlist.c:426
 #, c-format
 msgid "Created playlist '%s' with %d track."
 msgid_plural "Created playlist '%s' with %d tracks."
 msgstr[0] "新しくプレイリスト'%s'(%d曲)を作成しました"
 
 #. n==0
-#: ../src/misc_playlist.c:417
+#: ../src/misc_playlist.c:437
 msgid "No tracks available, playlist not created"
 msgstr "曲が見付からないので、プレイリストは作れません"
 
-#: ../src/misc_playlist.c:543
+#: ../src/misc_playlist.c:563
 #, c-format
 msgid "Most Listened (%d)"
 msgstr "良く聴く曲 (%d)"
 
-#: ../src/misc_playlist.c:584
+#: ../src/misc_playlist.c:604
 #, c-format
 msgid "Never Listened"
 msgstr "聴いたことがない曲"
 
-#: ../src/misc_playlist.c:624
+#: ../src/misc_playlist.c:644
 #, c-format
 msgid "Best Rated (%d)"
 msgstr "評価の高い曲 (%d)"
 
-#: ../src/misc_playlist.c:666
+#: ../src/misc_playlist.c:686
 msgid "Unrated tracks"
 msgstr "未評価の曲"
 
-#: ../src/misc_playlist.c:671
+#: ../src/misc_playlist.c:691
 #, c-format
 msgid "Rated %d"
 msgstr "評価された曲 (%d)"
 
-#: ../src/misc_playlist.c:714
+#: ../src/misc_playlist.c:734
 #, c-format
 msgid "Recent (%d)"
 msgstr "最近聴いた曲 (%d)"
 
-#: ../src/misc_playlist.c:753
+#: ../src/misc_playlist.c:773
 msgid "Last Time"
 msgstr "前回以降"
 
-#: ../src/misc_playlist.c:844
+#: ../src/misc_playlist.c:864
 msgid "Removal of dangling tracks with no files on PC was canceled."
 msgstr ""
 
-#: ../src/misc_playlist.c:854
+#: ../src/misc_playlist.c:874
 msgid "Handling of dangling tracks with files on PC was canceled."
 msgstr ""
 
-#: ../src/misc_playlist.c:882
+#: ../src/misc_playlist.c:902
 msgid "Dangling tracks with no files on PC were removed."
 msgstr ""
 
-#: ../src/misc_playlist.c:943
+#: ../src/misc_playlist.c:963
 msgid "Dangling tracks with files on PC were handled."
 msgstr ""
 
-#: ../src/misc_playlist.c:976
+#: ../src/misc_playlist.c:996
 msgid "Track"
 msgstr "曲"
 
-#: ../src/misc_playlist.c:1019
+#: ../src/misc_playlist.c:1035
+#, fuzzy
 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"
+"If you abort the operation, you can import the existing database before "
+"calling this function again.\n"
 msgstr ""
+"あなたは既にある iTunesDB ('%s') を読み込まずにこの操作をしています。これは普"
+"通は行わない事であり、今あるデータベースは失われることになります。\n"
+"\n"
+"もしそれでもよければ、'OK' を、保存を取り止めるなら 'キャンセル' を押してくだ"
+"さい。キャンセルした場合は、既にあるデータベースを取り込んでから再びこの操作"
+"を行うことができます。\n"
 
-#: ../src/misc_playlist.c:1033
+#: ../src/misc_playlist.c:1042
+#, fuzzy
+msgid "Abort operation"
+msgstr "ソートの設定"
+
+#: ../src/misc_playlist.c:1056
 msgid "Creating a tree of known files"
 msgstr ""
 
-#: ../src/misc_playlist.c:1077
+#: ../src/misc_playlist.c:1100
 msgid "Checking iPOD files against known files in DB"
 msgstr ""
 
-#: ../src/misc_playlist.c:1120
+#: ../src/misc_playlist.c:1143
 msgid "Orphaned"
 msgstr ""
 
-#: ../src/misc_playlist.c:1147
+#: ../src/misc_playlist.c:1170
 #, c-format
 msgid ""
 "The following orphaned file had already been added to the iPod again. It "
@@ -5070,12 +5086,12 @@
 "\n"
 msgstr ""
 
-#: ../src/misc_playlist.c:1175
+#: ../src/misc_playlist.c:1198
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Processing..."
 msgstr ""
 
-#: ../src/misc_playlist.c:1199
+#: ../src/misc_playlist.c:1222
 #, c-format
 msgid ""
 "The following dangling track has a file on PC.\n"
@@ -5088,7 +5104,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/misc_playlist.c:1204
+#: ../src/misc_playlist.c:1227
 #, c-format
 msgid ""
 "The following dangling track doesn't have file on PC. \n"
@@ -5101,11 +5117,11 @@
 
 #. we want unique window for each
 #. gboolean modal,
-#: ../src/misc_playlist.c:1211
+#: ../src/misc_playlist.c:1234
 msgid "Dangling Tracks"
 msgstr ""
 
-#: ../src/misc_playlist.c:1234
+#: ../src/misc_playlist.c:1257
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Done."
 msgstr ""
@@ -5138,73 +5154,73 @@
 msgid "Duplicate detection"
 msgstr "重複の検出"
 
-#: ../src/misc_track.c:1339
+#: ../src/misc_track.c:1347
 msgid "Local Database"
 msgstr ""
 
 #. artwork is set
-#: ../src/misc_track.c:1350
+#: ../src/misc_track.c:1358
 msgid "Embedded or filename was lost"
 msgstr ""
 
-#: ../src/misc_track.c:1354
+#: ../src/misc_track.c:1362
 #, fuzzy
 msgid "Artwork not set"
 msgstr "が設定されていない"
 
-#: ../src/misc_track.c:1816
+#: ../src/misc_track.c:1836
 #, fuzzy, c-format
 msgid "Could not find source file for '%s'. Track not copied."
 msgstr "iPod 上の '%s' に相当するファイルが見つかりません\n"
 
-#: ../src/misc_track.c:2052
+#: ../src/misc_track.c:2072
 #, c-format
 msgid "drag and drop: ignored '%s'\n"
 msgstr "ドラッグアンドドロップ: '%s'は無視します\n"
 
-#: ../src/mp3file.c:1336
+#: ../src/mp3file.c:1344
 #, fuzzy, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "'%s'の作成に失敗: %s\n"
 
-#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
-#: ../src/mp3file.c:2733
+#: ../src/mp3file.c:1368 ../src/mp3file.c:1552 ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870 ../src/mp3file.c:2929 ../src/mp3file.c:2956
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "ファイル '%s' を開く際にエラーが発生しました。 (%s)\n"
 
-#: ../src/mp3file.c:1688
+#: ../src/mp3file.c:1793 ../src/mp3file.c:2993
 #, fuzzy, 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
+#: ../src/mp3file.c:2907
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "ファイル \"%s\" は長さが0なので無視します。\n"
 
-#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#: ../src/mp4file.c:243 ../src/mp4file.c:475
 #, fuzzy, 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
+#: ../src/mp4file.c:253 ../src/mp4file.c:485
 #, 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
+#: ../src/mp4file.c:607
 #, c-format
 msgid "'%s' does not appear to be a mp4 audio file.\n"
 msgstr "'%s' は mp4 オーディオファイルとは認識できません。\n"
 
-#: ../src/mp4file.c:540
+#: ../src/mp4file.c:618
 #, 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
+#: ../src/mp4file.c:631
 #, fuzzy, c-format
 msgid ""
 "Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5213,7 +5229,7 @@
 "'%s'の読み込みに失敗: m4a/m4p の取り扱いには mp4v2 ライブラリが必要です。"
 "mp4v2 ライブラリを使って gtkpod を再度コンパイルしてください。\n"
 
-#: ../src/mp4file.c:559
+#: ../src/mp4file.c:637
 #, fuzzy, c-format
 msgid ""
 "m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5224,7 +5240,7 @@
 "リが必要です。mp4v2 ライブラリを使って gtkpod を再度コンパイルしてくださ"
 "い。\n"
 
-#: ../src/mp4file.c:565
+#: ../src/mp4file.c:643
 #, fuzzy, c-format
 msgid ""
 "m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5259,161 +5275,142 @@
 "リが必要です。mp4v2 ライブラリを使って gtkpod を再度コンパイルしてくださ"
 "い。\n"
 
-#: ../src/prefs.c:357
+#: ../src/prefs.c:365
 #, c-format
 msgid "gtkpod version %s usage:\n"
 msgstr "gtkpod version %s 使い方:\n"
 
-#: ../src/prefs.c:358
+#: ../src/prefs.c:366
 msgid "  -h, --help:   display this message\n"
 msgstr "  -h, --help:   このヘルプを表示します\n"
 
-#: ../src/prefs.c:359
+#: ../src/prefs.c:367
 msgid "  -p <file>:    increment playcount for file by one\n"
 msgstr ""
 
-#: ../src/prefs.c:360
+#: ../src/prefs.c:368
 msgid "  --hash <file>:print gtkpod hash for file\n"
 msgstr ""
 
-#: ../src/prefs.c:361
+#: ../src/prefs.c:369
 msgid "  -m path:      define the mountpoint of your iPod\n"
 msgstr "  -m path:      iPodのマウントポイントを指定します\n"
 
-#: ../src/prefs.c:362
+#: ../src/prefs.c:370
 msgid "  --mountpoint: same as '-m'.\n"
 msgstr "  --mountpoint: '-m'と同じ\n"
 
-#: ../src/prefs.c:363
+#: ../src/prefs.c:371
 msgid "  -a:           import database automatically after start.\n"
 msgstr "  -a:           起動時にデータベースを自動的に読み込みます\n"
 
-#: ../src/prefs.c:364
+#: ../src/prefs.c:372
 msgid "  --auto:       same as '-a'.\n"
 msgstr "  --auto:       '-a'と同じ\n"
 
-#: ../src/prefs.c:561
-#, c-format
-msgid "Couldn't create ~/.gtkpod\n"
-msgstr ""
+#: ../src/prefs.c:569
+#, fuzzy, c-format
+msgid "Couldn't create '%s'\n"
+msgstr "次のファイルのタグを変更できません: %s\n"
 
-#: ../src/prefs_window.c:133
-msgid "Please select command for 'Play Now'"
-msgstr ""
+#: ../src/prefsdlg.c:51
+#, fuzzy
+msgid "Hide"
+msgstr "表示(_V)"
 
-#: ../src/prefs_window.c:134
-msgid "Please select command for 'Enqueue'"
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
 msgstr ""
 
-#: ../src/prefs_window.c:135
-msgid "Please select the mp3gain executable"
+#: ../src/prefsdlg.c:53
+msgid "Text only"
 msgstr ""
 
-#: ../src/prefs_window.c:136
-msgid "Please select the aacgain executable"
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
 msgstr ""
 
-#: ../src/prefs_window.c:137
-msgid "Select the mserv music root directory"
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
 msgstr ""
 
-#: ../src/prefs_window.c:138
-msgid "Select the mserv trackinfo root directory"
-msgstr ""
-
-#: ../src/prefs_window.c:139
-msgid "Select the ogg/vorbis converter command"
-msgstr ""
-
-#: ../src/prefs_window.c:140
-msgid "Select the flac converter command"
-msgstr ""
-
-#: ../src/prefs_window.c:141
-msgid "Select the m4a converter command."
-msgstr ""
-
-#: ../src/prefs_window.c:142
-msgid "Select the mp3 converter command."
-msgstr ""
-
-#: ../src/prefs_window.c:143
-msgid "Select the wav converter command."
-msgstr ""
-
-#: ../src/prefs_window.c:201 ../src/repository.c:662
-#, c-format
+#: ../src/repository.c:527
+#, 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 ""
+"Are you sure you want to delete repository \"%s\"? This action cannot be "
+"undone!"
+msgstr "プレイリスト '%s' を本当に削除してもいいですか?"
 
-#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
-msgid "Preferences not updated"
-msgstr "設定は更新されません"
+#: ../src/repository.c:531
+#, fuzzy
+msgid "Delete repository?"
+msgstr "iPodから削除"
 
-#: ../src/prefs_window.c:1232
-msgid "Preferences applied"
-msgstr "設定を適用しました"
-
-#: ../src/repository.c:573 ../src/repository.c:2395
+#: ../src/repository.c:587 ../src/repository.c:2400
 msgid "Set backup file"
 msgstr ""
 
-#: ../src/repository.c:612
+#: ../src/repository.c:626
 #, fuzzy
 msgid "Select directory for synchronization"
 msgstr "再帰的に追加するディレクトリを選択してください"
 
-#: ../src/repository.c:638
+#: ../src/repository.c:652
 msgid "Please select command to sync contacts"
 msgstr ""
 
-#: ../src/repository.c:644
+#: ../src/repository.c:658
 msgid "Please select command to sync calendar"
 msgstr ""
 
-#: ../src/repository.c:650
+#: ../src/repository.c:664
 msgid "Please select command to sync notes"
 msgstr ""
 
-#: ../src/repository.c:729
+#: ../src/repository.c:676
+#, 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 ""
+
+#: ../src/repository.c:743
 #, fuzzy
 msgid "Smart playlist updated."
 msgstr "スマートプレイリスト"
 
-#: ../src/repository.c:1190
+#: ../src/repository.c:1204
 #, fuzzy
 msgid "Podcasts Repository"
 msgstr "iPodから削除"
 
-#: ../src/repository.c:1194
+#: ../src/repository.c:1208
 #, fuzzy
 msgid "Local Repository"
 msgstr "iPodから削除"
 
-#: ../src/repository.c:1348
+#: ../src/repository.c:1358
 #, fuzzy
 msgid "Master Playlist"
 msgstr "...マスタープレイリスト"
 
-#: ../src/repository.c:1352
+#: ../src/repository.c:1362
 #, fuzzy
 msgid "Podcasts Playlist"
 msgstr "スマートプレイリスト"
 
-#: ../src/repository.c:1360
+#: ../src/repository.c:1370
 #, fuzzy
 msgid "Regular Playlist"
 msgstr "スマートプレイリスト"
 
-#: ../src/repository.c:2423
+#: ../src/repository.c:2428
 #, fuzzy
 msgid "Set local repository file"
 msgstr "iPodから削除"
 
-#: ../src/repository.c:2522
+#: ../src/repository.c:2526
 #, fuzzy
 msgid "New Repository"
 msgstr "iPodから削除"
@@ -5427,19 +5424,32 @@
 msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
 msgstr "'%s' を開けないため、MD5 チェックサムが計算できません: %s\n"
 
-#: ../src/syncdir.c:237
+#: ../src/sort_window.c:237
+#, fuzzy
+msgid "No sorting"
+msgstr "並べ換え(_S)"
+
+#: ../src/sort_window.c:271
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr ""
+"表のヘッダを操作しても並べ換えはできますが, この機能を使うと表示されていない"
+"項目を使って並べ換えることができます."
+
+#: ../src/syncdir.c:246
 #, c-format
 msgid "Sync summary for %s/%s\n"
 msgstr ""
 
-#: ../src/syncdir.c:246
+#: ../src/syncdir.c:255
 #, 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曲を更新しました"
 
-#: ../src/syncdir.c:255
+#: ../src/syncdir.c:264
 #, fuzzy
 msgid "The following track has been completely removed from the iPod:\n"
 msgid_plural ""
@@ -5447,23 +5457,23 @@
 msgstr[0] "以下の曲を更新しました"
 msgstr[1] "以下の%d曲を更新しました"
 
-#: ../src/syncdir.c:264
+#: ../src/syncdir.c:273
 #, 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曲が削除されました。"
 
-#: ../src/syncdir.c:271
+#: ../src/syncdir.c:280
 #, 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曲はマスタープレイリストに追加されませんでした。"
 
-#: ../src/syncdir.c:277
+#: ../src/syncdir.c:286
 msgid "Nothing was changed.\n"
 msgstr ""
 
-#: ../src/syncdir.c:282
+#: ../src/syncdir.c:291
 msgid "Sync summary"
 msgstr ""
 
@@ -5565,10 +5575,434 @@
 msgstr ""
 
 #, fuzzy
-#~ msgid "<b>Resolution:</b>"
+#~ msgid "GtkPod"
+#~ msgstr "gtkpod"
+
+#~ msgid "...as icons"
+#~ msgstr "アイコンのみ"
+
+#~ msgid "...as text"
+#~ msgstr "テキストのみ"
+
+#~ msgid "...both as icons and text"
+#~ msgstr "アイコンとテキスト"
+
+#~ msgid "...entry 'All' in sort tab..."
+#~ msgstr "...以下のソートタブ内の「すべて」の項目"
+
+#~ msgid "...master playlist"
+#~ msgstr "...マスタープレイリスト"
+
+#~ msgid "<b>Adding/Updating/Syncing</b>"
+#~ msgstr "<b>登録/更新/同期</b>"
+
+#, fuzzy
+#~ msgid "<b>Audioscrobbler</b>"
+#~ msgstr "<b>ツールバー</b>"
+
+#~ msgid "<b>Automatically select...</b>"
+#~ msgstr "<b>自動的に選択...</b>"
+
+#~ msgid "<b>Misc</b>"
+#~ msgstr "<b>その他</b>"
+
+#, fuzzy
+#~ msgid "<b>Repositories</b>"
 #~ msgstr "<b>ツールチップ</b>"
 
+#~ msgid "<b>Tag Reading</b>"
+#~ msgstr "<b>タグの読み込み</b>"
+
+#, fuzzy
+#~ msgid "<b>Track Attributes</b>"
+#~ msgstr "<b>表示する曲属性</b>"
+
+#~ msgid "About gtkpod"
+#~ msgstr "gtkpod について"
+
+#~ msgid "Always write ID3v2.4 tags (only applies to MP3)"
+#~ msgstr "常に ID3v2.4 タグを書き込む (MP3 のみ)"
+
 #~ msgid ""
+#~ "As a last resort set the following tags to the\n"
+#~ "filename if they are (still) empty:"
+#~ msgstr ""
+#~ "最後の手段として、以下のタグが未設定の場合にファイル名をその値として使用す"
+#~ "る:"
+
+#~ msgid "Before removing tracks from the harddisk"
+#~ msgstr "曲をハードディスクから完全に削除する時"
+
+#~ msgid "Before removing tracks from the iPod"
+#~ msgstr "曲をiPodから完全に削除する時"
+
+#~ msgid "Before removing tracks from the local database"
+#~ msgstr "曲をローカルデータベースから削除する時"
+
+#~ msgid "Credits"
+#~ msgstr "権利表示"
+
+#~ msgid "Currently only rating is supported."
+#~ msgstr "現在は評価情報のみ使用"
+
+#, fuzzy
+#~ msgid ""
+#~ "Delete tracks that are no longer present from the\n"
+#~ "iPod or repository"
+#~ msgstr "以下の重複した%d曲が削除されました。"
+
+#, fuzzy
+#~ 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 ""
+#~ "iPodからコピーした曲に付けられるファイル名を設定します。例:'%A/%d%t - %n' "
+#~ "や '%o' など。%A: アーティスト; %n: タイトル; %t: トラックNo.; %o: 元の"
+#~ "ファイル名 (拡張情報ファイルが必要)"
+
+#~ msgid "Display a list of tracks that could actually be updated."
+#~ msgstr "実際に更新された曲のリストを表示します。"
+
+#~ msgid "Display a list of tracks that could not be updated."
+#~ msgstr "実際には更新されなかった曲のリストを表示します。"
+
+#~ msgid "Display info about non-updated tracks"
+#~ msgstr "更新されなかった曲を表示する"
+
+#~ msgid ""
+#~ "Display the list of duplicates that have been detected after adding files."
+#~ msgstr "ファイルを追加した際に発見した、重複する曲のリストを表示します。"
+
+#~ msgid "Display toolbar..."
+#~ msgstr "ツールバーの表示..."
+
+#~ msgid "Display tooltips in prefs window"
+#~ msgstr "ツールチップを設定画面で表示する"
+
+#, fuzzy
+#~ msgid "Displayed:"
+#~ msgstr "表示(_D)"
+
+#~ msgid "Don't allow file duplication"
+#~ msgstr "ファイルの重複を許さない"
+
+#, fuzzy
+#~ msgid ""
+#~ "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+#~ msgstr "md5を利用した重複チェックを行うようになります。"
+
+#, fuzzy
+#~ msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
+#~ msgstr "最初に <i>folder.jpg</i> を試し、無ければ <i>&lt;artist&gt;.jpg</i>"
+
+#, fuzzy
+#~ msgid ""
+#~ "For example, 'xmms %s' will clear xmms' current playlist, add the "
+#~ "selected tracks and start playing."
+#~ msgstr ""
+#~ "例えば 'xmms -p %s' とすると、xmms のその時のプレイリストをクリアし、選択"
+#~ "した曲をプレイリストの先頭に加えて演奏を始めます。"
+
+#~ msgid ""
+#~ "For example, 'xmms -e %s' will append (enqueue) the selected tracks to "
+#~ "xmms' current playlist."
+#~ msgstr ""
+#~ "例えば 'xmms -e %s' とすると、選択された曲を xmms のその時のプレイリストの"
+#~ "最後尾に追加します"
+
+#, 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 ""
+#~ "重複チェックを高速化するためには、この項目を有効にする事が強く推奨されま"
+#~ "す。また、ファイル名を保持する事でID3タグの変更をiPodに反映させる事が可能"
+#~ "になり、仮にiPodの中身が壊れたりした場合にも、再構成を容易にします。(デー"
+#~ "タベースのバックアップファイルの中の \"transferred=\" の項目を変更すればよ"
+#~ "い)"
+
+#~ 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, 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 ""
+#~ "マスタープレイリストを自動的に選択しないようにすると、起動時にデータベース"
+#~ "を読み込む際には何も表示しなくなるので、スピードが速くなります。"
+
+#~ 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 ""
+#~ "曲リストの曲を二つ以上選択して、最初の曲のタグを変更すると他の曲にもその変"
+#~ "更を適用します。"
+
+#~ msgid "Match al_l of the following"
+#~ msgstr "以下のすべてに該当するもの(_l)"
+
+#~ msgid "Match an_y of the following"
+#~ msgstr "以下のいずれかに該当するもの(_y)"
+
+#~ msgid "None"
+#~ msgstr "無指定"
+
+#~ 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以前の gtkpod でインポートされた曲はこの情報が記録さて"
+#~ "いません. この場合, ここで指定された文字コードが今後使われるようになりま"
+#~ "す."
+
+#~ 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以前に登録さ"
+#~ "れた曲については文字コード情報が保存されていません。「入出力」の項目で指定"
+#~ "された文字コードが適用されます。"
+
+#~ msgid "Number of tracks in generated playlists:"
+#~ msgstr "生成するプレイリストに加える曲数:"
+
+#~ msgid ""
+#~ "Number of tracks in the generated playlists 'Most Often Listened', 'Best "
+#~ "Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
+#~ msgstr ""
+#~ "プレイリストの新規作成で、「再生回数の多い曲」「評価の高い曲」「最近再生さ"
+#~ "れた曲」を選択した際にリストに登録する曲の数を指定します。0を指定すると、"
+#~ "曲数を制限しません。"
+
+#~ msgid "Overwrite tags that are already set"
+#~ msgstr "すでにあタグ情報を上書きする"
+
+#~ msgid "Please specify a time interval"
+#~ msgstr "期間を指定してください"
+
+#~ msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
+#~ msgstr "ファイルからタグ情報を読み込む (MP3 ファイルの ID3 タグなど)"
+
+#, fuzzy
+#~ msgid "Remove selected attributes from the displayed list"
+#~ msgstr "選択された曲をプレイリストから削除する"
+
+#~ msgid "Root directory of mserv database (trackinfo root)."
+#~ msgstr "mserv データベースのあるディレクトリ。(trackinfo root)"
+
+#~ msgid "Rules"
+#~ msgstr "ルール"
+
+#, fuzzy
+#~ msgid "Scrobble Tracks?"
+#~ msgstr "選択された曲(_T)"
+
+#, fuzzy
+#~ msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
+#~ msgstr ""
+#~ "セミコロンで区切られた, 適用しないファイルのマスクリスト. 例: '*.mp3'"
+
+#~ msgid "Sorting case sensitive"
+#~ msgstr "並べ換えの際に大文字小文字を区別する"
+
+#~ msgid "Sorttab: "
+#~ msgstr "ソートタブ: "
+
+#~ msgid "Sorttabs"
+#~ msgstr "ソートタブ"
+
+#, fuzzy
+#~ msgid ""
+#~ "The tags are written to the files on your harddrive and on the iPod (if "
+#~ "available)."
+#~ msgstr ""
+#~ "タグは使っているハードディスクと(可能であれば)iPodの両方で修正されます。"
+
+#~ msgid "This is the same option as in 'Edit/Delete Confirmation'"
+#~ msgstr "「編集/削除の確認」の項目と同じです"
+
+#~ msgid "Translators"
+#~ msgstr "翻訳担当"
+
+#~ msgid "Use 'Multi-Edit' also for title field"
+#~ msgstr "タイトルの項目も「一斉編集」を可能にする"
+
+#~ msgid "Use 'Multi-Edit' for tracks selections"
+#~ msgstr "選択された曲を「一斉編集」する"
+
+#, fuzzy
+#~ msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
+#~ msgstr "親ディレクトリにある <i>&lt;Album&gt;.jpg</i> を使う"
+
+#, fuzzy
+#~ msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
+#~ msgstr "<i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i> など"
+
+#~ msgid "Use <i>folder.jpg</i> as cover art."
+#~ msgstr "<i>folder.jpg</i> をカバーアートに使う"
+
+#~ msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
+#~ msgstr "<i>folder.jpg</i>, <i>folder.png</i> など"
+
+#, fuzzy
+#~ msgid ""
+#~ "Use selected encoding (on the 'General' page)\n"
+#~ "when writing tags"
+#~ msgstr ""
+#~ "「基本設定」のページで指定された文字コードを\n"
+#~ "タグの読み書きにも使用する"
+
+#~ msgid "Use this template to parse filename for tag information:"
+#~ msgstr "以下のテンプレートを、ファイル名からタグ情報を抽出するのに使用する:"
+
+#~ msgid "Username to be used for mserv database lookup."
+#~ msgstr "ユーザー名は mserv データベースの参照に使います。"
+
+#~ 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 ""
+#~ "普通は複数の曲のタイトルを同じものにする必要はないでしょう。このオプション"
+#~ "を選択すると大抵は望ましくない結果を得る事になります。(特に、今のところ"
+#~ "「やり直し」は効かないので、選択するべきではありません)"
+
+#~ msgid ""
+#~ "When adding dirs/files, update information of\n"
+#~ "existing tracks with identical filenames"
+#~ msgstr ""
+#~ "ファイルやディレクトリを追加する際に、同じファイル名の\n"
+#~ "曲がすでにあったら場合には、そちらを更新する"
+
+#, fuzzy
+#~ msgid "When syncing playlists"
+#~ msgstr "ディレクトリの同期処理時"
+
+#, fuzzy
+#~ msgid ""
+#~ "Write extended information (PC filenames, SHA1 hashes,\n"
+#~ "encoding...). Recommended."
+#~ msgstr ""
+#~ "拡張情報(PC上のファイル名,MD5値,文字コード)を書き込む。\n"
+#~ "推奨される設定です。"
+
+#~ msgid "_Encoding (ID3, files):"
+#~ msgstr "文字コード(_E) (ID3, ファイル):"
+
+#~ msgid "_Ignore rules"
+#~ msgstr "ルールを無視(_I)"
+
+#~ msgid "_Less Sort Tabs"
+#~ msgstr "ソートタブの削除(_L)"
+
+#~ msgid "_Track Info"
+#~ msgstr "曲情報(_T)"
+
+#~ 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'."
+
+#~ msgid "gtkpod"
+#~ msgstr "gtkpod"
+
+#~ 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のタグやファイル名に使われている"
+#~ "ものとして処理します.「ファイルの追加」や「ディレクトリごと追加」を実行す"
+#~ "る前にこの設定を変更すれば, これらの処理に設定が反映されます.「システム文"
+#~ "字」を選択すると, ロケールで指定されたコードが使われます."
+
+#~ msgid "mserv database lookup will be done for music in this directory."
+#~ msgstr "このディレクトリ内の曲に対し、mserv のデータベースを参照します。"
+
+#~ msgid "Confirmation Dialogue"
+#~ msgstr "確認"
+
+#~ msgid "Last Played"
+#~ msgstr "最後に演奏した日"
+
+#~ msgid "Last Modified"
+#~ msgstr "最後に変更した日"
+
+#, fuzzy
+#~ msgid "Add directories to '%s'"
+#~ msgstr "ディレクトリを再帰的に追加する"
+
+#, fuzzy
+#~ msgid "Add directories to '%s/%s'"
+#~ msgstr "ディレクトリを再帰的に追加する"
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "キャンセル"
+
+#~ msgid ""
+#~ "Data has been changed and not been saved.\n"
+#~ "OK to exit gtkpod?"
+#~ msgstr ""
+#~ "変更のあったデータはセーブされていません。\n"
+#~ "本当に終了しますか?"
+
+#~ msgid "Preferences not updated"
+#~ msgstr "設定は更新されません"
+
+#~ msgid "Preferences applied"
+#~ msgstr "設定を適用しました"
+
+#~ msgid ""
 #~ "Cannot open '%s' for reading.\n"
 #~ "\n"
 #~ msgstr ""
@@ -5587,15 +6021,9 @@
 #~ 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)"
@@ -5603,9 +6031,6 @@
 #~ 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"
@@ -5614,9 +6039,6 @@
 #~ msgid "Processing '%s'"
 #~ msgstr "'%s' の処理中"
 
-#~ msgid "<b>Import</b>"
-#~ msgstr "<b>インポート</b>"
-
 #, fuzzy
 #~ msgid "Automatically import iTunesDBs on startup"
 #~ msgstr "起動時に自動的に iTunesDB を読み込む"
@@ -5655,9 +6077,6 @@
 #~ "プレイリストやソートタブを変更した時に途中経過の\n"
 #~ "表示を抑制する(動作が速くなる)"
 
-#~ msgid "deleting..."
-#~ msgstr "削除中..."
-
 #~ msgid "preparing to copy..."
 #~ msgstr "コピーの準備中..."
 

Modified: gtkpod/branches/upstream/current/po/ro.po
===================================================================
--- gtkpod/branches/upstream/current/po/ro.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/ro.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,21 +1,17 @@
-# 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"
+"Project-Id-Version: gtkpod\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"
+"POT-Creation-Date: 2007-12-13 18:36-0500\n"
+"PO-Revision-Date: 2009-01-14 02:10+0200\n"
+"Last-Translator: alexef <alex at eftimie.ro>\n"
+"Language-Team: Romanian <tradu at softwareliber.ro>\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"
+"Plural-Forms:  nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+"X-Generator: Narro 0.9.3 on http://tradu.softwareliber.ro\n"
 
 #: ../data/gtkpod.desktop.in.h:1
 msgid "GtkPod"
@@ -23,11 +19,11 @@
 
 #: ../data/gtkpod.desktop.in.h:2
 msgid "Manage music and video on an Apple iPod"
-msgstr "Administrează muzica şi filmele pe un iPod Apple"
+msgstr "Gestionează muzica şi fişierele video pe un iPod Apple"
 
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
-msgstr "Manager iPod"
+msgstr "Gestionar de iPod"
 
 #: ../data/gtkpod.glade.h:1
 msgid " "
@@ -55,7 +51,7 @@
 
 #: ../data/gtkpod.glade.h:7
 msgid " Logic: "
-msgstr " Logică:"
+msgstr " Logică: "
 
 #: ../data/gtkpod.glade.h:9
 #, no-c-format
@@ -273,7 +269,7 @@
 
 #: ../data/gtkpod.glade.h:62
 msgid "Add Fol_der"
-msgstr "Adaugă _dosar"
+msgstr "A_daugă dosar"
 
 #: ../data/gtkpod.glade.h:63
 msgid "Add Folder"
@@ -313,7 +309,7 @@
 
 #: ../data/gtkpod.glade.h:72
 msgid "Add playlist from file"
-msgstr "Adaugă fișier listă de redare"
+msgstr "Adaugă fişier listă de redare"
 
 #: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
 #: ../src/display_tracks.c:2103
@@ -457,8 +453,8 @@
 "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."
+"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."
@@ -565,8 +561,8 @@
 "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 '%': %%."
+"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ă -- "
@@ -579,11 +575,11 @@
 #, 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 '%': %%."
+"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 "
@@ -598,9 +594,8 @@
 "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 "
-"'%': %%."
+"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 "
@@ -786,11 +781,10 @@
 
 #: ../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)."
+"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 "
@@ -828,17 +822,17 @@
 #: ../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."
+"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."
+"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."
@@ -848,8 +842,7 @@
 #: ../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."
+"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 "
@@ -877,8 +870,8 @@
 
 #: ../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."
+"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 "
@@ -956,7 +949,7 @@
 
 #: ../data/gtkpod.glade.h:206
 msgid "Move selected attributes to the displayed list"
-msgstr "Mută atributele selectate către lista afișată"
+msgstr "Mută atributele selectate către lista afişată"
 
 #: ../data/gtkpod.glade.h:207
 msgid "Music Root:"
@@ -1000,8 +993,8 @@
 #: ../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 "
+"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."
@@ -1011,33 +1004,33 @@
 "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."
+"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."
+"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."
+"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 "
+"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 "
@@ -1057,12 +1050,11 @@
 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."
+"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 "
@@ -1071,8 +1063,8 @@
 "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."
+"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:"
@@ -1193,11 +1185,11 @@
 
 #: ../data/gtkpod.glade.h:249
 msgid "Progress Information"
-msgstr "Informaţii progres"
+msgstr "Informaţii despre progres"
 
 #: ../data/gtkpod.glade.h:250
 msgid "R_ename Album"
-msgstr "R_edenumește album"
+msgstr "R_edenumeşte album"
 
 #: ../data/gtkpod.glade.h:251
 msgid "Random Playlist from Displayed Tracks"
@@ -1222,7 +1214,7 @@
 
 #: ../data/gtkpod.glade.h:256
 msgid "Remove selected attributes from the displayed list"
-msgstr "Șterge atributele selectate din lista afișată"
+msgstr "Şterge atributele selectate din lista afişată"
 
 #: ../data/gtkpod.glade.h:257
 msgid "Repository Options"
@@ -1361,20 +1353,20 @@
 "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ă."
+"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."
+"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ă."
+"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"
@@ -1440,8 +1432,8 @@
 #: ../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."
+"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."
@@ -1488,8 +1480,8 @@
 
 #: ../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."
+"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."
@@ -1513,17 +1505,17 @@
 #: ../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 "
+"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."
+"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."
@@ -1568,9 +1560,9 @@
 "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."
+"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"
@@ -1685,8 +1677,8 @@
 #: ../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)."
+"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 "
@@ -1711,8 +1703,8 @@
 #: ../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 "
+"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 "
@@ -1830,7 +1822,7 @@
 
 #: ../data/gtkpod.glade.h:386
 msgid "_General"
-msgstr "_General"
+msgstr "_Generale"
 
 #: ../data/gtkpod.glade.h:387
 msgid "_Help"
@@ -1874,7 +1866,7 @@
 
 #: ../data/gtkpod.glade.h:397
 msgid "_Misc."
-msgstr "_Misc."
+msgstr "_Diverse"
 
 #: ../data/gtkpod.glade.h:398
 msgid "_More Sort Tabs"
@@ -1910,7 +1902,7 @@
 
 #: ../data/gtkpod.glade.h:406
 msgid "_Remove Album"
-msgstr "Ște_rge album"
+msgstr "Şte_rge album"
 
 #: ../data/gtkpod.glade.h:407
 msgid "_Remove Cover Art"
@@ -1918,7 +1910,7 @@
 
 #: ../data/gtkpod.glade.h:408
 msgid "_Remove Images"
-msgstr "Ște_rge imagini"
+msgstr "Şte_rge imagini"
 
 #: ../data/gtkpod.glade.h:409
 msgid "_Save Changes"
@@ -1977,13 +1969,13 @@
 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'."
+"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'."
+"ş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"
@@ -2008,14 +2000,14 @@
 
 #: ../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."
+"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."
+"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"
@@ -2052,11 +2044,11 @@
 
 #: ../data/gtkpod.glade.h:441 ../src/details.c:1347
 msgid "n/a"
-msgstr "n/a"
+msgstr "indisponibil"
 
 #: ../data/gtkpod.glade.h:442
 msgid "special_sorttab -- Don't translate!"
-msgstr "special_sorttab -- Don't translate!"
+msgstr ""
 
 #: ../src/autodetection.c:310
 msgid "Could not initialize GnomeVFS\n"
@@ -2086,151 +2078,151 @@
 
 #: ../src/charset.c:53
 msgid "Arabic (IBM-864)"
-msgstr "Arabic (IBM-864)"
+msgstr "Arabă (IBM-864)"
 
 #: ../src/charset.c:54
 msgid "Arabic (ISO-8859-6)"
-msgstr "Arabic (ISO-8859-6)"
+msgstr "Arabă (ISO-8859-6)"
 
 #: ../src/charset.c:55
 msgid "Arabic (Windows-1256)"
-msgstr "Arabic (Windows-1256)"
+msgstr "Arabă (Windows-1256)"
 
 #: ../src/charset.c:56
 msgid "Baltic (ISO-8859-13)"
-msgstr "Baltic (ISO-8859-13)"
+msgstr "Baltică (ISO-8859-13)"
 
 #: ../src/charset.c:57
 msgid "Baltic (ISO-8859-4)"
-msgstr "Baltic (ISO-8859-4)"
+msgstr "Baltică (ISO-8859-4)"
 
 #: ../src/charset.c:58
 msgid "Baltic (Windows-1257)"
-msgstr "Baltic (Windows-1257)"
+msgstr "Baltică (Windows-1257)"
 
 #: ../src/charset.c:59
 msgid "Celtic (ISO-8859-14)"
-msgstr "Celtic (ISO-8859-14)"
+msgstr "Celtică (ISO-8859-14)"
 
 #: ../src/charset.c:60
 msgid "Central European (IBM-852)"
-msgstr "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)"
+msgstr "Central-europeană (ISO-8859-2)"
 
 #: ../src/charset.c:62
 msgid "Central European (Windows-1250)"
-msgstr "Central European (Windows-1250)"
+msgstr "Central-europeană (Windows-1250)"
 
 #: ../src/charset.c:63
 msgid "Chinese Simplified (GB18030)"
-msgstr "Chinese Simplified (GB18030)"
+msgstr "Chineză simplificată (GB18030)"
 
 #: ../src/charset.c:64
 msgid "Chinese Simplified (GB2312)"
-msgstr "Chinese Simplified (GB2312)"
+msgstr "Chineză simplificată (GB2312)"
 
 #: ../src/charset.c:65
 msgid "Chinese Traditional (Big5)"
-msgstr "Chinese Traditional (Big5)"
+msgstr "Chineză tradiţională (Big5)"
 
 #: ../src/charset.c:66
 msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr "Chinese Traditional (Big5-HKSCS)"
+msgstr "Chineză tradiţională (Big5-HKSCS)"
 
 #: ../src/charset.c:67
 msgid "Cyrillic (IBM-855)"
-msgstr "Cyrillic (IBM-855)"
+msgstr "Chirilică (IBM-855)"
 
 #: ../src/charset.c:68
 msgid "Cyrillic (ISO-8859-5)"
-msgstr "Cyrillic (ISO-8859-5)"
+msgstr "Chirilică (ISO-8859-5)"
 
 #: ../src/charset.c:69
 msgid "Cyrillic (ISO-IR-111)"
-msgstr "Cyrillic (ISO-IR-111)"
+msgstr "Chirilică (ISO-IR-111)"
 
 #: ../src/charset.c:70
 msgid "Cyrillic (KOI8-R)"
-msgstr "Cyrillic (KOI8-R)"
+msgstr "Chirilic (KOI8-R)"
 
 #: ../src/charset.c:71
 msgid "Cyrillic (Windows-1251)"
-msgstr "Cyrillic (Windows-1251)"
+msgstr "Chirilică (Windows-1251)"
 
 #: ../src/charset.c:72
 msgid "Cyrillic/Russian (CP-866)"
-msgstr "Cyrillic/Russian (CP-866)"
+msgstr "Chirilică/rusă (CP-866)"
 
 #: ../src/charset.c:73
 msgid "Cyrillic/Ukrainian (KOI8-U)"
-msgstr "Cyrillic/Ukrainian (KOI8-U)"
+msgstr "Chirilică/ucraineană (KOI8-U)"
 
 #: ../src/charset.c:74
 msgid "English (US-ASCII)"
-msgstr "English (US-ASCII)"
+msgstr "Engleză (US-ASCII)"
 
 #: ../src/charset.c:75
 msgid "Greek (ISO-8859-7)"
-msgstr "Greek (ISO-8859-7)"
+msgstr "Greacă (ISO-8859-7)"
 
 #: ../src/charset.c:76
 msgid "Greek (Windows-1253)"
-msgstr "Greek (Windows-1253)"
+msgstr "Greacă (Windows-1253)"
 
 #: ../src/charset.c:77
 msgid "Hebrew (IBM-862)"
-msgstr "Hebrew (IBM-862)"
+msgstr "Ebraică (IBM-862)"
 
 #: ../src/charset.c:78
 msgid "Hebrew (Windows-1255)"
-msgstr "Hebrew (Windows-1255)"
+msgstr "Ebraică (Windows-1255)"
 
 #: ../src/charset.c:79
 msgid "Japanese (automatic detection)"
-msgstr "Japanese (automatic detection)"
+msgstr "Japoneză (detectare automată)"
 
 #: ../src/charset.c:80
 msgid "Japanese (EUC-JP)"
-msgstr "Japanese (EUC-JP)"
+msgstr "Japoneză (EUC-JP)"
 
 #: ../src/charset.c:81
 msgid "Japanese (ISO-2022-JP)"
-msgstr "Japanese (ISO-2022-JP)"
+msgstr "Japoneză (ISO-2022-JP)"
 
 #: ../src/charset.c:82
 msgid "Japanese (Shift_JIS)"
-msgstr "Japanese (Shift_JIS)"
+msgstr "_Japoneză (ShiftJIS)"
 
 #: ../src/charset.c:83
 msgid "Korean (EUC-KR)"
-msgstr "Korean (EUC-KR)"
+msgstr "Coreeană (EUC-KR)"
 
 #: ../src/charset.c:84
 msgid "Nordic (ISO-8859-10)"
-msgstr "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)"
+msgstr "Mediteraneană (ISO-8859-3)"
 
 #: ../src/charset.c:86
 msgid "Thai (TIS-620)"
-msgstr "Thai (TIS-620)"
+msgstr "Thailandeză (TIS-620)"
 
 #: ../src/charset.c:87
 msgid "Turkish (IBM-857)"
-msgstr "Turkish (IBM-857)"
+msgstr "Turcă (IBM-857)"
 
 #: ../src/charset.c:88
 msgid "Turkish (ISO-8859-9)"
-msgstr "Turkish (ISO-8859-9)"
+msgstr "Turcă (ISO-8859-9)"
 
 #: ../src/charset.c:89
 msgid "Turkish (Windows-1254)"
-msgstr "Turkish (Windows-1254)"
+msgstr "Turcă (Windows-1254)"
 
 #: ../src/charset.c:90
 msgid "Unicode (UTF-7)"
@@ -2242,47 +2234,47 @@
 
 #: ../src/charset.c:92
 msgid "Unicode (UTF-16BE)"
-msgstr "Unicode (UTF-16BE)"
+msgstr "Unicode"
 
 #: ../src/charset.c:93
 msgid "Unicode (UTF-16LE)"
-msgstr "Unicode (UTF-16LE)"
+msgstr "Unicode (UTF-16 Little Endian)"
 
 #: ../src/charset.c:94
 msgid "Unicode (UTF-32BE)"
-msgstr "Unicode (UTF-32BE)"
+msgstr "Unicode (UTF-32 Big Endian)"
 
 #: ../src/charset.c:95
 msgid "Unicode (UTF-32LE)"
-msgstr "Unicode (UTF-32LE)"
+msgstr "Unicode (UTF-32 Little Endian)"
 
 #: ../src/charset.c:96
 msgid "Vietnamese (VISCII)"
-msgstr "Vietnamese (VISCII)"
+msgstr "Vietnameză (VISCII)"
 
 #: ../src/charset.c:97
 msgid "Vietnamese (Windows-1258)"
-msgstr "Vietnamese (Windows-1258)"
+msgstr "Vietnameză (Windows-1258)"
 
 #: ../src/charset.c:98
 msgid "Visual Hebrew (ISO-8859-8)"
-msgstr "Visual Hebrew (ISO-8859-8)"
+msgstr "Ebraică vizuală (ISO-8859-8)"
 
 #: ../src/charset.c:99
 msgid "Western (IBM-850)"
-msgstr "Western (IBM-850)"
+msgstr "Vest-europeană (IBM-850)"
 
 #: ../src/charset.c:100
 msgid "Western (ISO-8859-1)"
-msgstr "Western (ISO-8859-1)"
+msgstr "Vest-europeană (ISO-8859-1)"
 
 #: ../src/charset.c:101
 msgid "Western (ISO-8859-15)"
-msgstr "Western (ISO-8859-15)"
+msgstr "Vest-europeană (ISO-8859-15)"
 
 #: ../src/charset.c:102
 msgid "Western (Windows-1252)"
-msgstr "Western (Windows-1252)"
+msgstr "Vest-europeană (Windows-1252)"
 
 #. sanity!
 #. check for "System Charset" and return NULL
@@ -2293,8 +2285,7 @@
 #. 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 ""
 "O altă instanţă a gtkpod a fost detectată. Serverul de numărare a redărilor "
 "nu este pornit.\n"
@@ -2312,8 +2303,9 @@
 #, 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'"
+msgstr[0] "S-a copiat %d piesă către „%s”"
+msgstr[1] "S-au copiat %d piese către „%s”"
+msgstr[2] "S-au copiat %d de piese către „%s”"
 
 #: ../src/context_menus.c:429
 #, c-format
@@ -2324,8 +2316,9 @@
 #, 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'"
+msgstr[0] "S-a copiat %d piesă către „%s” în „%s”"
+msgstr[1] "S-au copiat %d piese către %s în „%s”"
+msgstr[2] "S-au copiat %d de piese către %s în „%s”"
 
 #: ../src/context_menus.c:622 ../src/tools.c:854
 msgid "Play Now"
@@ -2433,7 +2426,7 @@
 
 #: ../src/context_menus.c:895
 msgid "Remove Album"
-msgstr "Șterge album"
+msgstr "Şterge album"
 
 #: ../src/context_menus.c:905
 msgid "Remove Photo"
@@ -2441,7 +2434,7 @@
 
 #: ../src/context_menus.c:922
 msgid "Rename Album"
-msgstr "Redenumește album"
+msgstr "Redenumeşte album"
 
 #: ../src/context_menus.c:981 ../src/context_menus.c:1030
 msgid "Copy selected playlist to..."
@@ -2595,7 +2588,7 @@
 #: ../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"
+msgstr "Eroare la tragerea unei imagini în căsuţa afişare copertă: %s\n"
 
 #: ../src/display_itdb.c:376
 #, c-format
@@ -2612,8 +2605,7 @@
 msgid "Podcasts"
 msgstr "Podcasturi"
 
-#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:875 ../src/display_itdb.c:993 ../src/repository.c:1186
 msgid "iPod"
 msgstr "iPod"
 
@@ -2645,7 +2637,7 @@
 
 #: ../src/display_photo.c:939
 msgid "The Photo Library album cannot be removed"
-msgstr "Albumul Bibliotecă foto nu poate fi șters"
+msgstr "Albumul Bibliotecă foto nu poate fi şters"
 
 #: ../src/display_photo.c:961
 msgid "Do you want to remove the album's photos too?"
@@ -2653,23 +2645,23 @@
 
 #: ../src/display_photo.c:967
 msgid "Yes. Do Not Display Again"
-msgstr "Da. Nu afișa mesajul din nou"
+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?"
+"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?"
+"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"
@@ -2681,7 +2673,7 @@
 
 #: ../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."
+msgstr "Un album cu acelaşi nume există deja."
 
 #: ../src/display_photo.c:1210
 msgid "New Photo Album"
@@ -2702,7 +2694,7 @@
 #. 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."
+msgstr "Adaugare dosar cu imagini la iPod. Selectaţi dosarul."
 
 #: ../src/display_photo.c:1699
 #, c-format
@@ -2719,8 +2711,9 @@
 #, c-format
 msgid "Copied one track"
 msgid_plural "Copied %d tracks"
-msgstr[0] "Am copiat o piesă"
-msgstr[1] "Am copiat %d piese"
+msgstr[0] "S-a copiat o piesă"
+msgstr[1] "S-au copiat %d piese"
+msgstr[2] "S-au copiat %d de piese"
 
 #: ../src/display_playlists.c:865 ../src/display_playlists.c:877
 msgid "Can't reorder sorted treeview."
@@ -2816,12 +2809,12 @@
 
 #: ../src/display_spl.c:86 ../src/misc_conversion.c:74
 msgid "Bitrate"
-msgstr "Bitrate"
+msgstr "Rată de biţi"
 
 #. 15
 #: ../src/display_spl.c:87 ../src/misc_conversion.c:75
 msgid "Samplerate"
-msgstr "Samplerate"
+msgstr "Rată de eşantionare"
 
 #: ../src/display_spl.c:90
 msgid "Kind"
@@ -3045,20 +3038,21 @@
 #, c-format
 msgid "Moved one track"
 msgid_plural "Moved %d tracks"
-msgstr[0] "O piesă mutată."
-msgstr[1] "%d piese mutate."
+msgstr[0] "S-a mutat o piesă"
+msgstr[1] "S-au mutat %d piese"
+msgstr[2] "S-au mutat %d de piese"
 
 #: ../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 ""
-"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"
+"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
@@ -3083,7 +3077,7 @@
 
 #: ../src/display_tracks.c:2085
 msgid "Cmpl"
-msgstr "Cmpl"
+msgstr ""
 
 #: ../src/display_tracks.c:2091
 msgid "Time"
@@ -3099,7 +3093,7 @@
 
 #: ../src/display_tracks.c:2112
 msgid "Vol."
-msgstr "Vol."
+msgstr ""
 
 #: ../src/display_tracks.c:2115
 msgid "Sndchk."
@@ -3107,7 +3101,7 @@
 
 #: ../src/fetchcover.c:358
 msgid "Coverart file already exists"
-msgstr "Fișierul copertă există deja"
+msgstr "Fişierul copertă există deja"
 
 #: ../src/fetchcover.c:371
 #, c-format
@@ -3191,8 +3185,7 @@
 
 #: ../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 "Următoarea piesă nu a putut fi procesată (fişierul nu există): '%s'\n"
 
 #: ../src/file.c:1209
@@ -3242,6 +3235,7 @@
 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"
+msgstr[2] "Următoarele %d de piese nu au putut fi actualizate"
 
 #. gint id,
 #. gboolean modal,
@@ -3255,6 +3249,7 @@
 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"
+msgstr[2] "Următoarele %d de piese au fost actualizate"
 
 #. gint id,
 #. gboolean modal,
@@ -3267,9 +3262,9 @@
 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."
+msgstr[0] "Nu s-au putut obţine informaţii mserv pentru următoarea piesă"
+msgstr[1] "Nu s-au putut obţine informaţii mserv pentru următoarele %d piese"
+msgstr[2] "Nu s-au putut obţine informaţii mserv pentru următoarele %d de piese"
 
 #. gint id,
 #. gboolean modal,
@@ -3570,13 +3565,14 @@
 #, 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."
+msgstr[0] "S-a copiat %d piesă din %d."
+msgstr[1] "S-au copiat %d piese din %d."
+msgstr[2] "S-au copiat %d de 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)"
+msgstr "%d%% (Timp rămas: %d:%02d:%02d)"
 
 #: ../src/file_export.c:514
 msgid "Some tracks were not copied."
@@ -3604,8 +3600,8 @@
 "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"
+"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
@@ -3621,8 +3617,9 @@
 #, 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."
+msgstr[0] "S-a creat o listă de redare cu o piesă."
+msgstr[1] "S-a creat o listă de redare cu %d piese."
+msgstr[2] "S-a creat o listă de redare cu %d de piese."
 
 #: ../src/file_export.c:1031
 #, c-format
@@ -3695,7 +3692,7 @@
 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 "
+"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"
@@ -3825,11 +3822,11 @@
 #: ../src/file_itunesdb.c:1411
 #, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
-msgstr "%d%% (%d/%d  %d:%02d:%02d rămas)"
+msgstr "%d%% (%d din %d, timp rămas: %d:%02d:%02d)"
 
 #: ../src/file_itunesdb.c:1463
 msgid "Status: Deleting File"
-msgstr "Status: şterg fişier"
+msgstr "Stare: se şterg fişiere"
 
 #: ../src/file_itunesdb.c:1524
 #, c-format
@@ -3853,6 +3850,9 @@
 msgstr[1] ""
 "Următoarele piese nu au putut fi convertite cu succes:\n"
 "\n"
+msgstr[2] ""
+"Următoarele piese nu au putut fi convertite cu succes:\n"
+"\n"
 
 #: ../src/file_itunesdb.c:1642
 msgid ""
@@ -3867,6 +3867,9 @@
 msgstr[1] ""
 "Următoarele piese nu au putut fi transferate cu succes:\n"
 "\n"
+msgstr[2] ""
+"Următoarele piese nu au putut fi transferate cu succes:\n"
+"\n"
 
 #. ID
 #. modal,
@@ -3883,24 +3886,24 @@
 "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."
+"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ă"
+msgstr "Stare: se copiază piese"
 
 #: ../src/file_itunesdb.c:1721
 #, c-format
 msgid "Status: Waiting for conversion to complete"
-msgstr "Status: aştept finalizarea conversiei"
+msgstr "Stare: se aşteaptă finalizarea conversiei"
 
 #: ../src/file_itunesdb.c:1725
 #, c-format
 msgid "Status: Finished transfer"
-msgstr "Status: transfer terminat"
+msgstr "Stare: s-a terminat transferul"
 
 #: ../src/file_itunesdb.c:1770
 #, c-format
@@ -3913,13 +3916,17 @@
 "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."
+"O piesă nu a putut fi transferată pentru că iPod-ul este plin. Înainte de a "
+"deconecta iPod-ul, ştergeţi nişte piese sau creaţi spaţiu printr-o altă "
+"metodă."
 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."
+"%d piese nu au putut fi transferate pentru că iPod-ul este plin. Înainte de a "
+"deconecta iPod-ul, ştergeţi nişte piese sau creaţi spaţiu printr-o altă "
+"metodă."
+msgstr[2] ""
+"%d de piese nu au putut fi transferate pentru că iPod-ul este plin. Înainte "
+"de a deconecta iPod-ul, ştergeţi nişte piese sau creaţi spaţiu printr-o altă "
+"metodă."
 
 #: ../src/file_itunesdb.c:1852
 #, c-format
@@ -3943,8 +3950,8 @@
 "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"
+"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!"
@@ -3982,8 +3989,7 @@
 #: ../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."
+"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
@@ -4119,7 +4125,7 @@
 
 #: ../src/info.c:383
 msgid "n/c"
-msgstr "n/c"
+msgstr ""
 
 #: ../src/info.c:388 ../src/info.c:838
 msgid "offline"
@@ -4212,8 +4218,8 @@
 "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"
+"Jorg Schuler (jcsjcs la users punct sourceforge punct net)\n"
+"Corey Donohoe (atmos la atmos punct org)\n"
 
 #: ../src/misc.c:74
 msgid ""
@@ -4225,7 +4231,7 @@
 
 #: ../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)"
+msgstr "Ramesh Dharan: Editare multiplă (editarea mai multor piese simultan)"
 
 #: ../src/misc.c:76
 msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
@@ -4233,114 +4239,103 @@
 
 #: ../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"
+msgstr ""
+"Adrian Ulrich: portarea codului pentru liste de redare din mktunes.pl la "
+"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"
+msgstr "Sam Clegg: nume de fişier definite de utilizator la exportul de pe iPod"
 
 #: ../src/misc.c:80
 msgid "Chris Cutler: automatic creation of various playlist types"
-msgstr "Chris Cutler: automatic creation of various playlist types"
+msgstr "Chris Cutler: creare automată a mai multor tipuri de liste de redare"
 
 #: ../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"
+msgstr "Jens Lautenbach: unele îmbunătăţiri vizuale"
 
 #: ../src/misc.c:84
 msgid "Alex Tribble: iPod eject patch"
-msgstr "Alex Tribble: iPod eject patch"
+msgstr "Alex Tribble: petic ejectare iPod"
 
 #: ../src/misc.c:85
 msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
-msgstr "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+msgstr ""
 
 #: ../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"
+msgstr ""
 
 #: ../src/misc.c:89
 msgid "Armando Atienza: Support with external playcounts"
-msgstr "Armando Atienza: Support with external playcounts"
+msgstr "Armando Atienza: Suport pentru contoare de redare externe"
 
 #: ../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)"
+msgstr "D.L. Sharp: Suport pentru fişiere m4b"
 
 #: ../src/misc.c:91
 msgid "Jim Hall: Decent INSTALL file"
-msgstr "Jim Hall: Decent INSTALL file"
+msgstr "Jim Hall: Fişier INSTALL decent"
 
 #: ../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"
+"Juergen Helmers, Markus Gaugusch: Scripturi de conversie pentru sincronizare "
+"calendar/contacte cu iPod"
 
 #. J"urgen!
 #: ../src/misc.c:93
 msgid "Flavio Stanchina: bugfixes"
-msgstr "Flavio Stanchina: bugfixes"
+msgstr "Flavio Stanchina: reparări defecte"
 
 #: ../src/misc.c:94
 msgid ""
-"Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
-"the title"
+"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)"
+msgstr ""
 
 #: ../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 ""
@@ -4349,42 +4344,36 @@
 "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"
+msgstr ""
 
 #: ../src/misc.c:105
 msgid "Clinton Gormley: sync scripts for thunderbird"
-msgstr "Clinton Gormley: sync scripts for thunderbird"
+msgstr ""
 
 #: ../src/misc.c:107
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
-msgstr "Sebastien Beridot: sync script for ldif addressbook format"
+msgstr ""
 
 #: ../src/misc.c:109
 msgid "Sebastian Scherer: sync script for kNotes"
-msgstr "Sebastian Scherer: sync script for kNotes"
+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"
+msgstr ""
 
 #: ../src/misc.c:113
 msgid "Uwe Hermann: help with support for iPod Video"
-msgstr "Uwe Hermann: help with support for iPod Video"
+msgstr ""
 
 #: ../src/misc.c:115
 msgid ""
-"Iain Benson: support for compilation tag in mp3 files and separate display "
-"of compilations in the sort tab."
+"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 ""
@@ -4411,16 +4400,14 @@
 "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/)"
+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)"
+msgstr ""
 
 #: ../src/misc.c:124
 msgid "The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
@@ -4452,8 +4439,7 @@
 msgid ""
 "Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
 msgstr ""
-"Italiană:  Edward Matteucci (edward_matteucc at users dot sourceforge dot "
-"net)"
+"Italiană:  Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
 
 #: ../src/misc.c:134
 msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
@@ -4498,16 +4484,16 @@
 "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"
+"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"
+"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."
 
@@ -4584,39 +4570,43 @@
 "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? "
+"Sigur doriţi să ştergeţi pentru totdeauna 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ă."
+"Sigur doriţi să ştergeţi pentru totdeauna următoarele piese de pe iPod? "
+"Numărul listelor de redare în care e prezentă o piesă este indicat în "
+"paranteză."
+msgstr[2] ""
+"Sigur doriţi să ştergeţi pentru totdeauna următoarele piese de pe iPod? "
+"Numărul listelor de redare în care e prezentă o piesă 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?"
+msgstr[0] "Şterg piesa pentru totdeauna de pe iPod?"
+msgstr[1] "Şterg piesele pentru totdeauna de pe iPod?"
+msgstr[2] "Şterg piesele pentru totdeauna 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"
-"\"?"
+"Are you sure you want to remove the following tracks from the playlist \"%s\"?"
+msgstr[0] "Sigur doriţi să ştergeţi piesa de mai jos din lista de redare „%s”?"
 msgstr[1] ""
-"Sunteţi sigur că doriţi să ştergeţi următoarele piese din lista de redare \"%"
-"s\"?"
+"Sigur doriţi să ştergeţi piesele de mai jos din lista de redare „%s”?"
+msgstr[2] ""
+"Sigur doriţi să ştergeţi piesele de mai jos 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?"
+msgstr[2] "Şterg piesele din lista de redare?"
 
 #: ../src/misc_confirm.c:163
 msgid ""
@@ -4635,12 +4625,17 @@
 "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ă."
+msgstr[2] ""
+"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?"
+msgstr[2] "Şterg complet piesele de pe discul dur?"
 
 #: ../src/misc_confirm.c:192
 msgid ""
@@ -4649,22 +4644,27 @@
 "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."
+"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ă."
+"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ă."
+msgstr[2] ""
+"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ă?"
+msgstr[2] "Şterg piesele din baza de date locală?"
 
 #: ../src/misc_confirm.c:261
 #, c-format
@@ -4672,6 +4672,7 @@
 msgid_plural "Deleted %d tracks completely from iPod"
 msgstr[0] "\t\t\t\t"
 msgstr[1] "Am şters complet %d piese de pe iPod"
+msgstr[2] "Am şters complet %d piese de pe iPod"
 
 #: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
 #, c-format
@@ -4679,6 +4680,7 @@
 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'"
+msgstr[2] "Am şters complet %d piese din lista de redare '%s'"
 
 #: ../src/misc_confirm.c:285
 #, c-format
@@ -4686,6 +4688,7 @@
 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"
+msgstr[2] "Am şters %d piese de pe discul dur"
 
 #: ../src/misc_confirm.c:297
 #, c-format
@@ -4693,6 +4696,7 @@
 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ă"
+msgstr[2] "Am şters %d piese din baza de date locală"
 
 #: ../src/misc_confirm.c:442
 msgid "Cannot remove entry 'All'"
@@ -4714,6 +4718,7 @@
 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."
+msgstr[2] "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
@@ -4729,6 +4734,8 @@
 "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."
+msgstr[2] ""
+"Am şters lista de redare '%s' incluzând %d piese membre pe discul dur."
 
 #: ../src/misc_confirm.c:617
 #, c-format
@@ -4758,12 +4765,16 @@
 "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."
+"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."
+"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."
+msgstr[2] ""
+"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
@@ -4777,17 +4788,21 @@
 "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."
+"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."
+"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."
+msgstr[2] ""
+"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
@@ -4801,17 +4816,21 @@
 "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."
+"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."
+"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."
+msgstr[2] ""
+"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 ""
@@ -4835,7 +4854,7 @@
 
 #: ../src/misc_conversion.c:69
 msgid "iPod ID"
-msgstr "iPod ID"
+msgstr ""
 
 #. 10
 #: ../src/misc_conversion.c:70
@@ -5025,8 +5044,8 @@
 
 #: ../src/misc_conversion.c:143
 msgid ""
-"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
-"the iPod"
+"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
@@ -5038,8 +5057,7 @@
 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."
+"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."
@@ -5133,6 +5151,7 @@
 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."
+msgstr[2] "Am creat lista de redare '%s' cu %d piese."
 
 #. n==0
 #: ../src/misc_playlist.c:417
@@ -5166,7 +5185,7 @@
 #: ../src/misc_playlist.c:714
 #, c-format
 msgid "Recent (%d)"
-msgstr "Recent (%d)"
+msgstr "Recente (%d)"
 
 #: ../src/misc_playlist.c:753
 msgid "Last Time"
@@ -5197,9 +5216,8 @@
 "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 ""
 "Nu aţi importat iTunesDB existentă ('%s'). Acest lucru este cel mai probabil "
 "incorect, iar rezultatul va fi pierderea bazei de date existentă.\n"
@@ -5223,8 +5241,8 @@
 #: ../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 ""
@@ -5246,8 +5264,8 @@
 "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] ""
 "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 "
@@ -5256,6 +5274,10 @@
 "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."
+msgstr[2] ""
+"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
@@ -5271,6 +5293,9 @@
 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."
+msgstr[2] ""
+"Următoarele %d piese agăţate nu au fişiere pe PC.\n"
+" Apăsaţi OK pentru a le şterge, sau Renunţă pentru a le lăsa aşa cum sunt"
 
 #. we want unique window for each
 #. gboolean modal,
@@ -5290,6 +5315,7 @@
 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."
+msgstr[2] "Am făcut sumă binară de căutare (hash) pentru %d piese din %d."
 
 #: ../src/misc_track.c:198
 #, c-format
@@ -5297,19 +5323,22 @@
 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"
+msgstr[2] "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."
+"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ă."
+msgstr[2] ""
+"Următoarele %d piese cu dubluri nu au fost adăugate la lista de redare "
+"principală."
 
 #. gint id,
 #. gboolean modal,
@@ -5382,8 +5411,7 @@
 #, 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"
+"Nu am putut deschide '%s' pentru scriere, sau fişierul nu este de tipul mp4.\n"
 
 #: ../src/mp4file.c:553
 #, c-format
@@ -5438,8 +5466,8 @@
 "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"
+"fără biblioteca ogg. Trebuie să compilaţi sursa gtkpod împreună cu biblioteca "
+"ogg.\n"
 
 #: ../src/prefs.c:357
 #, c-format
@@ -5501,8 +5529,7 @@
 
 #: ../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"
+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"
@@ -5531,8 +5558,8 @@
 "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."
+"<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
@@ -5614,6 +5641,7 @@
 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"
+msgstr[2] "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"
@@ -5621,18 +5649,21 @@
 "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"
+msgstr[2] "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"
+msgstr[2] "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"
+msgstr[2] "Următoarele piese au fost eliminate din lista de redare:\n"
 
 #: ../src/syncdir.c:277
 msgid "Nothing was changed.\n"
@@ -5714,6 +5745,7 @@
 msgid_plural "Normalized %d of %d tracks."
 msgstr[0] "Am normalizat %d din %d piese."
 msgstr[1] "Am normalizat %d din %d piese."
+msgstr[2] "Am normalizat %d din %d piese."
 
 #: ../src/tools.c:633
 msgid ""
@@ -5759,55 +5791,3 @@
 #, 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"

Modified: gtkpod/branches/upstream/current/po/ru.po
===================================================================
--- gtkpod/branches/upstream/current/po/ru.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/ru.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -4,29 +4,31 @@
 # 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"
+"POT-Creation-Date: 2008-12-09 19:55+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-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"
+"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:2 ../data/gtkpod.glade.h:427
+#, fuzzy
+msgid "gtkpod iPod Manager"
+msgstr "Менеджер iPod"
+
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
 msgstr "Менеджер iPod"
@@ -40,523 +42,633 @@
 msgstr "    "
 
 #: ../data/gtkpod.glade.h:3
-msgid "     "
-msgstr "     "
+msgid " <= cts <= "
+msgstr " <= cts <= "
 
 #: ../data/gtkpod.glade.h:4
-msgid "      "
-msgstr "      "
+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:5
-msgid "   Sort by:"
-msgstr "   Сортировать по:"
+msgid "(Checked)"
+msgstr "(Отмечено)"
 
 #: ../data/gtkpod.glade.h:6
-msgid " <= cts <= "
-msgstr " <= cts <= "
+msgid "0"
+msgstr "0"
 
 #: ../data/gtkpod.glade.h:7
-msgid " Logic: "
-msgstr " Логика: "
+msgid "1"
+msgstr "1"
 
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr "2"
+
 #: ../data/gtkpod.glade.h:9
-#, no-c-format
-msgid "%A"
-msgstr "%A"
+msgid "3"
+msgstr "3"
 
 #: ../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 после"
-"завершения."
+msgid "4"
+msgstr "4"
 
 #: ../data/gtkpod.glade.h:11
-msgid "'aacgain' executable:"
-msgstr "Исполняемый файл \"aacgain\":"
+msgid "5"
+msgstr "5"
 
 #: ../data/gtkpod.glade.h:12
-msgid "'mp3gain' executable:"
-msgstr "Исполняемый файл \"mp3gain\":"
+msgid ":"
+msgstr ":"
 
 #: ../data/gtkpod.glade.h:13
-msgid "(Checked)"
-msgstr "(Отмечено)"
+msgid "<"
+msgstr "<"
 
 #: ../data/gtkpod.glade.h:14
-msgid "...as icons"
-msgstr "...как значки"
+#, fuzzy
+msgid "<b>Advanced Options</b>"
+msgstr "Дополнительные параметры сортировки"
 
 #: ../data/gtkpod.glade.h:15
-msgid "...as text"
-msgstr "...как текст"
+#, fuzzy
+msgid "<b>Ascending</b>"
+msgstr "По возрастанию"
 
 #: ../data/gtkpod.glade.h:16
-msgid "...both as icons and text"
-msgstr "...как значки и текст"
+#, fuzzy
+msgid "<b>Auto Store</b>"
+msgstr "Автосохранение"
 
 #: ../data/gtkpod.glade.h:17
-msgid "...entry 'All' in sort tab..."
-msgstr "...запись \"Все\" на вкладке сортировки"
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>Автоматически сгенерированные списки воспроизведения</b>"
 
 #: ../data/gtkpod.glade.h:18
-msgid "...master playlist"
-msgstr "...главный список воспроизведения"
+msgid "<b>Available Columns</b>"
+msgstr ""
 
+#: ../data/gtkpod.glade.h:19
+#, fuzzy
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>Coverart</b>"
+
 #: ../data/gtkpod.glade.h:20
-#, no-c-format
-msgid "../%A.jpg"
-msgstr "../%A.jpg"
+#, fuzzy
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>Coverart</b>"
 
 #: ../data/gtkpod.glade.h:21
-msgid "0"
-msgstr "0"
+#, fuzzy
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>Coverart</b>"
 
 #: ../data/gtkpod.glade.h:22
-msgid "1"
-msgstr "1"
+#, fuzzy
+msgid "<b>Cover Art</b>"
+msgstr "<b>Coverart</b>"
 
 #: ../data/gtkpod.glade.h:23
-msgid "2"
-msgstr "2"
+#, fuzzy
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>Подтверждение удаления</b>"
 
 #: ../data/gtkpod.glade.h:24
-msgid "3"
-msgstr "3"
+#, fuzzy
+msgid "<b>Descending</b>"
+msgstr "По убыванию"
 
 #: ../data/gtkpod.glade.h:25
-msgid "4"
-msgstr "4"
+#, fuzzy
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>Подтверждение удаления</b>"
 
 #: ../data/gtkpod.glade.h:26
-msgid "5"
-msgstr "5"
+#, fuzzy
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>Сортировочные вкладки</b>"
 
 #: ../data/gtkpod.glade.h:27
-msgid ":"
-msgstr ":"
+#, fuzzy
+msgid "<b>General Options</b>"
+msgstr "<b>Разрешение:</b>"
 
 #: ../data/gtkpod.glade.h:28
-msgid "<"
-msgstr "<"
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>н/д</b>"
 
 #: ../data/gtkpod.glade.h:29
-msgid "<b>Account Information</b>"
-msgstr "<b>Сведения об учётной записи</b>"
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>Игнорировать часто встречающиеся слова</b>"
 
 #: ../data/gtkpod.glade.h:30
-msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>Добавление/обновление/синхронизация</b>"
+#, fuzzy
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>Синхронизация</b>"
 
 #: ../data/gtkpod.glade.h:31
-msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Сборщик статистики</b>"
+#, fuzzy
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>Сведения об учётной записи</b>"
 
 #: ../data/gtkpod.glade.h:32
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>Автоматически сгенерированные списки воспроизведения</b>"
+#, fuzzy
+msgid "<b>Information Messages</b>"
+msgstr "<b>Сведения об учётной записи</b>"
 
 #: ../data/gtkpod.glade.h:33
-msgid "<b>Automatically select...</b>"
-msgstr "<b>Автоматически выбирать...</b>"
+#, fuzzy
+msgid "<b>Lower Margin</b>"
+msgstr "Нижняя граница"
 
 #: ../data/gtkpod.glade.h:34
-msgid "<b>Calendar/Contacts/Notes</b>"
-msgstr "<b>Календарь/контакты/заметки</b>"
+#, fuzzy
+msgid "<b>None</b>"
+msgstr "<b>н/д</b>"
 
 #: ../data/gtkpod.glade.h:35
-msgid "<b>Coverart</b>"
-msgstr "<b>Coverart</b>"
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Преобразование на лету</b>"
 
 #: ../data/gtkpod.glade.h:36
-msgid "<b>Delete Confirmation</b>"
-msgstr "<b>Подтверждение удаления</b>"
+#, fuzzy
+msgid "<b>Playback</b>"
+msgstr "<b>Воспроизведение</b>"
 
 #: ../data/gtkpod.glade.h:37
-msgid "<b>Examples</b>"
-msgstr "<b>Примеры</b>"
+#, fuzzy
+msgid "<b>Playlist Options</b>"
+msgstr "<b>Списки воспроизведения</b>"
 
 #: ../data/gtkpod.glade.h:38
-msgid "<b>Ignore Frequent Words</b>"
-msgstr "<b>Игнорировать часто встречающиеся слова</b>"
+msgid "<b>Please select mountpoint and your iPod model</b>"
+msgstr "<b>Пожалуйста, выберите точку монтирования и модель iPod</b>"
 
 #: ../data/gtkpod.glade.h:39
-msgid "<b>Misc</b>"
-msgstr "<b>Разное</b>"
+#, fuzzy
+msgid "<b>Rules</b>"
+msgstr "<b>Примеры</b>"
 
 #: ../data/gtkpod.glade.h:40
-msgid "<b>Mountpoint and individual repository/playlist options</b>"
-msgstr "<b>Настройки точки монтирования и отдельных репозиториев/списков воспроизведения</b>"
+msgid "<b>Sort Order</b>"
+msgstr "<b>Порядок сортировки</b>"
 
 #: ../data/gtkpod.glade.h:41
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Преобразование на лету</b>"
+msgid "<b>Synchronization</b>"
+msgstr "<b>Синхронизация</b>"
 
 #: ../data/gtkpod.glade.h:42
-msgid "<b>Play</b>"
-msgstr "<b>Воспроизведение</b>"
+#, fuzzy
+msgid "<b>Tag Editing</b>"
+msgstr "<b>Редактирование дорожек</b>"
 
 #: ../data/gtkpod.glade.h:43
-msgid "<b>Playlists</b>"
-msgstr "<b>Списки воспроизведения</b>"
+#, fuzzy
+msgid "<b>Tags</b>"
+msgstr "<b>н/д</b>"
 
 #: ../data/gtkpod.glade.h:44
-msgid "<b>Please select mountpoint and your iPod model</b>"
-msgstr "<b>Пожалуйста, выберите точку монтирования и модель iPod</b>"
+#, fuzzy
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>Панель инструментов</b>"
 
 #: ../data/gtkpod.glade.h:45
-msgid "<b>Repositories</b>"
-msgstr "<b>Репозитории</b>"
+msgid "<b>Tooltips</b>"
+msgstr "<b>Всплывающие подсказки</b>"
 
 #: ../data/gtkpod.glade.h:46
-msgid "<b>Resolution:</b>"
-msgstr "<b>Разрешение:</b>"
+#, fuzzy
+msgid "<b>Upper Margin</b>"
+msgstr "Верхняя граница"
 
 #: ../data/gtkpod.glade.h:47
-msgid "<b>Sort Order</b>"
-msgstr "<b>Порядок сортировки</b>"
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>Нормализация громкости</b>"
 
 #: ../data/gtkpod.glade.h:48
-msgid "<b>Sort Tabs</b>"
-msgstr "<b>Сортировочные вкладки</b>"
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:49
-msgid "<b>Sync</b>"
-msgstr "<b>Синхронизация</b>"
+#, fuzzy
+msgid "<b>gtkpod Options</b>"
+msgstr "параметры gtkpod"
 
 #: ../data/gtkpod.glade.h:50
-msgid "<b>Synchronization</b>"
-msgstr "<b>Синхронизация</b>"
+#, fuzzy
+msgid "<b>mserv Settings</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:51
-msgid "<b>Tag Reading</b>"
-msgstr "<b>Чтение меток</b>"
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
 
 #: ../data/gtkpod.glade.h:52
-msgid "<b>Toolbar</b>"
-msgstr "<b>Панель инструментов</b>"
+#, fuzzy
+msgid "<i>aacgain</i> executable:"
+msgstr "Исполняемый файл \"aacgain\":"
 
 #: ../data/gtkpod.glade.h:53
-msgid "<b>Tooltips</b>"
-msgstr "<b>Всплывающие подсказки</b>"
+#, fuzzy
+msgid "<i>mp3gain</i> executable:"
+msgstr "Исполняемый файл \"mp3gain\":"
 
 #: ../data/gtkpod.glade.h:54
-msgid "<b>Track Attributes</b>"
-msgstr "<b>Атрибуты дорожки</b>"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:55
-msgid "<b>Track Editing</b>"
-msgstr "<b>Редактирование дорожек</b>"
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:56
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>Нормализация громкости</b>"
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:57
-msgid "<b>mserv</b>"
-msgstr "<b>mserv</b>"
-
-#: ../data/gtkpod.glade.h:58
+#: ../data/gtkpod.glade.h:59
 msgid ">"
 msgstr ">"
 
-#: ../data/gtkpod.glade.h:59
-msgid "About gtkpod"
-msgstr "О программе gtkpod"
+#: ../data/gtkpod.glade.h:60
+#, fuzzy
+msgid "About unupdated tracks"
+msgstr "Отобразить сведения об обновлённых дорожках"
 
-#: ../data/gtkpod.glade.h:60
+#: ../data/gtkpod.glade.h:61
+#, fuzzy
+msgid "About updated tracks"
+msgstr "Отобразить сведения об обновлённых дорожках"
+
+#: ../data/gtkpod.glade.h:62
+#, fuzzy
+msgid "Add Column"
+msgstr "_Добавить альбом"
+
+#: ../data/gtkpod.glade.h:63
 msgid "Add Directories Recursively"
 msgstr "Добавить папки рекурсивно"
 
-#: ../data/gtkpod.glade.h:61
+#: ../data/gtkpod.glade.h:64
 msgid "Add Files"
 msgstr "Добавить файлы"
 
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:65
 msgid "Add Files or Directories"
 msgstr "Добавить файлы или папки"
 
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:66
 msgid "Add Fol_der"
 msgstr "Добавить _папку"
 
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:67 ../src/fileselection.c:606
 msgid "Add Folder"
 msgstr "Добавить папку"
 
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:68
 msgid "Add Image_s"
 msgstr "Добавить _изображения"
 
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:69
 msgid "Add Images from a Directory"
 msgstr "Добавить изображения из папки"
 
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:70
 msgid "Add Playlist"
 msgstr "Добавить список воспроизведения"
 
-#: ../data/gtkpod.glade.h:68
+#: ../data/gtkpod.glade.h:71
 msgid "Add _Files"
 msgstr "Добавить _файлы_"
 
-#: ../data/gtkpod.glade.h:69
+#: ../data/gtkpod.glade.h:72
 msgid "Add _Playlist"
 msgstr "Добавить _список воспроизведения"
 
-#: ../data/gtkpod.glade.h:70
-msgid "Add coverart from file using the following template"
+#: ../data/gtkpod.glade.h:73
+#, fuzzy
+msgid "Add cover art using file name template"
 msgstr "Добавить изображение обложки из файла, используя следующий шаблон"
 
-#: ../data/gtkpod.glade.h:71
-msgid "Add directories recursively"
-msgstr "Добавить папки рекурсивно"
+#: ../data/gtkpod.glade.h:74
+msgid ""
+"Add file masks to be excluded from import and synchronization, for example, "
+"<i>*.mp3</i>."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:72
-msgid "Add new repository/iPod"
+#: ../data/gtkpod.glade.h:75
+#, fuzzy
+msgid "Add new repository/iPod..."
 msgstr "Добавить новый репозиторий/iPod"
 
-#: ../data/gtkpod.glade.h:73
+#: ../data/gtkpod.glade.h:76
 msgid "Add playlist from file"
 msgstr "Добавить список воспроизведения из файла"
 
-#: ../data/gtkpod.glade.h:74 ../src/display_sorttabs.c:3247
-#: ../src/display_tracks.c:2103
-msgid "Added"
+#: ../data/gtkpod.glade.h:77
+#, fuzzy
+msgid "Add subfolders recursively"
+msgstr "Добавить папки рекурсивно"
+
+#: ../data/gtkpod.glade.h:78
+#, fuzzy
+msgid "Added:"
 msgstr "Добавлено"
 
-#: ../data/gtkpod.glade.h:75
-msgid "Advanced Sorting Options"
-msgstr "Дополнительные параметры сортировки"
-
 #. 0
-#: ../data/gtkpod.glade.h:76 ../src/display_sorttabs.c:2982
+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2995
 #: ../src/display_spl.c:84 ../src/misc_conversion.c:60
 msgid "Album"
 msgstr "Альбом"
 
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:80
 msgid "Album Art"
 msgstr "Обложка"
 
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:81
 msgid "All (AND)"
 msgstr "Все (И)"
 
-#: ../data/gtkpod.glade.h:79
+#: ../data/gtkpod.glade.h:82
 msgid "All Tracks Never Listened To"
 msgstr "Все дорожки, не прослушанные ни разу"
 
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:83
 msgid "All Tracks Played Since Last Time"
 msgstr "Все дорожки, прослушанные с прошлого раза"
 
-#: ../data/gtkpod.glade.h:81
+#: ../data/gtkpod.glade.h:84
 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:85
+msgid "Allow duplicate files"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:83
-msgid "Always write ID3v2.4 tags (only applies to MP3)"
-msgstr "Всегда записывать метки ID3v2.4 (только для MP3)"
+#: ../data/gtkpod.glade.h:86
+#, fuzzy
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr ""
+"Использовать выбранную кодировку также при обновлении или синхронизации "
+"дорожек"
 
-#: ../data/gtkpod.glade.h:84
+#: ../data/gtkpod.glade.h:87
+#, fuzzy
+msgid "Also use this encoding when writing tracks"
+msgstr ""
+"Использовать выбранную кодировку также при обновлении или синхронизации "
+"дорожек"
+
+#: ../data/gtkpod.glade.h:88
 msgid "Any (OR)"
 msgstr "Любые (ИЛИ)"
 
-#: ../data/gtkpod.glade.h:85 ../src/display_sorttabs.c:2979
+#: ../data/gtkpod.glade.h:89
+msgid ""
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:92 ../src/display_sorttabs.c:2992
 #: ../src/display_spl.c:85 ../src/misc_conversion.c:61
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: ../data/gtkpod.glade.h:86
+#: ../data/gtkpod.glade.h:93
 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:94
+msgid "Automatically generate video thumbnails"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:89
-msgid "Ascending"
-msgstr "По возрастанию"
-
-#: ../data/gtkpod.glade.h:90
-msgid "Auto Store"
-msgstr "Автосохранение"
-
-#: ../data/gtkpod.glade.h:91
+#: ../data/gtkpod.glade.h:95
 msgid ""
 "Automatically start displaying tracks that match the criteria entered above. "
 "If not selected, you must press 'Display' to start displaying."
-msgstr "Автоматически начать отображение дорожек, отвечающих выбранным выше критериям."
-"Если не выбрано, вы должны нажать \"Отобразить\" для начала отображения."
+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 "Перед удалением дорожек из локальной базы данных"
+msgid "Background color"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:97
 msgid "Best Rated Tracks"
 msgstr "Дорожки с наибольшим рейтингом"
 
 #: ../data/gtkpod.glade.h:98
+msgid "Bottom"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:99 ../src/prefsdlg.c:588
 msgid "Browse"
 msgstr "Обзор"
 
-#: ../data/gtkpod.glade.h:99
-msgid "Cache directory:"
+#: ../data/gtkpod.glade.h:100
+#, fuzzy
+msgid "Browse..."
+msgstr "Обзор"
+
+#: ../data/gtkpod.glade.h:101
+#, fuzzy
+msgid "Cache folder:"
 msgstr "Папка с кэшем:"
 
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:102
 msgid "Calendar"
 msgstr "Календарь"
 
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:103
 msgid "Calendar sync command:"
 msgstr "Команда синхронизации календаря:"
 
-#: ../data/gtkpod.glade.h:102
+#: ../data/gtkpod.glade.h:104
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Вызывать автоматически при синхронизации iTunesDB"
 
-#: ../data/gtkpod.glade.h:103
-msgid "Category: "
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:106
+#, fuzzy
+msgid "Category:"
 msgstr "Категория: "
 
-#: ../data/gtkpod.glade.h:104
+#: ../data/gtkpod.glade.h:107
 msgid ""
 "Change all tracks\n"
 "simultaneously"
-msgstr "Изменить все дорожки\n"
+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
+#: ../data/gtkpod.glade.h:109
 msgid "Check for existing files when copying from iPod."
 msgstr "Проверять наличие существующих файлов при копировании с iPod."
 
-#: ../data/gtkpod.glade.h:109
-msgid "Command for 'Enqueue':"
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:111
+#, fuzzy
+msgid "Command for \"Enqueue\":"
 msgstr "Команда \"Поставить в очередь\":"
 
-#: ../data/gtkpod.glade.h:110
-msgid "Command for 'Play now':"
+#: ../data/gtkpod.glade.h:112
+#, fuzzy
+msgid "Command for \"Play now\":"
 msgstr "Команда \"Воспроизвести сейчас\":"
 
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr ""
+
 #. 5
-#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:114 ../src/display_spl.c:97
 #: ../src/misc_conversion.c:65
 msgid "Composer"
 msgstr "Композитор"
 
-#: ../data/gtkpod.glade.h:112
+#: ../data/gtkpod.glade.h:115
 msgid "Confirm before removing tracks from the iPod or repository"
-msgstr "Выводить подтверждение перед удалением дорожек с iPod или из репозитория"
+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:116
+#, fuzzy
+msgid "Confirm deletion of playlists or tracks from a playlist"
+msgstr "Перед удалением списков воспроизведения или дорожек из списка"
 
-#: ../data/gtkpod.glade.h:115
-msgid "Confirm lists of directories"
+#: ../data/gtkpod.glade.h:117
+msgid "Confirm deletion of tracks during synchronization"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:118
+#, fuzzy
+msgid "Confirm deletion of tracks:"
 msgstr "Подтверждать списки папок"
 
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:119
 msgid "Contacts sync command:"
 msgstr "Команда синхронизации контактов:"
 
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:120
 msgid "Containing Displayed Tracks"
 msgstr "Содержащие отображаемые дорожки"
 
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:121
 msgid "Containing Selected Tracks"
 msgstr "Содержащие выбранные дорожки"
 
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:122
+#, fuzzy
+msgid "Conversion Preferences"
+msgstr "_Параметры"
+
+#: ../data/gtkpod.glade.h:123
 msgid "Conversion Progress Display"
 msgstr "Отображение хода преобразования"
 
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:124
+#, fuzzy
+msgid "Conversion Settings..."
+msgstr "_Журнал сообщений преобразования"
+
+#: ../data/gtkpod.glade.h:125
+msgid "Convert AAC (M4A)"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:126
+msgid "Convert FLAC"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:127
+#, fuzzy
+msgid "Convert MP3"
+msgstr "Обложка"
+
+#: ../data/gtkpod.glade.h:128
+#, fuzzy
+msgid "Convert Ogg Vorbis"
+msgstr "Ogg Vorbis"
+
+#: ../data/gtkpod.glade.h:129
+#, fuzzy
+msgid "Convert WAV"
+msgstr "Обложка"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Convert compatible formats to a single format"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:132
 msgid "Cover"
 msgstr "Обложка"
 
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:134
+#, fuzzy
+msgid "Cover art file pattern:"
+msgstr "Файл обложки уже существует"
+
+#: ../data/gtkpod.glade.h:135
 msgid "Create New Playlist"
 msgstr "Создать новый список воспроизведения"
 
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:136
 msgid "Create Repository"
 msgstr "Создать репозитория"
 
-#: ../data/gtkpod.glade.h:123
+#: ../data/gtkpod.glade.h:137
 msgid "Create _Playlist File"
 msgstr "Создать _файл списка воспроизведения"
 
-#: ../data/gtkpod.glade.h:124
-msgid "Credits"
-msgstr "Авторы"
+#: ../data/gtkpod.glade.h:138
+msgid "Customize..."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:125
-msgid "Currently only rating is supported."
-msgstr "В настоящее время поддерживается только рейтинг."
-
-#: ../data/gtkpod.glade.h:126
-msgid "Delete repository"
+#: ../data/gtkpod.glade.h:139
+#, fuzzy
+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:140
+#, fuzzy
+msgid "Delete missing tracks from the iPod or repository"
+msgstr ""
+"Выводить подтверждение перед удалением дорожек с iPod или из репозитория"
 
-#: ../data/gtkpod.glade.h:129
-msgid "Deleted tracks"
-msgstr "Удалённые дорожки"
+#: ../data/gtkpod.glade.h:141
+#, fuzzy
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "Дорожка %d удалена из списка воспроизведения \"%s\""
 
-#: ../data/gtkpod.glade.h:130
-msgid "Descending"
-msgstr "По убыванию"
-
-#: ../data/gtkpod.glade.h:131
+#: ../data/gtkpod.glade.h:142
 msgid "Details"
 msgstr "Подробности"
 
-#: ../data/gtkpod.glade.h:133
+#: ../data/gtkpod.glade.h:144
 #, no-c-format
 msgid ""
 "Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -566,13 +678,14 @@
 "nr: %C, year: %Y, original filename (requires extended information file): %"
 "o, the character '%': %%."
 msgstr ""
-"Определяет построение строки для поля сведений, например, '%a/%"
-"A/%T - %t.mp3' или '%o'.  Вы можете разделить несколько шаблонов точками с запятой -- "
+"Определяет построение строки для поля сведений, например, '%a/%A/%T - %t."
+"mp3' или '%o'.  Вы можете разделить несколько шаблонов точками с запятой -- "
 "gtkpod определит, какой из них использовать, по заданному расширению файла. "
-"Исполнитель: %a, альбом: %A, композитор: %c, название: %t, жанр: %G, номер дорожки: %T, номер CD: %C, год: %Y, оригинальное ися файла (требует расширенный файл сведений): %"
-"o, символ '%': %%."
+"Исполнитель: %a, альбом: %A, композитор: %c, название: %t, жанр: %G, номер "
+"дорожки: %T, номер CD: %C, год: %Y, оригинальное ися файла (требует "
+"расширенный файл сведений): %o, символ '%': %%."
 
-#: ../data/gtkpod.glade.h:135
+#: ../data/gtkpod.glade.h:146
 #, no-c-format
 msgid ""
 "Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -582,389 +695,332 @@
 "year: %Y, original filename (requires extended information file): %o, "
 "current playlist: %p, the character '%': %%."
 msgstr ""
-"Определяет имя файла для дорожек, копируемых с iPod, например, '%a/%A/%T - %t."
-"mp3' or '%o'.  Вы можете разделить несколько шаблонов точками с запятой -- "
+"Определяет имя файла для дорожек, копируемых с 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 "
+"Исполнитель: %a, альбом: %A, композитор: %c, название: %t, жанр: %G, номер "
+"дорожки: %T, номер CD: %C, год: %Y, оригинальное ися файла (требует "
+"расширенный файл сведений): %o, текущий список воспроизведения: %p,  символ "
 "'%': %%."
-msgstr ""
-"Определяет имя файла с изображением обложки. Вы можете разделить несколько шаблонов точками с запятой -- "
-"gtkpod определит, какой из них использовать, по заданному расширению файла. "
-"Исполнитель: %a, альбом: %A, композитор: %c, название: %t, жанр: %G, номер дорожки: %T, номер CD: %C, год: %Y, оригинальное ися файла (требует расширенный файл сведений): %o, текущий список воспроизведения: %p,  символ '%': %%."
 
-#: ../data/gtkpod.glade.h:138
+#: ../data/gtkpod.glade.h:147
 msgid ""
 "Directories to sync with are determined from the filenames of the tracks in "
 "the playlist."
-msgstr "Папки, подлежащие синхронизации, определяются по именам файлов дорожек в списке воспроизведения."
+msgstr ""
+"Папки, подлежащие синхронизации, определяются по именам файлов дорожек в "
+"списке воспроизведения."
 
-#: ../data/gtkpod.glade.h:139
-msgid "Display a list of tracks that could actually be updated."
-msgstr "Отобразить список дорожек, которые могут быть обновлены."
+#: ../data/gtkpod.glade.h:148
+#, fuzzy
+msgid "Display"
+msgstr "_Отображение"
 
-#: ../data/gtkpod.glade.h:140
-msgid "Display a list of tracks that could not be updated."
-msgstr "Отобразить список дорожек, которые не могут быть обновлены."
-
-#: ../data/gtkpod.glade.h:141
+#: ../data/gtkpod.glade.h:149
 msgid "Display conversion log"
 msgstr "Отобразить журнал сообщений преобразования"
 
-#: ../data/gtkpod.glade.h:142
-msgid "Display info about detected duplicates"
+#: ../data/gtkpod.glade.h:150
+#, fuzzy
+msgid "Display information about detected duplicate files"
 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
+#: ../data/gtkpod.glade.h:151
 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:152
+#, fuzzy
+msgid "Display synchronization results"
+msgstr "Отобразить журнал сообщений преобразования"
 
-#: ../data/gtkpod.glade.h:147
-msgid "Display toolbar..."
-msgstr "Отобразить панель инструментов..."
-
-#: ../data/gtkpod.glade.h:148
+#: ../data/gtkpod.glade.h:153
 msgid "Display tooltips in main window"
 msgstr "Отображать всплывающие подсказки в главном окне"
 
-#: ../data/gtkpod.glade.h:149
-msgid "Display tooltips in prefs window"
-msgstr "Отображать всплывающие подсказки в окне настроек"
-
-#: ../data/gtkpod.glade.h:150
+#: ../data/gtkpod.glade.h:154
 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 в отношении файла."
+msgid "Dummy\n"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:157
-msgid "Edit Repository/iPod Options"
-msgstr "Настройки репозиториев/iPod"
-
-#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:662
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:664
 msgid "Edit Smart Playlist"
 msgstr "Изменить умный список воспроизведения"
 
-#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:749
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:751
 msgid "Edit Track Details"
 msgstr "Изменить сведения о дорожке"
 
 #: ../data/gtkpod.glade.h:160
-msgid "Edit _Preferences"
-msgstr "_Параметры"
+msgid "Empty Playlist"
+msgstr "Пустой список воспроизведения"
 
 #: ../data/gtkpod.glade.h:161
-msgid "Effective free space"
-msgstr "Эффективное свободное пространство"
+#, fuzzy
+msgid "Encoding Preferences"
+msgstr "_Параметры"
 
 #: ../data/gtkpod.glade.h:162
-msgid "Empty Playlist"
-msgstr "Пустой список воспроизведения"
+#, fuzzy
+msgid "Encoding..."
+msgstr "копирование..."
 
 #: ../data/gtkpod.glade.h:163
-msgid "Exclude file mask(s)"
+#, fuzzy
+msgid "Excluded files..."
 msgstr "Исключать маски файлов"
 
 #: ../data/gtkpod.glade.h:164
-msgid "Export can be continued at a later time if canceled."
-msgstr "Экспорт может быть возобновлён позднее в случае отмены."
+msgid "Exclusions List"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:165
-msgid "File size"
-msgstr "Размер файла"
+msgid "Expand columns beyond the track list width"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:166
-msgid "File size (deleted)"
-msgstr "Размер файла (удалённого)"
+msgid "Export can be continued at a later time if canceled."
+msgstr "Экспорт может быть возобновлён позднее в случае отмены."
 
 #: ../data/gtkpod.glade.h:167
-msgid "File size (non-transferred)"
-msgstr "Размер файла (непереданного)"
+msgid "Feedback"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:168
-msgid "Filename Format: "
-msgstr "Формат имени файла: "
+#, fuzzy
+msgid "Filename Parse Preferences"
+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)"
+#, fuzzy
+msgid "Filename format: "
+msgstr "Формат имени файла: "
 
 #: ../data/gtkpod.glade.h:170
-msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
-msgstr "Сначала попробовать <i>folder.jpg</i>, затем <i>&lt;artist&gt;/jpg</i>"
+#, fuzzy
+msgid "Filename parse pattern:"
+msgstr "Формат имени файла: "
 
 #: ../data/gtkpod.glade.h:171
-msgid "Flac with :"
-msgstr "FLAC с помощью:"
+#, fuzzy
+msgid "Filter tab:"
+msgstr "Тип файла"
 
+#: ../data/gtkpod.glade.h:172
+#, fuzzy
+msgid "Filter tabs"
+msgstr "Размер файла"
+
 #: ../data/gtkpod.glade.h:173
-#, no-c-format
+#, fuzzy
+msgid "Filter:"
+msgstr "_Файл"
+
+#: ../data/gtkpod.glade.h:174
 msgid ""
-"For example, 'xmms %s' will clear xmms' current playlist, add the selected "
-"tracks and start playing."
-msgstr "Например, \"xmms %s\" очистит текущий список воспроизведения XMMS, добавит выбранные "
-"дорожки и начнёт воспроизведение."
+"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: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."
+#, fuzzy
+msgid "From the hard disk"
+msgstr "Удалить с жёсткого диска"
 
-#: ../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:176
+#, fuzzy
+msgid "From the iPod"
+msgstr "Удалить с iPod"
 
 #: ../data/gtkpod.glade.h:177
-msgid "Group artists on compilation CDs"
-msgstr "Группировать по исполнителям на CD сборников"
+#, fuzzy
+msgid "From the local database"
+msgstr "Локальная база данных"
 
-#: ../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:178 ../src/display_spl.c:182 ../src/info.c:794
+msgid "GB"
+msgstr "ГБ"
 
-#: ../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:179 ../src/display_sorttabs.c:2998
+#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
+msgid "Genre"
+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."
+msgid "Get Help _Online"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:181
-msgid "If both options are selected, embedded APIC data takes precedence."
-msgstr "Если выбраны обе опции, внедрённые данные APIC имеют приоритет."
+#, fuzzy
+msgid "Group artist filter tab by compilation CDs"
+msgstr "Группировать по исполнителям на CD сборников"
 
 #: ../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 "Если опция включена, сортировка будет учитывать регистр. Имейте в виду, что сортировка "
-"с учётнм регистра не работает корректно с большинством кодировок."
+"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: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 "Если имя файла (полный путь) существующей дорожки совпадает с именем файла"
-"добавляемой дорожки, эта опция позволяет вам обновить сведения о существующей"
-"дорожке вместо её пропуска. Обновление не будет произведено, если файл не"
-"был изменён и вы выбрали опцию \"Запрещать появление дубликатов файлов\" выше."
+"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
-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 "При выборе этой опции сведения (обложка и метаданные), изменившиеся"
-"у данной дорожки, будут также скопированы во все остальные дорожки."
-"Используйте с осторожностью."
+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
+#: ../data/gtkpod.glade.h:185
 msgid "Ignore these words when at the beginning of the following fields:"
 msgstr "Игнорировать эти слова в начале следующих полей:"
 
-#: ../data/gtkpod.glade.h:189
+#: ../data/gtkpod.glade.h:186
 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, выберите пункт"
+msgstr ""
+"Чтобы сохранить отображаемый порядок дорожек на iPod, выберите пункт"
 "\"Сохранить отображаемый порядок дорожек\" в меню \"Правка\" или опцию"
 "\"Автосохранение\" ниже."
 
-#: ../data/gtkpod.glade.h:190
+#: ../data/gtkpod.glade.h:187
+#, fuzzy
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr ""
+"Также включать никогда не воспроизведённые дорожки в список \"Наибольший "
+"рейтинг\""
+
+#: ../data/gtkpod.glade.h:188
+msgid "Info field template:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:189
 msgid "Initialize iPod"
 msgstr "Инициализировать iPod"
 
-#: ../data/gtkpod.glade.h:191
+#: ../data/gtkpod.glade.h:190
 msgid ""
 "Insert before\n"
 "Insert after"
-msgstr "Вставить перед\n"
+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:192
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:196
 msgid "Live _updating"
 msgstr "&Обновление в реальном времени"
 
-#: ../data/gtkpod.glade.h:195
+#: ../data/gtkpod.glade.h:197
 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 с помощью:"
+#, fuzzy
+msgid "Logic:"
+msgstr " Логика: "
 
 #: ../data/gtkpod.glade.h:199
-msgid "Match al_l of the following"
-msgstr "Совпадение со всеми указанными"
+msgid ""
+"MP3\n"
+"AAC\n"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:200
-msgid "Match an_y of the following"
-msgstr "Совпадение с любым из указанных"
+#: ../data/gtkpod.glade.h:202
+msgid "Mass-modify tags when multiple tracks are selected"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:201
+#: ../data/gtkpod.glade.h:203
 msgid "Match only _checked tracks"
 msgstr "Совпадение только с &отмеченными дорожками"
 
-#: ../data/gtkpod.glade.h:202
-msgid "Maximum number of background threads:"
+#: ../data/gtkpod.glade.h:204
+#, fuzzy
+msgid "Match:"
+msgstr "Путь:"
+
+#: ../data/gtkpod.glade.h:205
+msgid "Maximum cache size:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:206
+#, fuzzy
+msgid "Maximum threads:"
 msgstr "Максимальное число фоновых потоков:"
 
-#: ../data/gtkpod.glade.h:203
-msgid "Maximum size of cache directory (in GB):"
-msgstr "Максимальный размер папки кэша (в ГБ):"
+#: ../data/gtkpod.glade.h:207
+msgid "Metadata"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:204
+#: ../data/gtkpod.glade.h:208
 msgid "Model:"
 msgstr "Модель:"
 
-#: ../data/gtkpod.glade.h:205 ../src/display_tracks.c:2100
-msgid "Modified"
+#: ../data/gtkpod.glade.h:209
+#, fuzzy
+msgid "Modified:"
 msgstr "Изменено"
 
-#: ../data/gtkpod.glade.h:206
+#: ../data/gtkpod.glade.h:210
 msgid "Most Recently Played Tracks"
 msgstr "Недавно воспроизведённые дорожки"
 
-#: ../data/gtkpod.glade.h:207
-msgid "Move selected attributes to the displayed list"
-msgstr "Переместить выбранные атрибуты в отображаемый список"
+#: ../data/gtkpod.glade.h:211
+#, fuzzy
+msgid "Music"
+msgstr "Корневая папка музыки:"
 
-#: ../data/gtkpod.glade.h:208
-msgid "Music Root:"
+#: ../data/gtkpod.glade.h:212
+#, fuzzy
+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
+#: ../data/gtkpod.glade.h:213
 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
+#: ../data/gtkpod.glade.h:214 ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76 ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113 ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448 ../src/misc_playlist.c:450
 msgid "New Playlist"
 msgstr "Создать список воспроизведения"
 
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:215
 msgid "No lower margin"
 msgstr "Без нижней границы"
 
-#: ../data/gtkpod.glade.h:213
+#: ../data/gtkpod.glade.h:216
 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
+#: ../data/gtkpod.glade.h:217
 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 "
@@ -972,52 +1028,17 @@
 "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, кодировка сохранена не будет. Вместо этого будет использоваться"
-"заданная кодировка."
+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 "
@@ -1026,778 +1047,678 @@
 "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."
+msgstr ""
+"Как правило, если дорожка больше не существует в папке для синхронизации,она "
+"будет удалена из списка воспроизведения, но не с iPod (из репозитория).\n"
+"Если эта опция включена, дорожки будут полностью удалены с iPod или "
+"излокального репозитория, кроме случаев, когда дорожка также содержитсяв "
+"других списках воспроизведения.\n"
+"ЗАМЕЧАНИЕ: если вы синхронизируетесь с главным списком воспроизведения,вы "
+"должны включить эту опцию, если вы хотите удалять дорожки, посколькуудаление "
+"из главного списка означает удаление с iPod."
 
+#: ../data/gtkpod.glade.h:221
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
+msgstr ""
+
 #: ../data/gtkpod.glade.h:222
 msgid "Notes sync command:"
 msgstr "Команда синхронизации заметок:"
 
 #: ../data/gtkpod.glade.h:223
-msgid "Number of playlists"
-msgstr "Число списков воспроизведения"
+#, fuzzy
+msgid "Number of filter tabs:"
+msgstr "_Число вкладок сортировки:"
 
 #: ../data/gtkpod.glade.h:224
-msgid "Number of tracks"
+#, fuzzy
+msgid "Number of tracks:"
 msgstr "Число дорожек"
 
 #: ../data/gtkpod.glade.h:225
-msgid "Number of tracks in generated playlists:"
-msgstr "Число дорожек в сгенерированных списках воспроизведения:"
+msgid "On startup automatically sync with playlist directories"
+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
+#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically update (Live Playlist)"
-msgstr "Автоматически обновлять при запуске (список воспроизведения реального времени)"
+msgstr ""
+"Автоматически обновлять при запуске (список воспроизведения реального "
+"времени)"
 
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:228
 msgid "One for each Album"
 msgstr "По одному для каждого альбома"
 
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:229
 msgid "One for each Artist"
 msgstr "По одному для каждого исполнителя"
 
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:230
 msgid "One for each Composer"
 msgstr "По одному для каждого композитора"
 
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:231
 msgid "One for each Genre"
 msgstr "По одному для каждого жанра"
 
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:232
 msgid "One for each Rating"
 msgstr "По одному для каждого рейтинга"
 
-#: ../data/gtkpod.glade.h:236
+#: ../data/gtkpod.glade.h:233
 msgid "One for each Year"
 msgstr "По одному для каждого года"
 
-#: ../data/gtkpod.glade.h:237
-msgid "Overwrite tags that are already set"
-msgstr "Перезаписывать уже заданные метки"
+#: ../data/gtkpod.glade.h:234
+#, fuzzy
+msgid "Overwrite existing tags"
+msgstr "Перезаписан существующий файл: \"%s\"\n"
 
-#: ../data/gtkpod.glade.h:238
-msgid "Password:"
-msgstr "Пароль:"
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:236
 msgid "Path:"
 msgstr "Путь:"
 
-#: ../data/gtkpod.glade.h:240
+#: ../data/gtkpod.glade.h:237
 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"
+#: ../data/gtkpod.glade.h:238
+#, fuzzy
+msgid "Playcount:"
 msgstr "Число воспроизведений"
 
-#: ../data/gtkpod.glade.h:243 ../src/display_tracks.c:2097
-msgid "Played"
+#: ../data/gtkpod.glade.h:239
+#, fuzzy
+msgid "Played:"
 msgstr "Воспроизведено"
 
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:240
 msgid "Playlist name:"
 msgstr "Имя списка воспроизведения:"
 
-#: ../data/gtkpod.glade.h:245
+#: ../data/gtkpod.glade.h:241
 msgid "Playlist type:"
 msgstr "Тип списка воспроизведения:"
 
-#: ../data/gtkpod.glade.h:246 ../src/display_playlists.c:2258
+#: ../data/gtkpod.glade.h:242 ../src/display_playlists.c:2397
 msgid "Playlists"
 msgstr "Списки воспроизведения"
 
-#: ../data/gtkpod.glade.h:247
+#: ../data/gtkpod.glade.h:243
 msgid "Please refer to the notice below."
 msgstr "Пожалуйста, обратитесь к замечанию ниже."
 
-#: ../data/gtkpod.glade.h:248
-msgid "Please specify a time interval"
-msgstr "Пожалуйста, задайте временной интервал"
+#: ../data/gtkpod.glade.h:244
+#, fuzzy
+msgid "Position:"
+msgstr "Сборник"
 
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:245
 msgid "Preferences"
 msgstr "Параметры"
 
-#: ../data/gtkpod.glade.h:250
+#: ../data/gtkpod.glade.h:246
 msgid "Progress Information"
 msgstr "Сведения о ходе операции"
 
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:252
 msgid "R_ename Album"
 msgstr "Пере&именовать альбом"
 
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:253
 msgid "Random Playlist from Displayed Tracks"
 msgstr "Случайный список воспроизведения из отображаемых дорожек"
 
-#: ../data/gtkpod.glade.h:253
+#: ../data/gtkpod.glade.h:254
 msgid "Randomize Current Playlist"
 msgstr "Перестроить текущий список воспроизведения случайным образом"
 
-#: ../data/gtkpod.glade.h:254 ../src/display_spl.c:101
-#: ../src/misc_conversion.c:78
-msgid "Rating"
+#: ../data/gtkpod.glade.h:255
+#, fuzzy
+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)"
+msgid "Read embedded cover art information"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:257
-msgid "Remove selected attributes from the displayed list"
-msgstr "Удалить выбранные атрибуты из отображаемого списка"
+msgid "Read embedded tags from music files"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:258
+msgid "Report a _Problem"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:259
+#, fuzzy
+msgid "Report problems when accessing mserv"
+msgstr "Показывать сведения о проблемах при доступе к mserv"
+
+#: ../data/gtkpod.glade.h:260
+#, fuzzy
+msgid "Repository"
+msgstr "Новый репозиторий"
+
+#: ../data/gtkpod.glade.h:261
 msgid "Repository Options"
 msgstr "Настройки репозитория"
 
-#: ../data/gtkpod.glade.h:259
+#: ../data/gtkpod.glade.h:262
 msgid "Repository name:"
 msgstr "Название репозитория:"
 
-#: ../data/gtkpod.glade.h:260
+#: ../data/gtkpod.glade.h:263
 msgid "Repository type:"
 msgstr "Тип репозитория:"
 
-#: ../data/gtkpod.glade.h:261
-msgid "Root directory of mserv database (trackinfo root)."
-msgstr "Корневая папка базы данных mserv (trackinfo)."
+#: ../data/gtkpod.glade.h:264
+#, fuzzy
+msgid "Repository/iPod Options"
+msgstr "Настройки репозиториев/iPod"
 
-#: ../data/gtkpod.glade.h:262
-msgid "Rules"
-msgstr "Правила"
-
-#: ../data/gtkpod.glade.h:263 ../src/context_menus.c:804
+#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:806
 msgid "Save Changes"
 msgstr "Сохранить изменения"
 
-#: ../data/gtkpod.glade.h:264
-msgid "Scrobble Tracks?"
-msgstr "Собирать статистику о дорожках?"
-
-#: ../data/gtkpod.glade.h:265
+#: ../data/gtkpod.glade.h:266
 msgid "Select '-1' for no upper limit."
 msgstr "Выберите \"-1\" для отключения верхней границы."
 
-#: ../data/gtkpod.glade.h:266
+#: ../data/gtkpod.glade.h:267
 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
+#: ../data/gtkpod.glade.h:268
 msgid "Selected Filter Tab Entry from Database"
 msgstr "Выбранную запись вкладки фильтрации из базы данных"
 
-#: ../data/gtkpod.glade.h:272
+#: ../data/gtkpod.glade.h:269
 msgid "Selected Filter Tab Entry from Hard Disk"
 msgstr "Выбранную запись вкладки фильтрации с жёсткого диска"
 
-#: ../data/gtkpod.glade.h:273
+#: ../data/gtkpod.glade.h:270
 msgid "Selected Filter Tab Entry from Playlist"
 msgstr "Выбранную запись вкладки фильтрации из списка воспроизведения"
 
-#: ../data/gtkpod.glade.h:274
+#: ../data/gtkpod.glade.h:271
 msgid "Selected Filter Tab Entry from iPod"
 msgstr "Выбранную запись вкладки фильтрации с iPod"
 
-#: ../data/gtkpod.glade.h:275
+#: ../data/gtkpod.glade.h:272
 msgid "Selected Playlist Including Tracks from Database"
 msgstr "Выбранный список воспроизведения, включая дорожки, из базы данных"
 
-#: ../data/gtkpod.glade.h:276
+#: ../data/gtkpod.glade.h:273
 msgid "Selected Playlist Including Tracks from Hard Disk"
 msgstr "Выбранный список воспроизведения, включая дорожки, с жёсткого диска"
 
-#: ../data/gtkpod.glade.h:277
+#: ../data/gtkpod.glade.h:274
 msgid "Selected Playlist Including Tracks from iPod"
 msgstr "Выбранный список воспроизведения, включая дорожки, с iPod"
 
-#: ../data/gtkpod.glade.h:278
+#: ../data/gtkpod.glade.h:275
 msgid "Selected Tab _Entry"
 msgstr "Выбранную _запись вкладки"
 
-#: ../data/gtkpod.glade.h:279
+#: ../data/gtkpod.glade.h:276
 msgid "Selected Tracks from Database"
 msgstr "Выбранные дорожки из базы данных"
 
-#: ../data/gtkpod.glade.h:280
+#: ../data/gtkpod.glade.h:277
 msgid "Selected Tracks from Hard Disk"
 msgstr "Выбранные дорожки с жёсткого диска"
 
-#: ../data/gtkpod.glade.h:281
+#: ../data/gtkpod.glade.h:278
 msgid "Selected Tracks from Playlist"
 msgstr "Выбранные дорожки из списка воспроизведения"
 
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:279
 msgid "Selected Tracks from iPod"
 msgstr "Выбранные дорожки с iPod"
 
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:280
 msgid "Selected _Playlist"
 msgstr "Выбранный _список воспроизведения"
 
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:281
 msgid "Selected _Tracks"
 msgstr "Выбранные _дорожки"
 
-#: ../data/gtkpod.glade.h:285
+#: ../data/gtkpod.glade.h:282
 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
+#: ../data/gtkpod.glade.h:283
 msgid "Set Cover Art from _File"
 msgstr "Выбрать обложку из _файла"
 
-#: ../data/gtkpod.glade.h:288
-msgid "Set mountpoint or edit repository options"
-msgstr "Задать точку монтирования или изменить параметры репозитория"
+#: ../data/gtkpod.glade.h:284
+msgid "Set still missing tags to file name"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:289
-msgid "Set options for Calendar/Contacts/Notes"
-msgstr "Задать настройки календаря/контактов/заметок"
+#: ../data/gtkpod.glade.h:285
+#, fuzzy
+msgid "Settings..."
+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
+#: ../data/gtkpod.glade.h:286
 msgid "Show summary of sync result"
 msgstr "Показать сводную информацию о результате синхронизации"
 
-#: ../data/gtkpod.glade.h:298 ../src/misc_playlist.c:96
-#: ../src/repository.c:1356
+#: ../data/gtkpod.glade.h:287
+#, fuzzy
+msgid "Skip the track"
+msgstr "Одна дорожка скопирована"
+
+#: ../data/gtkpod.glade.h:288 ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
 msgid "Smart Playlist"
 msgstr "Умный список воспроизведения"
 
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:289
+#, fuzzy
+msgid "Sort by:"
+msgstr "   Сортировать по:"
+
+#: ../data/gtkpod.glade.h:290
 msgid "Sort tracks according to: "
 msgstr "Сортировать дорожки по:"
 
-#: ../data/gtkpod.glade.h:300
+#: ../data/gtkpod.glade.h:291
 msgid "Sorting Options"
 msgstr "Параметры сортировки"
 
-#: ../data/gtkpod.glade.h:301
-msgid "Sorting case sensitive"
-msgstr "Сортировка с учётом регистра"
+#: ../data/gtkpod.glade.h:292
+#, fuzzy
+msgid "Sorting..."
+msgstr "Прерывание..."
 
-#: ../data/gtkpod.glade.h:302
-msgid "Sorttab: "
-msgstr "Вкладка сортировки: "
-
-#: ../data/gtkpod.glade.h:303
-msgid "Sorttabs"
-msgstr "Вкладки сортировки"
-
-#: ../data/gtkpod.glade.h:304
+#: ../data/gtkpod.glade.h:293
 msgid "Source:"
 msgstr "Источник:"
 
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:295
 #, 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."
+msgstr ""
+"Задайте точный путь, включая параметры командной строки. \"%i\" "
+"будетзаменено на точку монтирования iPod."
 
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:296
 msgid "Specify interval"
 msgstr "Задайте интервал"
 
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:297
 msgid "Start display automatically"
 msgstr "Начать отображение автоматически"
 
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:298
 msgid "Synchronise Contacts, Calendar and Notes"
 msgstr "Синхронизировать контакты, календарь и заметки"
 
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:299
 msgid "Synchronize All"
 msgstr "Синхронизировать всё"
 
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:300
 msgid "Synchronize Calendar"
 msgstr "Синхронизировать календарь"
 
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:301
 msgid "Synchronize Contacts"
 msgstr "Синхронизировать контакты"
 
-#: ../data/gtkpod.glade.h:313
+#: ../data/gtkpod.glade.h:302
 msgid "Synchronize Notes"
 msgstr "Синхронизировать заметки"
 
-#: ../data/gtkpod.glade.h:314
-msgid "Template for info field: "
-msgstr "Шаблон для поля сведений:"
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:315
+#: ../data/gtkpod.glade.h:304
+msgid "Text color"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:305
 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 "Список воспроизведения ссылается на локальную копию дорожки Если"
-"дорожка недоступна локально, будет показано сообщение об ошибке."
+msgstr ""
+"Список воспроизведения ссылается на локальную копию дорожки Еслидорожка "
+"недоступна локально, будет показано сообщение об ошибке."
 
-#: ../data/gtkpod.glade.h:316
+#: ../data/gtkpod.glade.h:306
 msgid ""
 "The output of the background conversion scripts is copied below. Each page "
 "of the notebook corresponds to one background thread."
-msgstr "Вывод фоновых сценариев преобразования копируется ниже. Каждая вкладка"
-"соответствует одному фоновому потоку."
+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
+#: ../data/gtkpod.glade.h:307
 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
+#: ../data/gtkpod.glade.h:308
 msgid "Time:"
 msgstr "Время:"
 
-#: ../data/gtkpod.glade.h:323 ../src/display_sorttabs.c:2991
+#: ../data/gtkpod.glade.h:309 ../src/display_sorttabs.c:3004
 #: ../src/display_spl.c:83 ../src/misc_conversion.c:62
 msgid "Title"
 msgstr "Название"
 
-#: ../data/gtkpod.glade.h:324
+#: ../data/gtkpod.glade.h:310
 msgid ""
-"Total\n"
-"(iPod)"
-msgstr "Всего\n"
-"(iPod)"
+"To fill additional information, <i>gtkpod</i> can use a database provided by "
+"the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, "
+"leave this alone."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:326
-msgid ""
-"Total\n"
-"(local)"
-msgstr "Всего\n"
-"(локально)"
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:312
 msgid "Tracks"
 msgstr "Дорожки"
 
-#: ../data/gtkpod.glade.h:329
+#: ../data/gtkpod.glade.h:313
 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
+#: ../data/gtkpod.glade.h:314
 msgid "Tracks in Selected Tab _Entry"
 msgstr "Дорожки в выбранной _записи вкладки"
 
-#: ../data/gtkpod.glade.h:332
+#: ../data/gtkpod.glade.h:315
 msgid "Tracks in Selected _Playlist"
 msgstr "Дорожки в выбранном _списке воспроизведения"
 
-#: ../data/gtkpod.glade.h:333
-msgid "Transfer tracks to the iPod in the background"
+#: ../data/gtkpod.glade.h:316
+#, fuzzy
+msgid "Transfer tracks in background mode"
 msgstr "Передавать дорожки на iPod в фоновом режиме"
 
-#: ../data/gtkpod.glade.h:334
-msgid "Translators"
-msgstr "Переводчики"
-
-#: ../data/gtkpod.glade.h:335
+#: ../data/gtkpod.glade.h:317
 msgid ""
 "Try to load contents of all connected iPods. For each iPod a separate "
 "repository must be set up."
-msgstr "Попытаться загрузить содержимое всех подключённых iPod. Для каждого"
-"iPod должен быть создан отдельный репозиторий."
+msgstr ""
+"Попытаться загрузить содержимое всех подключённых iPod. Для каждогоiPod "
+"должен быть создан отдельный репозиторий."
 
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:318
 msgid "Undo _Track"
 msgstr "Отменить _дорожку"
 
-#: ../data/gtkpod.glade.h:337
+#: ../data/gtkpod.glade.h:319
 msgid "Update _mserv Data from File"
 msgstr "Обновить данные _mserv из файла"
 
-#: ../data/gtkpod.glade.h:338
-msgid "Update/Sync all playlists now"
+#: ../data/gtkpod.glade.h:320
+#, fuzzy
+msgid "Update information about the existing track"
+msgstr "Показывать сведения о проблемах при доступе к mserv"
+
+#: ../data/gtkpod.glade.h:321
+#, fuzzy
+msgid "Update/Sync All Playlists"
 msgstr "Обновить/синхронизировать все списки воспроизведения сейчас"
 
-#: ../data/gtkpod.glade.h:339
-msgid "Update/Sync playlist now"
+#: ../data/gtkpod.glade.h:322
+#, fuzzy
+msgid "Update/Sync Playlist"
 msgstr "Обновить/синхронизировать список воспроизведения сейчас"
 
-#: ../data/gtkpod.glade.h:340
-msgid "Upper margin"
-msgstr "Верхняя граница"
+#: ../data/gtkpod.glade.h:323
+msgid "Use legacy format for MP3 tags"
+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>&lt;Album&gt;.jpg</i> in the parent directory"
-msgstr "Использовать <i>&lt;Album&gt;.jpg</i> в родительской папке"
-
-#: ../data/gtkpod.glade.h:344
-msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-msgstr "Использовать <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.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"
+#: ../data/gtkpod.glade.h:324
+#, fuzzy
+msgid "Use mserv database to fill track information"
 msgstr "Использовать базу данных mserv для заполнения дополнительных сведений"
 
-#: ../data/gtkpod.glade.h:348
+#: ../data/gtkpod.glade.h:325
 msgid ""
 "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
 "for this filename."
-msgstr "Использовать выбранныю кодировку (Параметры - Добавление/обновление/синхронизация)\n"
+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
+#: ../data/gtkpod.glade.h:327
 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:328
+msgid "Video Thumbnail Generation"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:357
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:330
 msgid "View Full Size"
 msgstr "Просмотреть в полном размере"
 
-#: ../data/gtkpod.glade.h:358
-msgid "WAV with :"
-msgstr "WAV с помощью:"
-
-#: ../data/gtkpod.glade.h:359
+#: ../data/gtkpod.glade.h:331
 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."
+msgstr ""
+"При копировании с iPod не производится проверка существования конечного "
+"файла.При включении этой опции gtkpod будет проверять, соответствует ли "
+"длина конечногофайла длине файла на iPod. Если это так, файл пропускается, "
+"позволяя быстросинхронизировать всё содержимое iPod."
 
-#: ../data/gtkpod.glade.h:362
-msgid "When syncing playlists"
-msgstr "При синхронизации списков воспроизведения"
+#: ../data/gtkpod.glade.h:332
+msgid "When updating tracks, display information:"
+msgstr ""
 
-#: ../data/gtkpod.glade.h:363
+#: ../data/gtkpod.glade.h:333
 msgid ""
 "Will show a list of tracks removed and a list of tracks newly added or "
 "updated."
-msgstr "Показывает список удалённых дорожек, а также список новых и"
-"обновлённых дорожек."
+msgstr ""
+"Показывает список удалённых дорожек, а также список новых иобновлённых "
+"дорожек."
 
-#: ../data/gtkpod.glade.h:364
-msgid "Write ID3 tags to disk when modified in gtkpod"
-msgstr "Записывать метки ID3 на диск при их изменении в gtkpod"
-
-#: ../data/gtkpod.glade.h:365
+#: ../data/gtkpod.glade.h:334
 msgid "Write all changes made to the disk and the iPod(s)."
 msgstr "Записать все сделанные изменения на диск и на iPod"
 
-#: ../data/gtkpod.glade.h:366
+#: ../data/gtkpod.glade.h:335
+#, fuzzy
+msgid "Write tags to disk when edited"
+msgstr "Записывать метки ID3 на диск при их изменении в gtkpod"
+
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
 msgid ""
-"Write extended information (PC filenames, SHA1 hashes,\n"
-"encoding...). Recommended."
-msgstr "Записывать расширенную информацию (имена файлов на ПК,"
-"хэши SHA1, кодировку...). Рекомендуется."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:368
+#: ../data/gtkpod.glade.h:352
+#, no-c-format
 msgid ""
-"You can also use the table headers, but this allows you to sort according to "
-"a column that is not displayed."
-msgstr "Вы также можете использовать столбцы таблицы, но это позволяет вам"
-"сортировать дорожки по полям, отсутствующим в таблице."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
+msgstr ""
 
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:371
 msgid "_About gtkpod"
 msgstr "_О программе gtkpod"
 
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:372
 msgid "_Add Album"
 msgstr "_Добавить альбом"
 
-#: ../data/gtkpod.glade.h:371
+#: ../data/gtkpod.glade.h:373
 msgid "_Add Image"
 msgstr "_Добавить изображение"
 
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:374
 msgid "_Album"
 msgstr "_Альбом"
 
-#: ../data/gtkpod.glade.h:373
+#: ../data/gtkpod.glade.h:375
 msgid "_All Tracks"
 msgstr "_Все дорожки"
 
-#: ../data/gtkpod.glade.h:374
-msgid "_Arrange Sort Tabs"
+#: ../data/gtkpod.glade.h:376
+#, fuzzy
+msgid "_Arrange Filter Tabs"
 msgstr "_Упорядочить вкладки сортировки"
 
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:377
 msgid "_Check iPod's Files"
 msgstr "_Проверить файлы на iPod"
 
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:378
+#, fuzzy
+msgid "_Contents"
+msgstr "Примечание"
+
+#: ../data/gtkpod.glade.h:379
 msgid "_Conversion Log"
 msgstr "_Журнал сообщений преобразования"
 
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:380
 msgid "_Create Playlists"
 msgstr "_Создать списки воспроизведения"
 
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:381
 msgid "_Create iPod's Directories"
 msgstr "_Создать папки на iPod"
 
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:382
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:383
 msgid "_Display"
 msgstr "_Отображение"
 
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:384
 msgid "_Displayed Tracks"
 msgstr "_Отображаемые дорожки"
 
-#: ../data/gtkpod.glade.h:382
+#: ../data/gtkpod.glade.h:385
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../data/gtkpod.glade.h:383
-msgid "_Encoding (ID3, files):"
-msgstr "_Кодировка (ID3, файлы):"
-
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:386
 msgid "_Enqueue"
 msgstr "_Поставить в очередь"
 
-#: ../data/gtkpod.glade.h:385
+#: ../data/gtkpod.glade.h:387
 msgid "_Export Tracks from Database"
 msgstr "_Экспортировать дорожки из базы данных"
 
-#: ../data/gtkpod.glade.h:386
-msgid "_File"
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:389
+#, fuzzy
+msgid "_Filter Bar"
 msgstr "_Файл"
 
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:390
 msgid "_General"
 msgstr "_Общие"
 
-#: ../data/gtkpod.glade.h:388
+#: ../data/gtkpod.glade.h:391
 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
+#: ../data/gtkpod.glade.h:392
 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
+#: ../data/gtkpod.glade.h:394
 msgid "_Load iPod(s)"
 msgstr "_Загрузить iPod"
 
-#: ../data/gtkpod.glade.h:396
+#: ../data/gtkpod.glade.h:395
 msgid "_Local"
 msgstr "_Локальный"
 
+#: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+msgstr ""
+
 #: ../data/gtkpod.glade.h:397
 msgid "_M3U"
 msgstr "_M3U"
@@ -1807,81 +1728,85 @@
 msgstr "_Разное"
 
 #: ../data/gtkpod.glade.h:399
-msgid "_More Sort Tabs"
+#, fuzzy
+msgid "_More Filter Tabs"
 msgstr "_Больше вкладок сортировки"
 
 #: ../data/gtkpod.glade.h:400
+#, fuzzy
+msgid "_Music"
+msgstr "_Разное"
+
+#: ../data/gtkpod.glade.h:401
 msgid "_Newly Added Tracks"
 msgstr "_Вновь добавленные дорожки"
 
-#: ../data/gtkpod.glade.h:401
+#: ../data/gtkpod.glade.h:402
 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
+#, fuzzy
+msgid "_Photos"
+msgstr "Снимки"
+
+#: ../data/gtkpod.glade.h:405
 msgid "_Play Now"
 msgstr "_Воспроизвести сейчас"
 
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:406
 msgid "_Podcasts"
 msgstr "_Подкасты"
 
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:407
 msgid "_Prefer Local"
 msgstr "_Предпочитать локальные"
 
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:408
+#, fuzzy
+msgid "_Remove Album"
+msgstr "_Удалить альбом"
+
+#: ../data/gtkpod.glade.h:409
 msgid "_Remove Cover Art"
 msgstr "_Удалить обложку"
 
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:410
 msgid "_Remove Images"
 msgstr "_Удалить изображения"
 
-#: ../data/gtkpod.glade.h:409
-msgid "_Remove _Album"
-msgstr "_Удалить альбом"
-
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:411
 msgid "_Save Changes"
 msgstr "_Сохранить изменения"
 
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:412
 msgid "_Save Displayed Track Order"
 msgstr "_Сохранить отображаемый порядок дорожек"
 
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:413
 msgid "_Sorting"
 msgstr "_Сортировка"
 
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:414
 msgid "_Synchronize Playlist with Dir(s)"
 msgstr "_Синхронизировать список воспроизведения с папками"
 
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:415
 msgid "_Toolbar"
 msgstr "_Панель инструментов"
 
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:416
 msgid "_Tools"
 msgstr "_Инструменты"
 
-#: ../data/gtkpod.glade.h:416
+#: ../data/gtkpod.glade.h:417
 msgid "_Tooltips"
 msgstr "_Всплывающие подсказки"
 
-#: ../data/gtkpod.glade.h:417
-msgid "_Track Info"
-msgstr "_Сведения о дорожке"
-
 #: ../data/gtkpod.glade.h:418
 msgid "_Undo All"
 msgstr "_Отменить все"
@@ -1899,91 +1824,60 @@
 msgstr "_Вид"
 
 #: ../data/gtkpod.glade.h:422
+msgid "_Zoom"
+msgstr ""
+
+#: ../data/gtkpod.glade.h:423
 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'."
+msgid "checkbutton"
+msgstr ""
 
 #: ../data/gtkpod.glade.h:425
-msgid "folder"
-msgstr "folder"
+msgid "gtk-revert-to-saved"
+msgstr ""
 
 #: ../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"
+#, fuzzy
+msgid "gtkpod Information"
 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
+#: ../data/gtkpod.glade.h:429
 msgid ""
 "iPod\n"
 "Local Repository (Standard)\n"
 "Local Repository (Podcasts)\n"
-msgstr "iPod\n"
+msgstr ""
+"iPod\n"
 "Локальный репозиторий (стандартный)\n"
 "Локальный репозитория (подкасты)\n"
 
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:433
 msgid "iPod mountpoint:"
 msgstr "Точка монтирования iPod:"
 
-#: ../data/gtkpod.glade.h:439
+#: ../data/gtkpod.glade.h:434
 msgid "iTunesDB backup:"
 msgstr "Резервная копия iTunesDB:"
 
-#: ../data/gtkpod.glade.h:440
-msgid "label"
-msgstr "label"
+#: ../data/gtkpod.glade.h:435
+#, fuzzy
+msgid "mserv Preferences"
+msgstr "Параметры"
 
-#: ../data/gtkpod.glade.h:441
-msgid "mserv Root:"
+#: ../data/gtkpod.glade.h:436
+#, fuzzy
+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
+#: ../data/gtkpod.glade.h:437 ../src/details.c:1352
 msgid "n/a"
 msgstr "н/д"
 
-#: ../data/gtkpod.glade.h:444
+#: ../data/gtkpod.glade.h:438
 msgid "special_sorttab -- Don't translate!"
 msgstr "special_sorryab -- Не переводить!"
 
@@ -1996,7 +1890,8 @@
 msgid ""
 "Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
 "\n"
-msgstr "Вновь примонтированный iPod \"%s\" не мог быть загружен в gtkpod.\n"
+msgstr ""
+"Вновь примонтированный iPod \"%s\" не мог быть загружен в gtkpod.\n"
 "\n"
 
 #: ../src/autodetection.c:403
@@ -2004,7 +1899,8 @@
 msgid ""
 "Newly mounted iPod at '%s' appears to be already loaded!\n"
 "\n"
-msgstr "Вновь примонтированный iPod \"%s\" выглядит уже загруженным!\n"
+msgstr ""
+"Вновь примонтированный iPod \"%s\" выглядит уже загруженным!\n"
 "\n"
 
 #: ../src/autodetection.c:416
@@ -2213,162 +2109,177 @@
 
 #. sanity!
 #. check for "System Charset" and return NULL
-#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+#: ../src/charset.c:163 ../src/charset.c:173 ../src/charset.c:232
+#: ../src/charset.c:248 ../src/charset.c:332
 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
+#: ../src/clientserver.c:215
 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 "Диалог подтверждения"
+#: ../src/confirmation.c:389
+#, fuzzy
+msgid "Confirmation"
+msgstr "Сведения"
 
-#: ../src/context_menus.c:362
+#: ../src/context_menus.c:364
 #, c-format
 msgid "Copied \"%s\" playlist to %s"
 msgstr "Список воспроизведения \"%s\" скопирован в %s"
 
-#: ../src/context_menus.c:401
-#, c-format
+#: ../src/context_menus.c:403
+#, fuzzy, c-format
 msgid "Copied %d track to '%s'"
-msgstr "Дорожка %d скопирована в \"%s\""
+msgid_plural "Copied %d tracks to '%s'"
+msgstr[0] "Дорожка %d скопирована в \"%s\""
+msgstr[1] "Дорожка %d скопирована в \"%s\""
+msgstr[2] "Дорожка %d скопирована в \"%s\""
 
-#: ../src/context_menus.c:429
+#: ../src/context_menus.c:431
 #, c-format
 msgid "Copied '%s' playlist to '%s' in '%s'"
 msgstr "Список воспроизведения \"%s\" скопирован в \"%s\" в \"%s\""
 
-#: ../src/context_menus.c:462
-#, c-format
+#: ../src/context_menus.c:464
+#, fuzzy, c-format
 msgid "Copied %d track to '%s' in '%s'"
-msgstr "Дорожка %d скопирована в \"%s\" в \"%s\""
+msgid_plural "Copied %d tracks to %s in '%s'"
+msgstr[0] "Дорожка %d скопирована в \"%s\" в \"%s\""
+msgstr[1] "Дорожка %d скопирована в \"%s\" в \"%s\""
+msgstr[2] "Дорожка %d скопирована в \"%s\" в \"%s\""
 
-#: ../src/context_menus.c:622 ../src/tools.c:854
+#: ../src/context_menus.c:624 ../src/tools.c:854
 msgid "Play Now"
 msgstr "Воспроизвести сейчас"
 
-#: ../src/context_menus.c:628 ../src/tools.c:867
+#: ../src/context_menus.c:630 ../src/tools.c:867
 msgid "Enqueue"
 msgstr "Поставить в очередь"
 
-#: ../src/context_menus.c:634
+#: ../src/context_menus.c:636
 msgid "Copy Tracks to Filesystem"
 msgstr "Скопировать дорожки в файловую систему"
 
-#: ../src/context_menus.c:641 ../src/file_export.c:1085
+#: ../src/context_menus.c:643 ../src/file_export.c:1085
 msgid "Create Playlist File"
 msgstr "Создать файл списка воспроизведения"
 
-#: ../src/context_menus.c:648
+#: ../src/context_menus.c:650
 msgid "Create new Playlist"
 msgstr "Создать новый список воспроизведения"
 
-#: ../src/context_menus.c:655
+#: ../src/context_menus.c:657
 msgid "Update Tracks from File"
 msgstr "Обновить дорожки из файла"
 
-#: ../src/context_menus.c:669
+#: ../src/context_menus.c:671
 msgid "Sync Playlist with Dir(s)"
 msgstr "Синхронизировать список воспроизведения с папками"
 
-#: ../src/context_menus.c:679
+#: ../src/context_menus.c:681
 msgid "Remove All Tracks from iPod"
 msgstr "Удалить все дорожки с iPod"
 
-#: ../src/context_menus.c:697
+#: ../src/context_menus.c:687 ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr "Я уверен"
+
+#: ../src/context_menus.c:699
 msgid "Remove All Podcasts from iPod"
 msgstr "Удалить все подкасты с iPod"
 
-#: ../src/context_menus.c:712
+#: ../src/context_menus.c:714
 msgid "Delete Including Tracks"
 msgstr "Удалить, включая дорожки"
 
-#: ../src/context_menus.c:720
+#: ../src/context_menus.c:722
 msgid "Delete But Keep Tracks"
 msgstr "Удалить, но сохранить дорожки"
 
-#: ../src/context_menus.c:728
+#: ../src/context_menus.c:730
 msgid "Edit iPod Properties"
 msgstr "Свойства iPod"
 
-#: ../src/context_menus.c:735
+#: ../src/context_menus.c:737
 msgid "Edit Repository Properties"
 msgstr "Свойства репозитория"
 
-#: ../src/context_menus.c:742
+#: ../src/context_menus.c:744
 msgid "Edit Playlist Properties"
 msgstr "Свойства списка воспроизведения"
 
-#: ../src/context_menus.c:770
+#: ../src/context_menus.c:772
 msgid "View Full Size Artwork"
 msgstr "Просмотреть изображение в полном размере"
 
-#: ../src/context_menus.c:777
+#: ../src/context_menus.c:779
 msgid "Select Cover From File"
 msgstr "Выбрать обложку из файла"
 
-#: ../src/context_menus.c:790
+#: ../src/context_menus.c:792
 msgid "Load iPod"
 msgstr "Загрузить iPod"
 
-#: ../src/context_menus.c:797
+#: ../src/context_menus.c:799
 msgid "Eject iPod"
 msgstr "Извлечь iPod"
 
-#: ../src/context_menus.c:814
+#: ../src/context_menus.c:816
 msgid "Remove All Tracks from Database"
 msgstr "Удалить все дорожки из базы данных"
 
-#: ../src/context_menus.c:829
+#: ../src/context_menus.c:831
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Удалить, включая дорожки (жёсткий диск)"
 
-#: ../src/context_menus.c:837
+#: ../src/context_menus.c:839
 msgid "Delete Including Tracks (Database)"
 msgstr "Удалить, включая дорожки (база данных)"
 
-#: ../src/context_menus.c:845
+#: ../src/context_menus.c:847
 msgid "Delete From iPod"
 msgstr "Удалить с iPod"
 
-#: ../src/context_menus.c:853
+#: ../src/context_menus.c:855
 msgid "Delete From Playlist"
 msgstr "Удалить из списка воспроизведения"
 
-#: ../src/context_menus.c:861
+#: ../src/context_menus.c:863
 msgid "Delete From Harddisk"
 msgstr "Удалить с жёсткого диска"
 
-#: ../src/context_menus.c:869
+#: ../src/context_menus.c:871
 msgid "Delete From Database"
 msgstr "Удалить из базы данных"
 
-#: ../src/context_menus.c:877
+#: ../src/context_menus.c:879
 msgid "Alphabetize"
 msgstr "Упорядочить по алфавиту"
 
-#: ../src/context_menus.c:895
+#: ../src/context_menus.c:897
 msgid "Remove Album"
 msgstr "Удалить альбом"
 
-#: ../src/context_menus.c:905
+#: ../src/context_menus.c:907
 msgid "Remove Photo"
 msgstr "Удалить снимок"
 
-#: ../src/context_menus.c:915
+#: ../src/context_menus.c:924
 msgid "Rename Album"
 msgstr "Переименовать альбом"
 
-#: ../src/context_menus.c:974 ../src/context_menus.c:1023
+#: ../src/context_menus.c:983 ../src/context_menus.c:1032
 msgid "Copy selected playlist to..."
 msgstr "Копировать выбранный список воспроизведения в..."
 
-#: ../src/context_menus.c:1076
+#: ../src/context_menus.c:1085
 msgid "Copy selected track(s) to..."
 msgstr "Копировать выбранные дорожки в..."
 
@@ -2414,17 +2325,17 @@
 msgid "TV Show & Music Video"
 msgstr "Телепередача и музыкальный видеоклип"
 
-#: ../src/details.c:836
+#: ../src/details.c:837
 #, c-format
 msgid "%s (image data corrupted or unreadable)"
 msgstr "%s (данные изображения повреждены или не читаются)"
 
-#: ../src/details.c:973
+#: ../src/details.c:975
 #, c-format
 msgid "Please report unknown mediatype %x\n"
 msgstr "Пожалуйста, сообщите о неизвестном типе данных %x\n"
 
-#: ../src/details.c:1418
+#: ../src/details.c:1417
 msgid "<b>n/a</b>"
 msgstr "<b>н/д</b>"
 
@@ -2433,266 +2344,278 @@
 msgid "Error occurred dropping an image onto the details window: %s\n"
 msgstr "Произошла ошибка при перетаскивании изображения на окно сведений: %s\n"
 
-#: ../src/details.c:1952 ../src/display_coverart.c:2128
+#: ../src/details.c:1952 ../src/display_coverart.c:2297
 msgid "Successfully set new coverart for selected tracks"
 msgstr "Новая обложка успешно установлена для выбранных дорожек"
 
-#: ../src/display.c:743
+#. Set the resolution in the label
+#: ../src/display.c:570
+#, c-format
+msgid "<b>Image Dimensions: %d x %d</b>"
+msgstr ""
+
+#: ../src/display.c:814
 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
+#: ../src/display.c:821 ../src/misc_confirm.c:469 ../src/misc_track.c:2158
 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
+#: ../src/display.c:974 ../src/display.c:1320 ../src/display.c:1376
+#: ../src/display.c:1430 ../src/display.c:1485 ../src/display.c:1746
 #, c-format
 msgid "No entry selected in Sort Tab %d"
 msgstr "Не выбрана запись на вкладке сортировки %d"
 
-#: ../src/display.c:948
+#: ../src/display.c:1015
 msgid "Remove entry of which sort tab from database?"
 msgstr "На какой вкладке сортировки удалить запись из базы данных?"
 
-#: ../src/display.c:956
+#: ../src/display.c:1024
 msgid "Remove tracks in selected entry of which filter tab from the iPod?"
-msgstr "На какой вкладке фильтрации удалить дорожки из выбранной записи с iPod?"
+msgstr ""
+"На какой вкладке фильтрации удалить дорожки из выбранной записи с iPod?"
 
-#: ../src/display.c:978
+#: ../src/display.c:1049
 msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
-msgstr "На какой вкладке фильтрации удалить дорожки из выбранной записи с жёсткого диска?"
+msgstr ""
+"На какой вкладке фильтрации удалить дорожки из выбранной записи с жёсткого "
+"диска?"
 
-#: ../src/display.c:1008
+#: ../src/display.c:1082
 msgid "Remove tracks in selected entry of which filter tab from playlist?"
-msgstr "На какой вкладке фильтрации удалить дорожки из выбранной записи из списка воспроизведения?"
+msgstr ""
+"На какой вкладке фильтрации удалить дорожки из выбранной записи из списка "
+"воспроизведения?"
 
-#: ../src/display.c:1035 ../src/display.c:1073
+#: ../src/display.c:1109 ../src/display.c:1147
 #, c-format
 msgid ""
 "iPod at '%s' is not loaded.\n"
 "Please load it first."
-msgstr "iPod на \"%s\" не загружен.\n"
+msgstr ""
+"iPod на \"%s\" не загружен.\n"
 "Пожалуйста, сначала загрузите его."
 
-#: ../src/display.c:1110 ../src/display.c:1137
+#: ../src/display.c:1184 ../src/display.c:1218
 msgid "Update selected entry of which sort tab?"
 msgstr "На какой вкладке сортировки обновить выбранную запись?"
 
-#: ../src/display.c:1223
+#: ../src/display.c:1314
 msgid "Export selected entry of which sort tab?"
 msgstr "На какой вкладке сортировки экспортировать выбранную запись?"
 
-#: ../src/display.c:1279
+#: ../src/display.c:1370
 msgid "Create playlist file from selected entry of which sort tab?"
-msgstr "Из записи какой вкладки сортировки создать файл списка воспроизведения?"
+msgstr ""
+"Из записи какой вкладки сортировки создать файл списка воспроизведения?"
 
-#: ../src/display.c:1333
+#: ../src/display.c:1424
 msgid "Play tracks in selected entry of which sort tab?"
 msgstr "На какой вкладке сортировки воспроизвести дорожки из выбранной записи?"
 
-#: ../src/display.c:1388
+#: ../src/display.c:1479
 msgid "Enqueue tracks in selected entry of which sort tab?"
-msgstr "На какой вкладке сортировки поставить в очередь дорожки из выбранной записи?"
+msgstr ""
+"На какой вкладке сортировки поставить в очередь дорожки из выбранной записи?"
 
-#: ../src/display.c:1645
+#: ../src/display.c:1736
 msgid "Normalize tracks in selected entry of which sort tab?"
 msgstr "На какой вкладке сортировки нормализовать дорожки из выбранной записи?"
 
-#: ../src/display_coverart.c:1713
+#: ../src/display_coverart.c:1874
 msgid "Failed to remove the album from the album hash store."
 msgstr "Не удалось удалить альбом из хранилища хэшей альбомов."
 
-#: ../src/display_coverart.c:2098
+#: ../src/display_coverart.c:2262
 #, c-format
 msgid "Error occurred dropping an image onto the coverart display: %s\n"
-msgstr "Произошла ошибка при попытке перетащить изображение на окно обложки: %s\n"
+msgstr ""
+"Произошла ошибка при попытке перетащить изображение на окно обложки: %s\n"
 
-#: ../src/display_itdb.c:376
+#: ../src/display_itdb.c:385
 #, 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 "Локальный"
+#: ../src/display_itdb.c:871
+msgid "Music Library"
+msgstr ""
 
 #. add podcast playlist
-#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1025
+#: ../src/display_itdb.c:879 ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
 msgid "Podcasts"
 msgstr "Подкасты"
 
-#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:888 ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
 msgid "iPod"
 msgstr "iPod"
 
-#: ../src/display_itdb.c:1084
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr "Локальный"
+
+#: ../src/display_itdb.c:1098
 #, c-format
 msgid "Increased playcount for '%s'"
 msgstr "Увеличено число воспроизведений для \"%s\""
 
-#: ../src/display_photo.c:163
+#: ../src/display_photo.c:158
 #, c-format
 msgid "Error reading iPod photo database (%s).\n"
 msgstr "Ошибка при чтении базы данных снимков iPod (%s).\n"
 
-#: ../src/display_photo.c:168
+#: ../src/display_photo.c:161
 msgid "Error reading iPod photo database.\n"
 msgstr "Ошибка при чтении базы данных снимков iPod.\n"
 
-#: ../src/display_photo.c:238
-msgid "Could not access the ipod's photo database."
+#: ../src/display_photo.c:201
+#, fuzzy
+msgid "Could not access the iPod's photo database."
 msgstr "Не удалось обратиться к базе данных снимков iPod."
 
-#: ../src/display_photo.c:441
+#: ../src/display_photo.c:404
 msgid "Photo Albums"
 msgstr "Фотоальбомы"
 
-#: ../src/display_photo.c:451 ../src/display_photo.c:1666
+#: ../src/display_photo.c:414 ../src/display_photo.c:1587
 msgid "<Unnamed>"
 msgstr "<Безымянный>"
 
-#: ../src/display_photo.c:920
+#: ../src/display_photo.c:848
 msgid "The Photo Library album cannot be removed"
 msgstr "Альбом фотогалереи не может быть удалён"
 
-#: ../src/display_photo.c:942
+#: ../src/display_photo.c:870
 msgid "Do you want to remove the album's photos too?"
 msgstr "Желаете ли вы также удалить снимки альбома?"
 
-#: ../src/display_photo.c:948
+#: ../src/display_photo.c:876
 msgid "Yes. Do Not Display Again"
 msgstr "Да. Не показывать снова"
 
-#: ../src/display_photo.c:1019
+#: ../src/display_photo.c:947
 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"
+msgstr ""
+"Это удалит выбранные снимки из выбранного альбома.\n"
 " Желаете ли вы также удалить их из базы данных?"
 
-#: ../src/display_photo.c:1034
+#: ../src/display_photo.c:962
 msgid ""
 "This will delete the photo selection from the Photo Library and all albums. "
 "Are you sure?"
-msgstr "Это удалит выбранные снимки из фотогалереи и всех альбомов."
-"Вы уверены?"
+msgstr "Это удалит выбранные снимки из фотогалереи и всех альбомов.Вы уверены?"
 
-#: ../src/display_photo.c:1109
+#: ../src/display_photo.c:1036
 msgid "New Photo Album Name"
 msgstr "Новое название фотоальбома"
 
-#: ../src/display_photo.c:1110
+#: ../src/display_photo.c:1037
 msgid "Please enter a new name for the photo album"
 msgstr "Пожалуйста, введите новое название для фотоальбома"
 
-#: ../src/display_photo.c:1122 ../src/display_photo.c:1204
+#: ../src/display_photo.c:1050 ../src/display_photo.c:1133
 msgid "An album with that name already exists."
 msgstr "Альбом с таким названием уже существует."
 
-#: ../src/display_photo.c:1191
+#: ../src/display_photo.c:1119
 msgid "New Photo Album"
 msgstr "Новый фотоальбом"
 
-#: ../src/display_photo.c:1192
+#: ../src/display_photo.c:1120
 msgid "Please enter a name for the new photo album"
 msgstr "Пожалуйста, введите название для нового фотоальбома"
 
-#: ../src/display_photo.c:1213
+#: ../src/display_photo.c:1142
 msgid "The new album failed to be created."
 msgstr "Не удалось создать новый альбом."
 
-#: ../src/display_photo.c:1237
+#: ../src/display_photo.c:1166
 msgid "Add Image to iPod"
 msgstr "Добавить изображение на iPod"
 
 #. Open a dialog directory chooser window
-#: ../src/display_photo.c:1292
+#: ../src/display_photo.c:1221
 msgid "Add a Directory of Images to the iPod. Select the Directory."
 msgstr "Добавить папку с изображениями на iPod. Выбрать папку."
 
-#: ../src/display_photo.c:1680
+#: ../src/display_photo.c:1601
 #, 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
+#: ../src/display_playlists.c:537 ../src/display_playlists.c:579
 msgid "Error: drag from iPod not possible in offline mode."
 msgstr "Ошибка: перетаскивание с iPod невозможно в автономном режиме."
 
-#: ../src/display_playlists.c:585 ../src/display_tracks.c:286
-#, c-format
+#: ../src/display_playlists.c:606 ../src/display_tracks.c:403
+#, fuzzy, c-format
 msgid "Copied one track"
-msgstr "Одна дорожка скопирована"
+msgid_plural "Copied %d tracks"
+msgstr[0] "Одна дорожка скопирована"
+msgstr[1] "Одна дорожка скопирована"
+msgstr[2] "Одна дорожка скопирована"
 
-#: ../src/display_playlists.c:865 ../src/display_playlists.c:877
+#: ../src/display_playlists.c:886 ../src/display_playlists.c:898
 msgid "Can't reorder sorted treeview."
 msgstr "Нельзя переупорядочить отсортированное дерево."
 
-#: ../src/display_playlists.c:954
+#: ../src/display_playlists.c:975
 #, 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"
+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
+#: ../src/display_playlists.c:2039
 msgid "Photos"
 msgstr "Снимки"
 
-#: ../src/display_sorttabs.c:473
+#: ../src/display_sorttabs.c:479
 msgid "'Played' condition ignored because of error."
 msgstr "Условие \"воспроизведено\" проигнорировано из-за ошибки."
 
-#: ../src/display_sorttabs.c:476
+#: ../src/display_sorttabs.c:482
 msgid "'Modified' condition ignored because of error."
 msgstr "Условие \"изменено\" проигнорировано из-за ошибки."
 
-#: ../src/display_sorttabs.c:479
+#: ../src/display_sorttabs.c:485
 msgid "'Added' condition ignored because of error."
 msgstr "Условие \"Добавлено\" проигнорировано из-за ошибки."
 
-#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1568 ../src/misc_conversion.c:59
 msgid "All"
 msgstr "Все"
 
-#: ../src/display_sorttabs.c:1588
+#: ../src/display_sorttabs.c:1594
 msgid "Compilations"
 msgstr "Сборники"
 
-#: ../src/display_sorttabs.c:2988
+#: ../src/display_sorttabs.c:3001
 msgid "Comp."
 msgstr "Сбор."
 
-#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:3007 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333 ../src/misc_conversion.c:84
 msgid "Year"
 msgstr "Год"
 
-#: ../src/display_sorttabs.c:2997
+#: ../src/display_sorttabs.c:3010
 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 "дней"
@@ -2713,7 +2636,7 @@
 msgid "Hz"
 msgstr "Гц"
 
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:794
 msgid "MB"
 msgstr "МБ"
 
@@ -2746,6 +2669,10 @@
 msgid "Size"
 msgstr "Размер"
 
+#: ../src/display_spl.c:94 ../src/infodlg.c:78
+msgid "Play time"
+msgstr "Длительность"
+
 #: ../src/display_spl.c:95 ../src/misc_conversion.c:64
 msgid "Comment"
 msgstr "Примечание"
@@ -2754,6 +2681,10 @@
 msgid "Date added"
 msgstr "Дата добавления"
 
+#: ../src/display_spl.c:98 ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "Число воспроизведений"
+
 #: ../src/display_spl.c:99
 msgid "Last played"
 msgstr "Последние воспроизведённые"
@@ -2762,6 +2693,10 @@
 msgid "Disc number"
 msgstr "Номер диска"
 
+#: ../src/display_spl.c:101 ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "Рейтинг"
+
 #: ../src/display_spl.c:102 ../src/misc_conversion.c:87
 msgid "Compilation"
 msgstr "Сборник"
@@ -2876,10 +2811,6 @@
 msgid "hours"
 msgstr "часов"
 
-#: ../src/display_spl.c:182 ../src/info.c:780
-msgid "GB"
-msgstr "ГБ"
-
 #: ../src/display_spl.c:189
 msgid "random order"
 msgstr "случайный порядок"
@@ -2936,470 +2867,589 @@
 msgid "Movie"
 msgstr "Фильм"
 
-#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+#: ../src/display_spl.c:1143 ../src/display_spl.c:1158
 msgid "to"
 msgstr "до"
 
-#: ../src/display_spl.c:1485
+#: ../src/display_spl.c:1436
 msgid "-"
 msgstr "-"
 
-#: ../src/display_spl.c:1500
+#: ../src/display_spl.c:1451
 msgid "+"
 msgstr "+"
 
-#: ../src/display_tracks.c:281
-#, c-format
+#: ../src/display_tracks.c:398
+#, fuzzy, c-format
 msgid "Moved one track"
-msgstr "Одна дорожка перемещена"
+msgid_plural "Moved %d tracks"
+msgstr[0] "Одна дорожка перемещена"
+msgstr[1] "Одна дорожка перемещена"
+msgstr[2] "Одна дорожка перемещена"
 
-#: ../src/display_tracks.c:1810
+#: ../src/display_tracks.c:2022
 #, 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"
+msgstr ""
+"Не удалось отменить сортировку дорожек из-за ошибки в используемойбиблиотеке "
+"GTK (%d.%d.%d < 2.5.4). После сортировки окна дорожен невозможновернуться в "
+"неотсортированное состояние.\n"
 "\n"
 
-#: ../src/display_tracks.c:2069
+#: ../src/display_tracks.c:2288
 msgid "Rtng"
 msgstr "Рейтинг"
 
-#: ../src/display_tracks.c:2072
+#: ../src/display_tracks.c:2291
 msgid "#"
 msgstr "No"
 
-#: ../src/display_tracks.c:2075
+#: ../src/display_tracks.c:2294
 msgid "CD"
 msgstr "CD"
 
-#: ../src/display_tracks.c:2078
+#: ../src/display_tracks.c:2297
 msgid "ID"
 msgstr "ID"
 
-#: ../src/display_tracks.c:2081
+#: ../src/display_tracks.c:2300
 msgid "Trnsfrd"
 msgstr "Передано"
 
-#: ../src/display_tracks.c:2085
+#: ../src/display_tracks.c:2309
 msgid "Cmpl"
 msgstr "Сборник"
 
-#: ../src/display_tracks.c:2091
+#: ../src/display_tracks.c:2315
 msgid "Time"
 msgstr "Время"
 
-#: ../src/display_tracks.c:2094
+#: ../src/display_tracks.c:2318
 msgid "Plycnt"
 msgstr "Воспроизв."
 
-#: ../src/display_tracks.c:2106
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "Воспроизведено"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "Изменено"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "Добавлено"
+
+#: ../src/display_tracks.c:2330
 msgid "Released"
 msgstr "Выпущено"
 
-#: ../src/display_tracks.c:2112
+#: ../src/display_tracks.c:2336
 msgid "Vol."
 msgstr "Том"
 
-#: ../src/display_tracks.c:2115
+#: ../src/display_tracks.c:2339
 msgid "Sndchk."
 msgstr "Sndchk."
 
-#: ../src/fetchcover.c:358
-msgid "Coverart file already exists"
-msgstr "Файл обложки уже существует"
-
-#: ../src/fetchcover.c:371
-#, c-format
+#: ../src/fetchcover.c:359
+#, fuzzy, 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"
+"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 \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"
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to 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"
 "-  Нажмите \"Нет\", чтобы сохранить файл под уникальным именем.\t\t\t\t\n"
 "-  Нажмите \"Отмена\", чтобы отменить операцию получения обложки."
 
-#: ../src/file.c:236
+#: ../src/fetchcover.c:368
+#, fuzzy
+msgid "Cover art file already exists"
+msgstr "Файл обложки уже существует"
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr ""
+
+#: ../src/fetchcover.c:371
+#, fuzzy
+msgid "Rename"
+msgstr "Имя пользователя:"
+
+#: ../src/fetchcover.c:372
+#, fuzzy
+msgid "Abort"
+msgstr "Прерывание..."
+
+#: ../src/file.c:238
 #, c-format
 msgid ""
 "'%s' is a directory, not a playlist file.\n"
 "\n"
-msgstr "\"%s\" - папка, а не файл списка воспроизведения.\n"
+msgstr ""
+"\"%s\" - папка, а не файл списка воспроизведения.\n"
 "\n"
 
-#: ../src/file.c:266
+#: ../src/file.c:268
 #, c-format
 msgid ""
 "'%s' is a not a known playlist file.\n"
 "\n"
-msgstr "\"%s\" не является известным файлом списка воспроизведения.\n"
+msgstr ""
+"\"%s\" не является известным файлом списка воспроизведения.\n"
 "\n"
 
-#: ../src/file.c:283
+#: ../src/file.c:285 ../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
+#: ../src/file.c:371
 #, c-format
 msgid "Skipping '%s' because it is a directory.\n"
 msgstr "Пропущено \"%s\", поскольку это папка.\n"
 
-#: ../src/file.c:374
+#: ../src/file.c:376
 #, c-format
 msgid "Skipping '%s' to avoid adding playlist file recursively\n"
-msgstr "Пропущено \"%s\", чтобы предотвратить рекурсивное добавление файла списка воспроизведения.\n"
+msgstr ""
+"Пропущено \"%s\", чтобы предотвратить рекурсивное добавление файла списка "
+"воспроизведения.\n"
 
-#: ../src/file.c:629
+#: ../src/file.c:631
 #, c-format
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "Неизвестная лексема \"%s\" в шаблоне \"%s\"\n"
 
-#: ../src/file.c:923
+#: ../src/file.c:939
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Локальное имя файла недопустимо (%s)"
 
-#: ../src/file.c:982
+#: ../src/file.c:998
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "Сведения о пользователе \"%s\" в \"%s\" не найдены."
 
-#: ../src/file.c:991
+#: ../src/file.c:1007
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr "Файл данных mserv (%s) не доступен для дорожки (%s)"
 
-#: ../src/file.c:999
+#: ../src/file.c:1015
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr "Дорожка (%s) отсутствует в корневой папке музыки mserv (%s)"
 
-#: ../src/file.c:1123
+#: ../src/file.c:1046
+#, fuzzy, c-format
+msgid "Could not create '%s'"
+msgstr "Не удалось создать ~/.gtkpod\n"
+
+#: ../src/file.c:1083
+#, fuzzy
+msgid "Error creating thumbnail file"
+msgstr "Ошибка при создании %s: %s\n"
+
+#: ../src/file.c:1114 ../src/misc.c:1018
 #, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "Неизвестная лексема '%%%c' в шаблоне '%s'"
+
+#: ../src/file.c:1138
+#, c-format
 msgid ""
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
+msgstr ""
+
+#: ../src/file.c:1142
+#, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr ""
+
+#: ../src/file.c:1291
+#, 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:1209
+#: ../src/file.c:1377
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
-msgstr "Следующая дорожка не могла быть обработана (неизвестный тип файла): \"%s\"\n"
+msgstr ""
+"Следующая дорожка не могла быть обработана (неизвестный тип файла): \"%s\"\n"
 
-#: ../src/file.c:1307
+#: ../src/file.c:1476
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
 "failed): '%s'\n"
-msgstr "Следующая дорожка не могла быть обработана (тип файла известен, но его не удалось проанализировать): \"%s\"\n"
+msgstr ""
+"Следующая дорожка не могла быть обработана (тип файла известен, но его не "
+"удалось проанализировать): \"%s\"\n"
 
-#: ../src/file.c:1337 ../src/file.c:1391
+#: ../src/file.c:1506 ../src/file.c:1560
 msgid "Nothing to update"
 msgstr "Нечего обновлять"
 
-#: ../src/file.c:1358
+#: ../src/file.c:1527
 #, c-format
 msgid "Updating %s"
 msgstr "Обновляется %s"
 
-#: ../src/file.c:1372
+#: ../src/file.c:1541
 msgid "Updated selected tracks with info from file."
 msgstr "Выбранные дорожки обновлены с использованием сведений из файла."
 
-#: ../src/file.c:1406
+#: ../src/file.c:1575
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "Загружаются данные mserv %s"
 
-#: ../src/file.c:1411
+#: ../src/file.c:1580
 msgid "no filename available"
 msgstr "имя файла недоступно"
 
-#: ../src/file.c:1416
+#: ../src/file.c:1585
 msgid "Updated selected tracks with data from mserv."
 msgstr "Выбранные дорожки обновлены с использованием сведений из mserv."
 
-#: ../src/file.c:1437
-#, c-format
+#: ../src/file.c:1606
+#, fuzzy, c-format
 msgid "The following track could not be updated"
-msgstr "Следующая дорожка не может быть обновлена"
+msgid_plural "The following %d tracks could not be updated"
+msgstr[0] "Следующая дорожка не может быть обновлена"
+msgstr[1] "Следующая дорожка не может быть обновлена"
+msgstr[2] "Следующая дорожка не может быть обновлена"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1443
+#: ../src/file.c:1612
 msgid "Failed Track Update"
 msgstr "Ошибка при обновлении дорожки"
 
-#: ../src/file.c:1501
-#, c-format
+#: ../src/file.c:1670
+#, fuzzy, c-format
 msgid "The following track has been updated"
-msgstr "Следующая дорожка была обновлена"
+msgid_plural "The following %d tracks have been updated"
+msgstr[0] "Следующая дорожка была обновлена"
+msgstr[1] "Следующая дорожка была обновлена"
+msgstr[2] "Следующая дорожка была обновлена"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1507
+#: ../src/file.c:1676
 msgid "Successful Track Update"
 msgstr "Успешное обновление дорожки"
 
-#: ../src/file.c:1566
-#, c-format
+#: ../src/file.c:1735
+#, fuzzy, 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 "Сведения mserv не могли быть получены для следующей дорожки"
-"Сведения mserv не могли быть получены для следующих %d дорожек"
+msgstr[0] ""
+"Сведения mserv не могли быть получены для следующей дорожкиСведения mserv не "
+"могли быть получены для следующих %d дорожек"
+msgstr[1] ""
+"Сведения mserv не могли быть получены для следующей дорожкиСведения mserv не "
+"могли быть получены для следующих %d дорожек"
+msgstr[2] ""
+"Сведения mserv не могли быть получены для следующей дорожкиСведения mserv не "
+"могли быть получены для следующих %d дорожек"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1572
+#: ../src/file.c:1741
 msgid "mserv data retrieval problem"
 msgstr "Ошибка загрузки данных mserv"
 
-#: ../src/file.c:1661
+#: ../src/file.c:1829
 msgid "no local filename available, file on the iPod will be used instead"
 msgstr "локальное имя файла недоступно, будет использовано имя файла на iPod"
 
-#: ../src/file.c:1667
+#: ../src/file.c:1835
 msgid "no local filename available and copy on iPod cannot be found"
 msgstr "локальное имя файла недоступно, и не найдена копия на iPod"
 
-#: ../src/file.c:1671 ../src/file.c:1689
+#: ../src/file.c:1839 ../src/file.c:1857
 msgid "no local filename available"
 msgstr "локальное имя файла недоступно"
 
-#: ../src/file.c:1679
+#: ../src/file.c:1847
 msgid "local file could not be found, file on the iPod will be used instead"
 msgstr "локальный файл не найден, будет использован файл на iPod"
 
-#: ../src/file.c:1685
+#: ../src/file.c:1853
 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
+#: ../src/file.c:1956
 msgid "update failed (format not supported?)"
 msgstr "ошибка при обновлении (формат не поддерживается?)"
 
-#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#: ../src/file.c:2041 ../src/misc_playlist.c:936
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Идёт обработка \"%s\"..."
 
-#: ../src/file.c:1879
+#: ../src/file.c:2047
 #, 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
+#: ../src/file.c:2167 ../src/misc_track.c:1793 ../src/misc_track.c:1898
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
 "\n"
-msgstr "Подкаст уже присутствует: \"%s\"\n"
+msgstr ""
+"Подкаст уже присутствует: \"%s\"\n"
 "\n"
 
-#: ../src/file.c:2064
+#: ../src/file.c:2232
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
 "\n"
-msgstr "Запись в видеофайлы ещё не поддерживается (%s).\n"
+msgstr ""
+"Запись в видеофайлы ещё не поддерживается (%s).\n"
 "\n"
 
-#: ../src/file.c:2116 ../src/file.c:2130
+#: ../src/file.c:2284 ../src/file.c:2298
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Не удалось изменить метки файла: %s\n"
 
-#: ../src/file.c:2232
+#: ../src/file.c:2400
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "Не удалось открыть \"%s\" для чтения и записи.\n"
 
-#: ../src/file.c:2239
+#: ../src/file.c:2407
 #, 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
+#: ../src/file.c:2424 ../src/file.c:2433 ../src/file.c:2444 ../src/file.c:2454
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Некорректная строка в \"%s\": %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:2315
+#: ../src/file.c:2483
 msgid "Remove offline playcounts?"
 msgstr "Удалить счётчики воспроизведения в автономном режиме?"
 
 #. title
-#: ../src/file.c:2316
+#: ../src/file.c:2484
 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\", чтобы сохранить их."
+msgstr ""
+"Некоторые дорожки, воспроизведённые в автономном режиме, не были найдены в "
+"iTunesDB.Нажмите \"OK\", чтобы удалить их из файла счётчика воспроизведений "
+"в автономном режиме.Нажмите \"Cancel\", чтобы сохранить их."
 
-#: ../src/file.c:2333
+#: ../src/file.c:2501
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Ошибка записи в \"%s\".\n"
 
-#: ../src/file.c:2390 ../src/tools.c:270
+#: ../src/file.c:2558 ../src/tools.c:270
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
 "\n"
-msgstr "Нормализация завершена неуспешно: тип файла не поддерживается (%s).\n"
+msgstr ""
+"Нормализация завершена неуспешно: тип файла не поддерживается (%s).\n"
 "\n"
 
-#: ../src/file.c:2406 ../src/tools.c:287
+#: ../src/file.c:2574 ../src/tools.c:287
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
 "\n"
-msgstr "Нормализация завершена неуспешно: файл недоступен (%s).\n"
+msgstr ""
+"Нормализация завершена неуспешно: файл недоступен (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:316
+#: ../src/file.c:2631
+#, fuzzy, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr ""
+"Нормализация завершена неуспешно: файл недоступен (%s).\n"
+"\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save "
+"lyrics to: %s.\n"
+"\n"
+msgstr ""
+
+#: ../src/file.c:2712
+#, fuzzy, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr "Оригинальное имя файла недоступно для \"%s\".\n"
+
+#: ../src/file_convert.c:328
 msgid "Summary status of conversion processes"
 msgstr "Сводное состояние процессов преобразования"
 
-#: ../src/file_convert.c:564
+#: ../src/file_convert.c:576
 msgid "active"
 msgstr "активно"
 
-#: ../src/file_convert.c:569
+#: ../src/file_convert.c:581
 msgid "inactive"
 msgstr "неактивно"
 
-#: ../src/file_convert.c:580
+#: ../src/file_convert.c:592
 #, c-format
 msgid "Active threads: %d. Scheduled tracks: %d."
 msgstr "Активных потоков: %d. Спланированных дорожек: %d."
 
-#: ../src/file_convert.c:1071
+#: ../src/file_convert.c:1090
 #, c-format
 msgid "Original filename not available for '%s.'\n"
 msgstr "Оригинальное имя файла недоступно для \"%s\".\n"
 
-#: ../src/file_convert.c:1086
+#: ../src/file_convert.c:1105
 #, c-format
 msgid "Filename '%s' is no longer valid for '%s'.\n"
 msgstr "Имя файла \"%s\" больше не допустимо для \"%s\".\n"
 
-#: ../src/file_convert.c:1137
+#: ../src/file_convert.c:1156
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
-#: ../src/file_convert.c:1143
+#: ../src/file_convert.c:1162
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/file_convert.c:1198
+#: ../src/file_convert.c:1217
 #, 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"
+msgstr ""
+"Файлы типа \"%s\" не поддерживаются iPod. Пожалуйста, откройте диалог"
+"\"Параметры\", чтобы установить и включить подходящий сценарийпреобразования "
+"для \"%s\".\n"
 "\n"
 
-#: ../src/file_convert.c:1284
+#: ../src/file_convert.c:1303
 msgid "No information available"
 msgstr "Сведения недоступны"
 
-#: ../src/file_convert.c:1323
+#: ../src/file_convert.c:1342
 #, c-format
 msgid "Could not create '%s'. Filetype conversion will not work.\n"
-msgstr "Не удалось создать \"%s\". Преобразование типа файлов не будет работать.\n"
+msgstr ""
+"Не удалось создать \"%s\". Преобразование типа файлов не будет работать.\n"
 
-#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#: ../src/file_convert.c:1667 ../src/file_convert.c:3119
 #, c-format
 msgid ""
 "Transfer of '%s' failed. %s\n"
 "\n"
-msgstr "Передача \"%s\" завершена неуспешно. %s\n"
+msgstr ""
+"Передача \"%s\" завершена неуспешно. %s\n"
 "\n"
 
-#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#: ../src/file_convert.c:2073 ../src/file_convert.c:2352
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s'.\n"
 "\n"
-msgstr "Преобразование \"%s\" завершено неуспешно. %s\n"
+msgstr ""
+"Преобразование \"%s\" завершено неуспешно. %s\n"
 "\n"
 
-#: ../src/file_convert.c:2062
+#: ../src/file_convert.c:2088
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
 "\n"
-msgstr "Преобразование \"%s\" завершено неуспешно: \"%s %s\" вернул статус завершения %d.\n"
+msgstr ""
+"Преобразование \"%s\" завершено неуспешно: \"%s %s\" вернул статус "
+"завершения %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2091
+#: ../src/file_convert.c:2117
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
 "expected.\n"
 "\n"
-msgstr "Преобразование \"%s\" завершено неуспешно: \"%s %s\" не вернул расширение"
-"файла, как ожидалось.\n"
+msgstr ""
+"Преобразование \"%s\" завершено неуспешно: \"%s %s\" не вернул "
+"расширениефайла, как ожидалось.\n"
 "\n"
 
-#: ../src/file_convert.c:2167
+#: ../src/file_convert.c:2193
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
 "\n"
-msgstr "Преобразование \"%s\" завершено неуспешно: Нет доступа к оригинальному файлу \"%s\" (%s).\n"
+msgstr ""
+"Преобразование \"%s\" завершено неуспешно: Нет доступа к оригинальному файлу "
+"\"%s\" (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:2222
+#: ../src/file_convert.c:2248
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not create directory '%s'.\n"
 "\n"
-msgstr "Преобразование \"%s\" завершено неуспешно: Не удалось создать папку \"%s\".\n"
+msgstr ""
+"Преобразование \"%s\" завершено неуспешно: Не удалось создать папку \"%s\".\n"
 "\n"
 
-#: ../src/file_convert.c:2356
+#: ../src/file_convert.c:2383
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s' returned exit status %d.\n"
 "\n"
-msgstr "Преобразование \"%s\" завершено неуспешно: \"%s\" вернул статус завершения %d.\n"
+msgstr ""
+"Преобразование \"%s\" завершено неуспешно: \"%s\" вернул статус завершения %"
+"d.\n"
 "\n"
 
-#: ../src/file_convert.c:2395
+#: ../src/file_convert.c:2422
 #, c-format
 msgid ""
 "Conversion of '%s' failed: could not stat the converted file '%s'.\n"
 "\n"
-msgstr "Преобразование \"%s\" завершено неуспешно: не удалось получить информацию о преобразованном файле \"%s\".\n"
+msgstr ""
+"Преобразование \"%s\" завершено неуспешно: не удалось получить информацию о "
+"преобразованном файле \"%s\".\n"
 "\n"
 
 #: ../src/file_export.c:182
@@ -3422,11 +3472,6 @@
 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"
@@ -3451,9 +3496,12 @@
 msgstr "Не удалось записать \"%s-%s\"\n"
 
 #: ../src/file_export.c:489
-#, c-format
+#, fuzzy, c-format
 msgid "Copied %d of %d track."
-msgstr "Скопировано %d из дорожки %d."
+msgid_plural "Copied %d of %d tracks."
+msgstr[0] "Скопировано %d из дорожки %d."
+msgstr[1] "Скопировано %d из дорожки %d."
+msgstr[2] "Скопировано %d из дорожки %d."
 
 #: ../src/file_export.c:505 ../src/tools.c:518
 #, c-format
@@ -3485,8 +3533,9 @@
 "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"
+msgstr ""
+"Некоторые дорожки не были скопированы на ваш жёсткий диск. Только "
+"скопированныедорожки могут быть включены в текущую операцию перетаскивания.\n"
 "\n"
 
 #: ../src/file_export.c:1010
@@ -3494,69 +3543,79 @@
 msgid ""
 "No valid filename for: %s\n"
 "\n"
-msgstr "Нет допустимого имени файла для: %s\n"
+msgstr ""
+"Нет допустимого имени файла для: %s\n"
 "\n"
 
 #: ../src/file_export.c:1026
-#, c-format
+#, fuzzy, c-format
 msgid "Created playlist with one track."
-msgstr "Создан список воспроизведения с одной дорожкой."
+msgid_plural "Created playlist with %d tracks."
+msgstr[0] "Создан список воспроизведения с одной дорожкой."
+msgstr[1] "Создан список воспроизведения с одной дорожкой."
+msgstr[2] "Создан список воспроизведения с одной дорожкой."
 
 #: ../src/file_export.c:1031
 #, c-format
 msgid ""
 "Could not open '%s' for writing (%s).\n"
 "\n"
-msgstr "Не удалось открыть \"%s\" для записи (%s).\n"
+msgstr ""
+"Не удалось открыть \"%s\" для записи (%s).\n"
 "\n"
 
-#: ../src/file_itunesdb.c:129
+#: ../src/file_itunesdb.c:133
 #, 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:249
+#, fuzzy, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "Не удалось открыть \"%s\" для записи расширенных сведений.\n"
 
-#: ../src/file_itunesdb.c:243
+#: ../src/file_itunesdb.c:256
 msgid "Could not create hash value from itunesdb\n"
 msgstr "Не удалось создать значение хэша из iTunesDB\n"
 
-#: ../src/file_itunesdb.c:259
+#: ../src/file_itunesdb.c:272
 #, c-format
 msgid "Error while reading extended info: %s\n"
 msgstr "Ошибка при чтении расширенных сведений: %s\n"
 
-#: ../src/file_itunesdb.c:276
+#: ../src/file_itunesdb.c:289
 #, 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"
+msgstr ""
+"iTunesDB \"%s\" не соответствует контрольной сумме в файле расширенных "
+"сведений \"%s\"\n"
+"gtkpod попытается проверить сведения, используя контрольные суммы SHA1. Это "
+"можетзанять длительное время.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:288
+#: ../src/file_itunesdb.c:301
 #, c-format
 msgid ""
 "%s:\n"
 "Expected \"itunesdb_hash=\" but got:\"%s\"\n"
-msgstr "%s:\n"
+msgstr ""
+"%s:\n"
 "Ожидалось \"itunesdb_hash=\", но получено: \"%s\"\n"
 
-#: ../src/file_itunesdb.c:348
+#: ../src/file_itunesdb.c:363
 #, c-format
 msgid ""
 "%s:\n"
 "Format error: %s\n"
-msgstr "%s:\n"
+msgstr ""
+"%s:\n"
 "Ошибка форматирования: %s\n"
 
-#: ../src/file_itunesdb.c:393
+#: ../src/file_itunesdb.c:408
 msgid ""
 "No SHA1 checksums on individual tracks are available.\n"
 "\n"
@@ -3564,318 +3623,354 @@
 "(will provide SHA1 checksums) or avoid using the iPod with programs other "
 "than gtkpod.\n"
 "\n"
-msgstr "Контрольные суммы SHA1 для отдельных дорожек недоступны.\n"
+msgstr ""
+"Контрольные суммы SHA1 для отдельных дорожек недоступны.\n"
 "\n"
 "Чтобы избежать этой ситуации в будущем, либо включите обнаружение дубликатов"
-"(которое сделает доступными контрольные суммы SHA1), либо избегайте использования"
-"iPod с другими программами, кроме gtkpod.\n"
+"(которое сделает доступными контрольные суммы SHA1), либо избегайте "
+"использованияiPod с другими программами, кроме gtkpod.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:457
+#: ../src/file_itunesdb.c:474
 msgid ""
 "Extended info will not be used. If you have non-transferred tracks,\n"
 "these will be lost.\n"
-msgstr "Расширенные сведения не будут использованы. Если у вас имеются\n"
+msgstr ""
+"Расширенные сведения не будут использованы. Если у вас имеются\n"
 "непереданные дорожки, они будут потеряны.\n"
 
-#: ../src/file_itunesdb.c:465
+#: ../src/file_itunesdb.c:482
 msgid "Offline iPod database successfully imported"
 msgstr "База данных iPod автономного режима импортирована успешно"
 
-#: ../src/file_itunesdb.c:468
+#: ../src/file_itunesdb.c:485
 msgid "Local database successfully imported"
 msgstr "Локальная база данных импортирована успешно"
 
-#: ../src/file_itunesdb.c:476
+#: ../src/file_itunesdb.c:493
 #, c-format
 msgid ""
 "Offline iPod database import failed: '%s'\n"
 "\n"
-msgstr "Ошибка при импорте базы данных iPod автономного режима: \"%s\"\n"
+msgstr ""
+"Ошибка при импорте базы данных iPod автономного режима: \"%s\"\n"
 "\n"
 
-#: ../src/file_itunesdb.c:480
+#: ../src/file_itunesdb.c:497
 #, c-format
 msgid ""
 "Local database import failed: '%s'\n"
 "\n"
-msgstr "Ошибка при импорте локальной базы данных iPod: \"%s\"\n"
+msgstr ""
+"Ошибка при импорте локальной базы данных iPod: \"%s\"\n"
 "\n"
 
-#: ../src/file_itunesdb.c:487
+#: ../src/file_itunesdb.c:504
 msgid ""
 "Offline iPod database import failed: \n"
 "\n"
-msgstr "Ошибка при импорте базы данных iPod автономного режима: \n"
+msgstr ""
+"Ошибка при импорте базы данных iPod автономного режима: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:490
+#: ../src/file_itunesdb.c:507
 msgid ""
 "Local database import failed: \n"
 "\n"
-msgstr "Ошибка при импорте локальной базы данных iPod: \n"
+msgstr ""
+"Ошибка при импорте локальной базы данных iPod: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:497
+#: ../src/file_itunesdb.c:514
 #, c-format
 msgid ""
 "'%s' does not exist. Import aborted.\n"
 "\n"
-msgstr "\"%s\" не существует. Импорт прерван.\n"
+msgstr ""
+"\"%s\" не существует. Импорт прерван.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:520
+#: ../src/file_itunesdb.c:536
 msgid "Extended info will not be used.\n"
 msgstr "Расширенные сведения не будут использованы.\n"
 
-#: ../src/file_itunesdb.c:527
+#: ../src/file_itunesdb.c:543
 msgid "iPod Database Successfully Imported"
 msgstr "База данных iPod успешно импортирована"
 
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:550
 #, c-format
 msgid ""
 "iPod Database Import Failed: '%s'\n"
 "\n"
-msgstr "Ошибка импорта базы данных iPod: \"%s\"\n"
+msgstr ""
+"Ошибка импорта базы данных iPod: \"%s\"\n"
 "\n"
 
-#: ../src/file_itunesdb.c:540
+#: ../src/file_itunesdb.c:556
 msgid ""
 "iPod Database Import Failed.\n"
 "\n"
-msgstr "Ошибка импорта базы данных iPod.\n"
+msgstr ""
+"Ошибка импорта базы данных iPod.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:549
+#: ../src/file_itunesdb.c:565
 #, c-format
 msgid ""
 "'%s' (or similar) does not exist. Import aborted.\n"
 "\n"
-msgstr "\"%s\" (или похожий) не существует. Импорт прерван.\n"
+msgstr ""
+"\"%s\" (или похожий) не существует. Импорт прерван.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:865
-#, c-format
+#: ../src/file_itunesdb.c:886
+#, fuzzy, 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 может создать"
-"структуру папок для вас."
+"If you are sure that the iPod is properly mounted at '%s', it may not be "
+"initialized for use. In this case, gtkpod can initialize it for you.\n"
 "\n"
+"Do you want to create the directory structure now?"
+msgstr ""
+"Не удалось найти структуру папок iPod в \"%s\".\n"
+"Если вы уверены, что iPod правильно примонтирован в \"%s\", gtkpod может "
+"создатьструктуру папок для вас.\n"
 "Желаете ли вы создать структуру папок сейчас?\n"
 
-#: ../src/file_itunesdb.c:1180
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr ""
+
+#: ../src/file_itunesdb.c:892
+#, fuzzy
+msgid "Create directory structure"
+msgstr "Папка с кэшем:"
+
+#: ../src/file_itunesdb.c:1198
 #, c-format
 msgid "Could not open \"%s\" for writing extended info.\n"
 msgstr "Не удалось открыть \"%s\" для записи расширенных сведений.\n"
 
-#: ../src/file_itunesdb.c:1195
+#: ../src/file_itunesdb.c:1213
 msgid "Aborted writing of extended info.\n"
 msgstr "Запись расширенных сведений прервана.\n"
 
-#: ../src/file_itunesdb.c:1397
+#: ../src/file_itunesdb.c:1415
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/file_itunesdb.c:1411
+#: ../src/file_itunesdb.c:1429
 #, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
 msgstr "%d%% (%d/%d  %d:%02d:%02d осталось)"
 
-#: ../src/file_itunesdb.c:1463
+#: ../src/file_itunesdb.c:1481
 msgid "Status: Deleting File"
 msgstr "Состояние: Удаление файла"
 
-#: ../src/file_itunesdb.c:1524
+#: ../src/file_itunesdb.c:1542
 #, c-format
 msgid ""
 "Could not remove the following file: '%s'\n"
 "\n"
-msgstr "Не удалось удалить следующий файл: \"%s\"\n"
+msgstr ""
+"Не удалось удалить следующий файл: \"%s\"\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1632
+#: ../src/file_itunesdb.c:1651
+#, fuzzy
 msgid ""
 "The following track could not be converted successfully:\n"
 "\n"
+msgid_plural ""
 "The following tracks could not be converted successfully:\n"
 "\n"
-msgstr "Не удалось преобразовать следующую дорожку:\n"
-"\n"
-"Не удалось преобразовать следующие дорожки:\n"
-"\n"
+msgstr[0] "Следующая дорожка не может быть обновлена"
+msgstr[1] "Следующая дорожка не может быть обновлена"
+msgstr[2] "Следующая дорожка не может быть обновлена"
 
-#: ../src/file_itunesdb.c:1642
+#: ../src/file_itunesdb.c:1661
+#, fuzzy
 msgid ""
 "The following track could not be transferred successfully:\n"
 "\n"
+msgid_plural ""
 "The following tracks could not be transferred successfully:\n"
 "\n"
-msgstr "Не удалось передать следующую дорожку:\n"
-"\n"
-"Не удалось передать следующие дорожки:\n"
-"\n"
+msgstr[0] "Следующая дорожка не может быть обновлена"
+msgstr[1] "Следующая дорожка не может быть обновлена"
+msgstr[2] "Следующая дорожка не может быть обновлена"
 
 #. ID
 #. modal,
 #. gint id,
 #. gboolean modal,
-#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1670 ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
 msgid "Warning"
 msgstr "Внимание"
 
 #. title
-#: ../src/file_itunesdb.c:1652
+#: ../src/file_itunesdb.c:1671
 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 вновь попытается"
-"преобразовать и передать дорожки, для которых операция завершилась неудачей."
+msgstr ""
+"iPod не может быть извлечён. Пожалуйста, исправьте ошибки, упомянутыениже, и "
+"извлеките iPod снова. При нажатии \"OK\" gtkpod вновь "
+"попытаетсяпреобразовать и передать дорожки, для которых операция завершилась "
+"неудачей."
 
-#: ../src/file_itunesdb.c:1715
+#: ../src/file_itunesdb.c:1734
 #, c-format
 msgid "Status: Copying track"
 msgstr "Состояние: Копирование дорожки"
 
-#: ../src/file_itunesdb.c:1721
+#: ../src/file_itunesdb.c:1740
 #, c-format
 msgid "Status: Waiting for conversion to complete"
 msgstr "Состояние: Ожидание завершения преобразования"
 
-#: ../src/file_itunesdb.c:1725
+#: ../src/file_itunesdb.c:1744
 #, c-format
 msgid "Status: Finished transfer"
 msgstr "Состояние: Передача завершена"
 
-#: ../src/file_itunesdb.c:1770
-#, c-format
+#: ../src/file_itunesdb.c:1789
+#, fuzzy, 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 "Одна дорожка не могла быть передана, поскольку iPod заполнен. Либо удалите"
-"некоторые дорожки, либо освободите место на iPod иным образом перед"
-"повторным извлечением."
-"%d дорожек не могли быть переданы, поскольку iPod заполнен. Либо удалите"
-"некоторые дорожки, либо освободите место на iPod иным образом перед"
-"повторным извлечением."
+msgstr[0] ""
+"Одна дорожка не могла быть передана, поскольку iPod заполнен. Либо "
+"удалитенекоторые дорожки, либо освободите место на iPod иным образом "
+"передповторным извлечением.%d дорожек не могли быть переданы, поскольку iPod "
+"заполнен. Либо удалитенекоторые дорожки, либо освободите место на iPod иным "
+"образом передповторным извлечением."
+msgstr[1] ""
+"Одна дорожка не могла быть передана, поскольку iPod заполнен. Либо "
+"удалитенекоторые дорожки, либо освободите место на iPod иным образом "
+"передповторным извлечением.%d дорожек не могли быть переданы, поскольку iPod "
+"заполнен. Либо удалитенекоторые дорожки, либо освободите место на iPod иным "
+"образом передповторным извлечением."
+msgstr[2] ""
+"Одна дорожка не могла быть передана, поскольку iPod заполнен. Либо "
+"удалитенекоторые дорожки, либо освободите место на iPod иным образом "
+"передповторным извлечением.%d дорожек не могли быть переданы, поскольку iPod "
+"заполнен. Либо удалитенекоторые дорожки, либо освободите место на iPod иным "
+"образом передповторным извлечением."
 
-#: ../src/file_itunesdb.c:1852
-#, c-format
+#: ../src/file_itunesdb.c:1871
+#, fuzzy, 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"
+"If you skip storing, you can import the existing database before calling "
+"this function again.\n"
+msgstr ""
+"Вы не импортировали существующую iTunesDB (\"%s\"). Как правило, этоявляется "
+"ошибкой и приведёт к потере существующей базы данных.\n"
 "\n"
-"Нажмите \"OK\", чтобы продолжить, несмотря на это, или \"Отмена\", чтобы"
-"пропустить сохранение. Если вы нажмёте \"Отмена\", вы сможете"
-"импортировать существующую базу данных перед повторным вызовом"
-"этой функции.\n"
+"Нажмите \"OK\", чтобы продолжить, несмотря на это, или \"Отмена\", "
+"чтобыпропустить сохранение. Если вы нажмёте \"Отмена\", вы "
+"сможетеимпортировать существующую базу данных перед повторным вызовомэтой "
+"функции.\n"
 
-#: ../src/file_itunesdb.c:1887
+#: ../src/file_itunesdb.c:1875 ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr ""
+
+#: ../src/file_itunesdb.c:1877 ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr ""
+
+#: ../src/file_itunesdb.c:1878
+#, fuzzy
+msgid "Skip storing"
+msgstr "Число пропусков"
+
+#: ../src/file_itunesdb.c:1909
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
-msgstr "Структура папок iPod должна присутствовать, прежде чем может быть"
-"осуществлена синхронизация с iPod.\n"
+msgstr ""
+"Структура папок iPod должна присутствовать, прежде чем может "
+"бытьосуществлена синхронизация с iPod.\n"
 
-#: ../src/file_itunesdb.c:1896
+#: ../src/file_itunesdb.c:1918
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr "Некоторые дорожки не могут быть удалены с iPod. Экспорт прерван."
 
-#: ../src/file_itunesdb.c:1914
+#: ../src/file_itunesdb.c:1936
 #, c-format
 msgid "Now writing database '%s'. Please wait..."
 msgstr "Записывается база данных \"%s\". Пожалуйста, подождите..."
 
-#: ../src/file_itunesdb.c:1963
+#: ../src/file_itunesdb.c:1985
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "Файл расширенных сведений не удалён: \"%s\""
 
-#: ../src/file_itunesdb.c:2070
+#: ../src/file_itunesdb.c:2092
 #, c-format
 msgid "%s: Database saved"
 msgstr "%s: База данных сохранена"
 
-#: ../src/file_itunesdb.c:2074
+#: ../src/file_itunesdb.c:2096
 #, c-format
 msgid "%s: Changes saved"
 msgstr "%s: Изменения сохранены"
 
-#: ../src/fileselection.c:129
+#: ../src/fileselection.c:142 ../src/fileselection.c:583
 msgid "Successfully added files"
 msgstr "Файлы успешно добавлены"
 
-#: ../src/fileselection.c:131
+#: ../src/fileselection.c:144 ../src/fileselection.c:585
 msgid "Some files were not added successfully"
 msgstr "Произошла ошибка при добавлении некоторых файлов"
 
-#: ../src/fileselection.c:164 ../src/fileselection.c:305
-#: ../src/fileselection.c:792
+#: ../src/fileselection.c:176 ../src/fileselection.c:276
+#: ../src/fileselection.c:601
 msgid "Please select a playlist or repository before adding tracks."
-msgstr "Пожалуйста, выберите список воспроизведения или репозиторий перед добавлением дорожек."
+msgstr ""
+"Пожалуйста, выберите список воспроизведения или репозиторий перед "
+"добавлением дорожек."
 
-#: ../src/fileselection.c:175 ../src/fileselection.c:314
-#: ../src/fileselection.c:803
+#: ../src/fileselection.c:187 ../src/fileselection.c:285
 msgid "Please load the iPod before adding tracks."
 msgstr "Пожалуйста, загрузите iPod перед добавлением дорожек."
 
-#: ../src/fileselection.c:185
+#: ../src/fileselection.c:197
 #, c-format
 msgid "Add files to '%s'"
 msgstr "Добавить файлы к \"%s\""
 
-#: ../src/fileselection.c:189
+#: ../src/fileselection.c:201
 #, c-format
 msgid "Add files to '%s/%s'"
 msgstr "Добавить файлы к \"%s/%s\""
 
 #. Create window title
-#: ../src/fileselection.c:322
+#: ../src/fileselection.c:293
 #, c-format
 msgid "Add playlist files to '%s'"
 msgstr "Добавить файлы списка воспроизведения к \"%s\""
 
 #. Create the file chooser, and handle the response
-#: ../src/fileselection.c:378
+#: ../src/fileselection.c:319
 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"
@@ -3886,21 +3981,24 @@
 msgid "Error retrieving tags for '%s'.\n"
 msgstr "Ошибка при получении меток для \"%s\".\n"
 
-#: ../src/flacfile.c:165
+#: ../src/flacfile.c:193
 #, 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"
+msgstr ""
+"Ошибка при импорте \"%s\": FLAC не поддерживается без библиотеки FLAC. Вы "
+"должныскомпилировать исходный код gtkpod с поддержкой библиотеки FLAC.\n"
 
-#: ../src/flacfile.c:171
+#: ../src/flacfile.c:199
 #, 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"
+msgstr ""
+"Ошибка при обновлении метаданных FLAC для \"%s\": FLAC не поддерживается без "
+"библиотеки FLAC. Вы должныскомпилировать исходный код gtkpod с поддержкой "
+"библиотеки FLAC.\n"
 
 #: ../src/getopt.c:681
 #, c-format
@@ -3961,95 +4059,8 @@
 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
+#: ../src/help.c:48
 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"
@@ -4058,7 +4069,7 @@
 "Jorg Schuler (jcsjcs at users dot sourceforge dot net)\n"
 "Corey Donohoe (atmos at atmos dot org)\n"
 
-#: ../src/misc.c:74
+#: ../src/help.c:52
 msgid ""
 "Patches were supplied by the following people (list may be incomplete -- "
 "please contact me)\n"
@@ -4066,19 +4077,20 @@
 "Patches were supplied by the following people (list may be incomplete -- "
 "please contact me)\n"
 
-#: ../src/misc.c:75
+#: ../src/help.c:53
 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"
+#: ../src/help.c:54
+#, fuzzy
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
 msgstr "Hiroshi Kawashima: Japanese charset autodetecion feature"
 
-#: ../src/misc.c:77
+#: ../src/help.c:55
 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
+#: ../src/help.c:56
 msgid ""
 "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
 "newlines at the end"
@@ -4086,15 +4098,15 @@
 "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
 "newlines at the end"
 
-#: ../src/misc.c:79
+#: ../src/help.c:57
 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
+#: ../src/help.c:58
 msgid "Chris Cutler: automatic creation of various playlist types"
 msgstr "Chris Cutler: automatic creation of various playlist types"
 
-#: ../src/misc.c:81
+#: ../src/help.c:59
 msgid ""
 "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
 "dialogue during sync"
@@ -4102,7 +4114,7 @@
 "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
 "dialogue during sync"
 
-#: ../src/misc.c:82
+#: ../src/help.c:60
 msgid ""
 "Edward Matteucci: debugging, special playlist creation, most of the volume "
 "normalizing code"
@@ -4110,25 +4122,25 @@
 "Edward Matteucci: debugging, special playlist creation, most of the volume "
 "normalizing code"
 
-#: ../src/misc.c:83
+#: ../src/help.c:61
 msgid "Jens Lautenbach: some optical improvements"
 msgstr "Jens Lautenbach: some optical improvements"
 
-#: ../src/misc.c:84
+#: ../src/help.c:62
 msgid "Alex Tribble: iPod eject patch"
 msgstr "Alex Tribble: iPod eject patch"
 
-#: ../src/misc.c:85
+#: ../src/help.c:63
 msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
 msgstr "Yaroslav Halchenko: Orphaned and dangling tracks handling"
 
-#: ../src/misc.c:86
+#: ../src/help.c:64
 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
+#: ../src/help.c:65
 msgid ""
 "Ero Carrera: Filename validation and quick sync when copying tracks from the "
 "iPod"
@@ -4136,23 +4148,23 @@
 "Ero Carrera: Filename validation and quick sync when copying tracks from the "
 "iPod"
 
-#: ../src/misc.c:88
+#: ../src/help.c:66
 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
+#: ../src/help.c:67
 msgid "Armando Atienza: Support with external playcounts"
 msgstr "Armando Atienza: Support with external playcounts"
 
-#: ../src/misc.c:90
+#: ../src/help.c:68
 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
+#: ../src/help.c:69
 msgid "Jim Hall: Decent INSTALL file"
 msgstr "Jim Hall: Decent INSTALL file"
 
-#: ../src/misc.c:92
+#: ../src/help.c:70
 msgid ""
 "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
 "contacts to the iPod"
@@ -4161,11 +4173,11 @@
 "contacts to the iPod"
 
 #. J"urgen!
-#: ../src/misc.c:93
+#: ../src/help.c:71
 msgid "Flavio Stanchina: bugfixes"
 msgstr "Flavio Stanchina: bugfixes"
 
-#: ../src/misc.c:94
+#: ../src/help.c:72
 msgid ""
 "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
 "the title"
@@ -4173,11 +4185,11 @@
 "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
 "the title"
 
-#: ../src/misc.c:95
+#: ../src/help.c:73
 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
+#: ../src/help.c:75
 msgid ""
 "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
 "tags"
@@ -4185,7 +4197,7 @@
 "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
 "tags"
 
-#: ../src/misc.c:99
+#: ../src/help.c:77
 msgid ""
 "James Liggett:\n"
 "replacement of old GTK file selection dialogs with new GTK filechooser "
@@ -4197,31 +4209,31 @@
 "dialogs\n"
 "refactored user preferences system."
 
-#: ../src/misc.c:103
+#: ../src/help.c:81
 msgid "Daniel Kercher: sync scripts for abook and webcalendar"
 msgstr "Daniel Kercher: sync scripts for abook and webcalendar"
 
-#: ../src/misc.c:105
+#: ../src/help.c:83
 msgid "Clinton Gormley: sync scripts for thunderbird"
 msgstr "Clinton Gormley: sync scripts for thunderbird"
 
-#: ../src/misc.c:107
+#: ../src/help.c:85
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
 msgstr "Sebastien Beridot: sync script for ldif addressbook format"
 
-#: ../src/misc.c:109
+#: ../src/help.c:87
 msgid "Sebastian Scherer: sync script for kNotes"
 msgstr "Sebastian Scherer: sync script for kNotes"
 
-#: ../src/misc.c:111
+#: ../src/help.c:89
 msgid "Nick Piper: sync script for Palm, type-ahead search"
 msgstr "Nick Piper: sync script for Palm, type-ahead search"
 
-#: ../src/misc.c:113
+#: ../src/help.c:91
 msgid "Uwe Hermann: help with support for iPod Video"
 msgstr "Uwe Hermann: help with support for iPod Video"
 
-#: ../src/misc.c:115
+#: ../src/help.c:93
 msgid ""
 "Iain Benson: support for compilation tag in mp3 files and separate display "
 "of compilations in the sort tab."
@@ -4229,7 +4241,7 @@
 "Iain Benson: support for compilation tag in mp3 files and separate display "
 "of compilations in the sort tab."
 
-#: ../src/misc.c:116
+#: ../src/help.c:94
 msgid ""
 "Nicolas Chariot: icons of buttons\n"
 "\n"
@@ -4237,11 +4249,11 @@
 "Nicolas Chariot: icons of buttons\n"
 "\n"
 
-#: ../src/misc.c:118
+#: ../src/help.c:96
 msgid "This program borrows code from the following projects:"
 msgstr "This program borrows code from the following projects:"
 
-#: ../src/misc.c:119
+#: ../src/help.c:97
 msgid ""
 "gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB  (http://"
 "www.gnu.org/software/gnupod/)"
@@ -4249,7 +4261,7 @@
 "gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB  (http://"
 "www.gnu.org/software/gnupod/)"
 
-#: ../src/misc.c:120
+#: ../src/help.c:98
 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."
@@ -4257,49 +4269,71 @@
 "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
+#: ../src/help.c:99
 msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
 msgstr "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
 
-#: ../src/misc.c:122
+#: ../src/help.c:100
 msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
 msgstr "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
 
-#: ../src/misc.c:124
+#: ../src/help.c:102
 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/)."
+msgstr ""
+"The GUI was created with the help of glade-2 (http://glade.gnome.org/)."
 
-#: ../src/misc.c:128
+#: ../src/help.c:106
 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
+#: ../src/help.c:107
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr ""
+
+#: ../src/help.c:108
 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
+#: ../src/help.c:109
+msgid "German: Kai-Ove"
+msgstr ""
+
+#: ../src/help.c:110
 msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
 msgstr "Hebrew: Assaf Gillat (gillata at gmail dot com)"
 
-#: ../src/misc.c:131
+#: ../src/help.c:111
 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
+#: ../src/help.c:112
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr ""
+
+#: ../src/help.c:113
 msgid "Japanese: Ayako Sano"
 msgstr "Japanese: Ayako Sano"
 
-#: ../src/misc.c:133
+#: ../src/help.c:114
 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)"
+#: ../src/help.c:115
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr ""
+
+#: ../src/help.c:116
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr ""
+
+#: ../src/help.c:117
+#, fuzzy
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
 msgstr "Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)"
 
-#: ../src/misc.c:139
+#: ../src/help.c:122
 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"
@@ -4331,7 +4365,7 @@
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
 "02111-1307, USA."
 
-#: ../src/misc.c:154
+#: ../src/help.c:137
 msgid ""
 "© 2002-2007\n"
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
@@ -4341,49 +4375,212 @@
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
 "Corey Donohoe <atmos at atmos.org>"
 
-#: ../src/misc.c:162
+#: ../src/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr ""
+
+#: ../src/help.c:143 ../src/help.c:148
 msgid "Cross-platform multilingual interface to Apple's iPod™"
 msgstr "Кроссплатформенный многоязыковой интерфейс для Apple iPod™"
 
-#: ../src/misc.c:929
+#: ../src/info.c:359 ../src/infodlg.c:190
+msgid "n/c"
+msgstr "n/c"
+
+#: ../src/info.c:364 ../src/info.c:852 ../src/infodlg.c:193
+msgid "offline"
+msgstr "автономный"
+
+#: ../src/info.c:500
 #, c-format
+msgid " P:%d T:%d/%d"
+msgstr " P:%d T:%d/%d"
+
+#: ../src/info.c:794
+msgid "B"
+msgstr "Б"
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr "КБ"
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr "ТБ"
+
+#: ../src/info.c:837
+#, c-format
+msgid " %s Free"
+msgstr "%s свободно"
+
+#: ../src/info.c:842
+#, c-format
+msgid " %s Pending"
+msgstr "%s выполняется"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr " отключено"
+
+#: ../src/info.c:898
+msgid "No database or playlist selected"
+msgstr "Не выбрана база данных или список воспроизведения"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "Дорожки не выбраны"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "Список воспроизведения не выбран"
+
+#: ../src/info.c:913
+msgid "No iPod or iPod playlist selected"
+msgstr "Не выбран iPod или список воспроизведения iPod"
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"Всего\n"
+"(iPod)"
+
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"Всего\n"
+"(локально)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"Выбранный\n"
+"список воспроизведения"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"Отображаемые\n"
+"дорожки"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"Выбранные\n"
+"дорожки"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "Число дорожек"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "Размер файла"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "Число списков воспроизведения"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "Удалённые дорожки"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "Размер файла (удалённого)"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "Непереданные дорожки"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "Размер файла (непереданного)"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "Эффективное свободное пространство"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "Выберите или введите свою модель"
+
+#: ../src/ipod_init.c:81 ../src/repository.c:560 ../src/repository.c:2374
+msgid "Select mountpoint"
+msgstr "Выберите точку монтирования"
+
+#: ../src/ipod_init.c:362
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "Ошибка при инициализации iPod: %s\n"
+
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr "Ошибка при инициализации iPod, неизвестная ошибка\n"
+
+#: ../src/ipod_init.c:425
+#, 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:466
+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:864
+#, c-format
 msgid "Could not process '%s' (no filename available)"
 msgstr "Не удалось обработать \"%s\" (имя файла недоступно)"
 
-#: ../src/misc.c:1083
+#: ../src/misc.c:1101
 #, 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
+#: ../src/misc.c:1187
 #, c-format
 msgid "Error creating %s: %s\n"
 msgstr "Ошибка при создании %s: %s\n"
 
-#: ../src/misc.c:1686
+#: ../src/misc.c:1642
 #, c-format
 msgid ""
 "Writing preferences file '%s' failed (%s).\n"
 "\n"
-msgstr "Не удалось записать файл настроек \"%s\" (%s).\n"
+msgstr ""
+"Не удалось записать файл настроек \"%s\" (%s).\n"
 "\n"
 
-#: ../src/misc.c:1688
+#: ../src/misc.c:1644
 msgid "unspecified error"
 msgstr "неспецифицированная ошибка"
 
-#: ../src/misc.c:1696
+#: ../src/misc.c:1652
 #, c-format
 msgid ""
 "Writing preferences to the iPod (%s) failed: could not get path to Control "
 "Directory.\n"
 "\n"
-msgstr "Не удалось записать настройки на iPod (%s): невозможно получить путь к папке Control.\n"
+msgstr ""
+"Не удалось записать настройки на iPod (%s): невозможно получить путь к папке "
+"Control.\n"
 "\n"
 
 #. title
@@ -4391,206 +4588,329 @@
 msgid "The following has occurred:"
 msgstr "Произошло следующее:"
 
-#: ../src/misc_confirm.c:122
+#: ../src/misc_confirm.c:156
+#, fuzzy
 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 "Вы уверены, что хотите полностью удалить следующую дорожку с iPod?"
-"Число списков воспроизведения, в которые входит эта дорожка, указано"
-"в скобках."
-"Вы уверены, что хотите полностью удалить следующие дорожки с iPod?"
-"Число списков воспроизведения, в которые входят эти дорожки, указано"
-"в скобках."
+msgstr[0] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с iPod?Число "
+"списков воспроизведения, в которые входит эта дорожка, указанов скобках.Вы "
+"уверены, что хотите полностью удалить следующие дорожки с iPod?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
+msgstr[1] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с iPod?Число "
+"списков воспроизведения, в которые входит эта дорожка, указанов скобках.Вы "
+"уверены, что хотите полностью удалить следующие дорожки с iPod?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
+msgstr[2] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с iPod?Число "
+"списков воспроизведения, в которые входит эта дорожка, указанов скобках.Вы "
+"уверены, что хотите полностью удалить следующие дорожки с iPod?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
 
-#: ../src/misc_confirm.c:126
+#: ../src/misc_confirm.c:160
+#, fuzzy
 msgid "Delete Track Completely from iPod?"
-msgstr "Удалить дорожку с iPod полностью?"
+msgid_plural "Delete Tracks Completely from iPod?"
+msgstr[0] "Удалить дорожку с iPod полностью?"
+msgstr[1] "Удалить дорожку с iPod полностью?"
+msgstr[2] "Удалить дорожку с iPod полностью?"
 
-#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
-#, c-format
+#: ../src/misc_confirm.c:171 ../src/misc_confirm.c:212
+#, fuzzy, 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 "Вы уверены, что хотите удалить следующую дорожку из списка воспроизведения \"%s\"?"
-"Вы уверены, что хотите удалить следующие дорожки из списка воспроизведения \"%s\"?"
+msgstr[0] "Вы уверены, что хотите удалить все дорожки из базы данных?"
+msgstr[1] "Вы уверены, что хотите удалить все дорожки из базы данных?"
+msgstr[2] "Вы уверены, что хотите удалить все дорожки из базы данных?"
 
-#: ../src/misc_confirm.c:141 ../src/misc_confirm.c:182
+#: ../src/misc_confirm.c:175 ../src/misc_confirm.c:216
+#, fuzzy
 msgid "Remove Track From Playlist?"
-msgstr "Удалить дорожку из списка воспроизведения?"
+msgid_plural "Remove Tracks From Playlist?"
+msgstr[0] "Удалить дорожку из списка воспроизведения?"
+msgstr[1] "Удалить дорожку из списка воспроизведения?"
+msgstr[2] "Удалить дорожку из списка воспроизведения?"
 
-#: ../src/misc_confirm.c:163
+#: ../src/misc_confirm.c:197
+#, fuzzy
 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 "Вы уверены, что хотите полностью удалить следующую дорожку с жёсткого диска?"
-"Число списков воспроизведения, в которые входит эта дорожка, указано"
-"в скобках."
-"Вы уверены, что хотите полностью удалить следующие дорожки с жёсткого диска?"
-"Число списков воспроизведения, в которые входят эти дорожки, указано"
-"в скобках."
+msgstr[0] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с жёсткого диска?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите полностью удалить следующие дорожки с "
+"жёсткого диска?Число списков воспроизведения, в которые входят эти дорожки, "
+"указанов скобках."
+msgstr[1] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с жёсткого диска?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите полностью удалить следующие дорожки с "
+"жёсткого диска?Число списков воспроизведения, в которые входят эти дорожки, "
+"указанов скобках."
+msgstr[2] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с жёсткого диска?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите полностью удалить следующие дорожки с "
+"жёсткого диска?Число списков воспроизведения, в которые входят эти дорожки, "
+"указанов скобках."
 
-#: ../src/misc_confirm.c:167
+#: ../src/misc_confirm.c:201
+#, fuzzy
 msgid "Delete Track from Harddisk?"
-msgstr "Удалить дорожку с жёсткого диска?"
+msgid_plural "Delete Tracks from Harddisk?"
+msgstr[0] "Удалить дорожку с жёсткого диска?"
+msgstr[1] "Удалить дорожку с жёсткого диска?"
+msgstr[2] "Удалить дорожку с жёсткого диска?"
 
-#: ../src/misc_confirm.c:192
+#: ../src/misc_confirm.c:226
+#, fuzzy
 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 "Вы уверены, что хотите удалить следующую дорожку из локальной базы данных?"
-"Число списков воспроизведения, в которые входит эта дорожка, указано"
-"в скобках."
-"Вы уверены, что хотите удалить следующие дорожки из локальной базы данных?"
-"Число списков воспроизведения, в которые входят эти дорожки, указано"
-"в скобках."
+msgstr[0] ""
+"Вы уверены, что хотите удалить следующую дорожку из локальной базы данных?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите удалить следующие дорожки из локальной базы "
+"данных?Число списков воспроизведения, в которые входят эти дорожки, указанов "
+"скобках."
+msgstr[1] ""
+"Вы уверены, что хотите удалить следующую дорожку из локальной базы данных?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите удалить следующие дорожки из локальной базы "
+"данных?Число списков воспроизведения, в которые входят эти дорожки, указанов "
+"скобках."
+msgstr[2] ""
+"Вы уверены, что хотите удалить следующую дорожку из локальной базы данных?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите удалить следующие дорожки из локальной базы "
+"данных?Число списков воспроизведения, в которые входят эти дорожки, указанов "
+"скобках."
 
-#: ../src/misc_confirm.c:196
+#: ../src/misc_confirm.c:230
+#, fuzzy
 msgid "Remove Track from Local Database?"
-msgstr "Удалить дорожку из локальной базы данных?"
+msgid_plural "Remove Tracks from Local Database?"
+msgstr[0] "Удалить дорожку из локальной базы данных?"
+msgstr[1] "Удалить дорожку из локальной базы данных?"
+msgstr[2] "Удалить дорожку из локальной базы данных?"
 
-#: ../src/misc_confirm.c:261
-#, c-format
+#: ../src/misc_confirm.c:295
+#, fuzzy, c-format
 msgid "Deleted one track completely from iPod"
-msgstr "Одна дорожка полностью удалена с iPod"
+msgid_plural "Deleted %d tracks completely from iPod"
+msgstr[0] "Одна дорожка полностью удалена с iPod"
+msgstr[1] "Одна дорожка полностью удалена с iPod"
+msgstr[2] "Одна дорожка полностью удалена с iPod"
 
-#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
-#, c-format
+#: ../src/misc_confirm.c:301 ../src/misc_confirm.c:325
+#, fuzzy, c-format
 msgid "Deleted %d track from playlist '%s'"
-msgstr "Дорожка %d удалена из списка воспроизведения \"%s\""
+msgid_plural "Deleted %d tracks from playlist '%s'"
+msgstr[0] "Дорожка %d удалена из списка воспроизведения \"%s\""
+msgstr[1] "Дорожка %d удалена из списка воспроизведения \"%s\""
+msgstr[2] "Дорожка %d удалена из списка воспроизведения \"%s\""
 
-#: ../src/misc_confirm.c:285
-#, c-format
+#: ../src/misc_confirm.c:319
+#, fuzzy, c-format
 msgid "Deleted one track from harddisk"
-msgstr "Одна дорожка удалена с жёсткого диска"
+msgid_plural "Deleted %d tracks from harddisk"
+msgstr[0] "Одна дорожка удалена с жёсткого диска"
+msgstr[1] "Одна дорожка удалена с жёсткого диска"
+msgstr[2] "Одна дорожка удалена с жёсткого диска"
 
-#: ../src/misc_confirm.c:297
-#, c-format
+#: ../src/misc_confirm.c:331
+#, fuzzy, c-format
 msgid "Deleted track from local database"
-msgstr "Дорожка удалена из локальной базы данных"
+msgid_plural "Deleted %d tracks from local database"
+msgstr[0] "Дорожка удалена из локальной базы данных"
+msgstr[1] "Дорожка удалена из локальной базы данных"
+msgstr[2] "Дорожка удалена из локальной базы данных"
 
-#: ../src/misc_confirm.c:442
+#: ../src/misc_confirm.c:476
 msgid "Cannot remove entry 'All'"
 msgstr "Невозможно удалить запись \"Все\""
 
-#: ../src/misc_confirm.c:536
+#: ../src/misc_confirm.c:570
 #, c-format
 msgid "Removed all %d tracks from the iPod"
 msgstr "Удалено %d дорожек с iPod"
 
-#: ../src/misc_confirm.c:541
+#: ../src/misc_confirm.c:575
 #, c-format
 msgid "Removed all podcasts from the iPod"
 msgstr "Все подкасты удалены с iPod"
 
-#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
-#, c-format
+#: ../src/misc_confirm.c:584 ../src/misc_confirm.c:658
+#, fuzzy, c-format
 msgid "Deleted playlist '%s' including %d member track"
-msgstr "Удалён список воспроизведения \"%s\", включая %d дорожек"
+msgid_plural "Deleted playlist '%s' including %d member tracks"
+msgstr[0] "Удалён список воспроизведения \"%s\", включая %d дорожек"
+msgstr[1] "Удалён список воспроизведения \"%s\", включая %d дорожек"
+msgstr[2] "Удалён список воспроизведения \"%s\", включая %d дорожек"
 
 #. first use playlist name
-#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#: ../src/misc_confirm.c:600 ../src/misc_confirm.c:674
 #, c-format
 msgid "Deleted playlist '%s'"
 msgstr "Удалён список воспроизведения \"%s\""
 
-#: ../src/misc_confirm.c:600
-#, c-format
+#: ../src/misc_confirm.c:634
+#, fuzzy, c-format
 msgid "Deleted playlist '%s' including %d member track on harddisk"
-msgstr "Удалён список воспроизведения \"%s\", включая %d дорожек на жёстком диске"
+msgid_plural "Deleted playlist '%s' including %d member tracks on harddisk"
+msgstr[0] ""
+"Удалён список воспроизведения \"%s\", включая %d дорожек на жёстком диске"
+msgstr[1] ""
+"Удалён список воспроизведения \"%s\", включая %d дорожек на жёстком диске"
+msgstr[2] ""
+"Удалён список воспроизведения \"%s\", включая %d дорожек на жёстком диске"
 
-#: ../src/misc_confirm.c:617
+#: ../src/misc_confirm.c:651
 #, c-format
 msgid "Removed all %d tracks from the database"
 msgstr "Удалено %d дорожек из базы данных"
 
-#: ../src/misc_confirm.c:695
+#: ../src/misc_confirm.c:729
 #, c-format
 msgid "Are you sure you want to remove all tracks from your iPod?"
 msgstr "Вы уверены, что хотите удалить все дорожки с iPod?"
 
-#: ../src/misc_confirm.c:700
+#: ../src/misc_confirm.c:734
 #, c-format
 msgid "Are you sure you want to remove all podcasts from your iPod?"
 msgstr "Вы уверены, что хотите удалить все подкасты с iPod?"
 
-#: ../src/misc_confirm.c:708
-#, c-format
+#: ../src/misc_confirm.c:742
+#, 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 "Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующую дорожку с iPod?"
-"Число списков воспроизведения, в которые входит эта дорожка, указано"
-"в скобках."
-"Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующие дорожки с iPod?"
-"Число списков воспроизведения, в которые входят эти дорожки, указано"
-"в скобках."
+msgstr[0] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с iPod?Число "
+"списков воспроизведения, в которые входит эта дорожка, указанов скобках.Вы "
+"уверены, что хотите полностью удалить следующие дорожки с iPod?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
+msgstr[1] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с iPod?Число "
+"списков воспроизведения, в которые входит эта дорожка, указанов скобках.Вы "
+"уверены, что хотите полностью удалить следующие дорожки с iPod?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
+msgstr[2] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с iPod?Число "
+"списков воспроизведения, в которые входит эта дорожка, указанов скобках.Вы "
+"уверены, что хотите полностью удалить следующие дорожки с iPod?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
 
-#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#: ../src/misc_confirm.c:753 ../src/misc_confirm.c:808
 #, c-format
 msgid "Are you sure you want to delete the playlist '%s'?"
 msgstr "Вы уверены, что хотите удалить список воспроизведения \"%s\"?"
 
-#: ../src/misc_confirm.c:745
-#, c-format
+#: ../src/misc_confirm.c:779
+#, fuzzy, 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 "Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующую дорожку с жёсткого диска?"
-"Число списков воспроизведения, в которые входит эта дорожка, указано"
-"в скобках."
-"Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующие дорожки с жёсткого диска?"
-"Число списков воспроизведения, в которые входят эти дорожки, указано"
-"в скобках."
+msgstr[0] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с жёсткого диска?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите полностью удалить следующие дорожки с "
+"жёсткого диска?Число списков воспроизведения, в которые входят эти дорожки, "
+"указанов скобках."
+msgstr[1] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с жёсткого диска?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите полностью удалить следующие дорожки с "
+"жёсткого диска?Число списков воспроизведения, в которые входят эти дорожки, "
+"указанов скобках."
+msgstr[2] ""
+"Вы уверены, что хотите полностью удалить следующую дорожку с жёсткого диска?"
+"Число списков воспроизведения, в которые входит эта дорожка, указанов "
+"скобках.Вы уверены, что хотите полностью удалить следующие дорожки с "
+"жёсткого диска?Число списков воспроизведения, в которые входят эти дорожки, "
+"указанов скобках."
 
-#: ../src/misc_confirm.c:753
+#: ../src/misc_confirm.c:787
 #, c-format
 msgid "Are you sure you want to remove all tracks from the database?"
 msgstr "Вы уверены, что хотите удалить все дорожки из базы данных?"
 
-#: ../src/misc_confirm.c:762
-#, c-format
+#: ../src/misc_confirm.c:796
+#, fuzzy, 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 "Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующую дорожку из базы данных?"
-"Число списков воспроизведения, в которые входит эта дорожка, указано"
-"в скобках."
-"Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующие дорожки из базы данных?"
-"Число списков воспроизведения, в которые входят эти дорожки, указано"
-"в скобках."
+msgstr[0] ""
+"Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующую "
+"дорожку из базы данных?Число списков воспроизведения, в которые входит эта "
+"дорожка, указанов скобках.Вы уверены, что хотите удалить список "
+"воспроизведения \"%s\" и следующие дорожки из базы данных?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
+msgstr[1] ""
+"Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующую "
+"дорожку из базы данных?Число списков воспроизведения, в которые входит эта "
+"дорожка, указанов скобках.Вы уверены, что хотите удалить список "
+"воспроизведения \"%s\" и следующие дорожки из базы данных?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
+msgstr[2] ""
+"Вы уверены, что хотите удалить список воспроизведения \"%s\" и следующую "
+"дорожку из базы данных?Число списков воспроизведения, в которые входит эта "
+"дорожка, указанов скобках.Вы уверены, что хотите удалить список "
+"воспроизведения \"%s\" и следующие дорожки из базы данных?Число списков "
+"воспроизведения, в которые входят эти дорожки, указанов скобках."
 
-#: ../src/misc_confirm.c:841
+#: ../src/misc_confirm.c:869
 msgid ""
-"Data has been changed and not been saved.\n"
-"OK to exit gtkpod?"
-msgstr "Данные изменены и не были сохранены.\n"
-"Вы уверены, что хотите выйти из gtkpod?"
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
+"changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
+msgstr ""
 
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr ""
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr ""
+
 #: ../src/misc_conversion.c:66
 msgid "File type"
 msgstr "Тип файла"
@@ -4747,320 +5067,381 @@
 msgid "Gapless Track Flag"
 msgstr "Флаг безразрывной дорожки"
 
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
+msgstr ""
+
+#: ../src/misc_conversion.c:127
 msgid "Name of file on PC, if available"
 msgstr "Имя файла на ПК, если доступно"
 
-#: ../src/misc_conversion.c:127
+#: ../src/misc_conversion.c:128
 msgid "Name of file on the iPod"
 msgstr "Имя файла на iPod"
 
 #. 10
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
 msgid "Track Nr. and total number of tracks on CD"
 msgstr "Номер дорожки и общее число дорожек на CD"
 
-#: ../src/misc_conversion.c:130
+#: ../src/misc_conversion.c:131
 msgid "Whether the file has already been transferred to the iPod or not"
 msgstr "Был ли файл уже передан на iPod или нет"
 
-#: ../src/misc_conversion.c:136
+#: ../src/misc_conversion.c:137
 msgid "Beats per minute"
 msgstr "Ударов в минуту"
 
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
 msgid "Number of times the track has been played"
 msgstr "Сколько раз дорожка была воспроизведена"
 
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
 msgid "Star rating from 0 to 5"
 msgstr "Оценка в звёздах, от 0 до 5"
 
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
 msgid "Date and time track has been added"
 msgstr "Дата и время добавления дорожки"
 
 #. 20
-#: ../src/misc_conversion.c:140
+#: ../src/misc_conversion.c:141
 msgid "Date and time track has last been played"
 msgstr "Дата и время последнего воспроизведения дорожки"
 
-#: ../src/misc_conversion.c:141
+#: ../src/misc_conversion.c:142
 msgid "Date and time track has last been modified"
 msgstr "Дата и время последнего изменения дорожки"
 
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:143
 msgid "Manual volume adjust"
 msgstr "Ручная подстройка громкости"
 
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:144
 msgid ""
 "Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
 "the iPod"
-msgstr "Подстройка громкости в dB (\"replay gain\"): вы должны включить опцию"
+msgstr ""
+"Подстройка громкости в dB (\"replay gain\"): вы должны включить опцию"
 "\"soundcheck\" на iPod"
 
 #. 25
-#: ../src/misc_conversion.c:146
+#: ../src/misc_conversion.c:147
 msgid "CD Nr. and total number of CDS in set"
 msgstr "Номер CD и общее число CD в наборе"
 
-#: ../src/misc_conversion.c:149
+#: ../src/misc_conversion.c:150
 msgid ""
 "The category (e.g. 'Technology' or 'Music') where the podcast was located."
-msgstr "Категория (например, \"Технология\" или \"Музыка\", где находился подкаст."
+msgstr ""
+"Категория (например, \"Технология\" или \"Музыка\", где находился подкаст."
 
-#: ../src/misc_conversion.c:150
+#: ../src/misc_conversion.c:151
 msgid "Accessible by selecting the center button on the iPod."
 msgstr "Доступно нажатием средней кнопки на iPod."
 
-#: ../src/misc_conversion.c:154
+#: ../src/misc_conversion.c:155
 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
+#: ../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 ../src/misc_conversion.c:174
 msgid "Used for sorting on the iPod"
 msgstr "Используется для сортировки на iPod"
 
-#: ../src/misc_conversion.c:735
+#: ../src/misc_conversion.c:737
 #, 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
+#: ../src/misc_conversion.c:747
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "Локальный URL типа file \"%s\" не может включать \"#\""
 
-#: ../src/misc_conversion.c:762
+#: ../src/misc_conversion.c:764
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "URI \"%s\" некорректен"
 
-#: ../src/misc_conversion.c:774
+#: ../src/misc_conversion.c:776
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "Имя хоста в URI \"%s\" некорректно"
 
-#: ../src/misc_conversion.c:790
+#: ../src/misc_conversion.c:792
 #, 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
+#: ../src/misc_playlist.c:71 ../src/misc_playlist.c:108
+#, fuzzy
+msgid "Please load the iPod before adding playlists."
+msgstr "Пожалуйста, загрузите iPod перед добавлением дорожек."
+
+#: ../src/misc_playlist.c:77 ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
 msgid "Please enter a name for the new playlist"
 msgstr "Пожалуйста, введите имя нового списка воспроизведения"
 
-#: ../src/misc_playlist.c:154
+#: ../src/misc_playlist.c:174
 msgid "AR:"
 msgstr "ИС:"
 
-#: ../src/misc_playlist.c:157
+#: ../src/misc_playlist.c:177
 msgid "AL:"
 msgstr "АЛ:"
 
-#: ../src/misc_playlist.c:160
+#: ../src/misc_playlist.c:180
 msgid "GE:"
 msgstr "ЖА:"
 
-#: ../src/misc_playlist.c:163
+#: ../src/misc_playlist.c:183
 msgid "CO:"
 msgstr "ОБ:"
 
-#: ../src/misc_playlist.c:166
+#: ../src/misc_playlist.c:186
 msgid "YE:"
 msgstr "ГО:"
 
-#: ../src/misc_playlist.c:194
+#: ../src/misc_playlist.c:214
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/misc_playlist.c:272
+#: ../src/misc_playlist.c:292
 #, c-format
 msgid "Random (%d)"
 msgstr "Случайное (%d)"
 
-#: ../src/misc_playlist.c:297
+#: ../src/misc_playlist.c:317
 msgid ""
 "Auto Store of track view disabled.\n"
 "\n"
-msgstr "Автосохранение представления дорожки отключено.\n"
+msgstr ""
+"Автосохранение представления дорожки отключено.\n"
 "\n"
 
-#: ../src/misc_playlist.c:356
+#: ../src/misc_playlist.c:376
 msgid "Not Listed"
 msgstr "Не в списке"
 
-#: ../src/misc_playlist.c:406
-#, c-format
+#: ../src/misc_playlist.c:426
+#, fuzzy, c-format
 msgid "Created playlist '%s' with %d track."
-msgstr "Создан список воспроизведения \"%s\" с дорожкой %d."
+msgid_plural "Created playlist '%s' with %d tracks."
+msgstr[0] "Создан список воспроизведения \"%s\" с дорожкой %d."
+msgstr[1] "Создан список воспроизведения \"%s\" с дорожкой %d."
+msgstr[2] "Создан список воспроизведения \"%s\" с дорожкой %d."
 
 #. n==0
-#: ../src/misc_playlist.c:417
+#: ../src/misc_playlist.c:437
 msgid "No tracks available, playlist not created"
 msgstr "Нет доступных дорожек, список воспроизведения не создан"
 
-#: ../src/misc_playlist.c:543
+#: ../src/misc_playlist.c:563
 #, c-format
 msgid "Most Listened (%d)"
 msgstr "Наиболее часто прослушиваемые (%d)"
 
-#: ../src/misc_playlist.c:584
+#: ../src/misc_playlist.c:604
 #, c-format
 msgid "Never Listened"
 msgstr "Никогда не прослушанные"
 
-#: ../src/misc_playlist.c:624
+#: ../src/misc_playlist.c:644
 #, c-format
 msgid "Best Rated (%d)"
 msgstr "Наибольший рейтинг (%d)"
 
-#: ../src/misc_playlist.c:666
+#: ../src/misc_playlist.c:686
 msgid "Unrated tracks"
 msgstr "Дорожки без рейтинга"
 
-#: ../src/misc_playlist.c:671
+#: ../src/misc_playlist.c:691
 #, c-format
 msgid "Rated %d"
 msgstr "Рейтинг %d"
 
-#: ../src/misc_playlist.c:714
+#: ../src/misc_playlist.c:734
 #, c-format
 msgid "Recent (%d)"
 msgstr "Недавние (%d)"
 
-#: ../src/misc_playlist.c:753
+#: ../src/misc_playlist.c:773
 msgid "Last Time"
 msgstr "Последнее время"
 
-#: ../src/misc_playlist.c:844
+#: ../src/misc_playlist.c:864
 msgid "Removal of dangling tracks with no files on PC was canceled."
 msgstr "Удаление повисших дорожек без файлов на ПК отменено."
 
-#: ../src/misc_playlist.c:854
+#: ../src/misc_playlist.c:874
 msgid "Handling of dangling tracks with files on PC was canceled."
 msgstr "Обработка повисших дорожек без файлов на ПК отменена."
 
-#: ../src/misc_playlist.c:882
+#: ../src/misc_playlist.c:902
 msgid "Dangling tracks with no files on PC were removed."
 msgstr "Повисшие дорожки без файлов на ПК были удалены."
 
-#: ../src/misc_playlist.c:943
+#: ../src/misc_playlist.c:963
 msgid "Dangling tracks with files on PC were handled."
 msgstr "Повисшие дорожки без файлов на ПК были обработаны."
 
-#: ../src/misc_playlist.c:976
+#: ../src/misc_playlist.c:996
 msgid "Track"
 msgstr "Дорожка"
 
-#: ../src/misc_playlist.c:1019
+#: ../src/misc_playlist.c:1035
+#, fuzzy
 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"
+"If you abort the operation, you can import the existing database before "
+"calling this function again.\n"
+msgstr ""
+"Вы не импортировали существующую iTunesDB (\"%s\"). Как правило, этоявляется "
+"ошибкой и приведёт к потере существующей базы данных.\n"
 "\n"
-"Нажмите \"OK\", чтобы продолжить, несмотря на это, или \"Отмена\", чтобы"
-"пропустить сохранение. Если вы нажмёте \"Отмена\", вы сможете"
-"импортировать существующую базу данных перед повторным вызовом"
-"этой функции.\n"
+"Нажмите \"OK\", чтобы продолжить, несмотря на это, или \"Отмена\", "
+"чтобыпропустить сохранение. Если вы нажмёте \"Отмена\", вы "
+"сможетеимпортировать существующую базу данных перед повторным вызовомэтой "
+"функции.\n"
 
-#: ../src/misc_playlist.c:1033
+#: ../src/misc_playlist.c:1042
+#, fuzzy
+msgid "Abort operation"
+msgstr "Параметры сортировки"
+
+#: ../src/misc_playlist.c:1056
 msgid "Creating a tree of known files"
 msgstr "Создание дерева известных файлов"
 
-#: ../src/misc_playlist.c:1077
+#: ../src/misc_playlist.c:1100
 msgid "Checking iPOD files against known files in DB"
 msgstr "Сопоставление файлов на iPod с известными файлами в БД"
 
-#: ../src/misc_playlist.c:1120
+#: ../src/misc_playlist.c:1143
 msgid "Orphaned"
 msgstr "Сирота"
 
-#: ../src/misc_playlist.c:1147
+#: ../src/misc_playlist.c:1170
 #, 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"
+msgstr ""
+"Следующий осиротевший файл уже был добавлен на iPod вновь. Онбудет удалён "
+"при следующей синхронизации:\n"
 "%s\n"
 "\n"
 
-#: ../src/misc_playlist.c:1175
+#: ../src/misc_playlist.c:1198
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Processing..."
 msgstr "Найдено %d осиротевших и %d повисших файлов. Идёт обработка..."
 
-#: ../src/misc_playlist.c:1199
-#, c-format
+#: ../src/misc_playlist.c:1222
+#, fuzzy, 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 "Следующая повисшая дорожка имеет файл на ПК.\n"
-"Нажмите \"OK\", чтобы передать её из файла при следующей синхронизации,"
-"или \"Отмена\", чтобы оставить её как есть."
-"Следующие %d повисших дорожек имеют файлы на ПК.\n"
-"Нажмите \"OK\", чтобы передать их из файлов при следующей синхронизации,"
-"или \"Отмена\", чтобы оставить их как есть."
+msgstr[0] ""
+"Следующая повисшая дорожка имеет файл на ПК.\n"
+"Нажмите \"OK\", чтобы передать её из файла при следующей синхронизации,или "
+"\"Отмена\", чтобы оставить её как есть.Следующие %d повисших дорожек имеют "
+"файлы на ПК.\n"
+"Нажмите \"OK\", чтобы передать их из файлов при следующей синхронизации,или "
+"\"Отмена\", чтобы оставить их как есть."
+msgstr[1] ""
+"Следующая повисшая дорожка имеет файл на ПК.\n"
+"Нажмите \"OK\", чтобы передать её из файла при следующей синхронизации,или "
+"\"Отмена\", чтобы оставить её как есть.Следующие %d повисших дорожек имеют "
+"файлы на ПК.\n"
+"Нажмите \"OK\", чтобы передать их из файлов при следующей синхронизации,или "
+"\"Отмена\", чтобы оставить их как есть."
+msgstr[2] ""
+"Следующая повисшая дорожка имеет файл на ПК.\n"
+"Нажмите \"OK\", чтобы передать её из файла при следующей синхронизации,или "
+"\"Отмена\", чтобы оставить её как есть.Следующие %d повисших дорожек имеют "
+"файлы на ПК.\n"
+"Нажмите \"OK\", чтобы передать их из файлов при следующей синхронизации,или "
+"\"Отмена\", чтобы оставить их как есть."
 
-#: ../src/misc_playlist.c:1204
-#, c-format
+#: ../src/misc_playlist.c:1227
+#, fuzzy, 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 "Следующая повисшая дорожка не имеет файла на ПК.\n"
-"Нажмите \"OK\", чтобы удалить её, или \"Отмена\", чтобы оставить её без изменений."
-"Следующие %d повисших дорожек не имеют файла на ПК.\n"
-"Нажмите \"OK\", чтобы удалитьихё, или \"Отмена\", чтобы оставить их без изменений."
+msgstr[0] ""
+"Следующая повисшая дорожка не имеет файла на ПК.\n"
+"Нажмите \"OK\", чтобы удалить её, или \"Отмена\", чтобы оставить её без "
+"изменений.Следующие %d повисших дорожек не имеют файла на ПК.\n"
+"Нажмите \"OK\", чтобы удалитьихё, или \"Отмена\", чтобы оставить их без "
+"изменений."
+msgstr[1] ""
+"Следующая повисшая дорожка не имеет файла на ПК.\n"
+"Нажмите \"OK\", чтобы удалить её, или \"Отмена\", чтобы оставить её без "
+"изменений.Следующие %d повисших дорожек не имеют файла на ПК.\n"
+"Нажмите \"OK\", чтобы удалитьихё, или \"Отмена\", чтобы оставить их без "
+"изменений."
+msgstr[2] ""
+"Следующая повисшая дорожка не имеет файла на ПК.\n"
+"Нажмите \"OK\", чтобы удалить её, или \"Отмена\", чтобы оставить её без "
+"изменений.Следующие %d повисших дорожек не имеют файла на ПК.\n"
+"Нажмите \"OK\", чтобы удалитьихё, или \"Отмена\", чтобы оставить их без "
+"изменений."
 
 #. we want unique window for each
 #. gboolean modal,
-#: ../src/misc_playlist.c:1211
+#: ../src/misc_playlist.c:1234
 msgid "Dangling Tracks"
 msgstr "Повисшие дорожки"
 
-#: ../src/misc_playlist.c:1234
+#: ../src/misc_playlist.c:1257
 #, 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
+#, fuzzy, c-format
 msgid "Hashed %d of %d track."
-msgstr "Хэшировано %d из %d дорожек."
+msgid_plural "Hashed %d of %d tracks."
+msgstr[0] "Хэшировано %d из %d дорожек."
+msgstr[1] "Хэшировано %d из %d дорожек."
+msgstr[2] "Хэшировано %d из %d дорожек."
 
 #: ../src/misc_track.c:198
-#, c-format
+#, fuzzy, c-format
 msgid "The following duplicate track has been removed."
-msgstr "Следующая дорожка-дубликат была удалена."
+msgid_plural "The following %d duplicate tracks have been removed."
+msgstr[0] "Следующая дорожка-дубликат была удалена."
+msgstr[1] "Следующая дорожка-дубликат была удалена."
+msgstr[2] "Следующая дорожка-дубликат была удалена."
 
 #: ../src/misc_track.c:205
-#, c-format
+#, fuzzy, 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 "Следующая дорожка-дубликат не была добавлена в главный список воспроизведения."
-"Следующие %d дорожек-дубликатов не были добавлены в главный список воспроизведения."
+msgstr[0] "Следующая дорожка-дубликат была удалена."
+msgstr[1] "Следующая дорожка-дубликат была удалена."
+msgstr[2] "Следующая дорожка-дубликат была удалена."
 
 #. gint id,
 #. gboolean modal,
@@ -5068,104 +5449,105 @@
 msgid "Duplicate detection"
 msgstr "Обнаружение дубликатов"
 
-#: ../src/misc_track.c:1339
+#: ../src/misc_track.c:1347
 msgid "Local Database"
 msgstr "Локальная база данных"
 
 #. artwork is set
-#: ../src/misc_track.c:1350
+#: ../src/misc_track.c:1358
 msgid "Embedded or filename was lost"
 msgstr "Внедрено или имя файла было потеряно"
 
-#: ../src/misc_track.c:1354
+#: ../src/misc_track.c:1362
 msgid "Artwork not set"
 msgstr "Изображение не задано"
 
-#: ../src/misc_track.c:1816
+#: ../src/misc_track.c:1836
 #, c-format
 msgid "Could not find source file for '%s'. Track not copied."
 msgstr "Не удалось найти исходный файл для \"%s\". Дорожка не скопирована."
 
-#: ../src/misc_track.c:2052
+#: ../src/misc_track.c:2072
 #, c-format
 msgid "drag and drop: ignored '%s'\n"
 msgstr "перетаскивание: проигнорировано \"%s\"\n"
 
-#: ../src/mp3file.c:1336
+#: ../src/mp3file.c:1344
 #, 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
+#: ../src/mp3file.c:1368 ../src/mp3file.c:1552 ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870 ../src/mp3file.c:2929 ../src/mp3file.c:2956
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "ОШИБКА при открытии файла: \"%s\" (%s).\n"
 
-#: ../src/mp3file.c:1688
+#: ../src/mp3file.c:1793 ../src/mp3file.c:2993
 #, 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
+#: ../src/mp3file.c:2907
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "Файл \"%s\" имеет нулевую длительность. Проигнорировано.\n"
 
-#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#: ../src/mp4file.c:243 ../src/mp4file.c:475
 #, 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
+#: ../src/mp4file.c:253 ../src/mp4file.c:485
 #, 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:529
+#: ../src/mp4file.c:607
 #, c-format
 msgid "'%s' does not appear to be a mp4 audio file.\n"
 msgstr "\"%s\" не похож на аудиофайл MP4.\n"
 
-#: ../src/mp4file.c:540
+#: ../src/mp4file.c:618
 #, 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:553
+#: ../src/mp4file.c:631
 #, 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"
+msgstr ""
+"Импорт \"%s\" завершился неуспешно: M4A/M4P/M4B не поддерживается без "
+"библиотеки mp4v2.Вы должны откомпилировать исходный код gtkpod с поддержкой "
+"библиотеки mp4v2.\n"
 
-#: ../src/mp4file.c:559
+#: ../src/mp4file.c:637
 #, 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"
+msgstr ""
+"Обновление метаданных M4A/M4P/M4B для \"%s\" завершилось неуспешно: M4A/M4P/"
+"M4Bне поддерживается без библиотеки mp4v2. Вы должны откомпилировать "
+"исходный кодgtkpod с поддержкой библиотеки mp4v2.\n"
 
-#: ../src/mp4file.c:565
+#: ../src/mp4file.c:643
 #, 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"
+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"
@@ -5176,7 +5558,8 @@
 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."
+msgstr ""
+"Импорт \"%s\" завершился неуспешно: Ogg не поддерживается без библиотеки Ogg."
 "Вы должны откомпилировать исходный код gtkpod с поддержкой библиотеки Ogg.\n"
 
 #: ../src/oggfile.c:160
@@ -5184,158 +5567,142 @@
 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"
+msgstr ""
+"Обновление метаданных для \"%s\" завершилось неуспешно: Ogg не "
+"поддерживается без библиотеки Ogg.Вы должны откомпилировать исходный код "
+"gtkpod с поддержкой библиотеки Ogg.\n"
 
-#: ../src/prefs.c:357
+#: ../src/prefs.c:365
 #, c-format
 msgid "gtkpod version %s usage:\n"
 msgstr "использование версии gtkpod %s:\n"
 
-#: ../src/prefs.c:358
+#: ../src/prefs.c:366
 msgid "  -h, --help:   display this message\n"
 msgstr "  -h, --help:   отобразить это сообщение\n"
 
-#: ../src/prefs.c:359
+#: ../src/prefs.c:367
 msgid "  -p <file>:    increment playcount for file by one\n"
 msgstr "  -p <file>:    увеличить число воспроизведений файла на 1\n"
 
-#: ../src/prefs.c:360
+#: ../src/prefs.c:368
 msgid "  --hash <file>:print gtkpod hash for file\n"
 msgstr "  --hash <file>:вывести хэш gtkpod для файла\n"
 
-#: ../src/prefs.c:361
+#: ../src/prefs.c:369
 msgid "  -m path:      define the mountpoint of your iPod\n"
 msgstr "  -m path:      задать точку монтирования iPod\n"
 
-#: ../src/prefs.c:362
+#: ../src/prefs.c:370
 msgid "  --mountpoint: same as '-m'.\n"
 msgstr "  --mountpoint: то же, что '-m'.\n"
 
-#: ../src/prefs.c:363
+#: ../src/prefs.c:371
 msgid "  -a:           import database automatically after start.\n"
 msgstr "  -a:           импортировать базу данных автоматически при запуске.\n"
 
-#: ../src/prefs.c:364
+#: ../src/prefs.c:372
 msgid "  --auto:       same as '-a'.\n"
 msgstr "  --auto:       то же, что '-a'.\n"
 
-#: ../src/prefs.c:561
-#, c-format
-msgid "Couldn't create ~/.gtkpod\n"
+#: ../src/prefs.c:569
+#, fuzzy, c-format
+msgid "Couldn't create '%s'\n"
 msgstr "Не удалось создать ~/.gtkpod\n"
 
-#: ../src/prefs_window.c:133
-msgid "Please select command for 'Play Now'"
-msgstr "Пожалуйста, выберите команду для функции \"Воспроизвести сейчас\""
+#: ../src/prefsdlg.c:51
+#, fuzzy
+msgid "Hide"
+msgstr "Видео"
 
-#: ../src/prefs_window.c:134
-msgid "Please select command for 'Enqueue'"
-msgstr "Пожалуйста, выберите команду для функции \"Поставить в очередь\""
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
+msgstr ""
 
-#: ../src/prefs_window.c:135
-msgid "Please select the mp3gain executable"
-msgstr "Пожалуйста, выберите исполняемый файл mp3gain"
+#: ../src/prefsdlg.c:53
+msgid "Text only"
+msgstr ""
 
-#: ../src/prefs_window.c:136
-msgid "Please select the aacgain executable"
-msgstr "Пожалуйста, выберите исполняемый файл aacgain"
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
+msgstr ""
 
-#: ../src/prefs_window.c:137
-msgid "Select the mserv music root directory"
-msgstr "Выберите корневую папку музыки mserv"
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
+msgstr ""
 
-#: ../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
+#: ../src/repository.c:527
+#, 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 at users.sourceforge.net "
-"для включения в следующую версию.</i>"
+"Are you sure you want to delete repository \"%s\"? This action cannot be "
+"undone!"
+msgstr "Вы уверены, что хотите удалить список воспроизведения \"%s\"?"
 
-#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
-msgid "Preferences not updated"
-msgstr "Настройки не обновлены"
+#: ../src/repository.c:531
+#, fuzzy
+msgid "Delete repository?"
+msgstr "Удалить репозиторий"
 
-#: ../src/prefs_window.c:1232
-msgid "Preferences applied"
-msgstr "Настройки применены"
-
-#: ../src/repository.c:573 ../src/repository.c:2395
+#: ../src/repository.c:587 ../src/repository.c:2400
 msgid "Set backup file"
 msgstr "Задайте файл резервной копии"
 
-#: ../src/repository.c:612
+#: ../src/repository.c:626
 msgid "Select directory for synchronization"
 msgstr "Выберите папку для синхронизации"
 
-#: ../src/repository.c:638
+#: ../src/repository.c:652
 msgid "Please select command to sync contacts"
 msgstr "Пожалуйста, выберите команду для синхронизации контактов"
 
-#: ../src/repository.c:644
+#: ../src/repository.c:658
 msgid "Please select command to sync calendar"
 msgstr "Пожалуйста, выберите команду для синхронизации календаря"
 
-#: ../src/repository.c:650
+#: ../src/repository.c:664
 msgid "Please select command to sync notes"
 msgstr "Пожалуйста, выберите команду для синхронизации заметок"
 
-#: ../src/repository.c:729
+#: ../src/repository.c:676
+#, 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/repository.c:743
 msgid "Smart playlist updated."
 msgstr "Умный список воспроизведения обновлён."
 
-#: ../src/repository.c:1190
+#: ../src/repository.c:1204
 msgid "Podcasts Repository"
 msgstr "Репозиторий подкастов"
 
-#: ../src/repository.c:1194
+#: ../src/repository.c:1208
 msgid "Local Repository"
 msgstr "Локальный репозиторий"
 
-#: ../src/repository.c:1348
+#: ../src/repository.c:1358
 msgid "Master Playlist"
 msgstr "Главный список воспроизведения"
 
-#: ../src/repository.c:1352
+#: ../src/repository.c:1362
 msgid "Podcasts Playlist"
 msgstr "Список воспроизведения подкастов"
 
-#: ../src/repository.c:1360
+#: ../src/repository.c:1370
 msgid "Regular Playlist"
 msgstr "Обычный список воспроизведения"
 
-#: ../src/repository.c:2423
+#: ../src/repository.c:2428
 msgid "Set local repository file"
 msgstr "Задайте файл локального репозитория"
 
-#: ../src/repository.c:2522
+#: ../src/repository.c:2526
 msgid "New Repository"
 msgstr "Новый репозиторий"
 
@@ -5348,34 +5715,62 @@
 msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
 msgstr "Не удалось открыть \"%s\" для вычисления контрольной суммы SHA1: %s\n"
 
-#: ../src/syncdir.c:237
+#: ../src/sort_window.c:237
+#, fuzzy
+msgid "No sorting"
+msgstr "_Сортировка"
+
+#: ../src/sort_window.c:271
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr ""
+"Вы также можете использовать столбцы таблицы, но это позволяет "
+"вамсортировать дорожки по полям, отсутствующим в таблице."
+
+#: ../src/syncdir.c:246
 #, c-format
 msgid "Sync summary for %s/%s\n"
 msgstr "Сводная информация о синхронизации для %s/%s\n"
 
-#: ../src/syncdir.c:246
+#: ../src/syncdir.c:255
+#, fuzzy
 msgid "The following track has been added or updated:\n"
-msgstr "Следующая дорожка была добавлена или обновлена:\n"
+msgid_plural "The following tracks have been added or updated:\n"
+msgstr[0] "Следующая дорожка была добавлена или обновлена:\n"
+msgstr[1] "Следующая дорожка была добавлена или обновлена:\n"
+msgstr[2] "Следующая дорожка была добавлена или обновлена:\n"
 
-#: ../src/syncdir.c:255
+#: ../src/syncdir.c:264
+#, 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 "Следующая дорожка была полностью удалена с iPod:\n"
-"Следующие дорожки была полностью удалены с iPod:\n"
+msgstr[0] "Следующая дорожка была удалена из репозитория:\n"
+msgstr[1] "Следующая дорожка была удалена из репозитория:\n"
+msgstr[2] "Следующая дорожка была удалена из репозитория:\n"
 
-#: ../src/syncdir.c:264
+#: ../src/syncdir.c:273
+#, fuzzy
 msgid "The following track has been removed from the repository:\n"
-msgstr "Следующая дорожка была удалена из репозитория:\n"
+msgid_plural "The following tracks have been removed from the repository:\n"
+msgstr[0] "Следующая дорожка была удалена из репозитория:\n"
+msgstr[1] "Следующая дорожка была удалена из репозитория:\n"
+msgstr[2] "Следующая дорожка была удалена из репозитория:\n"
 
-#: ../src/syncdir.c:271
+#: ../src/syncdir.c:280
+#, fuzzy
 msgid "The following track has been removed from the playlist:\n"
-msgstr "Следующая дорожка была удалена из списка воспроизведения:\n"
+msgid_plural "The following tracks have been removed from the playlist:\n"
+msgstr[0] "Следующая дорожка была удалена из списка воспроизведения:\n"
+msgstr[1] "Следующая дорожка была удалена из списка воспроизведения:\n"
+msgstr[2] "Следующая дорожка была удалена из списка воспроизведения:\n"
 
-#: ../src/syncdir.c:277
+#: ../src/syncdir.c:286
 msgid "Nothing was changed.\n"
 msgstr "Никаких изменений не произошло.\n"
 
-#: ../src/syncdir.c:282
+#: ../src/syncdir.c:291
 msgid "Sync summary"
 msgstr "Сводная информация о синхронизации"
 
@@ -5386,9 +5781,10 @@
 "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"
+msgstr ""
+"Не удалось найти \"%s\".\n"
+"Пожалуйста, задайте полный путь в разделе \"Инструменты\" диалога "
+"настроекили установите программу, если она не установлена на вашей системе.\n"
 "\n"
 
 #: ../src/tools.c:203
@@ -5396,7 +5792,8 @@
 msgid ""
 "Execution of '%s' failed.\n"
 "\n"
-msgstr "Ошибка при исполнении \"%s\".\n"
+msgstr ""
+"Ошибка при исполнении \"%s\".\n"
 "\n"
 
 #: ../src/tools.c:248
@@ -5404,16 +5801,18 @@
 msgid ""
 "Did not normalize '%s'. Set mp3gain path in the Tools section of the "
 "preferences.\n"
-msgstr "\"%s\" не был нормализован. Задайте путь к mp3gain в разделе \"Инструменты\""
-"диалога настроек.\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"
+msgstr ""
+"\"%s\" не был нормализован. Задайте путь к aacgain в разделе \"Инструменты"
+"\"диалога настроек.\n"
 
 #: ../src/tools.c:385
 msgid "Normalizing..."
@@ -5442,16 +5841,20 @@
 "\n"
 
 #: ../src/tools.c:530
-#, c-format
+#, fuzzy, c-format
 msgid "Normalized %d of %d tracks."
-msgstr "Нормализовано %d из %d дорожек."
+msgid_plural "Normalized %d of %d tracks."
+msgstr[0] "Нормализовано %d из %d дорожек."
+msgstr[1] "Нормализовано %d из %d дорожек."
+msgstr[2] "Нормализовано %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"
+msgstr ""
+"Пожалуйста, задайте команду для вызова в разделе \"Инструменты\"диалога "
+"настроек.\n"
 
 #: ../src/tools.c:645
 #, c-format
@@ -5460,16 +5863,17 @@
 "\n"
 "Please verify the setting in the 'Tools' section of the preferences dialog.\n"
 "\n"
-msgstr "Не удалось найти команду \"%s\".\n"
-"Пожалуйста, проверьте настройку в разделе \"Инструменты\""
-"диалога настроек.\n"
+msgstr ""
+"Не удалось найти команду \"%s\".\n"
+"Пожалуйста, проверьте настройку в разделе \"Инструменты\"диалога настроек.\n"
 
 #: ../src/tools.c:687
 #, c-format
 msgid ""
 "'%s' returned the following output:\n"
 "%s\n"
-msgstr "\"%s\" вернул следующий вывод:\n"
+msgstr ""
+"\"%s\" вернул следующий вывод:\n"
 "%s\n"
 
 #: ../src/tools.c:754
@@ -5487,3 +5891,718 @@
 msgid "%s does not appear to be a supported wav file.\n"
 msgstr "%s не похож на поддерживаемый wav-файл.\n"
 
+#~ msgid "GtkPod"
+#~ msgstr "GtkPod"
+
+#~ msgid "     "
+#~ msgstr "     "
+
+#~ msgid "      "
+#~ msgstr "      "
+
+#~ msgid "%A"
+#~ msgstr "%A"
+
+#~ msgid "...as icons"
+#~ msgstr "...как значки"
+
+#~ msgid "...as text"
+#~ msgstr "...как текст"
+
+#~ msgid "...both as icons and text"
+#~ msgstr "...как значки и текст"
+
+#~ msgid "...entry 'All' in sort tab..."
+#~ msgstr "...запись \"Все\" на вкладке сортировки"
+
+#~ msgid "...master playlist"
+#~ msgstr "...главный список воспроизведения"
+
+#~ msgid "../%A.jpg"
+#~ msgstr "../%A.jpg"
+
+#~ msgid "<b>Adding/Updating/Syncing</b>"
+#~ msgstr "<b>Добавление/обновление/синхронизация</b>"
+
+#~ msgid "<b>Audioscrobbler</b>"
+#~ msgstr "<b>Сборщик статистики</b>"
+
+#~ msgid "<b>Automatically select...</b>"
+#~ msgstr "<b>Автоматически выбирать...</b>"
+
+#~ msgid "<b>Calendar/Contacts/Notes</b>"
+#~ msgstr "<b>Календарь/контакты/заметки</b>"
+
+#~ msgid "<b>Misc</b>"
+#~ msgstr "<b>Разное</b>"
+
+#~ msgid "<b>Mountpoint and individual repository/playlist options</b>"
+#~ msgstr ""
+#~ "<b>Настройки точки монтирования и отдельных репозиториев/списков "
+#~ "воспроизведения</b>"
+
+#~ msgid "<b>Repositories</b>"
+#~ msgstr "<b>Репозитории</b>"
+
+#~ msgid "<b>Sync</b>"
+#~ msgstr "<b>Синхронизация</b>"
+
+#~ msgid "<b>Tag Reading</b>"
+#~ msgstr "<b>Чтение меток</b>"
+
+#~ msgid "<b>Track Attributes</b>"
+#~ msgstr "<b>Атрибуты дорожки</b>"
+
+#~ msgid "About gtkpod"
+#~ msgstr "О программе gtkpod"
+
+#~ msgid "Always write ID3v2.4 tags (only applies to MP3)"
+#~ msgstr "Всегда записывать метки ID3v2.4 (только для MP3)"
+
+#~ msgid ""
+#~ "As a last resort set the following tags to the\n"
+#~ "filename if they are (still) empty:"
+#~ msgstr ""
+#~ "В качестве крайней меры, установить следующие метки в\n"
+#~ "имя файла, если они (всё ещё) пусты"
+
+#~ msgid "Available:"
+#~ msgstr "Доступно:"
+
+#~ msgid "Before removing tracks from the harddisk"
+#~ msgstr "Перед удалением дорожек с жёсткого диска"
+
+#~ msgid "Before removing tracks from the iPod"
+#~ msgstr "Перед удалением дорожек с iPod"
+
+#~ msgid "Before removing tracks from the local database"
+#~ msgstr "Перед удалением дорожек из локальной базы данных"
+
+#~ msgid ""
+#~ "Check before removing photos from a photo album whether\n"
+#~ "they should be deleted from the Photo Database."
+#~ msgstr ""
+#~ "Перед удалением снимков из фотоальбома, проверять,\n"
+#~ "должны ли они быть удалены из базы данных снимков."
+
+#~ msgid ""
+#~ "Confirm before removing tracks from the iPod or repository\n"
+#~ "when syncing playlists"
+#~ msgstr ""
+#~ "Выводить подтверждение перед удалением дорожек с iPod или из репозитория\n"
+#~ "при синхронизации списков воспроизведения"
+
+#~ msgid "Credits"
+#~ msgstr "Авторы"
+
+#~ msgid "Currently only rating is supported."
+#~ msgstr "В настоящее время поддерживается только рейтинг."
+
+#~ msgid ""
+#~ "Delete tracks that are no longer present from the\n"
+#~ "iPod or repository"
+#~ msgstr ""
+#~ "Удалять отсутствующие дорожки с\n"
+#~ "iPod или из репозитория"
+
+#~ 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,  символ '%': %%."
+
+#~ msgid "Display a list of tracks that could actually be updated."
+#~ msgstr "Отобразить список дорожек, которые могут быть обновлены."
+
+#~ msgid "Display a list of tracks that could not be updated."
+#~ msgstr "Отобразить список дорожек, которые не могут быть обновлены."
+
+#~ msgid "Display info about non-updated tracks"
+#~ msgstr "Отобразить сведения о необновлённых дорожках"
+
+#~ msgid ""
+#~ "Display the list of duplicates that have been detected after adding files."
+#~ msgstr "Отобразить список дубликатов, обнаруженных после добавления файлов."
+
+#~ msgid "Display toolbar..."
+#~ msgstr "Отобразить панель инструментов..."
+
+#~ msgid "Display tooltips in prefs window"
+#~ msgstr "Отображать всплывающие подсказки в окне настроек"
+
+#~ msgid "Displayed:"
+#~ msgstr "Отображено:"
+
+#~ msgid "Don't allow file duplication"
+#~ msgstr "Запрещать появление дубликатов файлов"
+
+#~ msgid ""
+#~ "Duplicate Recognition is based on a (modified) sha1 hash over the file."
+#~ msgstr ""
+#~ "Поиск дубликатов основан на (модифицированном) хэше SHA1 в отношении "
+#~ "файла."
+
+#~ msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
+#~ msgstr ""
+#~ "Сначала попробовать <i>folder.jpg</i>, затем <i>&lt;artist&gt;/jpg</i>"
+
+#~ msgid "Flac with :"
+#~ msgstr "FLAC с помощью:"
+
+#~ 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."
+
+#~ 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=\" в своей резервной копии базы данных)."
+
+#~ msgid "If both options are selected, embedded APIC data takes precedence."
+#~ msgstr "Если выбраны обе опции, внедрённые данные APIC имеют приоритет."
+
+#~ 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, 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 ""
+#~ "Если вы не выбираете главный список воспроизведения автоматически,первый "
+#~ "импорт базы данных происходит значительно быстрее, посколькуотображаемые "
+#~ "сведения не нуждаются в обновлении."
+
+#~ 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 ""
+#~ "Если вы выберете несколько дорожек в списке дорожек и изменитеметку "
+#~ "первой дорожки, метки всех остальных дорожек также обновятся."
+
+#~ msgid "Keeps all compilation CDs grouped together in the artists sort tab."
+#~ msgstr ""
+#~ "Группирует вместе все CD сборников на вкладке сортировки по исполнителям."
+
+#~ msgid "M4A with :"
+#~ msgstr "M4A с помощью:"
+
+#~ msgid "MP3 with :"
+#~ msgstr "MP3 с помощью:"
+
+#~ msgid "Match al_l of the following"
+#~ msgstr "Совпадение со всеми указанными"
+
+#~ msgid "Match an_y of the following"
+#~ msgstr "Совпадение с любым из указанных"
+
+#~ msgid "Maximum size of cache directory (in GB):"
+#~ msgstr "Максимальный размер папки кэша (в ГБ):"
+
+#~ msgid "Move selected attributes to the displayed list"
+#~ msgstr "Переместить выбранные атрибуты в отображаемый список"
+
+#~ msgid ""
+#~ "Music files can have images embedded in the APIC tag. Currently this is "
+#~ "only supported for MP3 files."
+#~ msgstr ""
+#~ "Музыкальные файлы могут иметь изображения, внедрённые в метку APIC.В "
+#~ "настоящее время это поддерживается только для файлов MP3."
+
+#~ msgid "None"
+#~ msgstr "Нет"
+
+#~ 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, кодировка "
+#~ "сохранена не будет. Вместоэтого будет использоваться заданная кодировка."
+
+#~ msgid "Number of tracks in generated playlists:"
+#~ msgstr "Число дорожек в сгенерированных списках воспроизведения:"
+
+#~ msgid ""
+#~ "Number of tracks in the generated playlists 'Most Often Listened', 'Best "
+#~ "Rated' and 'Most Recently Played'. Choose '0' for 'no limit'."
+#~ msgstr ""
+#~ "Число дорожек в сгенерированных списках воспроизведения\"Наиболее часто "
+#~ "прослушиваемые\", \"Наибольший рейтинг\" и\"Последние воспроизведённые\". "
+#~ "Выберите 0, чтобы убрать лимит."
+
+#~ msgid "Ogg with :"
+#~ msgstr "Ogg с помощью:"
+
+#~ msgid "Overwrite tags that are already set"
+#~ msgstr "Перезаписывать уже заданные метки"
+
+#~ msgid "Password:"
+#~ msgstr "Пароль:"
+
+#~ msgid "Please specify a time interval"
+#~ msgstr "Пожалуйста, задайте временной интервал"
+
+#~ msgid "Read coverart from embedded APIC data"
+#~ msgstr "Читать изображения обложек из внедрённых данных APIC"
+
+#~ msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)"
+#~ msgstr ""
+#~ "Читать метки из содержимого файлов (например, меток ID3 для файлов MP3)"
+
+#~ msgid "Remove selected attributes from the displayed list"
+#~ msgstr "Удалить выбранные атрибуты из отображаемого списка"
+
+#~ msgid "Root directory of mserv database (trackinfo root)."
+#~ msgstr "Корневая папка базы данных mserv (trackinfo)."
+
+#~ msgid "Rules"
+#~ msgstr "Правила"
+
+#~ msgid "Scrobble Tracks?"
+#~ msgstr "Собирать статистику о дорожках?"
+
+#~ msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"
+#~ msgstr ""
+#~ "Список файловых масок для исключения, разделённых точками с запятой, "
+#~ "например, \"*.mp3\""
+
+#~ msgid "Set mountpoint or edit repository options"
+#~ msgstr "Задать точку монтирования или изменить параметры репозитория"
+
+#~ msgid "Set options for Calendar/Contacts/Notes"
+#~ 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 будут вычислены и "
+#~ "записаны вмузыкальный файл с помощью этой команды."
+
+#~ 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с помощью этой команды."
+
+#~ msgid "Set this to your last.fm password"
+#~ msgstr "Введите здесь ваш пароль last.fm"
+
+#~ msgid "Set this to your last.fm username"
+#~ msgstr "Введите здесь ваше имя пользователя last.fm"
+
+#~ msgid ""
+#~ "Set to 0 to effectively disable caching (a maximum of one track will be "
+#~ "cached at a time)."
+#~ msgstr ""
+#~ "Установите в 0, чтобы де-факто отключить кэширование (будеткэшировано не "
+#~ "более одной дорожки)."
+
+#~ msgid ""
+#~ "Set to 0 to use as many background threads as CPUs are available on your "
+#~ "system."
+#~ msgstr ""
+#~ "Установите в 0, чтобы использовать максимально доступное на вашейсистеме "
+#~ "число фоновых потоков."
+
+#~ msgid "Sorting case sensitive"
+#~ msgstr "Сортировка с учётом регистра"
+
+#~ msgid "Sorttab: "
+#~ msgstr "Вкладка сортировки: "
+
+#~ msgid "Sorttabs"
+#~ msgstr "Вкладки сортировки"
+
+#~ msgid "Template for info field: "
+#~ msgstr "Шаблон для поля сведений:"
+
+#~ msgid ""
+#~ "The tags are written to the files on your harddrive and on the iPod (if "
+#~ "available)."
+#~ msgstr ""
+#~ "Метки записываются в файлы на вашем жёстком диске и на iPod(если "
+#~ "доступно)."
+
+#~ msgid "This is the same option as in 'Edit/Delete Confirmation'"
+#~ msgstr ""
+#~ "Это та же опция, что и в группе \"Подтверждение изменения/удаления\"."
+
+#~ 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 также будут записаны, если они уже "
+#~ "присутствуют в файле, вкоторый производится запись."
+
+#~ msgid "This option will be re-activated when you upgrade gtkpod."
+#~ msgstr "Эта опция будет включена вновь после обновления gtkpod."
+
+#~ 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, а до этого его содержимое не изменится."
+
+#~ msgid "Translators"
+#~ msgstr "Переводчики"
+
+#~ msgid "Use 'Multi-Edit' also for title field"
+#~ msgstr "Использовать многострочный редактор также для поля \"Название\""
+
+#~ msgid "Use 'Multi-Edit' for tracks selections"
+#~ msgstr "Использовать многострочный редактор для выбора дорожек"
+
+#~ msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
+#~ msgstr "Использовать <i>&lt;Album&gt;.jpg</i> в родительской папке"
+
+#~ msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
+#~ msgstr "Использовать <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
+
+#~ msgid "Use <i>folder.jpg</i> as cover art."
+#~ msgstr "Использовать <i>folder.jpg</i> как обложку."
+
+#~ msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..."
+#~ msgstr "Использовать <i>folder.jpg</i>, <i>folder.png</i>..."
+
+#~ msgid ""
+#~ "Use selected encoding (on the 'General' page)\n"
+#~ "when writing tags"
+#~ msgstr ""
+#~ "Использовать выбранную кодировку (на вкладке \"Общие\")\n"
+#~ "при записи меток"
+
+#~ msgid "Use this template to parse filename for tag information:"
+#~ msgstr ""
+#~ "Использовать этот шаблон для разбора имени файла при заполнении меток:"
+
+#~ msgid "Username to be used for mserv database lookup."
+#~ msgstr "Имя пользователя, используемое для поиска в базе данных mserv."
+
+#~ 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 ""
+#~ "Присвоение нескольким дорожкам одного и того же названия обычно не "
+#~ "приветствуется.Эта опция поможет избежать нежелательных результатов "
+#~ "(особенно учитывая, что функции\"Отмена\" пока не существует)."
+
+#~ msgid "WAV with :"
+#~ msgstr "WAV с помощью:"
+
+#~ msgid ""
+#~ "When adding dirs/files, update information of\n"
+#~ "existing tracks with identical filenames"
+#~ msgstr ""
+#~ "Обновлять сведения о существующих дорожках\n"
+#~ "с одинаковыми именами файлов при добавлении папок/файлов"
+
+#~ msgid "When syncing playlists"
+#~ msgstr "При синхронизации списков воспроизведения"
+
+#~ msgid ""
+#~ "Write extended information (PC filenames, SHA1 hashes,\n"
+#~ "encoding...). Recommended."
+#~ msgstr ""
+#~ "Записывать расширенную информацию (имена файлов на ПК,хэши SHA1, "
+#~ "кодировку...). Рекомендуется."
+
+#~ msgid "_Encoding (ID3, files):"
+#~ msgstr "_Кодировка (ID3, файлы):"
+
+#~ msgid "_Ignore rules"
+#~ msgstr "_Игнорировать правила"
+
+#~ msgid "_Image"
+#~ msgstr "_Изображение"
+
+#~ msgid "_Last.FM"
+#~ msgstr "_Last.FM"
+
+#~ msgid "_Less Sort Tabs"
+#~ msgstr "_Меньше вкладок сортировки"
+
+#~ msgid "_Track Info"
+#~ msgstr "_Сведения о дорожке"
+
+#~ 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'."
+
+#~ msgid "folder"
+#~ msgstr "folder"
+
+#~ msgid "folder.jpg"
+#~ msgstr "folder.jpg"
+
+#~ msgid "folder.jpg;%a.jpg"
+#~ msgstr "folder.jpg;%a.jpg"
+
+#~ msgid "gtkpod"
+#~ msgstr "gtkpod"
+
+#~ 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 и имена файлов будут в указанной "
+#~ "здеськодировке. Вы можете изменить её для последовательных операций"
+#~ "\"Добавить файлы\" и \"Добавить папку\". \"Системная кодировка\" - "
+#~ "этокодировка, заданная вашей текущей локалью."
+
+#~ msgid "label"
+#~ msgstr "label"
+
+#~ msgid "mserv database lookup will be done for music in this directory."
+#~ msgstr ""
+#~ "Поиск по базе данных mserv будет производиться для музыки в этой папке."
+
+#~ msgid "Confirmation Dialogue"
+#~ msgstr "Диалог подтверждения"
+
+#~ msgid "Last Played"
+#~ msgstr "Последние воспроизведённые"
+
+#~ msgid "Last Modified"
+#~ msgstr "Последние изменённые"
+
+#~ 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 ""
+#~ "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"
+
+#~ 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"
+
+#~ msgid "Add directories to '%s'"
+#~ msgstr "Добавить папки к \"%s\""
+
+#~ msgid "Add directories to '%s/%s'"
+#~ msgstr "Добавить файлы к \"%s/%s\""
+
+#~ msgid "Ok"
+#~ msgstr "OK"
+
+#~ msgid "Cancel"
+#~ msgstr "Отмена"
+
+#~ 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\"?"
+
+#~ 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?Число списков "
+#~ "воспроизведения, в которые входят эти дорожки, указанов скобках."
+
+#~ 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\" и следующие дорожки с жёсткого диска?Число списков "
+#~ "воспроизведения, в которые входят эти дорожки, указанов скобках."
+
+#~ msgid ""
+#~ "Data has been changed and not been saved.\n"
+#~ "OK to exit gtkpod?"
+#~ msgstr ""
+#~ "Данные изменены и не были сохранены.\n"
+#~ "Вы уверены, что хотите выйти из gtkpod?"
+
+#~ 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 дорожек-дубликатов не были добавлены в "
+#~ "главный список воспроизведения."
+
+#~ msgid "Please select command for 'Play Now'"
+#~ msgstr "Пожалуйста, выберите команду для функции \"Воспроизвести сейчас\""
+
+#~ msgid "Please select command for 'Enqueue'"
+#~ msgstr "Пожалуйста, выберите команду для функции \"Поставить в очередь\""
+
+#~ msgid "Please select the mp3gain executable"
+#~ msgstr "Пожалуйста, выберите исполняемый файл mp3gain"
+
+#~ msgid "Please select the aacgain executable"
+#~ msgstr "Пожалуйста, выберите исполняемый файл aacgain"
+
+#~ msgid "Select the mserv music root directory"
+#~ msgstr "Выберите корневую папку музыки mserv"
+
+#~ msgid "Select the mserv trackinfo root directory"
+#~ msgstr "Выберите корневую папку mserv trackinfo"
+
+#~ msgid "Select the ogg/vorbis converter command"
+#~ msgstr "Выберите команду преобразования Ogg/Vorbis"
+
+#~ msgid "Select the flac converter command"
+#~ msgstr "Выберите команду преобразования FLAC"
+
+#~ msgid "Select the m4a converter command."
+#~ msgstr "Выберите команду преобразования M4A"
+
+#~ msgid "Select the mp3 converter command."
+#~ msgstr "Выберите команду преобразования MP3"
+
+#~ msgid "Select the wav converter command."
+#~ msgstr "Выберите команду преобразования WAV"
+
+#~ msgid "Preferences not updated"
+#~ msgstr "Настройки не обновлены"
+
+#~ msgid "Preferences applied"
+#~ msgstr "Настройки применены"
+
+#~ 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"

Modified: gtkpod/branches/upstream/current/po/sv.po
===================================================================
--- gtkpod/branches/upstream/current/po/sv.po	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/po/sv.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -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, 2007.
+# Copyright (C) Stefan Asserhäll <stefan.asserhall at comhem.se>, 2004, 2005, 2007, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-13 18:36-0500\n"
-"PO-Revision-Date: 2007-12-14 21:11+0100\n"
+"POT-Creation-Date: 2008-12-09 19:55+0900\n"
+"PO-Revision-Date: 2008-12-09 22:25+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,13 +17,13 @@
 "X-Generator: KBabel 1.11.4\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 "Hantera musik och video på en Apple iPod"
 
+#: ../data/gtkpod.desktop.in.h:2 ../data/gtkpod.glade.h:427
+msgid "gtkpod iPod Manager"
+msgstr "Gtkpod hantering av iPod"
+
 #: ../data/gtkpod.desktop.in.h:3
 msgid "iPod Manager"
 msgstr "Hantering av iPod"
@@ -37,356 +37,382 @@
 msgstr "    "
 
 #: ../data/gtkpod.glade.h:3
-msgid "     "
-msgstr "     "
+msgid " <= cts <= "
+msgstr " <= antal <= "
 
 #: ../data/gtkpod.glade.h:4
-msgid "      "
-msgstr "      "
+msgid ""
+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
+"finished."
+msgstr ""
+"'ÅÅÅÅ-MM-DD TT:MM < d < ÅÅÅÅ-MM-DD TT:MM' eller liknande. Tryck på "
+"returtangenten när du är klar."
 
 #: ../data/gtkpod.glade.h:5
-msgid "   Sort by:"
-msgstr "   Sortera enligt:"
+msgid "(Checked)"
+msgstr "(Kontrollerad)"
 
 #: ../data/gtkpod.glade.h:6
-msgid " <= cts <= "
-msgstr " <= antal <= "
+msgid "0"
+msgstr "0"
 
 #: ../data/gtkpod.glade.h:7
-msgid " Logic: "
-msgstr " Logiskt: "
+msgid "1"
+msgstr "1"
 
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr "2"
+
 #: ../data/gtkpod.glade.h:9
-#, no-c-format
-msgid "%A"
-msgstr "%A"
+msgid "3"
+msgstr "3"
 
 #: ../data/gtkpod.glade.h:10
-msgid ""
-"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "
-"finished."
-msgstr ""
-"'ÅÅÅÅ-MM-DD TT:MM < d < ÅÅÅÅ-MM-DD TT:MM' eller liknande. Tryck på "
-"returtangenten när du är klar."
+msgid "4"
+msgstr "4"
 
 #: ../data/gtkpod.glade.h:11
-msgid "'aacgain' executable:"
-msgstr "Körbart program 'aacgain':"
+msgid "5"
+msgstr "5"
 
 #: ../data/gtkpod.glade.h:12
-msgid "'mp3gain' executable:"
-msgstr "Körbart program 'mp3gain':"
+msgid ":"
+msgstr ":"
 
 #: ../data/gtkpod.glade.h:13
-msgid "(Checked)"
-msgstr "(Kontrollerad)"
+msgid "<"
+msgstr "<"
 
 #: ../data/gtkpod.glade.h:14
-msgid "...as icons"
-msgstr "...som ikoner"
+msgid "<b>Advanced Options</b>"
+msgstr "<b>Avancerade alternativ</b>"
 
 #: ../data/gtkpod.glade.h:15
-msgid "...as text"
-msgstr "...som text"
+msgid "<b>Ascending</b>"
+msgstr "<b>Stigande</b>"
 
 #: ../data/gtkpod.glade.h:16
-msgid "...both as icons and text"
-msgstr "...både som ikoner och text"
+msgid "<b>Auto Store</b>"
+msgstr "<b>Lagra automatiskt</b>"
 
 #: ../data/gtkpod.glade.h:17
-msgid "...entry 'All' in sort tab..."
-msgstr "...raden 'Alla' i sorteringsflikar"
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>Automatiskt skapade spellistor</b>"
 
 #: ../data/gtkpod.glade.h:18
-msgid "...master playlist"
-msgstr "...huvudspellista"
+msgid "<b>Available Columns</b>"
+msgstr "<b>Tillgängliga kolumner</b>"
 
+#: ../data/gtkpod.glade.h:19
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>Kompatibla format</b>"
+
 #: ../data/gtkpod.glade.h:20
-#, no-c-format
-msgid "../%A.jpg"
-msgstr "../%A.jpg"
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>Inställningar av konvertering</b>"
 
 #: ../data/gtkpod.glade.h:21
-msgid "0"
-msgstr "0"
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>Visning av omslag</b>"
 
 #: ../data/gtkpod.glade.h:22
-msgid "1"
-msgstr "1"
+msgid "<b>Cover Art</b>"
+msgstr "<b>Omslag</b>"
 
 #: ../data/gtkpod.glade.h:23
-msgid "2"
-msgstr "2"
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>Meddelanden om att bekräfta borttagning</b>"
 
 #: ../data/gtkpod.glade.h:24
-msgid "3"
-msgstr "3"
+msgid "<b>Descending</b>"
+msgstr "<b>Fallande</b>"
 
 #: ../data/gtkpod.glade.h:25
-msgid "4"
-msgstr "4"
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>Visade kolumner</b>"
 
 #: ../data/gtkpod.glade.h:26
-msgid "5"
-msgstr "5"
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>Filtreringsflikar</b>"
 
 #: ../data/gtkpod.glade.h:27
-msgid ":"
-msgstr ":"
+msgid "<b>General Options</b>"
+msgstr "<b>Allmänna alternativ</b>"
 
 #: ../data/gtkpod.glade.h:28
-msgid "<"
-msgstr "<"
+msgid "<b>General</b>"
+msgstr "<b>Allmänt</b>"
 
 #: ../data/gtkpod.glade.h:29
-msgid "<b>Account Information</b>"
-msgstr "<b>Kontoinformation</b>"
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>Ignorera vanliga ord</b>"
 
 #: ../data/gtkpod.glade.h:30
-msgid "<b>Adding/Updating/Syncing</b>"
-msgstr "<b>Tillägg, uppdatering, synkronisering</b>"
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>Import och synkronisering</b>"
 
 #: ../data/gtkpod.glade.h:31
-msgid "<b>Audioscrobbler</b>"
-msgstr "<b>Audioscrobbler</b>"
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>Inkompatibla format</b>"
 
 #: ../data/gtkpod.glade.h:32
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>Automatiskt skapade spellistor</b>"
+msgid "<b>Information Messages</b>"
+msgstr "<b>Informationsmeddelanden</b>"
 
 #: ../data/gtkpod.glade.h:33
-msgid "<b>Automatically select...</b>"
-msgstr "<b>Välj automatiskt...</b>"
+msgid "<b>Lower Margin</b>"
+msgstr "<b>Under gräns</b>"
 
 #: ../data/gtkpod.glade.h:34
-msgid "<b>Calendar/Contacts/Notes</b>"
-msgstr "<b>Kalender, kontakter och anteckningar</b>"
+msgid "<b>None</b>"
+msgstr "<b>Ingen</b>"
 
 #: ../data/gtkpod.glade.h:35
-msgid "<b>Coverart</b>"
-msgstr "<b>Omslag</b>"
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Konvertering i farten</b>"
 
 #: ../data/gtkpod.glade.h:36
-msgid "<b>Delete Confirmation</b>"
-msgstr "<b>Bekräfta borttagning</b>"
+msgid "<b>Playback</b>"
+msgstr "<b>Uppspelning</b>"
 
 #: ../data/gtkpod.glade.h:37
-msgid "<b>Examples</b>"
-msgstr "<b>Exempel</b>"
+msgid "<b>Playlist Options</b>"
+msgstr "<b>Spellistealternativ</b>"
 
 #: ../data/gtkpod.glade.h:38
-msgid "<b>Ignore Frequent Words</b>"
-msgstr "<b>Ignorera vanliga ord</b>"
+msgid "<b>Please select mountpoint and your iPod model</b>"
+msgstr "<b>Välj monteringsplats och iPod-modell</b>"
 
 #: ../data/gtkpod.glade.h:39
-msgid "<b>Misc</b>"
-msgstr "<b>Diverse</b>"
+msgid "<b>Rules</b>"
+msgstr "<b>Regler</b>"
 
 #: ../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>"
+msgid "<b>Sort Order</b>"
+msgstr "<b>Sorteringsordning</b>"
 
 #: ../data/gtkpod.glade.h:41
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Konvertering i farten</b>"
+msgid "<b>Synchronization</b>"
+msgstr "<b>Synkronisering</b>"
 
 #: ../data/gtkpod.glade.h:42
-msgid "<b>Play</b>"
-msgstr "<b>Spela</b>"
+msgid "<b>Tag Editing</b>"
+msgstr "<b>Taggredigering</b>"
 
 #: ../data/gtkpod.glade.h:43
-msgid "<b>Playlists</b>"
-msgstr "<b>Spellistor</b>"
+msgid "<b>Tags</b>"
+msgstr "<b>Taggar</b>"
 
 #: ../data/gtkpod.glade.h:44
-msgid "<b>Please select mountpoint and your iPod model</b>"
-msgstr "<b>Välj monteringsplats och iPod-modell</b>"
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>Verktygsradens stil</b>"
 
 #: ../data/gtkpod.glade.h:45
-msgid "<b>Repositories</b>"
-msgstr "<b>Arkiv</b>"
+msgid "<b>Tooltips</b>"
+msgstr "<b>Verktygstips</b>"
 
 #: ../data/gtkpod.glade.h:46
-msgid "<b>Sort Order</b>"
-msgstr "<b>Sorteringsordning</b>"
+msgid "<b>Upper Margin</b>"
+msgstr "<b>Övre gräns</b>"
 
 #: ../data/gtkpod.glade.h:47
-msgid "<b>Sort Tabs</b>"
-msgstr "<b>Sorteringsflikar</b>"
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>Normalisering av volym</b>"
 
 #: ../data/gtkpod.glade.h:48
-msgid "<b>Sync</b>"
-msgstr "<b>Synkronisera</b>"
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr "<b>Vid försök att lägga till ett befintligt spår</b>"
 
 #: ../data/gtkpod.glade.h:49
-msgid "<b>Synchronization</b>"
-msgstr "<b>Synkronisering</b>"
+msgid "<b>gtkpod Options</b>"
+msgstr "<b>Inställningar av gtkpod</b>"
 
 #: ../data/gtkpod.glade.h:50
-msgid "<b>Tag Reading</b>"
-msgstr "<b>Taggläsning</b>"
+msgid "<b>mserv Settings</b>"
+msgstr "<b>Inställningar av mServ</b>"
 
 #: ../data/gtkpod.glade.h:51
-msgid "<b>Toolbar</b>"
-msgstr "<b>Verktygsrad</b>"
+msgid "<b>mserv</b>"
+msgstr "<b>mServ</b>"
 
 #: ../data/gtkpod.glade.h:52
-msgid "<b>Tooltips</b>"
-msgstr "<b>Verktygstips</b>"
+msgid "<i>aacgain</i> executable:"
+msgstr "Körbart program <i>aacgain</i>:"
 
 #: ../data/gtkpod.glade.h:53
-msgid "<b>Track Attributes</b>"
-msgstr "<b>Spåregenskaper</b>"
+msgid "<i>mp3gain</i> executable:"
+msgstr "Körbart program <i>mp3gain</i>:"
 
 #: ../data/gtkpod.glade.h:54
-msgid "<b>Track Editing</b>"
-msgstr "<b>Spårredigering</b>"
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Ange ett tidsintervall</span>"
 
 #: ../data/gtkpod.glade.h:55
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>Normalisering av volym</b>"
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
+"<span weight='bold' size='larger'>Meddelande</span>\n"
+"\n"
+"Östen äter müsli på ett café."
 
-#: ../data/gtkpod.glade.h:56
-msgid "<b>mserv</b>"
-msgstr "<b>mServ</b>"
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
+msgstr "<span weight='bold' size='larger'>Ingen spellista markerad</span>"
 
-#: ../data/gtkpod.glade.h:57
+#: ../data/gtkpod.glade.h:59
 msgid ">"
 msgstr ">"
 
-#: ../data/gtkpod.glade.h:58
-msgid "About gtkpod"
-msgstr "Om gtkpod"
+#: ../data/gtkpod.glade.h:60
+msgid "About unupdated tracks"
+msgstr "Om icke uppdaterade spår"
 
-#: ../data/gtkpod.glade.h:59
+#: ../data/gtkpod.glade.h:61
+msgid "About updated tracks"
+msgstr "Om uppdaterade spår"
+
+#: ../data/gtkpod.glade.h:62
+msgid "Add Column"
+msgstr "Lägg till kolumn"
+
+#: ../data/gtkpod.glade.h:63
 msgid "Add Directories Recursively"
 msgstr "Lägg till kataloger rekursivt"
 
-#: ../data/gtkpod.glade.h:60
+#: ../data/gtkpod.glade.h:64
 msgid "Add Files"
 msgstr "Lägg till filer"
 
-#: ../data/gtkpod.glade.h:61
+#: ../data/gtkpod.glade.h:65
 msgid "Add Files or Directories"
 msgstr "Lägg till filer eller kataloger"
 
-#: ../data/gtkpod.glade.h:62
+#: ../data/gtkpod.glade.h:66
 msgid "Add Fol_der"
 msgstr "Lägg till _katalog"
 
-#: ../data/gtkpod.glade.h:63
+#: ../data/gtkpod.glade.h:67 ../src/fileselection.c:606
 msgid "Add Folder"
 msgstr "Lägg till katalog"
 
-#: ../data/gtkpod.glade.h:64
+#: ../data/gtkpod.glade.h:68
 msgid "Add Image_s"
 msgstr "Lägg till _bilder"
 
-#: ../data/gtkpod.glade.h:65
+#: ../data/gtkpod.glade.h:69
 msgid "Add Images from a Directory"
 msgstr "Lägg till bilder från en katalog"
 
-#: ../data/gtkpod.glade.h:66
+#: ../data/gtkpod.glade.h:70
 msgid "Add Playlist"
 msgstr "Lägg till spellista"
 
-#: ../data/gtkpod.glade.h:67
+#: ../data/gtkpod.glade.h:71
 msgid "Add _Files"
 msgstr "Lägg till _filer"
 
-#: ../data/gtkpod.glade.h:68
+#: ../data/gtkpod.glade.h:72
 msgid "Add _Playlist"
 msgstr "Lägg till s_pellista"
 
-#: ../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:73
+msgid "Add cover art using file name template"
+msgstr "Lägg till omslag från filnamnsmall"
 
-#: ../data/gtkpod.glade.h:70
-msgid "Add directories recursively"
-msgstr "Lägg till kataloger rekursivt"
+#: ../data/gtkpod.glade.h:74
+msgid ""
+"Add file masks to be excluded from import and synchronization, for example, "
+"<i>*.mp3</i>."
+msgstr ""
+"Lägg till filmasker att undanta från import och synkronisering, till exempel "
+"<i>*.mp3</i>."
 
-#: ../data/gtkpod.glade.h:71
-msgid "Add new repository/iPod"
-msgstr "Lägg till nytt arkiv eller iPod"
+#: ../data/gtkpod.glade.h:75
+msgid "Add new repository/iPod..."
+msgstr "Lägg till nytt arkiv eller iPod..."
 
-#: ../data/gtkpod.glade.h:72
+#: ../data/gtkpod.glade.h:76
 msgid "Add playlist from file"
 msgstr "Lägg till spellista från fil"
 
-#: ../data/gtkpod.glade.h:73 ../src/display_sorttabs.c:3247
-#: ../src/display_tracks.c:2103
-msgid "Added"
-msgstr "Tillagd"
+#: ../data/gtkpod.glade.h:77
+msgid "Add subfolders recursively"
+msgstr "Lägg till underkataloger rekursivt"
 
-#: ../data/gtkpod.glade.h:74
-msgid "Advanced Sorting Options"
-msgstr "Avancerade sorteringsalternativ"
+#: ../data/gtkpod.glade.h:78
+msgid "Added:"
+msgstr "Tillagd:"
 
 #. 0
-#: ../data/gtkpod.glade.h:75 ../src/display_sorttabs.c:2982
+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2995
 #: ../src/display_spl.c:84 ../src/misc_conversion.c:60
 msgid "Album"
 msgstr "Album"
 
-#: ../data/gtkpod.glade.h:76
+#: ../data/gtkpod.glade.h:80
 msgid "Album Art"
 msgstr "Albumomslag"
 
-#: ../data/gtkpod.glade.h:77
+#: ../data/gtkpod.glade.h:81
 msgid "All (AND)"
 msgstr "Alla (och)"
 
-#: ../data/gtkpod.glade.h:78
+#: ../data/gtkpod.glade.h:82
 msgid "All Tracks Never Listened To"
 msgstr "Alla spår som aldrig lyssnats på"
 
-#: ../data/gtkpod.glade.h:79
+#: ../data/gtkpod.glade.h:83
 msgid "All Tracks Played Since Last Time"
 msgstr "Alla spår som spelats sedan sist"
 
-#: ../data/gtkpod.glade.h:80
+#: ../data/gtkpod.glade.h:84
 msgid "All Tracks not Listed in any Playlist"
 msgstr "Alla spår som inte finns i någon spellista"
 
-#: ../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\""
+#: ../data/gtkpod.glade.h:85
+msgid "Allow duplicate files"
+msgstr "Tillåt duplicerade filer"
 
-#: ../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:86
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr "Använd också kodningen vid uppdatering eller synkronisering av spår"
 
-#: ../data/gtkpod.glade.h:83
+#: ../data/gtkpod.glade.h:87
+msgid "Also use this encoding when writing tracks"
+msgstr "Använd också kodningen vid skrivning av spår"
+
+#: ../data/gtkpod.glade.h:88
 msgid "Any (OR)"
 msgstr "Någon (eller)"
 
-#: ../data/gtkpod.glade.h:84 ../src/display_sorttabs.c:2979
+#: ../data/gtkpod.glade.h:89
+msgid ""
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
+msgstr ""
+"Vilka regler som helst\n"
+"Alla regler\n"
+"Ignorera regler"
+
+#: ../data/gtkpod.glade.h:92 ../src/display_sorttabs.c:2992
 #: ../src/display_spl.c:85 ../src/misc_conversion.c:61
 msgid "Artist"
 msgstr "Artist"
 
-#: ../data/gtkpod.glade.h:85
+#: ../data/gtkpod.glade.h:93
 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:"
-msgstr ""
-"Om följande taggar (fortfarande) är tomma,\n"
-"lagra filnamnet i dem som en sista utväg:"
+#: ../data/gtkpod.glade.h:94
+msgid "Automatically generate video thumbnails"
+msgstr "Skapa automatiskt miniatyrbilder för videor"
 
-#: ../data/gtkpod.glade.h:88
-msgid "Ascending"
-msgstr "Stigande"
-
-#: ../data/gtkpod.glade.h:89
-msgid "Auto Store"
-msgstr "Lagra automatiskt"
-
-#: ../data/gtkpod.glade.h:90
+#: ../data/gtkpod.glade.h:95
 msgid ""
 "Automatically start displaying tracks that match the criteria entered above. "
 "If not selected, you must press 'Display' to start displaying."
@@ -394,55 +420,51 @@
 "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: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:93
-msgid "Before removing tracks from the harddisk"
-msgstr "Innan spår tas bort från hårddisken"
-
-#: ../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:95
-msgid "Before removing tracks from the local database"
-msgstr "Innan spår tas bort från den lokala databasen"
-
 #: ../data/gtkpod.glade.h:96
+msgid "Background color"
+msgstr "Bakgrundsfärg"
+
+#: ../data/gtkpod.glade.h:97
 msgid "Best Rated Tracks"
 msgstr "Spår med bäst betyg"
 
-#: ../data/gtkpod.glade.h:97
+#: ../data/gtkpod.glade.h:98
+msgid "Bottom"
+msgstr "Längst ner"
+
+#: ../data/gtkpod.glade.h:99 ../src/prefsdlg.c:588
 msgid "Browse"
 msgstr "Bläddra"
 
-#: ../data/gtkpod.glade.h:98
-msgid "Cache directory:"
+#: ../data/gtkpod.glade.h:100
+msgid "Browse..."
+msgstr "Bläddra..."
+
+#: ../data/gtkpod.glade.h:101
+msgid "Cache folder:"
 msgstr "Cachekatalog:"
 
-#: ../data/gtkpod.glade.h:99
+#: ../data/gtkpod.glade.h:102
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../data/gtkpod.glade.h:100
+#: ../data/gtkpod.glade.h:103
 msgid "Calendar sync command:"
 msgstr "Synkroniseringskommando för kalender:"
 
-#: ../data/gtkpod.glade.h:101
+#: ../data/gtkpod.glade.h:104
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Anropa automatiskt vid synkronisering av iTunes databas"
 
-#: ../data/gtkpod.glade.h:102
-msgid "Category: "
-msgstr "Kategori: "
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr "Skiftlägeskänslig sortering"
 
-#: ../data/gtkpod.glade.h:103
+#: ../data/gtkpod.glade.h:106
+msgid "Category:"
+msgstr "Kategori:"
+
+#: ../data/gtkpod.glade.h:107
 msgid ""
 "Change all tracks\n"
 "simultaneously"
@@ -450,113 +472,145 @@
 "Ändra alla spår\n"
 "samtidigt"
 
-#: ../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
+#: ../data/gtkpod.glade.h:109
 msgid "Check for existing files when copying from iPod."
 msgstr "Titta efter befintliga filer vid kopiering från iPod."
 
-#: ../data/gtkpod.glade.h:108
-msgid "Command for 'Enqueue':"
-msgstr "Kommando för 'Köa':"
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr "Välj en annan färg för bakgrunden vid visning av omslag"
 
-#: ../data/gtkpod.glade.h:109
-msgid "Command for 'Play now':"
-msgstr "Kommando för 'Spela nu':"
+#: ../data/gtkpod.glade.h:111
+msgid "Command for \"Enqueue\":"
+msgstr "Kommando för \"Köa\":"
 
+#: ../data/gtkpod.glade.h:112
+msgid "Command for \"Play now\":"
+msgstr "Kommando för \"Spela nu\":"
+
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr "Kommandon..."
+
 #. 5
-#: ../data/gtkpod.glade.h:110 ../src/display_spl.c:97
+#: ../data/gtkpod.glade.h:114 ../src/display_spl.c:97
 #: ../src/misc_conversion.c:65
 msgid "Composer"
 msgstr "Kompositör"
 
-#: ../data/gtkpod.glade.h:111
+#: ../data/gtkpod.glade.h:115
 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:112
-msgid ""
-"Confirm before removing tracks from the iPod or repository\n"
-"when syncing playlists"
-msgstr ""
-"Bekräfta innan spår tas bort från iPod eller arkiv\n"
-"vid synkronisering av spellistor"
+#: ../data/gtkpod.glade.h:116
+msgid "Confirm deletion of playlists or tracks from a playlist"
+msgstr "Bekräfta borttagning av spellistor eller spår från en spellista"
 
-#: ../data/gtkpod.glade.h:114
-msgid "Confirm lists of directories"
-msgstr "Bekräfta lista med kataloger"
+#: ../data/gtkpod.glade.h:117
+msgid "Confirm deletion of tracks during synchronization"
+msgstr "Bekräfta borttagning av spår vid synkronisering"
 
-#: ../data/gtkpod.glade.h:115
+#: ../data/gtkpod.glade.h:118
+msgid "Confirm deletion of tracks:"
+msgstr "Bekräfta borttagning av spår:"
+
+#: ../data/gtkpod.glade.h:119
 msgid "Contacts sync command:"
 msgstr "Synkroniseringskommando för kontakter:"
 
-#: ../data/gtkpod.glade.h:116
+#: ../data/gtkpod.glade.h:120
 msgid "Containing Displayed Tracks"
 msgstr "Som innehåller visade spår"
 
-#: ../data/gtkpod.glade.h:117
+#: ../data/gtkpod.glade.h:121
 msgid "Containing Selected Tracks"
 msgstr "Som innehåller markerade spår"
 
-#: ../data/gtkpod.glade.h:118
+#: ../data/gtkpod.glade.h:122
+msgid "Conversion Preferences"
+msgstr "Inställningar av konvertering"
+
+#: ../data/gtkpod.glade.h:123
 msgid "Conversion Progress Display"
 msgstr "Visning av konverteringsförlopp"
 
-#: ../data/gtkpod.glade.h:119
+#: ../data/gtkpod.glade.h:124
+msgid "Conversion Settings..."
+msgstr "Inställningar av konvertering..."
+
+#: ../data/gtkpod.glade.h:125
+msgid "Convert AAC (M4A)"
+msgstr "Konvertera AAC (M4A)"
+
+#: ../data/gtkpod.glade.h:126
+msgid "Convert FLAC"
+msgstr "Konvertera FLAC"
+
+#: ../data/gtkpod.glade.h:127
+msgid "Convert MP3"
+msgstr "Konvertera MP3"
+
+#: ../data/gtkpod.glade.h:128
+msgid "Convert Ogg Vorbis"
+msgstr "Konvertera Ogg Vorbis"
+
+#: ../data/gtkpod.glade.h:129
+msgid "Convert WAV"
+msgstr "Konvertera WAV"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Convert compatible formats to a single format"
+msgstr "Konvertera kompatibla format till ett enda format"
+
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr "Konvertera icke kompatibla musikformat till:"
+
+#: ../data/gtkpod.glade.h:132
 msgid "Cover"
 msgstr "Omslag"
 
-#: ../data/gtkpod.glade.h:120
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr "Inställningar för omslagssökning"
+
+#: ../data/gtkpod.glade.h:134
+msgid "Cover art file pattern:"
+msgstr "Filmönster för omslag:"
+
+#: ../data/gtkpod.glade.h:135
 msgid "Create New Playlist"
 msgstr "Skapa ny spellista"
 
-#: ../data/gtkpod.glade.h:121
+#: ../data/gtkpod.glade.h:136
 msgid "Create Repository"
 msgstr "Skapa arkiv"
 
-#: ../data/gtkpod.glade.h:122
+#: ../data/gtkpod.glade.h:137
 msgid "Create _Playlist File"
 msgstr "Skapa sp_ellistefil"
 
-#: ../data/gtkpod.glade.h:123
-msgid "Credits"
-msgstr "Tack till"
+#: ../data/gtkpod.glade.h:138
+msgid "Customize..."
+msgstr "Anpassa..."
 
-#: ../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:125
-msgid "Delete repository"
+#: ../data/gtkpod.glade.h:139
+msgid "Delete Repository"
 msgstr "Ta bort arkiv"
 
-#: ../data/gtkpod.glade.h:126
-msgid ""
-"Delete tracks that are no longer present from the\n"
-"iPod or repository"
-msgstr ""
-"Ta bort spår som inte längre finns\n"
-"från iPod eller arkiv"
+#: ../data/gtkpod.glade.h:140
+msgid "Delete missing tracks from the iPod or repository"
+msgstr "Ta bort saknade spår från iPod eller arkiv"
 
-#: ../data/gtkpod.glade.h:128
-msgid "Deleted tracks"
-msgstr "Borttagna spår"
+#: ../data/gtkpod.glade.h:141
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "Ta bort saknade spår vid synkronisering av spellistor"
 
-#: ../data/gtkpod.glade.h:129
-msgid "Descending"
-msgstr "Fallande"
-
-#: ../data/gtkpod.glade.h:130
+#: ../data/gtkpod.glade.h:142
 msgid "Details"
 msgstr "Detaljinformation"
 
-#: ../data/gtkpod.glade.h:132
+#: ../data/gtkpod.glade.h:144
 #, no-c-format
 msgid ""
 "Determines how the string for the info field should be constructed, e.g '%a/%"
@@ -573,7 +627,7 @@
 "C, år: %Y, ursprungligt filnamn (kräver fil med utökad information): %o, "
 "tecknet '%': %%."
 
-#: ../data/gtkpod.glade.h:134
+#: ../data/gtkpod.glade.h:146
 #, no-c-format
 msgid ""
 "Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."
@@ -590,211 +644,151 @@
 "ursprungligt filnamn (kräver fil med utökad information): %o, nuvarande "
 "spellista: %p, tecknet '%': %%."
 
-#: ../data/gtkpod.glade.h:136
-#, no-c-format
+#: ../data/gtkpod.glade.h:147
 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 ""
-"Avgör namn på filen med omslagsbilden. Du kan skilja flera mönster åt med "
-"semikolon, som används i tur och ordning. Artist: %a, album: %A, kompositör: "
-"%c, titel: %t, genre: %G, spårnummer: %T, cd-nummer: %C, år: %Y, "
-"ursprungligt filnamn (kräver fil med utökad information): %o, ursprungligt "
-"filnamn utan filändelse: %O, nuvarande spellista: %p, tecknet '%': %%."
-
-#: ../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: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:148
+msgid "Display"
+msgstr "Visa"
 
-#: ../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:140
+#: ../data/gtkpod.glade.h:149
 msgid "Display conversion log"
 msgstr "Visa konverteringslogg"
 
-#: ../data/gtkpod.glade.h:141
-msgid "Display info about detected duplicates"
-msgstr "Visa information om detekterade duplikat"
+#: ../data/gtkpod.glade.h:150
+msgid "Display information about detected duplicate files"
+msgstr "Visa information om detekterade duplicerade filer"
 
-#: ../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:143
-msgid "Display info about updated tracks"
-msgstr "Visa information om uppdaterade spår"
-
-#: ../data/gtkpod.glade.h:144
+#: ../data/gtkpod.glade.h:151
 msgid "Display messages and warnings at startup"
 msgstr "Visa meddelanden och varningar vid start"
 
-#: ../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:152
+msgid "Display synchronization results"
+msgstr "Visa synkroniseringsresultat"
 
-#: ../data/gtkpod.glade.h:146
-msgid "Display toolbar..."
-msgstr "Visa verktygsrad..."
-
-#: ../data/gtkpod.glade.h:147
+#: ../data/gtkpod.glade.h:153
 msgid "Display tooltips in main window"
 msgstr "Visa verktygstips i huvudfönstret"
 
-#: ../data/gtkpod.glade.h:148
-msgid "Display tooltips in prefs window"
-msgstr "Visa verktygstips i inställningsfönstret"
-
-#: ../data/gtkpod.glade.h:149
+#: ../data/gtkpod.glade.h:154
 msgid "Display tracks that match the criteria entered above."
 msgstr "Visa spår som uppfyller ovan inskrivna villkor."
 
-#: ../data/gtkpod.glade.h:150
-msgid ""
-"Displayed\n"
-"Tracks"
-msgstr ""
-"Visade\n"
-"spår"
-
-#: ../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:154
+#: ../data/gtkpod.glade.h:155
 msgid "Don't automatically sync on startup"
 msgstr "Synkronisera inte automatiskt vid start"
 
-#: ../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) SHA1-checksumma."
-
 #: ../data/gtkpod.glade.h:156
-msgid "Edit Repository/iPod Options"
-msgstr "Redigera arkiv- och iPodalternativ"
+msgid "Dummy\n"
+msgstr "Platsmarkör\n"
 
-#: ../data/gtkpod.glade.h:157 ../src/context_menus.c:662
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:664
 msgid "Edit Smart Playlist"
 msgstr "Redigera smart spellista"
 
-#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:749
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:751
 msgid "Edit Track Details"
 msgstr "Redigera detaljinformation om spår"
 
-#: ../data/gtkpod.glade.h:159
-msgid "Edit _Preferences"
-msgstr "Redigera in_ställningar"
-
 #: ../data/gtkpod.glade.h:160
-msgid "Effective free space"
-msgstr "Verkligt ledigt utrymme"
-
-#: ../data/gtkpod.glade.h:161
 msgid "Empty Playlist"
 msgstr "Tom spellista"
 
+#: ../data/gtkpod.glade.h:161
+msgid "Encoding Preferences"
+msgstr "Inställningar av kodning"
+
 #: ../data/gtkpod.glade.h:162
-msgid "Exclude file mask(s)"
-msgstr "Filmask(er) att utesluta"
+msgid "Encoding..."
+msgstr "Kodning..."
 
 #: ../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."
+msgid "Excluded files..."
+msgstr "Undantagna filer..."
 
 #: ../data/gtkpod.glade.h:164
-msgid "File size"
-msgstr "Filstorlek"
+msgid "Exclusions List"
+msgstr "Undantagslista"
 
 #: ../data/gtkpod.glade.h:165
-msgid "File size (deleted)"
-msgstr "Filstorlek (borttagna)"
+msgid "Expand columns beyond the track list width"
+msgstr "Expandera kolumner bortom spårlistans bredd"
 
 #: ../data/gtkpod.glade.h:166
-msgid "File size (non-transferred)"
-msgstr "Filstorlek (inte överförda)"
+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:167
-msgid "Filename Format: "
-msgstr "Filnamnsformat: "
+msgid "Feedback"
+msgstr "Gensvar"
 
 #: ../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 ""
-"Hitta övergivna filer (filer utan någon spårinformation i databasen) och "
-"saknade spår (spår utan motsvarande filer på iPod)"
+msgid "Filename Parse Preferences"
+msgstr "Inställningar av filnamnstolkning"
 
 #: ../data/gtkpod.glade.h:169
-msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>"
-msgstr "Försök först med <i>katalog.jpg</i>, därefter med <i>&lt;artist&gt;.jpg</i>"
+msgid "Filename format: "
+msgstr "Filnamnsformat: "
 
 #: ../data/gtkpod.glade.h:170
-msgid "Flac with :"
-msgstr "FLAC med: "
+msgid "Filename parse pattern:"
+msgstr "Tolkningsmönster för filnamn:"
 
+#: ../data/gtkpod.glade.h:171
+msgid "Filter tab:"
+msgstr "Filtreringsflik:"
+
 #: ../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 ""
-"Till exempel rensas XMM:s nuvarande spellista, de markerade spåren läggs "
-"till och uppspelning startar med 'xmms %s'."
+msgid "Filter tabs"
+msgstr "Filtreringsflikar"
 
+#: ../data/gtkpod.glade.h:173
+msgid "Filter:"
+msgstr "Filter:"
+
 #: ../data/gtkpod.glade.h:174
-#, no-c-format
 msgid ""
-"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "
-"current playlist."
+"Find orphan files (files with no track info in DB) and dangling tracks "
+"(tracks with no corresponding files on iPod)"
 msgstr ""
-"Till exempel läggs de markerade spåren till sist i XMM:s nuvarande spellista "
-"(köas) med 'xmms -e %s'."
+"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:175 ../src/display_sorttabs.c:2985
-#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
-msgid "Genre"
-msgstr "Genre"
+#: ../data/gtkpod.glade.h:175
+msgid "From the hard disk"
+msgstr "Från hårddisken"
 
 #: ../data/gtkpod.glade.h:176
-msgid "Group artists on compilation CDs"
-msgstr "Gruppera artister på samlingsskivor"
+msgid "From the iPod"
+msgstr "Från 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 ""
-"Rekommenderas starkt för snabbare import när funktionen för att känna igen "
-"duplikat utnyttjas. Dessutom blir det möjligt att skriva ändrade ID3-taggar "
-"till disk när PC-filnamnen behålls, eller till och med att återskapa "
-"innehållet i iPod om filsystemet blir skadat (ändra raderna \"transferred=\" "
-"i den säkerhetskopierade databasen)."
+msgid "From the local database"
+msgstr "Från lokal databas"
 
-#: ../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:178 ../src/display_spl.c:182 ../src/info.c:794
+msgid "GB"
+msgstr "Gibyte"
 
-#: ../data/gtkpod.glade.h:179
+#: ../data/gtkpod.glade.h:179 ../src/display_sorttabs.c:2998
+#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
+msgid "Genre"
+msgstr "Genre"
+
+#: ../data/gtkpod.glade.h:180
+msgid "Get Help _Online"
+msgstr "Hämta _direkthjälp"
+
+#: ../data/gtkpod.glade.h:181
+msgid "Group artist filter tab by compilation CDs"
+msgstr "Gruppera artister i filtreringsflik enligt samlingsskivor"
+
+#: ../data/gtkpod.glade.h:182
 msgid ""
 "If available, the local copy of the track is referenced in the playlist. "
 "Otherwise the file on the iPod is used."
@@ -802,11 +796,7 @@
 "Om tillgänglig, hänvisar spellistan till den lokala kopian av spåret. Annars "
 "används filen på iPod."
 
-#: ../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:181
+#: ../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."
@@ -814,24 +804,6 @@
 "Om markerat är sorteringen skiftlägeskänslig. Observera att "
 "skiftlägeskänslig sortering inte fungerar bra med de flesta teckenkodningar."
 
-#: ../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 ""
-"Om filnamnet (fullständiga sökvägen) för ett befintligt spår motsvarar ett "
-"spår som ska läggas till, låter det här alternativet dig uppdatera "
-"informationen om det befintliga spåret istället för att bara hoppa över "
-"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: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:184
 msgid ""
 "If you check this, information (cover art and meta information) changed for "
@@ -843,26 +815,10 @@
 "försiktighet."
 
 #: ../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 ""
-"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: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 ""
-"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: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:188
+#: ../data/gtkpod.glade.h:186
 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."
@@ -870,6 +826,14 @@
 "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:187
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr "Inkludera spår som aldrig spelats i spellistan \"med bäst betyg\""
+
+#: ../data/gtkpod.glade.h:188
+msgid "Info field template:"
+msgstr "Informationsfältmall:"
+
 #: ../data/gtkpod.glade.h:189
 msgid "Initialize iPod"
 msgstr "Initiera iPod"
@@ -883,107 +847,99 @@
 "Infoga efter"
 
 #: ../data/gtkpod.glade.h:192
-msgid "Keeps all compilation CDs grouped together in the artists sort tab."
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
 msgstr ""
-"Behåller alla samlingsskivor grupperade tillsammans i sorteringsfliken för "
-"artister"
+"Senast spelat\n"
+"Senast ändrad\n"
+"Tillagd\n"
 
-#: ../data/gtkpod.glade.h:193
+#: ../data/gtkpod.glade.h:196
 msgid "Live _updating"
 msgstr "_Uppdatering under tiden"
 
-#: ../data/gtkpod.glade.h:194
+#: ../data/gtkpod.glade.h:197
 msgid "Load iPod(s)"
 msgstr "Ladda iPod"
 
-#: ../data/gtkpod.glade.h:195
-msgid "Lower Margin"
-msgstr "Under gräns"
-
-#: ../data/gtkpod.glade.h:196
-msgid "M4A with :"
-msgstr "M4A med: "
-
-#: ../data/gtkpod.glade.h:197
-msgid "MP3 with :"
-msgstr "MP3 med: "
-
 #: ../data/gtkpod.glade.h:198
-msgid "Match al_l of the following"
-msgstr "Matcha a_lla följande"
+msgid "Logic:"
+msgstr "Logiskt:"
 
 #: ../data/gtkpod.glade.h:199
-msgid "Match an_y of the following"
-msgstr "Matcha _någon av följande"
+msgid ""
+"MP3\n"
+"AAC\n"
+msgstr ""
+"MP3\n"
+"AAC\n"
 
-#: ../data/gtkpod.glade.h:200
+#: ../data/gtkpod.glade.h:202
+msgid "Mass-modify tags when multiple tracks are selected"
+msgstr "Modifera samtliga taggar när flera spår är markerade"
+
+#: ../data/gtkpod.glade.h:203
 msgid "Match only _checked tracks"
 msgstr "Matcha bara _kryssmarkerade spår"
 
-#: ../data/gtkpod.glade.h:201
-msgid "Maximum number of background threads:"
-msgstr "Maximalt antal bakgrundstrådar:"
+#: ../data/gtkpod.glade.h:204
+msgid "Match:"
+msgstr "Träff:"
 
-#: ../data/gtkpod.glade.h:202
-msgid "Maximum size of cache directory (in GB):"
-msgstr "Maximal storlek för cachekatalogen (i Gibyte):"
+#: ../data/gtkpod.glade.h:205
+msgid "Maximum cache size:"
+msgstr "Maximal cachestorlek:"
 
-#: ../data/gtkpod.glade.h:203
+#: ../data/gtkpod.glade.h:206
+msgid "Maximum threads:"
+msgstr "Maximalt antal trådar:"
+
+#: ../data/gtkpod.glade.h:207
+msgid "Metadata"
+msgstr "Metadata"
+
+#: ../data/gtkpod.glade.h:208
 msgid "Model:"
 msgstr "Modell:"
 
-#: ../data/gtkpod.glade.h:204 ../src/display_tracks.c:2100
-msgid "Modified"
-msgstr "Ändrad"
+#: ../data/gtkpod.glade.h:209
+msgid "Modified:"
+msgstr "Ändrad:"
 
-#: ../data/gtkpod.glade.h:205
+#: ../data/gtkpod.glade.h:210
 msgid "Most Recently Played Tracks"
 msgstr "Spår som nyligen spelats"
 
-#: ../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:211
+msgid "Music"
+msgstr "Musik"
 
-#: ../data/gtkpod.glade.h:207
-msgid "Music Root:"
+#: ../data/gtkpod.glade.h:212
+msgid "Music root:"
 msgstr "Musikrot:"
 
-#: ../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 ""
-"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:209
+#: ../data/gtkpod.glade.h:213
 msgid "Never show this dialogue again"
 msgstr "Visa aldrig den här dialogrutan igen"
 
-#: ../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
+#: ../data/gtkpod.glade.h:214 ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76 ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113 ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448 ../src/misc_playlist.c:450
 msgid "New Playlist"
 msgstr "Ny spellista"
 
-#: ../data/gtkpod.glade.h:211
+#: ../data/gtkpod.glade.h:215
 msgid "No lower margin"
 msgstr "Ingen undre gräns"
 
-#: ../data/gtkpod.glade.h:212
+#: ../data/gtkpod.glade.h:216
 msgid "No upper margin"
 msgstr "Ingen övre gräns"
 
-#: ../data/gtkpod.glade.h:213
-msgid "Non-transferred tracks"
-msgstr "Spår som inte överförts"
-
-#: ../data/gtkpod.glade.h:214
-msgid "None"
-msgstr "Ingen"
-
-#: ../data/gtkpod.glade.h:215
+#: ../data/gtkpod.glade.h:217
 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,43 +956,6 @@
 "importerats innan version 0.51 har ingen teckenkodning lagrad. Istället "
 "används då teckensnittet som anges."
 
-#: ../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 ""
-"Normalt används teckenkodning som först anges när spåret importeras för att "
-"uppdatera spårinformation. Om du valde fel teckenkodning när spåret först "
-"importerades, och vill rätta det med funktionen 'Uppdatera spår', måste du "
-"markera alternativet. Observera: kodningsinformationen lagras i filen med "
-"utökad information (se 'Skrivning av iTunes databas' nedan) och spår som "
-"importerats innan version 0.51 har ingen teckenkodning lagrad. Istället "
-"används då teckensnittet som anges ovan."
-
-#: ../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 ""
-"Normalt används teckenkodning som först anges när spåret importeras för att "
-"skriva taggarna. Om du valde fel teckenkodning när spåret först "
-"importerades, ska du markera det här alternativet tillsammans med den "
-"riktiga teckenkodningen. Observera: använder filen med utökad information "
-"för att lagra kodningsinformation (se 'Skrivning av iTunes databas' på sidan "
-"'In- och utmatning') och spår som importerats innan version 0.51 har ingen "
-"teckenkodning lagrad. Istället används då teckensnittet som anges på sidan "
-"'In- och utmatning'."
-
 #: ../data/gtkpod.glade.h:218
 msgid ""
 "Normally, if a track is no longer present in the sync directory, it will be "
@@ -1057,367 +976,301 @@
 "huvudspellistan innebär att ta bort från iPod."
 
 #: ../data/gtkpod.glade.h:221
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
+msgstr ""
+"Normalt används bara kodningen som anges ovan vid import av nya spår, och "
+"kodningen som angavs när filen först importerades används vid alla åtgärder "
+"för befintliga spår. Du kan använda alternativen nedan för att ändra detta "
+"beteende, i händelse du angav felaktig kodning vid den första importen."
+
+#: ../data/gtkpod.glade.h:222
 msgid "Notes sync command:"
 msgstr "Synkroniseringskommando för anteckningar:"
 
-#: ../data/gtkpod.glade.h:222
-msgid "Number of playlists"
-msgstr "Antal spellistor"
-
 #: ../data/gtkpod.glade.h:223
-msgid "Number of tracks"
-msgstr "Antal spår"
+msgid "Number of filter tabs:"
+msgstr "Antal filtreringsflikar:"
 
 #: ../data/gtkpod.glade.h:224
-msgid "Number of tracks in generated playlists:"
-msgstr "Antal spår i skapade spellistor:"
+msgid "Number of tracks:"
+msgstr "Antal spår:"
 
 #: ../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 ""
-"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:226
-msgid "Ogg with :"
-msgstr "Ogg med: "
-
-#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically sync with playlist directories"
 msgstr "Synkronisera automatiskt med spellistekataloger vid start"
 
-#: ../data/gtkpod.glade.h:228
+#: ../data/gtkpod.glade.h:226
 msgid "On startup automatically sync with the following directory"
 msgstr "Synkronisera automatiskt med följande katalog vid start"
 
-#: ../data/gtkpod.glade.h:229
+#: ../data/gtkpod.glade.h:227
 msgid "On startup automatically update (Live Playlist)"
 msgstr "Uppdatera automatiskt vid start (levande spellista)"
 
-#: ../data/gtkpod.glade.h:230
+#: ../data/gtkpod.glade.h:228
 msgid "One for each Album"
 msgstr "En för varje album"
 
-#: ../data/gtkpod.glade.h:231
+#: ../data/gtkpod.glade.h:229
 msgid "One for each Artist"
 msgstr "En för varje artist"
 
-#: ../data/gtkpod.glade.h:232
+#: ../data/gtkpod.glade.h:230
 msgid "One for each Composer"
 msgstr "En för varje kompositör"
 
-#: ../data/gtkpod.glade.h:233
+#: ../data/gtkpod.glade.h:231
 msgid "One for each Genre"
 msgstr "En för varje genre"
 
-#: ../data/gtkpod.glade.h:234
+#: ../data/gtkpod.glade.h:232
 msgid "One for each Rating"
 msgstr "En för varje betyg"
 
-#: ../data/gtkpod.glade.h:235
+#: ../data/gtkpod.glade.h:233
 msgid "One for each Year"
 msgstr "En för varje år"
 
-#: ../data/gtkpod.glade.h:236
-msgid "Overwrite tags that are already set"
-msgstr "Skriv över taggar som redan är angivna"
+#: ../data/gtkpod.glade.h:234
+msgid "Overwrite existing tags"
+msgstr "Skriv över befintliga taggar"
 
-#: ../data/gtkpod.glade.h:237
-msgid "Password:"
-msgstr "Lösenord:"
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
+msgstr "Tolka filnamn för att ange saknade taggar"
 
-#: ../data/gtkpod.glade.h:238
+#: ../data/gtkpod.glade.h:236
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: ../data/gtkpod.glade.h:239
+#: ../data/gtkpod.glade.h:237
 msgid "Photo Window"
 msgstr "Fotofönster"
 
-#: ../data/gtkpod.glade.h:240 ../src/display_spl.c:94
-msgid "Play time"
-msgstr "Speltid"
+#: ../data/gtkpod.glade.h:238
+msgid "Playcount:"
+msgstr "Spelningsantal:"
 
-#: ../data/gtkpod.glade.h:241 ../src/display_spl.c:98
-#: ../src/misc_conversion.c:77
-msgid "Playcount"
-msgstr "Spelningsantal"
+#: ../data/gtkpod.glade.h:239
+msgid "Played:"
+msgstr "Spelad:"
 
-#: ../data/gtkpod.glade.h:242 ../src/display_tracks.c:2097
-msgid "Played"
-msgstr "Spelad"
-
-#: ../data/gtkpod.glade.h:243
+#: ../data/gtkpod.glade.h:240
 msgid "Playlist name:"
 msgstr "Spellistans namn:"
 
-#: ../data/gtkpod.glade.h:244
+#: ../data/gtkpod.glade.h:241
 msgid "Playlist type:"
 msgstr "Typ av spellista:"
 
-#: ../data/gtkpod.glade.h:245 ../src/display_playlists.c:2258
+#: ../data/gtkpod.glade.h:242 ../src/display_playlists.c:2397
 msgid "Playlists"
 msgstr "Spellistor"
 
-#: ../data/gtkpod.glade.h:246
+#: ../data/gtkpod.glade.h:243
 msgid "Please refer to the notice below."
 msgstr "Se anmärkningen nedan."
 
-#: ../data/gtkpod.glade.h:247
-msgid "Please specify a time interval"
-msgstr "Ange ett tidsintervall"
+#: ../data/gtkpod.glade.h:244
+msgid "Position:"
+msgstr "Position:"
 
-#: ../data/gtkpod.glade.h:248
+#: ../data/gtkpod.glade.h:245
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../data/gtkpod.glade.h:249
+#: ../data/gtkpod.glade.h:246
 msgid "Progress Information"
 msgstr "Förloppsinformation"
 
-#: ../data/gtkpod.glade.h:250
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
+msgstr ""
+"Tillhandahåll ett skalkommando för att skapa en miniatyrbild av videofilen.  "
+"Följande formatsträngar expanderas:\n"
+"- %f: infil\n"
+"- %o: utfil (som automatiskt skapas)\n"
+
+#: ../data/gtkpod.glade.h:252
 msgid "R_ename Album"
 msgstr "B_yt namn på album"
 
-#: ../data/gtkpod.glade.h:251
+#: ../data/gtkpod.glade.h:253
 msgid "Random Playlist from Displayed Tracks"
 msgstr "Slumpmässig spellista från visade spår"
 
-#: ../data/gtkpod.glade.h:252
+#: ../data/gtkpod.glade.h:254
 msgid "Randomize Current Playlist"
 msgstr "Gör nuvarande spellista slumpmässig"
 
-#: ../data/gtkpod.glade.h:253 ../src/display_spl.c:101
-#: ../src/misc_conversion.c:78
-msgid "Rating"
-msgstr "Betyg"
-
-#: ../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: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)"
+msgid "Rating:"
+msgstr "Betyg:"
 
 #: ../data/gtkpod.glade.h:256
-msgid "Remove selected attributes from the displayed list"
-msgstr "Ta bort markerade egenskaper från den visade listan"
+msgid "Read embedded cover art information"
+msgstr "Läs inbäddad omslagsinformation"
 
 #: ../data/gtkpod.glade.h:257
-msgid "Repository Options"
-msgstr "Arkivalternativ"
+msgid "Read embedded tags from music files"
+msgstr "Läs inbäddade taggar från musikfiler"
 
 #: ../data/gtkpod.glade.h:258
-msgid "Repository name:"
-msgstr "Arkivnamn:"
+msgid "Report a _Problem"
+msgstr "Rapportera _problem"
 
 #: ../data/gtkpod.glade.h:259
-msgid "Repository type:"
-msgstr "Arkivtyp:"
+msgid "Report problems when accessing mserv"
+msgstr "Rapportera problem vid användning av mserv"
 
 #: ../data/gtkpod.glade.h:260
-msgid "Root directory of mserv database (trackinfo root)."
-msgstr "Rotkatalog för mserv databasen (rot för spårinformation)."
+msgid "Repository"
+msgstr "Arkiv"
 
 #: ../data/gtkpod.glade.h:261
-msgid "Rules"
-msgstr "Regler"
+msgid "Repository Options"
+msgstr "Arkivalternativ"
 
-#: ../data/gtkpod.glade.h:262 ../src/context_menus.c:804
-msgid "Save Changes"
-msgstr "Spara ändringar"
+#: ../data/gtkpod.glade.h:262
+msgid "Repository name:"
+msgstr "Arkivnamn:"
 
 #: ../data/gtkpod.glade.h:263
-msgid "Scrobble Tracks?"
-msgstr "Skicka spår till Audioscrobble?"
+msgid "Repository type:"
+msgstr "Arkivtyp:"
 
 #: ../data/gtkpod.glade.h:264
+msgid "Repository/iPod Options"
+msgstr "Arkiv- och iPodalternativ"
+
+#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:806
+msgid "Save Changes"
+msgstr "Spara ändringar"
+
+#: ../data/gtkpod.glade.h:266
 msgid "Select '-1' for no upper limit."
 msgstr "Välj '-1' för ingen övre gräns."
 
-#: ../data/gtkpod.glade.h:265
+#: ../data/gtkpod.glade.h:267
 msgid "Select '0' for no lower limit."
 msgstr "Välj '0' för ingen undre gräns."
 
-#: ../data/gtkpod.glade.h:266
-msgid ""
-"Selected\n"
-"Playlist"
-msgstr ""
-"Markerad\n"
-"spellista"
-
 #: ../data/gtkpod.glade.h:268
-msgid ""
-"Selected\n"
-"Tracks"
-msgstr ""
-"Markerade\n"
-"spår"
-
-#: ../data/gtkpod.glade.h:270
 msgid "Selected Filter Tab Entry from Database"
-msgstr "Markerade filterflikar från databas"
+msgstr "Markerad post i filtreringsflik från databas"
 
-#: ../data/gtkpod.glade.h:271
+#: ../data/gtkpod.glade.h:269
 msgid "Selected Filter Tab Entry from Hard Disk"
-msgstr "Markerade filterflikar från hårddisk"
+msgstr "Markerad post i filtreringsflik från hårddisk"
 
-#: ../data/gtkpod.glade.h:272
+#: ../data/gtkpod.glade.h:270
 msgid "Selected Filter Tab Entry from Playlist"
-msgstr "Markerade filterflikar från spellista"
+msgstr "Markerad post i filtreringsflik från spellista"
 
-#: ../data/gtkpod.glade.h:273
+#: ../data/gtkpod.glade.h:271
 msgid "Selected Filter Tab Entry from iPod"
-msgstr "Markerade filterflikar från iPod"
+msgstr "Markerad post i filtreringsflik från iPod"
 
-#: ../data/gtkpod.glade.h:274
+#: ../data/gtkpod.glade.h:272
 msgid "Selected Playlist Including Tracks from Database"
 msgstr "Markerade spellista inklusive spår från databas"
 
-#: ../data/gtkpod.glade.h:275
+#: ../data/gtkpod.glade.h:273
 msgid "Selected Playlist Including Tracks from Hard Disk"
 msgstr "Markerade spellista inklusive spår från hårddisk"
 
-#: ../data/gtkpod.glade.h:276
+#: ../data/gtkpod.glade.h:274
 msgid "Selected Playlist Including Tracks from iPod"
 msgstr "Markerade spellista inklusive spår från iPod"
 
-#: ../data/gtkpod.glade.h:277
+#: ../data/gtkpod.glade.h:275
 msgid "Selected Tab _Entry"
-msgstr "Markerad _flikrad"
+msgstr "Markerade _flikrad"
 
-#: ../data/gtkpod.glade.h:278
+#: ../data/gtkpod.glade.h:276
 msgid "Selected Tracks from Database"
 msgstr "Markerade spår från databas"
 
-#: ../data/gtkpod.glade.h:279
+#: ../data/gtkpod.glade.h:277
 msgid "Selected Tracks from Hard Disk"
 msgstr "Markerade spår från hårddisk"
 
-#: ../data/gtkpod.glade.h:280
+#: ../data/gtkpod.glade.h:278
 msgid "Selected Tracks from Playlist"
 msgstr "Markerade spår från spellista"
 
-#: ../data/gtkpod.glade.h:281
+#: ../data/gtkpod.glade.h:279
 msgid "Selected Tracks from iPod"
 msgstr "Markerade spår från iPod"
 
-#: ../data/gtkpod.glade.h:282
+#: ../data/gtkpod.glade.h:280
 msgid "Selected _Playlist"
-msgstr "Markerad _spellista"
+msgstr "Markerade _spellista"
 
-#: ../data/gtkpod.glade.h:283
+#: ../data/gtkpod.glade.h:281
 msgid "Selected _Tracks"
 msgstr "Markerade s_pår"
 
-#: ../data/gtkpod.glade.h:284
+#: ../data/gtkpod.glade.h:282
 msgid "Selected playlist"
 msgstr "Markerade spellista"
 
-#: ../data/gtkpod.glade.h:285
-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
+#: ../data/gtkpod.glade.h:283
 msgid "Set Cover Art from _File"
 msgstr "Ange omslagsbild från _fil"
 
-#: ../data/gtkpod.glade.h:287
-msgid "Set mountpoint or edit repository options"
-msgstr "Ange monteringspunkt eller redigera arkivalternativ"
+#: ../data/gtkpod.glade.h:284
+msgid "Set still missing tags to file name"
+msgstr "Ställ in taggar som fortfarande saknas till filnamn"
 
-#: ../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:285
+msgid "Settings..."
+msgstr "Inställningar..."
 
-#: ../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 ""
-"Ställ in det här till 'aacgain -q -k' för att använda funktionen "
-"'Normalisera volym' i menyn Verktyg. Om det är inställt, beräknas saknad "
-"normaliseringsdata för .m4a- och .m4b-filer och skrivs i musikfilerna med "
-"detta kommando."
-
-#: ../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 ""
-"Ställ in det här till 'mp3gain -q -k' för att använda funktionen "
-"'Normalisera volym' i menyn Verktyg. Om det är inställt, beräknas saknad "
-"normaliseringsdata för mp3-filer och skrivs i musikfilerna med detta "
-"kommando."
-
-#: ../data/gtkpod.glade.h:291
-msgid "Set this to your last.fm password"
-msgstr "Ställ in detta till ditt lösenord på last.fm"
-
-#: ../data/gtkpod.glade.h:292
-msgid "Set this to your last.fm username"
-msgstr "Ställ in detta till ditt användarnamn på 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 ""
-"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: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:295
-msgid "Show information about problems when accessing mserv"
-msgstr "Visa information om problem vid användning av mserv"
-
-#: ../data/gtkpod.glade.h:296
+#: ../data/gtkpod.glade.h:286
 msgid "Show summary of sync result"
 msgstr "Visa sammanfattning av synkroniseringsresultat"
 
-#: ../data/gtkpod.glade.h:297 ../src/misc_playlist.c:96
-#: ../src/repository.c:1356
+#: ../data/gtkpod.glade.h:287
+msgid "Skip the track"
+msgstr "Hoppa över spåret"
+
+#: ../data/gtkpod.glade.h:288 ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
 msgid "Smart Playlist"
 msgstr "Smart spellista"
 
-#: ../data/gtkpod.glade.h:298
+#: ../data/gtkpod.glade.h:289
+msgid "Sort by:"
+msgstr "Sortera enligt:"
+
+#: ../data/gtkpod.glade.h:290
 msgid "Sort tracks according to: "
 msgstr "Sortera spår enligt: "
 
-#: ../data/gtkpod.glade.h:299
+#: ../data/gtkpod.glade.h:291
 msgid "Sorting Options"
 msgstr "Sorteringsalternativ"
 
-#: ../data/gtkpod.glade.h:300
-msgid "Sorting case sensitive"
-msgstr "Skiftlägeskänslig sortering"
+#: ../data/gtkpod.glade.h:292
+msgid "Sorting..."
+msgstr "Sortering..."
 
-#: ../data/gtkpod.glade.h:301
-msgid "Sorttab: "
-msgstr "Sorteringsflik: "
-
-#: ../data/gtkpod.glade.h:302
-msgid "Sorttabs"
-msgstr "Sorteringsflikar"
-
-#: ../data/gtkpod.glade.h:303
+#: ../data/gtkpod.glade.h:293
 msgid "Source:"
 msgstr "Källa:"
 
-#: ../data/gtkpod.glade.h:305
+#: ../data/gtkpod.glade.h:295
 #, no-c-format
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
@@ -1426,39 +1279,43 @@
 "Ange fullständig sökväg inklusive kommandoradsväljare. '%i' ersätts med "
 "monteringspunkten för iPod."
 
-#: ../data/gtkpod.glade.h:306
+#: ../data/gtkpod.glade.h:296
 msgid "Specify interval"
 msgstr "Ange intervall"
 
-#: ../data/gtkpod.glade.h:307
+#: ../data/gtkpod.glade.h:297
 msgid "Start display automatically"
 msgstr "Börja visa automatiskt"
 
-#: ../data/gtkpod.glade.h:308
+#: ../data/gtkpod.glade.h:298
 msgid "Synchronise Contacts, Calendar and Notes"
 msgstr "Synkronisera kontakter, kalender och anteckningar"
 
-#: ../data/gtkpod.glade.h:309
+#: ../data/gtkpod.glade.h:299
 msgid "Synchronize All"
 msgstr "Synkronisera allt"
 
-#: ../data/gtkpod.glade.h:310
+#: ../data/gtkpod.glade.h:300
 msgid "Synchronize Calendar"
 msgstr "Synkronisera kalender"
 
-#: ../data/gtkpod.glade.h:311
+#: ../data/gtkpod.glade.h:301
 msgid "Synchronize Contacts"
 msgstr "Synkronisera kontakter"
 
-#: ../data/gtkpod.glade.h:312
+#: ../data/gtkpod.glade.h:302
 msgid "Synchronize Notes"
 msgstr "Synkronisera anteckningar"
 
-#: ../data/gtkpod.glade.h:313
-msgid "Template for info field: "
-msgstr "Mall för informationsfält:"
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
+msgstr "Kodning av taggar och filnamn:"
 
-#: ../data/gtkpod.glade.h:314
+#: ../data/gtkpod.glade.h:304
+msgid "Text color"
+msgstr "Textfärg"
+
+#: ../data/gtkpod.glade.h:305
 msgid ""
 "The local copy of the track is referenced in the playlist. If the track is "
 "not available locally, an error message is displayed."
@@ -1466,7 +1323,7 @@
 "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:315
+#: ../data/gtkpod.glade.h:306
 msgid ""
 "The output of the background conversion scripts is copied below. Each page "
 "of the notebook corresponds to one background thread."
@@ -1474,98 +1331,54 @@
 "Utmatningen från konverteringsskripten som kört i bakgrunden har kopierats "
 "nedan. Varje sida i anteckningsboken motsvarar en bakgrundstråd."
 
-#: ../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)."
-
-#: ../data/gtkpod.glade.h:317
+#: ../data/gtkpod.glade.h:307
 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: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: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 ""
-"Det här är rätt metod, men kanske stöder inte alla program det ännu. ID3v2.4 "
-"använder Unicode för att lagra taggar, så du behöver inte längre bekymra dig "
-"om teckenkodning. Kodningen UTF8 används av gtkpod, om den inte ökar "
-"storleken av rena ASCII-taggar. ID3v2.2/4-taggar skrivs också om de redan "
-"finns i filen som skrivs."
-
-#: ../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:321
+#: ../data/gtkpod.glade.h:308
 msgid "Time:"
 msgstr "Tid:"
 
-#: ../data/gtkpod.glade.h:322 ../src/display_sorttabs.c:2991
+#: ../data/gtkpod.glade.h:309 ../src/display_sorttabs.c:3004
 #: ../src/display_spl.c:83 ../src/misc_conversion.c:62
 msgid "Title"
 msgstr "Titel"
 
-#: ../data/gtkpod.glade.h:323
+#: ../data/gtkpod.glade.h:310
 msgid ""
-"Total\n"
-"(iPod)"
+"To fill additional information, <i>gtkpod</i> can use a database provided by "
+"the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, "
+"leave this alone."
 msgstr ""
-"Totalt\n"
-"(iPod)"
+"För att fylla i ytterligare information kan <i>gtkpod</i> använda en databas "
+"som tillhandahålls av musikservern <i>mserv</i>. Om du inte vet vad "
+"<i>mserv</i> är, lämna detta orört."
 
-#: ../data/gtkpod.glade.h:325
-msgid ""
-"Total\n"
-"(local)"
-msgstr ""
-"Totalt\n"
-"(lokalt)"
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
+msgstr "Längst upp"
 
-#: ../data/gtkpod.glade.h:327
+#: ../data/gtkpod.glade.h:312
 msgid "Tracks"
 msgstr "Spår"
 
-#: ../data/gtkpod.glade.h:328
+#: ../data/gtkpod.glade.h:313
 msgid "Tracks Most Often Listened To"
 msgstr "Spår som oftast lyssnats på"
 
-#: ../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:330
+#: ../data/gtkpod.glade.h:314
 msgid "Tracks in Selected Tab _Entry"
 msgstr "Spår i markerad _flikrad"
 
-#: ../data/gtkpod.glade.h:331
+#: ../data/gtkpod.glade.h:315
 msgid "Tracks in Selected _Playlist"
 msgstr "Spår i markerad _spellista"
 
-#: ../data/gtkpod.glade.h:332
-msgid "Transfer tracks to the iPod in the background"
-msgstr "Överför spår till iPod i bakgrunden"
+#: ../data/gtkpod.glade.h:316
+msgid "Transfer tracks in background mode"
+msgstr "Överför spår i bakgrunden"
 
-#: ../data/gtkpod.glade.h:333
-msgid "Translators"
-msgstr "Översättare"
-
-#: ../data/gtkpod.glade.h:334
+#: ../data/gtkpod.glade.h:317
 msgid ""
 "Try to load contents of all connected iPods. For each iPod a separate "
 "repository must be set up."
@@ -1573,55 +1386,35 @@
 "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:335
+#: ../data/gtkpod.glade.h:318
 msgid "Undo _Track"
 msgstr "Å_ngra spår"
 
-#: ../data/gtkpod.glade.h:336
+#: ../data/gtkpod.glade.h:319
 msgid "Update _mserv Data from File"
 msgstr "Uppdatera _mserv data från fil"
 
-#: ../data/gtkpod.glade.h:337
-msgid "Update/Sync all playlists now"
-msgstr "Uppdatera och synkronisera alla spellistor nu"
+#: ../data/gtkpod.glade.h:320
+msgid "Update information about the existing track"
+msgstr "Uppdatera information om befintligt spår"
 
-#: ../data/gtkpod.glade.h:338
-msgid "Update/Sync playlist now"
-msgstr "Uppdatera och synkronisera spellista nu"
+#: ../data/gtkpod.glade.h:321
+msgid "Update/Sync All Playlists"
+msgstr "Uppdatera och synkronisera alla spellistor"
 
-#: ../data/gtkpod.glade.h:339
-msgid "Upper margin"
-msgstr "Övre gräns"
+#: ../data/gtkpod.glade.h:322
+msgid "Update/Sync Playlist"
+msgstr "Uppdatera och synkronisera spellista"
 
-#: ../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:323
+msgid "Use legacy format for MP3 tags"
+msgstr "Använd gammalt format för MP3-taggar"
 
-#: ../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:324
+msgid "Use mserv database to fill track information"
+msgstr "Använd mserv databas för att fylla i spårinformation"
 
-#: ../data/gtkpod.glade.h:342
-msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory"
-msgstr "Använd <i>&lt;Album&gt;.jpg</i> i överliggande katalog"
-
-#: ../data/gtkpod.glade.h:343
-msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-msgstr "Använd <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..."
-
-#: ../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: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: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:347
+#: ../data/gtkpod.glade.h:325
 msgid ""
 "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
 "for this filename."
@@ -1629,58 +1422,24 @@
 "Använd vald teckenkodning för detta filnamn\n"
 "(Inställningar/'Tillägg, uppdatering, synkronisering')."
 
-#: ../data/gtkpod.glade.h:349
-msgid ""
-"Use selected encoding (on the 'General' page)\n"
-"when writing tags"
-msgstr ""
-"Använd vald teckenkodning (från sidan 'Allmänt')\n"
-"vid skrivning av taggar"
-
-#: ../data/gtkpod.glade.h:351
-msgid "Use selected encoding also when updating or syncing tracks"
-msgstr "Använd också vald kodning vid uppdatering eller synkronisering av spår"
-
-#: ../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: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:354
+#: ../data/gtkpod.glade.h:327
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../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 ""
-"Oftast vill du inte ange titeln för flera spår till samma text. Det här "
-"alternativet kan undvika oönskade resultat (särskilt eftersom funktionen "
-"'Ångra' inte finns ännu)."
+#: ../data/gtkpod.glade.h:328
+msgid "Video Thumbnail Generation"
+msgstr "Skapa miniatyrbilder för video"
 
-#: ../data/gtkpod.glade.h:356
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
+msgstr "Program för videominiatyrbilder:"
+
+#: ../data/gtkpod.glade.h:330
 msgid "View Full Size"
 msgstr "Visa med full storlek"
 
-#: ../data/gtkpod.glade.h:357
-msgid "WAV with :"
-msgstr "Wav med: "
-
-#: ../data/gtkpod.glade.h:358
+#: ../data/gtkpod.glade.h:331
 msgid ""
-"When adding dirs/files, update information of\n"
-"existing tracks with identical filenames"
-msgstr ""
-"När kataloger och filer läggs till, uppdatera information\n"
-"om befintliga spår med identiska filnamn"
-
-#: ../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 "
@@ -1691,11 +1450,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:361
-msgid "When syncing playlists"
-msgstr "Vid synkronisering av spellistor"
+#: ../data/gtkpod.glade.h:332
+msgid "When updating tracks, display information:"
+msgstr "Vid uppdatering av spår, visa information:"
 
-#: ../data/gtkpod.glade.h:362
+#: ../data/gtkpod.glade.h:333
 msgid ""
 "Will show a list of tracks removed and a list of tracks newly added or "
 "updated."
@@ -1703,130 +1462,184 @@
 "Visar en lista med borttagna spår och en lista med spår som är nytillagda "
 "eller uppdaterade."
 
-#: ../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:364
+#: ../data/gtkpod.glade.h:334
 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:365
+#: ../data/gtkpod.glade.h:335
+msgid "Write tags to disk when edited"
+msgstr "Skriv taggar till disk när de har redigerats"
+
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
 msgid ""
-"Write extended information (PC filenames, SHA1 hashes,\n"
-"encoding...). Recommended."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"Skriv utökad information (PC-filnamn, SHA1-checksummor,\n"
-"teckenkodning). Rekommenderas."
+"Du kan skilja flera mallar åt med ';'. Den första som motsvarar filnamnet "
+"kommer att användas.\n"
+"\n"
+"Exempel: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- kompositör: %c\n"
+"- titel: %t\n"
+"- genre: %G\n"
+"- spårnummer: %T\n"
+"- skivnummer: %C\n"
+"- år: %Y\n"
+"- hoppa över data: %*\n"
+"- tecknet '%': %%."
 
-#: ../data/gtkpod.glade.h:367
+#: ../data/gtkpod.glade.h:352
+#, no-c-format
 msgid ""
-"You can also use the table headers, but this allows you to sort according to "
-"a column that is not displayed."
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
 msgstr ""
-"Du kan också använda tabellhuvuden, men här kan du sortera enligt en kolumn "
-"som inte visas."
+"Du kan skilja flera mallar åt med ';'. Den första som motsvarar filnamnet "
+"kommer att användas.\n"
+"\n"
+"Exempel:\n"
+"- <i>katalog.jpg</i>: Använd <i>katalog.jpg</i> som omslag.\n"
+"- <i>katalog</i>: Använd <i>katalog.jpg</i>, <i>katalog.png</i>...\n"
+"- <i>../%A.jpg</i>: Använd <i>&lt;Album&gt;.jpg</i> i överliggande katalog\n"
+"- <i>%a</i>: Använd <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>katalog.jpg;%a.jpg</i>: Prova först <i>katalog.jpg</i>, därefter <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- kompositör: %c\n"
+"- titel: %t\n"
+"- genre: %G\n"
+"- spårnummer: %T\n"
+"- skivnummer: %C\n"
+"- år: %Y\n"
+"- hoppa över data: %*\n"
+"- tecknet '%': %%."
 
-#: ../data/gtkpod.glade.h:368
+#: ../data/gtkpod.glade.h:371
 msgid "_About gtkpod"
 msgstr "_Om gtkpod"
 
-#: ../data/gtkpod.glade.h:369
+#: ../data/gtkpod.glade.h:372
 msgid "_Add Album"
 msgstr "_Lägg till album"
 
-#: ../data/gtkpod.glade.h:370
+#: ../data/gtkpod.glade.h:373
 msgid "_Add Image"
 msgstr "_Lägg till bild"
 
-#: ../data/gtkpod.glade.h:371
+#: ../data/gtkpod.glade.h:374
 msgid "_Album"
 msgstr "_Album"
 
-#: ../data/gtkpod.glade.h:372
+#: ../data/gtkpod.glade.h:375
 msgid "_All Tracks"
 msgstr "_Alla spår"
 
-#: ../data/gtkpod.glade.h:373
-msgid "_Arrange Sort Tabs"
-msgstr "_Ordna sorteringsflikar"
+#: ../data/gtkpod.glade.h:376
+msgid "_Arrange Filter Tabs"
+msgstr "_Ordna filtreringsflikar"
 
-#: ../data/gtkpod.glade.h:374
+#: ../data/gtkpod.glade.h:377
 msgid "_Check iPod's Files"
 msgstr "K_ontrollera iPod-filer"
 
-#: ../data/gtkpod.glade.h:375
+#: ../data/gtkpod.glade.h:378
+msgid "_Contents"
+msgstr "_Innehåll"
+
+#: ../data/gtkpod.glade.h:379
 msgid "_Conversion Log"
 msgstr "_Konverteringslogg"
 
-#: ../data/gtkpod.glade.h:376
+#: ../data/gtkpod.glade.h:380
 msgid "_Create Playlists"
 msgstr "S_kapa spellistor"
 
-#: ../data/gtkpod.glade.h:377
+#: ../data/gtkpod.glade.h:381
 msgid "_Create iPod's Directories"
 msgstr "Skapa iPod-ka_taloger"
 
-#: ../data/gtkpod.glade.h:378
+#: ../data/gtkpod.glade.h:382
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: ../data/gtkpod.glade.h:379
+#: ../data/gtkpod.glade.h:383
 msgid "_Display"
 msgstr "_Visa"
 
-#: ../data/gtkpod.glade.h:380
+#: ../data/gtkpod.glade.h:384
 msgid "_Displayed Tracks"
 msgstr "_Visade spår"
 
-#: ../data/gtkpod.glade.h:381
+#: ../data/gtkpod.glade.h:385
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../data/gtkpod.glade.h:382
-msgid "_Encoding (ID3, files):"
-msgstr "_Teckenkodning (ID3, filer):"
-
-#: ../data/gtkpod.glade.h:383
+#: ../data/gtkpod.glade.h:386
 msgid "_Enqueue"
 msgstr "_Köa"
 
-#: ../data/gtkpod.glade.h:384
+#: ../data/gtkpod.glade.h:387
 msgid "_Export Tracks from Database"
 msgstr "E_xportera spår från databasen"
 
-#: ../data/gtkpod.glade.h:385
-msgid "_File"
-msgstr "_Arkiv"
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr "_Färre filtreringsflikar"
 
-#: ../data/gtkpod.glade.h:386
+#: ../data/gtkpod.glade.h:389
+msgid "_Filter Bar"
+msgstr "_Filtreringsrad"
+
+#: ../data/gtkpod.glade.h:390
 msgid "_General"
 msgstr "_Allmänt"
 
-#: ../data/gtkpod.glade.h:387
+#: ../data/gtkpod.glade.h:391
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../data/gtkpod.glade.h:388
-msgid "_Ignore rules"
-msgstr "_Ignorera regler"
-
-#: ../data/gtkpod.glade.h:389
-msgid "_Image"
-msgstr "B_ild"
-
-#: ../data/gtkpod.glade.h:390
+#: ../data/gtkpod.glade.h:392
 msgid "_Info Window"
 msgstr "_Informationsfönster"
 
-#: ../data/gtkpod.glade.h:391
-msgid "_Last.FM"
-msgstr "_Last.FM"
-
-#: ../data/gtkpod.glade.h:392
-msgid "_Less Sort Tabs"
-msgstr "Färre _sorteringsflikar"
-
 #: ../data/gtkpod.glade.h:393
 msgid "_Limit to"
 msgstr "_Begränsa till"
@@ -1840,160 +1653,131 @@
 msgstr "_Lokal"
 
 #: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+msgstr "_Sångtexter"
+
+#: ../data/gtkpod.glade.h:397
 msgid "_M3U"
 msgstr "_M3U"
 
-#: ../data/gtkpod.glade.h:397
+#: ../data/gtkpod.glade.h:398
 msgid "_Misc."
 msgstr "_Diverse"
 
-#: ../data/gtkpod.glade.h:398
-msgid "_More Sort Tabs"
-msgstr "_Fler sorteringsflikar"
-
 #: ../data/gtkpod.glade.h:399
-msgid "_Newly Added Tracks"
-msgstr "_Nytillagda spår"
+msgid "_More Filter Tabs"
+msgstr "_Fler filtreringsflikar"
 
 #: ../data/gtkpod.glade.h:400
-msgid "_Normalize Volume"
-msgstr "_Normalisera volym"
+msgid "_Music"
+msgstr "_Musik"
 
 #: ../data/gtkpod.glade.h:401
-msgid "_Number of sort tabs:"
-msgstr "A_ntal sorteringsflikar:"
+msgid "_Newly Added Tracks"
+msgstr "_Nytillagda spår"
 
 #: ../data/gtkpod.glade.h:402
+msgid "_Normalize Volume"
+msgstr "_Normalisera volym"
+
+#: ../data/gtkpod.glade.h:403
 msgid "_PLS"
 msgstr "_PLS"
 
-#: ../data/gtkpod.glade.h:403
+#: ../data/gtkpod.glade.h:404
+msgid "_Photos"
+msgstr "_Foton"
+
+#: ../data/gtkpod.glade.h:405
 msgid "_Play Now"
 msgstr "S_pela nu"
 
-#: ../data/gtkpod.glade.h:404
+#: ../data/gtkpod.glade.h:406
 msgid "_Podcasts"
 msgstr "_Podradiosändningar"
 
-#: ../data/gtkpod.glade.h:405
+#: ../data/gtkpod.glade.h:407
 msgid "_Prefer Local"
 msgstr "_Föredra lokal"
 
-#: ../data/gtkpod.glade.h:406
+#: ../data/gtkpod.glade.h:408
 msgid "_Remove Album"
 msgstr "Ta bort _album"
 
-#: ../data/gtkpod.glade.h:407
+#: ../data/gtkpod.glade.h:409
 msgid "_Remove Cover Art"
 msgstr "_Ta bort omslagsbild"
 
-#: ../data/gtkpod.glade.h:408
+#: ../data/gtkpod.glade.h:410
 msgid "_Remove Images"
 msgstr "_Ta bort bilder"
 
-#: ../data/gtkpod.glade.h:409
+#: ../data/gtkpod.glade.h:411
 msgid "_Save Changes"
 msgstr "_Spara ändringar"
 
-#: ../data/gtkpod.glade.h:410
+#: ../data/gtkpod.glade.h:412
 msgid "_Save Displayed Track Order"
 msgstr "Spara _visad spårordning"
 
-#: ../data/gtkpod.glade.h:411
+#: ../data/gtkpod.glade.h:413
 msgid "_Sorting"
 msgstr "S_ortera"
 
-#: ../data/gtkpod.glade.h:412
+#: ../data/gtkpod.glade.h:414
 msgid "_Synchronize Playlist with Dir(s)"
 msgstr "S_ynkronisera spellista med katalog(er)"
 
-#: ../data/gtkpod.glade.h:413
+#: ../data/gtkpod.glade.h:415
 msgid "_Toolbar"
 msgstr "_Verktygsrad"
 
-#: ../data/gtkpod.glade.h:414
+#: ../data/gtkpod.glade.h:416
 msgid "_Tools"
 msgstr "Verk_tyg"
 
-#: ../data/gtkpod.glade.h:415
+#: ../data/gtkpod.glade.h:417
 msgid "_Tooltips"
 msgstr "Verktygs_tips"
 
-#: ../data/gtkpod.glade.h:416
-msgid "_Track Info"
-msgstr "_Spårinformation"
-
-#: ../data/gtkpod.glade.h:417
+#: ../data/gtkpod.glade.h:418
 msgid "_Undo All"
 msgstr "Å_ngra alla"
 
-#: ../data/gtkpod.glade.h:418
+#: ../data/gtkpod.glade.h:419
 msgid "_Update Tracks from File"
 msgstr "_Uppdatera spår från fil"
 
-#: ../data/gtkpod.glade.h:419
+#: ../data/gtkpod.glade.h:420
 msgid "_Video"
 msgstr "_Video"
 
-#: ../data/gtkpod.glade.h:420
+#: ../data/gtkpod.glade.h:421
 msgid "_View"
 msgstr "_Visa"
 
-#: ../data/gtkpod.glade.h:421
+#: ../data/gtkpod.glade.h:422
+msgid "_Zoom"
+msgstr "_Zooma"
+
+#: ../data/gtkpod.glade.h:423
 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, kompositör: %c, titel: %t, genre: %G, spårnummer: %T, "
-"cd-nummer: %C, år: %Y, hoppa över data: %*, tecknet '%': %%. Du kan skilja "
-"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:424
-msgid "folder"
-msgstr "katalog"
+msgid "checkbutton"
+msgstr "checkbutton"
 
 #: ../data/gtkpod.glade.h:425
-msgid "folder.jpg"
-msgstr "katalog.jpg"
+msgid "gtk-revert-to-saved"
+msgstr "gtk-revert-to-saved"
 
-#: ../data/gtkpod.glade.h:427
-#, no-c-format
-msgid "folder.jpg;%a.jpg"
-msgstr "katalog.jpg;%a.jpg"
-
-#: ../data/gtkpod.glade.h:428
-msgid "gtkpod"
-msgstr "gtkpod"
-
-#: ../data/gtkpod.glade.h:429
-msgid "gtkpod Info"
+#: ../data/gtkpod.glade.h:426
+msgid "gtkpod Information"
 msgstr "Information om 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 ""
-"ID3-taggar och filnamn förväntas ha kodningen som anges här. Du kan ändra "
-"den för varje enskild användning av 'Lägg till filer' eller 'Lägg till "
-"kataloger'. 'Systemets kodning' är den kodning som används i din aktuella "
-"landsinställning."
-
-#: ../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:433
+#: ../data/gtkpod.glade.h:429
 msgid ""
 "iPod\n"
 "Local Repository (Standard)\n"
@@ -2003,27 +1787,27 @@
 "Lokalt arkiv (standard)\n"
 "Lokalt arkiv (podradiosändningar)\n"
 
-#: ../data/gtkpod.glade.h:437
+#: ../data/gtkpod.glade.h:433
 msgid "iPod mountpoint:"
 msgstr "iPod monteringspunkt:"
 
-#: ../data/gtkpod.glade.h:438
+#: ../data/gtkpod.glade.h:434
 msgid "iTunesDB backup:"
 msgstr "Säkerhetskopia av iTunes databas:"
 
-#: ../data/gtkpod.glade.h:439
-msgid "mserv Root:"
+#: ../data/gtkpod.glade.h:435
+msgid "mserv Preferences"
+msgstr "Inställningar av mserv"
+
+#: ../data/gtkpod.glade.h:436
+msgid "mserv root:"
 msgstr "Rot för mserv:"
 
-#: ../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:441 ../src/details.c:1347
+#: ../data/gtkpod.glade.h:437 ../src/details.c:1352
 msgid "n/a"
 msgstr "ej tillgänglig"
 
-#: ../data/gtkpod.glade.h:442
+#: ../data/gtkpod.glade.h:438
 msgid "special_sorttab -- Don't translate!"
 msgstr "special_sorttab -- Don't translate!"
 
@@ -2255,165 +2039,173 @@
 
 #. sanity!
 #. check for "System Charset" and return NULL
-#: ../src/charset.c:160 ../src/charset.c:170 ../src/charset.c:223
+#: ../src/charset.c:163 ../src/charset.c:173 ../src/charset.c:232
+#: ../src/charset.c:248 ../src/charset.c:332
 msgid "System Charset"
 msgstr "Systemets kodning"
 
 #. 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"
+#: ../src/clientserver.c:215
+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/confirmation.c:389
+msgid "Confirmation"
+msgstr "Bekräftelse"
 
-#: ../src/context_menus.c:362
+#: ../src/context_menus.c:364
 #, c-format
 msgid "Copied \"%s\" playlist to %s"
 msgstr "Kopierade spellistan \"%s\" till %s"
 
-#: ../src/context_menus.c:401
+#: ../src/context_menus.c:403
 #, c-format
 msgid "Copied %d track to '%s'"
 msgid_plural "Copied %d tracks to '%s'"
 msgstr[0] "Kopierade %d spår till '%s'"
 msgstr[1] "Kopierade %d spår till '%s'"
 
-#: ../src/context_menus.c:429
+#: ../src/context_menus.c:431
 #, c-format
 msgid "Copied '%s' playlist to '%s' in '%s'"
 msgstr "Kopierade spellistan '%s'till '%s' i '%s'"
 
-#: ../src/context_menus.c:462
+#: ../src/context_menus.c:464
 #, c-format
 msgid "Copied %d track to '%s' in '%s'"
 msgid_plural "Copied %d tracks to %s in '%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:622 ../src/tools.c:854
+#: ../src/context_menus.c:624 ../src/tools.c:854
 msgid "Play Now"
 msgstr "Spela nu"
 
-#: ../src/context_menus.c:628 ../src/tools.c:867
+#: ../src/context_menus.c:630 ../src/tools.c:867
 msgid "Enqueue"
 msgstr "Köa"
 
-#: ../src/context_menus.c:634
+#: ../src/context_menus.c:636
 msgid "Copy Tracks to Filesystem"
 msgstr "Kopiera spår till filsystem"
 
-#: ../src/context_menus.c:641 ../src/file_export.c:1085
+#: ../src/context_menus.c:643 ../src/file_export.c:1085
 msgid "Create Playlist File"
 msgstr "Skapa spellistefil"
 
-#: ../src/context_menus.c:648
+#: ../src/context_menus.c:650
 msgid "Create new Playlist"
 msgstr "Skapa ny spellista"
 
-#: ../src/context_menus.c:655
+#: ../src/context_menus.c:657
 msgid "Update Tracks from File"
 msgstr "Uppdatera spår från fil"
 
-#: ../src/context_menus.c:669
+#: ../src/context_menus.c:671
 msgid "Sync Playlist with Dir(s)"
 msgstr "Synkronisera spellista med katalog(er)"
 
-#: ../src/context_menus.c:679
+#: ../src/context_menus.c:681
 msgid "Remove All Tracks from iPod"
 msgstr "Ta bort alla spår från iPod"
 
-#: ../src/context_menus.c:697
+#: ../src/context_menus.c:687 ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr "Jag är säker"
+
+#: ../src/context_menus.c:699
 msgid "Remove All Podcasts from iPod"
 msgstr "Ta bort alla podradiosändningar från iPod"
 
-#: ../src/context_menus.c:712
+#: ../src/context_menus.c:714
 msgid "Delete Including Tracks"
 msgstr "Ta bort inklusive spår"
 
-#: ../src/context_menus.c:720
+#: ../src/context_menus.c:722
 msgid "Delete But Keep Tracks"
 msgstr "Ta bort men behåll spår"
 
-#: ../src/context_menus.c:728
+#: ../src/context_menus.c:730
 msgid "Edit iPod Properties"
 msgstr "Redigera iPod-egenskaper"
 
-#: ../src/context_menus.c:735
+#: ../src/context_menus.c:737
 msgid "Edit Repository Properties"
 msgstr "Redigera arkivegenskaper"
 
-#: ../src/context_menus.c:742
+#: ../src/context_menus.c:744
 msgid "Edit Playlist Properties"
 msgstr "Redigera spellisteegenskaper"
 
-#: ../src/context_menus.c:770
+#: ../src/context_menus.c:772
 msgid "View Full Size Artwork"
 msgstr "Visa omslagsbilder med full storlek"
 
-#: ../src/context_menus.c:777
+#: ../src/context_menus.c:779
 msgid "Select Cover From File"
 msgstr "Välj omslag från fil"
 
-#: ../src/context_menus.c:790
+#: ../src/context_menus.c:792
 msgid "Load iPod"
 msgstr "Ladda iPod"
 
-#: ../src/context_menus.c:797
+#: ../src/context_menus.c:799
 msgid "Eject iPod"
 msgstr "Mata ut iPod"
 
-#: ../src/context_menus.c:814
+#: ../src/context_menus.c:816
 msgid "Remove All Tracks from Database"
 msgstr "Ta bort alla spår från databasen"
 
-#: ../src/context_menus.c:829
+#: ../src/context_menus.c:831
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Ta bort inklusive spår (hårddisk)"
 
-#: ../src/context_menus.c:837
+#: ../src/context_menus.c:839
 msgid "Delete Including Tracks (Database)"
 msgstr "Ta bort inklusive spår (databas)"
 
-#: ../src/context_menus.c:845
+#: ../src/context_menus.c:847
 msgid "Delete From iPod"
 msgstr "Ta bort från iPod"
 
-#: ../src/context_menus.c:853
+#: ../src/context_menus.c:855
 msgid "Delete From Playlist"
 msgstr "Ta bort från spellista"
 
-#: ../src/context_menus.c:861
+#: ../src/context_menus.c:863
 msgid "Delete From Harddisk"
 msgstr "Ta bort från hårddisk"
 
-#: ../src/context_menus.c:869
+#: ../src/context_menus.c:871
 msgid "Delete From Database"
 msgstr "Ta bort från databas"
 
-#: ../src/context_menus.c:877
+#: ../src/context_menus.c:879
 msgid "Alphabetize"
 msgstr "Sortera alfabetiskt"
 
-#: ../src/context_menus.c:895
+#: ../src/context_menus.c:897
 msgid "Remove Album"
 msgstr "Ta bort album"
 
-#: ../src/context_menus.c:905
+#: ../src/context_menus.c:907
 msgid "Remove Photo"
 msgstr "Ta bort foto"
 
-#: ../src/context_menus.c:922
+#: ../src/context_menus.c:924
 msgid "Rename Album"
 msgstr "Byt namn på album"
 
-#: ../src/context_menus.c:981 ../src/context_menus.c:1030
+#: ../src/context_menus.c:983 ../src/context_menus.c:1032
 msgid "Copy selected playlist to..."
 msgstr "Kopiera markerad spellista till..."
 
-#: ../src/context_menus.c:1083
+#: ../src/context_menus.c:1085
 msgid "Copy selected track(s) to..."
 msgstr "Kopiera markerade spår till..."
 
@@ -2459,66 +2251,72 @@
 msgid "TV Show & Music Video"
 msgstr "Tv-program och musikvideo"
 
-#: ../src/details.c:836
+#: ../src/details.c:837
 #, c-format
 msgid "%s (image data corrupted or unreadable)"
 msgstr "%s (bilddata förstörd eller oläsbar)"
 
-#: ../src/details.c:973
+#: ../src/details.c:975
 #, c-format
 msgid "Please report unknown mediatype %x\n"
 msgstr "Rapportera gärna okänd mediatyp %x\n"
 
-#: ../src/details.c:1418
+#: ../src/details.c:1417
 msgid "<b>n/a</b>"
 msgstr "<b>ej tillgänglig</b>"
 
 #: ../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"
+msgstr ""
+"Fel uppstod när en bild släpptes på fönstret med detaljinformation: %s\n"
+"Fel uppstod när en bild släpptes på fönstret med detaljinformation: %s\n"
 
-#: ../src/details.c:1952 ../src/display_coverart.c:2128
+#: ../src/details.c:1952 ../src/display_coverart.c:2297
 msgid "Successfully set new coverart for selected tracks"
 msgstr "Nya omslagsbilder för markerade spår tillagda med lyckat resultat"
 
-#: ../src/display.c:490
+#. Set the resolution in the label
+#: ../src/display.c:570
 #, c-format
-msgid "<b>Image Dimensions: %s</b>"
-msgstr "<b>Bilddimensioner: %s</b>"
+msgid "<b>Image Dimensions: %d x %d</b>"
+msgstr "<b>Bilddimensioner: %d x %d</b>"
 
-#: ../src/display.c:744
+#: ../src/display.c:814
 msgid "Edit selected entry of which sort tab?"
 msgstr "Redigera markerad rad för vilken sorts flik?"
 
 #. no entry selected
-#: ../src/display.c:751 ../src/misc_confirm.c:435 ../src/misc_track.c:2138
+#: ../src/display.c:821 ../src/misc_confirm.c:469 ../src/misc_track.c:2158
 msgid "No entry selected."
 msgstr "Ingen rad markerad."
 
-#: ../src/display.c:910 ../src/display.c:1230 ../src/display.c:1286
-#: ../src/display.c:1340 ../src/display.c:1395 ../src/display.c:1656
+#: ../src/display.c:974 ../src/display.c:1320 ../src/display.c:1376
+#: ../src/display.c:1430 ../src/display.c:1485 ../src/display.c:1746
 #, c-format
 msgid "No entry selected in Sort Tab %d"
 msgstr "Ingen rad markerad i sorteringsflik %d"
 
-#: ../src/display.c:949
+#: ../src/display.c:1015
 msgid "Remove entry of which sort tab from database?"
 msgstr "Ta bort rad för vilken sorts flik från databasen?"
 
-#: ../src/display.c:957
+#: ../src/display.c:1024
 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?"
+msgstr ""
+"Ta bort spår i markerad rad för vilken sorts filtreringsflik från iPod?"
 
-#: ../src/display.c:979
+#: ../src/display.c:1049
 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 filtreringsflik från hårddisken?"
 
-#: ../src/display.c:1009
+#: ../src/display.c:1082
 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 filtreringsflik från spellistan?"
 
-#: ../src/display.c:1036 ../src/display.c:1074
+#: ../src/display.c:1109 ../src/display.c:1147
 #, c-format
 msgid ""
 "iPod at '%s' is not loaded.\n"
@@ -2527,98 +2325,102 @@
 "iPod på '%s' har inte laddats.\n"
 "Ladda den först."
 
-#: ../src/display.c:1111 ../src/display.c:1138
+#: ../src/display.c:1184 ../src/display.c:1218
 msgid "Update selected entry of which sort tab?"
 msgstr "Uppdatera markerad rad för vilken sorts flik?"
 
-#: ../src/display.c:1224
+#: ../src/display.c:1314
 msgid "Export selected entry of which sort tab?"
 msgstr "Exportera markerad rad för vilken sorts flik?"
 
-#: ../src/display.c:1280
+#: ../src/display.c:1370
 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:1334
+#: ../src/display.c:1424
 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:1389
+#: ../src/display.c:1479
 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:1646
+#: ../src/display.c:1736
 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:1713
+#: ../src/display_coverart.c:1874
 msgid "Failed to remove the album from the album hash store."
 msgstr "Misslyckades ta bort albumet från den checksummerade albumlagringen."
 
-#: ../src/display_coverart.c:2098
+#: ../src/display_coverart.c:2262
 #, 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
+#: ../src/display_itdb.c:385
 #, c-format
 msgid "Failed to set cover art: '%s'\n"
 msgstr "Misslyckades ange omslagsbild: '%s'\n"
 
-#: ../src/display_itdb.c:858 ../src/display_itdb.c:991
-msgid "Local"
-msgstr "Lokal"
+#: ../src/display_itdb.c:871
+msgid "Music Library"
+msgstr "Musikbibliotek"
 
 #. add podcast playlist
-#: ../src/display_itdb.c:866 ../src/display_itdb.c:989
-#: ../src/display_itdb.c:1025
+#: ../src/display_itdb.c:879 ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
 msgid "Podcasts"
 msgstr "Podradiosändningar"
 
-#: ../src/display_itdb.c:875 ../src/display_itdb.c:993
-#: ../src/repository.c:1186
+#: ../src/display_itdb.c:888 ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
 msgid "iPod"
 msgstr "iPod"
 
-#: ../src/display_itdb.c:1084
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr "Lokal"
+
+#: ../src/display_itdb.c:1098
 #, c-format
 msgid "Increased playcount for '%s'"
 msgstr "ökade spelningsantal för '%s'"
 
-#: ../src/display_photo.c:163
+#: ../src/display_photo.c:158
 #, 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
+#: ../src/display_photo.c:161
 msgid "Error reading iPod photo database.\n"
 msgstr "Fel vid läsning av iPod fotodatabas.\n"
 
-#: ../src/display_photo.c:238
+#: ../src/display_photo.c:201
 msgid "Could not access the iPod's photo database."
 msgstr "Kunde inte komma åt iPod fotodatabas."
 
-#: ../src/display_photo.c:441
+#: ../src/display_photo.c:404
 msgid "Photo Albums"
 msgstr "Fotoalbum"
 
-#: ../src/display_photo.c:451 ../src/display_photo.c:1685
+#: ../src/display_photo.c:414 ../src/display_photo.c:1587
 msgid "<Unnamed>"
 msgstr "<Namnlös>"
 
-#: ../src/display_photo.c:939
+#: ../src/display_photo.c:848
 msgid "The Photo Library album cannot be removed"
 msgstr "Fotobibliotekets album kan inte tas bort"
 
-#: ../src/display_photo.c:961
+#: ../src/display_photo.c:870
 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
+#: ../src/display_photo.c:876
 msgid "Yes. Do Not Display Again"
 msgstr "Ja. Visa inte igen"
 
-#: ../src/display_photo.c:1038
+#: ../src/display_photo.c:947
 msgid ""
 "This will remove the photo selection from the selected album.\n"
 " Do you want to delete them from the database as well?"
@@ -2626,7 +2428,7 @@
 "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
+#: ../src/display_photo.c:962
 msgid ""
 "This will delete the photo selection from the Photo Library and all albums. "
 "Are you sure?"
@@ -2634,62 +2436,62 @@
 "Detta tar bort markerade foton från fotobiblioteket och alla album.\n"
 "Är du säker?"
 
-#: ../src/display_photo.c:1128
+#: ../src/display_photo.c:1036
 msgid "New Photo Album Name"
 msgstr "Nytt namn på fotoalbum"
 
-#: ../src/display_photo.c:1129
+#: ../src/display_photo.c:1037
 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
+#: ../src/display_photo.c:1050 ../src/display_photo.c:1133
 msgid "An album with that name already exists."
 msgstr "Ett album med samma namn finns redan."
 
-#: ../src/display_photo.c:1210
+#: ../src/display_photo.c:1119
 msgid "New Photo Album"
 msgstr "Nytt fotoalbum"
 
-#: ../src/display_photo.c:1211
+#: ../src/display_photo.c:1120
 msgid "Please enter a name for the new photo album"
 msgstr "Skriv in ett namn på det nya fotoalbumet"
 
-#: ../src/display_photo.c:1232
+#: ../src/display_photo.c:1142
 msgid "The new album failed to be created."
 msgstr "Det nya albumet kunde inte skapas."
 
-#: ../src/display_photo.c:1256
+#: ../src/display_photo.c:1166
 msgid "Add Image to iPod"
 msgstr "Lägg till bild på iPod"
 
 #. Open a dialog directory chooser window
-#: ../src/display_photo.c:1311
+#: ../src/display_photo.c:1221
 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
+#: ../src/display_photo.c:1601
 #, 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:516 ../src/display_playlists.c:558
+#: ../src/display_playlists.c:537 ../src/display_playlists.c:579
 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:585 ../src/display_tracks.c:286
+#: ../src/display_playlists.c:606 ../src/display_tracks.c:403
 #, 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:865 ../src/display_playlists.c:877
+#: ../src/display_playlists.c:886 ../src/display_playlists.c:898
 msgid "Can't reorder sorted treeview."
 msgstr "Kan inte ordna om sorterad trädvy."
 
-#: ../src/display_playlists.c:954
+#: ../src/display_playlists.c:975
 #, c-format
 msgid ""
 "This DND type (%d) is not (yet) supported. If you feel implementing this "
@@ -2700,55 +2502,43 @@
 "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
+#: ../src/display_playlists.c:2039
 msgid "Photos"
 msgstr "Foton"
 
-#: ../src/display_sorttabs.c:473
+#: ../src/display_sorttabs.c:479
 msgid "'Played' condition ignored because of error."
 msgstr "Tillståndet 'Spelad' ignoreras på grund av fel."
 
-#: ../src/display_sorttabs.c:476
+#: ../src/display_sorttabs.c:482
 msgid "'Modified' condition ignored because of error."
 msgstr "Tillståndet 'Ändrad' ignoreras på grund av fel."
 
-#: ../src/display_sorttabs.c:479
+#: ../src/display_sorttabs.c:485
 msgid "'Added' condition ignored because of error."
 msgstr "Tillståndet 'Tillagd' ignoreras på grund av fel."
 
-#: ../src/display_sorttabs.c:1562 ../src/misc_conversion.c:59
+#: ../src/display_sorttabs.c:1568 ../src/misc_conversion.c:59
 msgid "All"
 msgstr "Alla"
 
-#: ../src/display_sorttabs.c:1588
+#: ../src/display_sorttabs.c:1594
 msgid "Compilations"
 msgstr "Samlingar"
 
-#: ../src/display_sorttabs.c:2988
+#: ../src/display_sorttabs.c:3001
 msgid "Comp."
 msgstr "Komp."
 
-#: ../src/display_sorttabs.c:2994 ../src/display_spl.c:88
-#: ../src/display_tracks.c:2109 ../src/misc_conversion.c:84
+#: ../src/display_sorttabs.c:3007 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333 ../src/misc_conversion.c:84
 msgid "Year"
 msgstr "År"
 
-#: ../src/display_sorttabs.c:2997
+#: ../src/display_sorttabs.c:3010
 msgid "Special"
 msgstr "Special"
 
-#: ../src/display_sorttabs.c:3245
-msgid "Last Played"
-msgstr "Senast spelad"
-
-#: ../src/display_sorttabs.c:3246
-msgid "Last Modified"
-msgstr "Senast ändrad"
-
 #: ../src/display_spl.c:64
 msgid "days"
 msgstr "dagar"
@@ -2769,7 +2559,7 @@
 msgid "Hz"
 msgstr "Hz"
 
-#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:780
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:794
 msgid "MB"
 msgstr "Mibyte"
 
@@ -2802,6 +2592,10 @@
 msgid "Size"
 msgstr "Storlek"
 
+#: ../src/display_spl.c:94 ../src/infodlg.c:78
+msgid "Play time"
+msgstr "Speltid"
+
 #: ../src/display_spl.c:95 ../src/misc_conversion.c:64
 msgid "Comment"
 msgstr "Kommentar"
@@ -2810,6 +2604,10 @@
 msgid "Date added"
 msgstr "Tillagd datum"
 
+#: ../src/display_spl.c:98 ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "Spelningsantal"
+
 #: ../src/display_spl.c:99
 msgid "Last played"
 msgstr "Senast spelad"
@@ -2818,6 +2616,10 @@
 msgid "Disc number"
 msgstr "Skivnummer"
 
+#: ../src/display_spl.c:101 ../src/misc_conversion.c:78
+msgid "Rating"
+msgstr "Betyg"
+
 #: ../src/display_spl.c:102 ../src/misc_conversion.c:87
 msgid "Compilation"
 msgstr "Samling"
@@ -2932,10 +2734,6 @@
 msgid "hours"
 msgstr "timmar"
 
-#: ../src/display_spl.c:182 ../src/info.c:780
-msgid "GB"
-msgstr "Gibyte"
-
 #: ../src/display_spl.c:189
 msgid "random order"
 msgstr "slumpmässig ordning"
@@ -2992,26 +2790,26 @@
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/display_spl.c:1192 ../src/display_spl.c:1207
+#: ../src/display_spl.c:1143 ../src/display_spl.c:1158
 msgid "to"
 msgstr "till"
 
-#: ../src/display_spl.c:1485
+#: ../src/display_spl.c:1436
 msgid "-"
 msgstr "-"
 
-#: ../src/display_spl.c:1500
+#: ../src/display_spl.c:1451
 msgid "+"
 msgstr "+"
 
-#: ../src/display_tracks.c:281
+#: ../src/display_tracks.c:398
 #, c-format
 msgid "Moved one track"
 msgid_plural "Moved %d tracks"
 msgstr[0] "Flyttade ett spår"
 msgstr[1] "Flyttade %d spår"
 
-#: ../src/display_tracks.c:1810
+#: ../src/display_tracks.c:2022
 #, c-format
 msgid ""
 "Cannot unsort track view because of a bug in the GTK lib you are using (%d.%"
@@ -3024,74 +2822,97 @@
 "tillbaka till det osorterade tillståndet.\n"
 "\n"
 
-#: ../src/display_tracks.c:2069
+#: ../src/display_tracks.c:2288
 msgid "Rtng"
 msgstr "Betyg"
 
-#: ../src/display_tracks.c:2072
+#: ../src/display_tracks.c:2291
 msgid "#"
 msgstr "#"
 
-#: ../src/display_tracks.c:2075
+#: ../src/display_tracks.c:2294
 msgid "CD"
 msgstr "Cd"
 
-#: ../src/display_tracks.c:2078
+#: ../src/display_tracks.c:2297
 msgid "ID"
 msgstr "Id"
 
-#: ../src/display_tracks.c:2081
+#: ../src/display_tracks.c:2300
 msgid "Trnsfrd"
 msgstr "Överfört"
 
-#: ../src/display_tracks.c:2085
+#: ../src/display_tracks.c:2309
 msgid "Cmpl"
 msgstr "Komp."
 
-#: ../src/display_tracks.c:2091
+#: ../src/display_tracks.c:2315
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/display_tracks.c:2094
+#: ../src/display_tracks.c:2318
 msgid "Plycnt"
 msgstr "Speln."
 
-#: ../src/display_tracks.c:2106
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "Spelad"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "Ändrad"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "Tillagd"
+
+#: ../src/display_tracks.c:2330
 msgid "Released"
 msgstr "Utgiven"
 
-#: ../src/display_tracks.c:2112
+#: ../src/display_tracks.c:2336
 msgid "Vol."
 msgstr "Vol."
 
-#: ../src/display_tracks.c:2115
+#: ../src/display_tracks.c:2339
 msgid "Sndchk."
 msgstr "Ljudkontr."
 
-#: ../src/fetchcover.c:358
-msgid "Coverart file already exists"
-msgstr "Omslagsfilen finns redan"
-
-#: ../src/fetchcover.c:371
+#: ../src/fetchcover.c:359
 #, 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."
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to 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."
+"Vill du skriva över den befintliga filen, och kanske koppla ihop\n"
+"andra musikfiler i samma katalog med den här omslagsfilen, spara\n"
+"filen med ett unikt filnamn, eller avbryta omslagshämtningen?"
 
-#: ../src/file.c:236
+#: ../src/fetchcover.c:368
+msgid "Cover art file already exists"
+msgstr "Omslagsfilen finns redan"
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr "Skriv över"
+
+#: ../src/fetchcover.c:371
+msgid "Rename"
+msgstr "Byt namn"
+
+#: ../src/fetchcover.c:372
+msgid "Abort"
+msgstr "Avbryt"
+
+#: ../src/file.c:238
 #, c-format
 msgid ""
 "'%s' is a directory, not a playlist file.\n"
@@ -3100,7 +2921,7 @@
 "'%s' är en katalog, inte en spellistefil.\n"
 "\n"
 
-#: ../src/file.c:266
+#: ../src/file.c:268
 #, c-format
 msgid ""
 "'%s' is a not a known playlist file.\n"
@@ -3109,58 +2930,88 @@
 "'%s' är inte en känd spellistefil.\n"
 "\n"
 
-#: ../src/file.c:283 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/file.c:285 ../src/file_export.c:217 ../src/oggfile.c:62
 #: ../src/wavfile.c:107
 #, c-format
 msgid "Could not open '%s' for reading.\n"
 msgstr "Kunde inte öppna '%s' för läsning.\n"
 
-#: ../src/file.c:369
+#: ../src/file.c:371
 #, c-format
 msgid "Skipping '%s' because it is a directory.\n"
 msgstr "Hoppar över '%s' eftersom det är en katalog.\n"
 
-#: ../src/file.c:374
+#: ../src/file.c:376
 #, 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
+#: ../src/file.c:631
 #, c-format
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "Okänd beteckning '%s' i mallen '%s'\n"
 
-#: ../src/file.c:923
+#: ../src/file.c:939
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Lokalt filnamn inte giltigt (%s)"
 
-#: ../src/file.c:982
+#: ../src/file.c:998
 #, 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:991
+#: ../src/file.c:1007
 #, 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:999
+#: ../src/file.c:1015
 #, 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:1123
+#: ../src/file.c:1046
 #, c-format
-msgid "The following track could not be processed (file does not exist): '%s'\n"
+msgid "Could not create '%s'"
+msgstr "Kunde inte skapa '%s'"
+
+#: ../src/file.c:1083
+msgid "Error creating thumbnail file"
+msgstr "Fel när miniatyrbildsfil skulle skapas"
+
+#: ../src/file.c:1114 ../src/misc.c:1018
+#, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "Okänd beteckning '%%%c' i mallen '%s'"
+
+#: ../src/file.c:1138
+#, c-format
+msgid ""
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
+msgstr ""
+"Kunde inte starta miniatyrbildsprogrammet för video\n"
+"(kommandoraden var: '%s')"
+
+#: ../src/file.c:1142
+#, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr "Miniatyrbildsprogrammet returnerade status %d"
+
+#: ../src/file.c:1291
+#, c-format
+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:1209
+#: ../src/file.c:1377
 #, 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:1307
+#: ../src/file.c:1476
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -3169,33 +3020,33 @@
 "Följande spår kunde inte behandlas (filtypen känd, men analys misslyckades): "
 "'%s'\n"
 
-#: ../src/file.c:1337 ../src/file.c:1391
+#: ../src/file.c:1506 ../src/file.c:1560
 msgid "Nothing to update"
 msgstr "Ingenting att uppdatera"
 
-#: ../src/file.c:1358
+#: ../src/file.c:1527
 #, c-format
 msgid "Updating %s"
 msgstr "Uppdaterar %s"
 
-#: ../src/file.c:1372
+#: ../src/file.c:1541
 msgid "Updated selected tracks with info from file."
 msgstr "Uppdaterar markerade spår med information från fil."
 
-#: ../src/file.c:1406
+#: ../src/file.c:1575
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "Hämtar data från mserv %s"
 
-#: ../src/file.c:1411
+#: ../src/file.c:1580
 msgid "no filename available"
 msgstr "inget filnamn tillgängligt"
 
-#: ../src/file.c:1416
+#: ../src/file.c:1585
 msgid "Updated selected tracks with data from mserv."
 msgstr "Uppdaterar markerade spår med data från mserv."
 
-#: ../src/file.c:1437
+#: ../src/file.c:1606
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -3204,11 +3055,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1443
+#: ../src/file.c:1612
 msgid "Failed Track Update"
 msgstr "Uppdatering av spår misslyckades"
 
-#: ../src/file.c:1501
+#: ../src/file.c:1670
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -3217,59 +3068,60 @@
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:1507
+#: ../src/file.c:1676
 msgid "Successful Track Update"
 msgstr "Uppdatering av spår lyckades"
 
-#: ../src/file.c:1566
+#: ../src/file.c:1735
 #, 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:1572
+#: ../src/file.c:1741
 msgid "mserv data retrieval problem"
 msgstr "Problem att hämta data från mserv"
 
-#: ../src/file.c:1661
+#: ../src/file.c:1829
 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:1667
+#: ../src/file.c:1835
 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:1671 ../src/file.c:1689
+#: ../src/file.c:1839 ../src/file.c:1857
 msgid "no local filename available"
 msgstr "inget lokalt filnamn tillgängligt"
 
-#: ../src/file.c:1679
+#: ../src/file.c:1847
 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:1685
+#: ../src/file.c:1853
 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:1788
+#: ../src/file.c:1956
 msgid "update failed (format not supported?)"
 msgstr "uppdatering misslyckades (formatet stöds kanske inte)"
 
-#: ../src/file.c:1873 ../src/misc_playlist.c:916
+#: ../src/file.c:2041 ../src/misc_playlist.c:936
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Behandlar '%s'..."
 
-#: ../src/file.c:1879
+#: ../src/file.c:2047
 #, c-format
 msgid "Skipping '%s' because it matches exclude masks.\n"
 msgstr "Hoppar över '%s' eftersom det motsvarar filmasker att utesluta.\n"
 
-#: ../src/file.c:1999 ../src/misc_track.c:1773 ../src/misc_track.c:1878
+#: ../src/file.c:2167 ../src/misc_track.c:1793 ../src/misc_track.c:1898
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
@@ -3278,7 +3130,7 @@
 "Podradiosändning finns redan: '%s'\n"
 "\n"
 
-#: ../src/file.c:2064
+#: ../src/file.c:2232
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
@@ -3287,35 +3139,35 @@
 "Att skriva till videofiler stöds inte än (%s).\n"
 "\n"
 
-#: ../src/file.c:2116 ../src/file.c:2130
+#: ../src/file.c:2284 ../src/file.c:2298
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Kunde inte ändra taggar för filen: %s\n"
 
-#: ../src/file.c:2232
+#: ../src/file.c:2400
 #, 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:2239
+#: ../src/file.c:2407
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "Kunde inte låsa '%s'.\n"
 
 #. error!
-#: ../src/file.c:2256 ../src/file.c:2265 ../src/file.c:2276 ../src/file.c:2286
+#: ../src/file.c:2424 ../src/file.c:2433 ../src/file.c:2444 ../src/file.c:2454
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Felaktig rad i '%s': %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: ../src/file.c:2315
+#: ../src/file.c:2483
 msgid "Remove offline playcounts?"
 msgstr "Ta bort nerkopplade spelningsantal?"
 
 #. title
-#: ../src/file.c:2316
+#: ../src/file.c:2484
 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."
@@ -3324,12 +3176,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:2333
+#: ../src/file.c:2501
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Fel vid skrivning till '%s'.\n"
 
-#: ../src/file.c:2390 ../src/tools.c:270
+#: ../src/file.c:2558 ../src/tools.c:270
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
@@ -3338,7 +3190,7 @@
 "Normalisering misslyckades: Filtypen stöds inte (%s).\n"
 "\n"
 
-#: ../src/file.c:2406 ../src/tools.c:287
+#: ../src/file.c:2574 ../src/tools.c:287
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -3347,42 +3199,71 @@
 "Normalisering misslyckades: Filen inte tillgänglig (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:316
+#: ../src/file.c:2631
+#, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr ""
+"Sångtext hittades inte, filen inte tillgänglig (%s).\n"
+"\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save "
+"lyrics to: %s.\n"
+"\n"
+msgstr ""
+"Filen på iPod inte tillgänglig och att spara ID3 inaktiverat i "
+"inställningarna, kan inte spara sångtext i: %s.\n"
+"\n"
+
+#: ../src/file.c:2712
+#, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr ""
+"Sångtexten skrevs inte, filnamnet inte tillgängligt (%s).\n"
+"\n"
+
+#: ../src/file_convert.c:328
 msgid "Summary status of conversion processes"
 msgstr "Sammanfattning av konverteringsprocessens status"
 
-#: ../src/file_convert.c:564
+#: ../src/file_convert.c:576
 msgid "active"
 msgstr "aktiv"
 
-#: ../src/file_convert.c:569
+#: ../src/file_convert.c:581
 msgid "inactive"
 msgstr "inaktiv"
 
-#: ../src/file_convert.c:580
+#: ../src/file_convert.c:592
 #, c-format
 msgid "Active threads: %d. Scheduled tracks: %d."
 msgstr "Aktiva trådar: %d. Schemalagda spår: %d."
 
-#: ../src/file_convert.c:1071
+#: ../src/file_convert.c:1090
 #, c-format
 msgid "Original filename not available for '%s.'\n"
 msgstr "Originalfilnamnet inte tillgängligt för '%s'.\n"
 
-#: ../src/file_convert.c:1086
+#: ../src/file_convert.c:1105
 #, c-format
 msgid "Filename '%s' is no longer valid for '%s'.\n"
 msgstr "Filnamnet '%s' är inte längre giltigt för '%s'.\n"
 
-#: ../src/file_convert.c:1137
+#: ../src/file_convert.c:1156
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
-#: ../src/file_convert.c:1143
+#: ../src/file_convert.c:1162
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/file_convert.c:1198
+#: ../src/file_convert.c:1217
 #, c-format
 msgid ""
 "Files of type '%s' are not supported by the iPod. Please go to the "
@@ -3393,16 +3274,18 @@
 "ställa in och aktivera ett lämpligt konverteringsskript för '%s'.\n"
 "\n"
 
-#: ../src/file_convert.c:1284
+#: ../src/file_convert.c:1303
 msgid "No information available"
 msgstr "Ingen information tillgänglig"
 
-#: ../src/file_convert.c:1323
+#: ../src/file_convert.c:1342
 #, c-format
 msgid "Could not create '%s'. Filetype conversion will not work.\n"
-msgstr "Kunde inte skapa '%s'. Konvertering av filtyp kommer inte att fungera.\n"
+msgstr ""
+"Kunde inte skapa '%s'. Konvertering av filtyp kommer inte att fungera.\n"
+"Kunde inte skapa '%s'. Konvertering av filtyp kommer inte att fungera.\n"
 
-#: ../src/file_convert.c:1641 ../src/file_convert.c:3049
+#: ../src/file_convert.c:1667 ../src/file_convert.c:3119
 #, c-format
 msgid ""
 "Transfer of '%s' failed. %s\n"
@@ -3411,7 +3294,7 @@
 "Överföring av '%s' misslyckades. %s\n"
 "\n"
 
-#: ../src/file_convert.c:2047 ../src/file_convert.c:2325
+#: ../src/file_convert.c:2073 ../src/file_convert.c:2352
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s'.\n"
@@ -3420,7 +3303,7 @@
 "Konvertering av '%s' misslyckades: '%s'.\n"
 "\n"
 
-#: ../src/file_convert.c:2062
+#: ../src/file_convert.c:2088
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
@@ -3429,7 +3312,7 @@
 "Konvertering av '%s' misslyckades: '%s %s' returnerade status %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2091
+#: ../src/file_convert.c:2117
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
@@ -3440,7 +3323,7 @@
 "filnamnsändelse som förväntat.\n"
 "\n"
 
-#: ../src/file_convert.c:2167
+#: ../src/file_convert.c:2193
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
@@ -3449,7 +3332,7 @@
 "Körning av '%s' misslyckades: Kunde inte komma åt originalfil '%s' (%s).\n"
 "\n"
 
-#: ../src/file_convert.c:2222
+#: ../src/file_convert.c:2248
 #, c-format
 msgid ""
 "Conversion of '%s' failed: Could not create directory '%s'.\n"
@@ -3458,7 +3341,7 @@
 "Konvertering av '%s'misslyckades: Kunde inte skapa katalogen '%s'.\n"
 "\n"
 
-#: ../src/file_convert.c:2356
+#: ../src/file_convert.c:2383
 #, c-format
 msgid ""
 "Conversion of '%s' failed: '%s' returned exit status %d.\n"
@@ -3467,7 +3350,7 @@
 "Konvertering av '%s'misslyckades: '%s' returnerade status %d.\n"
 "\n"
 
-#: ../src/file_convert.c:2395
+#: ../src/file_convert.c:2422
 #, c-format
 msgid ""
 "Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -3587,26 +3470,26 @@
 "Kunde inte öppna '%s' för skrivning (%s).\n"
 "\n"
 
-#: ../src/file_itunesdb.c:129
+#: ../src/file_itunesdb.c:133
 #, c-format
 msgid "Matching SHA1 checksum for file %d/%d"
 msgstr "Matchande SHA1-checksumma för filen %d/%d"
 
-#: ../src/file_itunesdb.c:236
+#: ../src/file_itunesdb.c:249
 #, 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:243
+#: ../src/file_itunesdb.c:256
 msgid "Could not create hash value from itunesdb\n"
 msgstr "Kunde inte skapa checksumma från itunesdb\n"
 
-#: ../src/file_itunesdb.c:259
+#: ../src/file_itunesdb.c:272
 #, 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:276
+#: ../src/file_itunesdb.c:289
 #, c-format
 msgid ""
 "iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -3620,7 +3503,7 @@
 "Det kan ta lång tid.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:288
+#: ../src/file_itunesdb.c:301
 #, c-format
 msgid ""
 "%s:\n"
@@ -3629,7 +3512,7 @@
 "%s:\n"
 "Förväntande \"itunesdb_hash=\", men hittade \"%s\"\n"
 
-#: ../src/file_itunesdb.c:348
+#: ../src/file_itunesdb.c:363
 #, c-format
 msgid ""
 "%s:\n"
@@ -3638,7 +3521,7 @@
 "%s:\n"
 "Formatfel: %s\n"
 
-#: ../src/file_itunesdb.c:393
+#: ../src/file_itunesdb.c:408
 msgid ""
 "No SHA1 checksums on individual tracks are available.\n"
 "\n"
@@ -3654,7 +3537,7 @@
 "iPod med andra program än gtkpod.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:457
+#: ../src/file_itunesdb.c:474
 msgid ""
 "Extended info will not be used. If you have non-transferred tracks,\n"
 "these will be lost.\n"
@@ -3662,15 +3545,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:465
+#: ../src/file_itunesdb.c:482
 msgid "Offline iPod database successfully imported"
 msgstr "Nerkopplad iPod-databas importerad med lyckat resultat"
 
-#: ../src/file_itunesdb.c:468
+#: ../src/file_itunesdb.c:485
 msgid "Local database successfully imported"
 msgstr "Lokal databas importerad med lyckat resultat"
 
-#: ../src/file_itunesdb.c:476
+#: ../src/file_itunesdb.c:493
 #, c-format
 msgid ""
 "Offline iPod database import failed: '%s'\n"
@@ -3679,7 +3562,7 @@
 "Import av nerkopplad iPod-databas misslyckades: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:480
+#: ../src/file_itunesdb.c:497
 #, c-format
 msgid ""
 "Local database import failed: '%s'\n"
@@ -3688,7 +3571,7 @@
 "Import av lokal databas misslyckades: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:487
+#: ../src/file_itunesdb.c:504
 msgid ""
 "Offline iPod database import failed: \n"
 "\n"
@@ -3696,7 +3579,7 @@
 "Import av nerkopplad iPod-databas misslyckades: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:490
+#: ../src/file_itunesdb.c:507
 msgid ""
 "Local database import failed: \n"
 "\n"
@@ -3704,7 +3587,7 @@
 "Import av lokal databas misslyckades: \n"
 "\n"
 
-#: ../src/file_itunesdb.c:497
+#: ../src/file_itunesdb.c:514
 #, c-format
 msgid ""
 "'%s' does not exist. Import aborted.\n"
@@ -3713,15 +3596,15 @@
 "'%s' finns inte. Import avbruten.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:520
+#: ../src/file_itunesdb.c:536
 msgid "Extended info will not be used.\n"
 msgstr "Utökad information kommer inte att användas.\n"
 
-#: ../src/file_itunesdb.c:527
+#: ../src/file_itunesdb.c:543
 msgid "iPod Database Successfully Imported"
 msgstr "iPod-databasen importerad med lyckat resultat"
 
-#: ../src/file_itunesdb.c:534
+#: ../src/file_itunesdb.c:550
 #, c-format
 msgid ""
 "iPod Database Import Failed: '%s'\n"
@@ -3730,7 +3613,7 @@
 "Import av iPod-databasen misslyckades: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:540
+#: ../src/file_itunesdb.c:556
 msgid ""
 "iPod Database Import Failed.\n"
 "\n"
@@ -3738,7 +3621,7 @@
 "Import av iPod-databasen misslyckades.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:549
+#: ../src/file_itunesdb.c:565
 #, c-format
 msgid ""
 "'%s' (or similar) does not exist. Import aborted.\n"
@@ -3747,45 +3630,55 @@
 "'%s' (eller liknande) finns inte. Import avbruten.\n"
 "\n"
 
-#: ../src/file_itunesdb.c:865
+#: ../src/file_itunesdb.c:886
 #, 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"
+"If you are sure that the iPod is properly mounted at '%s', it may not be "
+"initialized for use. In this case, gtkpod can initialize it for you.\n"
+"\n"
+"Do you want to create the directory structure now?"
 msgstr ""
 "Kunde inte hitta iPod-katalogstrykturen på '%s'.\n"
-"Om du är säker på att din iPod är riktigt monterad på %s', kan gtkpod skapa "
-"katalogstrukturen åt dig.\n"
 "\n"
-"Vill du skapa katalogstrukturen nu?\n"
+"Om du är säker på att din iPod är riktigt monterad på %s', kanske den inte "
+"är initierad för användning. I så fall kan gtkpod initiera den åt dig.\n"
+"\n"
+"Vill du skapa katalogstrukturen nu?"
 
-#: ../src/file_itunesdb.c:1180
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr "Hittade inte iPod-katalogstrykturen"
+
+#: ../src/file_itunesdb.c:892
+msgid "Create directory structure"
+msgstr "Skapa katalogstruktur"
+
+#: ../src/file_itunesdb.c:1198
 #, 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:1195
+#: ../src/file_itunesdb.c:1213
 msgid "Aborted writing of extended info.\n"
 msgstr "Avbröt skrivning av utökad information.\n"
 
-#: ../src/file_itunesdb.c:1397
+#: ../src/file_itunesdb.c:1415
 #, c-format
 msgid "%d%%"
 msgstr "%d %%"
 
-#: ../src/file_itunesdb.c:1411
+#: ../src/file_itunesdb.c:1429
 #, c-format
 msgid "%d%% (%d/%d  %d:%02d:%02d left)"
 msgstr "%d %% (%d/%d  %d:%02d:%02d kvar)"
 
-#: ../src/file_itunesdb.c:1463
+#: ../src/file_itunesdb.c:1481
 msgid "Status: Deleting File"
 msgstr "Status: Tar bort fil"
 
-#: ../src/file_itunesdb.c:1524
+#: ../src/file_itunesdb.c:1542
 #, c-format
 msgid ""
 "Could not remove the following file: '%s'\n"
@@ -3794,7 +3687,7 @@
 "Kunde inte ta bort följande fil: '%s'\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1632
+#: ../src/file_itunesdb.c:1651
 msgid ""
 "The following track could not be converted successfully:\n"
 "\n"
@@ -3808,7 +3701,7 @@
 "Följande spår kunde inte konverteras med lyckat resultat:\n"
 "\n"
 
-#: ../src/file_itunesdb.c:1642
+#: ../src/file_itunesdb.c:1661
 msgid ""
 "The following track could not be transferred successfully:\n"
 "\n"
@@ -3826,12 +3719,13 @@
 #. modal,
 #. gint id,
 #. gboolean modal,
-#: ../src/file_itunesdb.c:1651 ../src/misc_confirm.c:70
+#: ../src/file_itunesdb.c:1670 ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
 msgid "Warning"
 msgstr "Varning"
 
 #. title
-#: ../src/file_itunesdb.c:1652
+#: ../src/file_itunesdb.c:1671
 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 "
@@ -3841,22 +3735,22 @@
 "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:1715
+#: ../src/file_itunesdb.c:1734
 #, c-format
 msgid "Status: Copying track"
 msgstr "Status: Kopierar spår"
 
-#: ../src/file_itunesdb.c:1721
+#: ../src/file_itunesdb.c:1740
 #, c-format
 msgid "Status: Waiting for conversion to complete"
 msgstr "Status: Väntar på att konvertering ska bli klar"
 
-#: ../src/file_itunesdb.c:1725
+#: ../src/file_itunesdb.c:1744
 #, c-format
 msgid "Status: Finished transfer"
 msgstr "Status: Överföring klar"
 
-#: ../src/file_itunesdb.c:1770
+#: ../src/file_itunesdb.c:1789
 #, c-format
 msgid ""
 "One track could not be transferred because your iPod is full. Either delete "
@@ -3875,24 +3769,34 @@
 "spår eller skapa utrymme på iPod på något annat sätt innan iPod matas ut "
 "igen."
 
-#: ../src/file_itunesdb.c:1852
+#: ../src/file_itunesdb.c:1871
 #, 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"
+"If you skip storing, you can import the existing database before calling "
+"this function again.\n"
 msgstr ""
 "Du importerade inte befintlig iTunes databas ('%s'). Det är troligtvis "
 "felaktigt och orsakar förlust av den befintliga databasen.\n"
 "\n"
-"Klicka på 'Ok' om du vill fortsätta ändå eller 'Avbryt' för att avbryta "
-"lagringen. Om du avbryter, kan du importera befintlig databas innan du "
+"Om du hoppar över lagring, kan du importera befintlig databas innan du "
 "använder den här funktionen igen.\n"
 
-#: ../src/file_itunesdb.c:1887
+#: ../src/file_itunesdb.c:1875 ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr "Befintlig iTunes-databas importerades inte"
+
+#: ../src/file_itunesdb.c:1877 ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr "Fortsätt ändå"
+
+#: ../src/file_itunesdb.c:1878
+msgid "Skip storing"
+msgstr "Hoppa över lagring"
+
+#: ../src/file_itunesdb.c:1909
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -3900,87 +3804,68 @@
 "Katalogstrukturen i iPod måste finnas innan synkronisering av iPod kan "
 "utföras.\n"
 
-#: ../src/file_itunesdb.c:1896
+#: ../src/file_itunesdb.c:1918
 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:1914
+#: ../src/file_itunesdb.c:1936
 #, c-format
 msgid "Now writing database '%s'. Please wait..."
 msgstr "Skriver nu databas '%s'. Vänta..."
 
-#: ../src/file_itunesdb.c:1963
+#: ../src/file_itunesdb.c:1985
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "Filen med utökad information inte borttagen: '%s'"
 
-#: ../src/file_itunesdb.c:2070
+#: ../src/file_itunesdb.c:2092
 #, c-format
 msgid "%s: Database saved"
 msgstr "%s: Databas sparad"
 
-#: ../src/file_itunesdb.c:2074
+#: ../src/file_itunesdb.c:2096
 #, c-format
 msgid "%s: Changes saved"
 msgstr "%s: Ändringar sparade"
 
-#: ../src/fileselection.c:129
+#: ../src/fileselection.c:142 ../src/fileselection.c:583
 msgid "Successfully added files"
 msgstr "Filer tillagda med lyckat resultat"
 
-#: ../src/fileselection.c:131
+#: ../src/fileselection.c:144 ../src/fileselection.c:585
 msgid "Some files were not added successfully"
 msgstr "Vissa filer kunde inte läggas till med lyckat resultat"
 
-#: ../src/fileselection.c:164 ../src/fileselection.c:305
-#: ../src/fileselection.c:792
+#: ../src/fileselection.c:176 ../src/fileselection.c:276
+#: ../src/fileselection.c:601
 msgid "Please select a playlist or repository before adding tracks."
 msgstr "Välj en spellista eller arkiv innan spår läggs till."
 
-#: ../src/fileselection.c:175 ../src/fileselection.c:314
-#: ../src/fileselection.c:803
+#: ../src/fileselection.c:187 ../src/fileselection.c:285
 msgid "Please load the iPod before adding tracks."
 msgstr "Ladda iPod innan spår läggs till."
 
-#: ../src/fileselection.c:185
+#: ../src/fileselection.c:197
 #, c-format
 msgid "Add files to '%s'"
 msgstr "Lägg till filer i '%s'"
 
-#: ../src/fileselection.c:189
+#: ../src/fileselection.c:201
 #, c-format
 msgid "Add files to '%s/%s'"
 msgstr "Lägg till filer i '%s/%s'"
 
 #. Create window title
-#: ../src/fileselection.c:322
+#: ../src/fileselection.c:293
 #, 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:378
+#: ../src/fileselection.c:319
 msgid "Set Cover"
 msgstr "Ange omslag"
 
-#: ../src/fileselection.c:816
-#, c-format
-msgid "Add directories to '%s'"
-msgstr "Lägg till kataloger i '%s'"
-
-#: ../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:1106
-msgid "Cancel"
-msgstr "Avbryt"
-
 #: ../src/flacfile.c:62
 #, c-format
 msgid "'%s' does not appear to be an FLAC audio file.\n"
@@ -3991,7 +3876,7 @@
 msgid "Error retrieving tags for '%s'.\n"
 msgstr "Fel vid hämtning av taggar för '%s'.\n"
 
-#: ../src/flacfile.c:165
+#: ../src/flacfile.c:193
 #, c-format
 msgid ""
 "Import of '%s' failed: FLAC not supported without the FLAC library. You must "
@@ -4000,7 +3885,7 @@
 "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:171
+#: ../src/flacfile.c:199
 #, c-format
 msgid ""
 "FLAC metadata update for '%s' failed: FLAC not supported without the FLAC "
@@ -4069,95 +3954,8 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: väljaren `-W %s' tillåter inte något argument\n"
 
-#: ../src/info.c:383
-msgid "n/c"
-msgstr "okänt"
-
-#: ../src/info.c:388 ../src/info.c:838
-msgid "offline"
-msgstr "nerkopplad"
-
-#: ../src/info.c:486
-#, c-format
-msgid " P:%d T:%d/%d"
-msgstr " L:%d S:%d/%d"
-
-#: ../src/info.c:780
-msgid "B"
-msgstr "byte"
-
-#: ../src/info.c:780
-msgid "kB"
-msgstr "Kibyte"
-
-#: ../src/info.c:780
-msgid "TB"
-msgstr "Tibyte"
-
-#: ../src/info.c:823
-#, c-format
-msgid " %s Free"
-msgstr " %s fritt"
-
-#: ../src/info.c:828
-#, c-format
-msgid " %s Pending"
-msgstr " %s återstår"
-
-#: ../src/info.c:833
-msgid " disconnected"
-msgstr " nerkopplad"
-
-#: ../src/info.c:884
-msgid "No database or playlist selected"
-msgstr "Ingen databas eller spellista markerad"
-
-#: ../src/info.c:889
-msgid "No tracks selected"
-msgstr "Inga spår markerade"
-
-#: ../src/info.c:894
-msgid "No playlist selected"
-msgstr "Ingen spellista markerad"
-
-#: ../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 "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
-#, c-format
-msgid "Error initialising iPod: %s\n"
-msgstr "Fel vid initiering av iPod: %s\n"
-
-#: ../src/ipod_init.c:366
-msgid "Error initialising iPod, unknown error\n"
-msgstr "Fel vid initiering av iPod: okänt fel\n"
-
-#: ../src/ipod_init.c:422
-#, c-format
-msgid "<b>Please select your iPod model at </b><i>%s</i>"
-msgstr "<b>Välj iPod-modell på </b><i>%s</i>"
-
-#: ../src/ipod_init.c:463
+#: ../src/help.c:48
 msgid ""
-"Could not determine the model you selected -- this could be a bug or "
-"incompatibilty in the GTK+ or glade library.\n"
-"\n"
-msgstr ""
-"Kunde inte avgöra vald modell: Detta kan vara ett fel eller en "
-"inkompatibilitet i biblioteken GTK+ eller glade.\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"
@@ -4166,7 +3964,7 @@
 "Jorg Schuler (jcsjcs snabela users punkt sourceforge punkt net)\n"
 "Corey Donohoe (atmos snabela atmos punkt org)\n"
 
-#: ../src/misc.c:74
+#: ../src/help.c:52
 msgid ""
 "Patches were supplied by the following people (list may be incomplete -- "
 "please contact me)\n"
@@ -4174,21 +3972,23 @@
 "Programfixar har tillhandahållits av följande personer (listan kan vara "
 "ofullständig: kontakta mig då gärna)\n"
 
-#: ../src/misc.c:75
+#: ../src/help.c:53
 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)"
+msgstr ""
+"Ramesh Dharan: Redigera flera (redigera taggar för flera spår på en gång)"
 
-#: ../src/misc.c:76
+#: ../src/help.c:54
 msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
 msgstr ""
 "Hiroshi Kawashima: Funktion för automatisk detektering av japansk "
 "teckenkodning"
 
-#: ../src/misc.c:77
+#: ../src/help.c:55
 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"
+msgstr ""
+"Adrian Ulrich: överföring av spellistans kod från mktunes.pl till itunesdb.c"
 
-#: ../src/misc.c:78
+#: ../src/help.c:56
 msgid ""
 "Walter Bell: correct handling of DND URIs with escaped characters and/or cr/"
 "newlines at the end"
@@ -4196,15 +3996,15 @@
 "Walter Bell: riktig hantering av drag och släpp information med "
 "specialtecken och/eller returtecken/nyrader i slutet"
 
-#: ../src/misc.c:79
+#: ../src/help.c:57
 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:80
+#: ../src/help.c:58
 msgid "Chris Cutler: automatic creation of various playlist types"
 msgstr "Chris Cutler: skapa olika sorters spellistor automatiskt"
 
-#: ../src/misc.c:81
+#: ../src/help.c:59
 msgid ""
 "Graeme Wilford: reading and writing of the 'Composer' ID3 tags, progress "
 "dialogue during sync"
@@ -4212,7 +4012,7 @@
 "Graeme Wilford: läsning och skrivning av ID3-taggar för 'Kompositör', "
 "förloppsdialog under synkronisering"
 
-#: ../src/misc.c:82
+#: ../src/help.c:60
 msgid ""
 "Edward Matteucci: debugging, special playlist creation, most of the volume "
 "normalizing code"
@@ -4220,25 +4020,26 @@
 "Edward Matteucci: felsökning, skapa speciella spellistor, den största delen "
 "av koden för volymnormalisering"
 
-#: ../src/misc.c:83
+#: ../src/help.c:61
 msgid "Jens Lautenbach: some optical improvements"
 msgstr "Jens Lautenbach: några visuella förbättringar"
 
-#: ../src/misc.c:84
+#: ../src/help.c:62
 msgid "Alex Tribble: iPod eject patch"
 msgstr "Alex Tribble: programfix för att mata ut iPod"
 
-#: ../src/misc.c:85
+#: ../src/help.c:63
 msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
 msgstr "Yaroslav Halchenko: hantering av övergivna filer och saknade spår"
 
-#: ../src/misc.c:86
-msgid "Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
+#: ../src/help.c:64
+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"
 
-#: ../src/misc.c:87
+#: ../src/help.c:65
 msgid ""
 "Ero Carrera: Filename validation and quick sync when copying tracks from the "
 "iPod"
@@ -4246,25 +4047,25 @@
 "Ero Carrera: validering av filnamn och snabbsynkronisering när spår kopieras "
 "från iPod"
 
-#: ../src/misc.c:88
+#: ../src/help.c:66
 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"
 
-#: ../src/misc.c:89
+#: ../src/help.c:67
 msgid "Armando Atienza: Support with external playcounts"
 msgstr "Armando Atienza: stöd med externa spelningsantal"
 
-#: ../src/misc.c:90
+#: ../src/help.c:68
 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:91
+#: ../src/help.c:69
 msgid "Jim Hall: Decent INSTALL file"
 msgstr "Jim Hall: hygglig INSTALL-fil"
 
-#: ../src/misc.c:92
+#: ../src/help.c:70
 msgid ""
 "Juergen Helmers, Markus Gaugusch: Conversion scripts to sync calendar/"
 "contacts to the iPod"
@@ -4273,21 +4074,23 @@
 "kalender och kontakter i iPod"
 
 #. J"urgen!
-#: ../src/misc.c:93
+#: ../src/help.c:71
 msgid "Flavio Stanchina: bugfixes"
 msgstr "Flavio Stanchina: felrättningar"
 
-#: ../src/misc.c:94
+#: ../src/help.c:72
 msgid ""
 "Chris Micacchi: when sorting ignore 'the' and similar at the beginning of "
 "the title"
-msgstr "Chris Micacchi: ignorera 'the' och liknande i titelns början vid sortering"
+msgstr ""
+"Chris Micacchi: ignorera 'the' och liknande i titelns början vid sortering"
 
-#: ../src/misc.c:95
+#: ../src/help.c:73
 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)"
+msgstr ""
+"Steve Jay: använd statvfs() istället för df (bättre flyttbarhet, snabbare)"
 
-#: ../src/misc.c:97
+#: ../src/help.c:75
 msgid ""
 "Christoph Kunz: address compatibility issues when writing id3v2.4 type mp3 "
 "tags"
@@ -4295,7 +4098,7 @@
 "Christoph Kunz: hantering av kompatibilitetsfrågor när MP3-taggar av typ "
 "id3v2.4 skrivs"
 
-#: ../src/misc.c:99
+#: ../src/help.c:77
 msgid ""
 "James Liggett:\n"
 "replacement of old GTK file selection dialogs with new GTK filechooser "
@@ -4306,31 +4109,31 @@
 "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:103
+#: ../src/help.c:81
 msgid "Daniel Kercher: sync scripts for abook and webcalendar"
 msgstr "Daniel Kercher: synkroniseringsskript för abook och webbkalender"
 
-#: ../src/misc.c:105
+#: ../src/help.c:83
 msgid "Clinton Gormley: sync scripts for thunderbird"
 msgstr "Clinton Gormley: synkroniseringsskript för thunderbird"
 
-#: ../src/misc.c:107
+#: ../src/help.c:85
 msgid "Sebastien Beridot: sync script for ldif addressbook format"
 msgstr "Sebastien Beridot: synkroniseringsskript för LDIF-adressboksformat"
 
-#: ../src/misc.c:109
+#: ../src/help.c:87
 msgid "Sebastian Scherer: sync script for kNotes"
 msgstr "Sebastian Scherer: synkroniseringsskript för Knotes"
 
-#: ../src/misc.c:111
+#: ../src/help.c:89
 msgid "Nick Piper: sync script for Palm, type-ahead search"
 msgstr "Nick Piper: synkroniseringsskript för Palm, sökning under inskrivning"
 
-#: ../src/misc.c:113
+#: ../src/help.c:91
 msgid "Uwe Hermann: help with support for iPod Video"
 msgstr "Uwe Hermann: hjälp med stöd för iPod-video"
 
-#: ../src/misc.c:115
+#: ../src/help.c:93
 msgid ""
 "Iain Benson: support for compilation tag in mp3 files and separate display "
 "of compilations in the sort tab."
@@ -4338,7 +4141,7 @@
 "Iain Benson: stöd för samlingstaggen i mp3-filer och separat visning av "
 "samlingar i sorteringsfliken."
 
-#: ../src/misc.c:116
+#: ../src/help.c:94
 msgid ""
 "Nicolas Chariot: icons of buttons\n"
 "\n"
@@ -4346,11 +4149,11 @@
 "Nicolas Chariot: ikoner för knappar\n"
 "\n"
 
-#: ../src/misc.c:118
+#: ../src/help.c:96
 msgid "This program borrows code from the following projects:"
 msgstr "Detta program lånar kod från följande projekt:"
 
-#: ../src/misc.c:119
+#: ../src/help.c:97
 msgid ""
 "gnutools: (mktunes.pl, ported to C) reading and writing of iTunesDB  (http://"
 "www.gnu.org/software/gnupod/)"
@@ -4358,79 +4161,86 @@
 "gnutools: (mktunes.pl, överförd till C) läsning och skrivning av iTunes "
 "databas (http://www.gnu.org/software/gnupod/)"
 
-#: ../src/misc.c:120
+#: ../src/help.c:98
 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 av Samuel Wood (sam punkt wood snabela gmail punkt "
-"com): viss kod för smarta spellistor är baserad på hans C++ klasser."
+"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:121
+#: ../src/help.c:99
 msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
-msgstr "mp3info: detektering av MP3-spelningslängd (http://ibiblio.org/mp3info/)"
+msgstr ""
+"mp3info: detektering av MP3-spelningslängd (http://ibiblio.org/mp3info/)"
 
-#: ../src/misc.c:122
+#: ../src/help.c:100
 msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
 msgstr ""
-"xmms: katalogbläddring, detektering av MP3-spelningslängd "
-"(http://www.xmms.org)"
+"xmms: katalogbläddring, detektering av MP3-spelningslängd (http://www.xmms."
+"org)"
 
-#: ../src/misc.c:124
+#: ../src/help.c:102
 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/)."
+msgstr ""
+"Det grafiska gränssnittet skapades med hjälp av glade-2 (http://glade.gnome."
+"org/)."
 
-#: ../src/misc.c:128
+#: ../src/help.c:106
 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:129
+#: ../src/help.c:107
 msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
 msgstr "Franska: Éric Lassauge (rpmfarm snabela free punkt fr)"
 
-#: ../src/misc.c:130
+#: ../src/help.c:108
 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
+#: ../src/help.c:109
 msgid "German: Kai-Ove"
 msgstr "Tyska: Kai-Ove"
 
-#: ../src/misc.c:132
+#: ../src/help.c:110
 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)"
+#: ../src/help.c:111
+msgid ""
+"Italian: Edward Matteucci (edward_matteucc at users dot sourceforge dot net)"
 msgstr ""
 "Italienska: Edward Matteucci (edward_matteucc snabela users punkt "
 "sourceforge punkt net)"
 
-#: ../src/misc.c:134
+#: ../src/help.c:112
 msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
 msgstr "Italienska: Daniele Forsi (dforsi snabela gmail punkt com)"
 
-#: ../src/misc.c:135
+#: ../src/help.c:113
 msgid "Japanese: Ayako Sano"
 msgstr "Japanska: Ayako Sano"
 
-#: ../src/misc.c:136
+#: ../src/help.c:114
 msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
-msgstr "Japanska: Kentaro Fukuchi (fukuchi snabela users punkt sourceforge punkt net)"
+msgstr ""
+"Japanska: Kentaro Fukuchi (fukuchi snabela users punkt sourceforge punkt net)"
 
-#: ../src/misc.c:137
+#: ../src/help.c:115
 msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
 msgstr "Rumänska: Alex Eftimie (alexeftimie snabela gmail punkt com)"
 
-#: ../src/misc.c:138
+#: ../src/help.c:116
 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)"
+msgstr ""
+"Spanska: Alejandro Lamas Daviña (alejandro.lamas snabela ific punkt uv punkt "
+"es)"
 
-#: ../src/misc.c:139
+#: ../src/help.c:117
 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
+#: ../src/help.c:122
 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"
@@ -4461,7 +4271,7 @@
 "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:159
+#: ../src/help.c:137
 msgid ""
 "© 2002-2007\n"
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
@@ -4471,31 +4281,190 @@
 "Jorg Schuler <jcsjcs at users.sourceforge.net>\n"
 "Corey Donohoe <atmos at atmos.org>"
 
-#: ../src/misc.c:167
+#: ../src/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr "(använder libgpod %s)"
+
+#: ../src/help.c:143 ../src/help.c:148
 msgid "Cross-platform multilingual interface to Apple's iPod™"
 msgstr "Plattformsoberoende flerspråkigt gränssnitt för Apples iPod™"
 
-#: ../src/misc.c:934
+#: ../src/info.c:359 ../src/infodlg.c:190
+msgid "n/c"
+msgstr "okänt"
+
+#: ../src/info.c:364 ../src/info.c:852 ../src/infodlg.c:193
+msgid "offline"
+msgstr "nerkopplad"
+
+#: ../src/info.c:500
 #, c-format
-msgid "Could not process '%s' (no filename available)"
-msgstr "Kunde inte behandla '%s' (inget filnamn tillgängligt)"
+msgid " P:%d T:%d/%d"
+msgstr " L:%d S:%d/%d"
 
-#: ../src/misc.c:1088
+#: ../src/info.c:794
+msgid "B"
+msgstr "byte"
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr "Kibyte"
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr "Tibyte"
+
+#: ../src/info.c:837
 #, c-format
-msgid "Unknown token '%%%c' in template '%s'"
-msgstr "Okänd beteckning '%%%c' i mallen '%s'"
+msgid " %s Free"
+msgstr " %s fritt"
 
-#: ../src/misc.c:1171
+#: ../src/info.c:842
 #, c-format
+msgid " %s Pending"
+msgstr " %s återstår"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr " nerkopplad"
+
+#: ../src/info.c:898
+msgid "No database or playlist selected"
+msgstr "Ingen databas eller spellista markerad"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "Inga spår markerade"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "Ingen spellista markerad"
+
+#: ../src/info.c:913
+msgid "No iPod or iPod playlist selected"
+msgstr "Ingen iPod eller iPod-spellista markerad"
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"Totalt\n"
+"(iPod)"
+
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"Totalt\n"
+"(lokalt)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"Markerad\n"
+"spellista"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr ""
+"Visade\n"
+"spår"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"Markerade\n"
+"spår"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "Antal spår"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "Filstorlek"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "Antal spellistor"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "Borttagna spår"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "Filstorlek (borttagna)"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "Spår som inte överförts"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "Filstorlek (inte överförda)"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "Verkligt ledigt utrymme"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "Välj eller skriv in modell"
+
+#: ../src/ipod_init.c:81 ../src/repository.c:560 ../src/repository.c:2374
+msgid "Select mountpoint"
+msgstr "Markera monteringspunkt"
+
+#: ../src/ipod_init.c:362
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "Fel vid initiering av iPod: %s\n"
+
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr "Fel vid initiering av iPod: okänt fel\n"
+
+#: ../src/ipod_init.c:425
+#, c-format
+msgid "<b>Please select your iPod model at </b><i>%s</i>"
+msgstr "<b>Välj iPod-modell på </b><i>%s</i>"
+
+#: ../src/ipod_init.c:466
+msgid ""
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
+msgstr ""
+"Kunde inte avgöra vald modell: Detta kan vara ett fel eller en "
+"inkompatibilitet i biblioteken GTK+ eller glade.\n"
+
+#: ../src/misc.c:864
+#, c-format
+msgid "Could not process '%s' (no filename available)"
+msgstr "Kunde inte behandla '%s' (inget filnamn tillgängligt)"
+
+#: ../src/misc.c:1101
+#, 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:1257
+#: ../src/misc.c:1187
 #, c-format
 msgid "Error creating %s: %s\n"
 msgstr "Fel när %s skulle skapas: %s\n"
 
-#: ../src/misc.c:1691
+#: ../src/misc.c:1642
 #, c-format
 msgid ""
 "Writing preferences file '%s' failed (%s).\n"
@@ -4504,11 +4473,11 @@
 "Skrivning av inställningsfilen '%s' misslyckades (%s).\n"
 "\n"
 
-#: ../src/misc.c:1693
+#: ../src/misc.c:1644
 msgid "unspecified error"
 msgstr "ospecificerat fel"
 
-#: ../src/misc.c:1701
+#: ../src/misc.c:1652
 #, c-format
 msgid ""
 "Writing preferences to the iPod (%s) failed: could not get path to Control "
@@ -4524,7 +4493,7 @@
 msgid "The following has occurred:"
 msgstr "Följande har inträffat:"
 
-#: ../src/misc_confirm.c:122
+#: ../src/misc_confirm.c:156
 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 "
@@ -4540,28 +4509,31 @@
 "Är du säker på att du vill ta bort följande spår helt från iPod? Antal "
 "spellistor som spåret finns i anges inom parentes."
 
-#: ../src/misc_confirm.c:126
+#: ../src/misc_confirm.c:160
 msgid "Delete Track Completely from iPod?"
 msgid_plural "Delete Tracks Completely from iPod?"
 msgstr[0] "Ta bort spår helt från iPod?"
 msgstr[1] "Ta bort spår helt från iPod?"
 
-#: ../src/misc_confirm.c:137 ../src/misc_confirm.c:178
+#: ../src/misc_confirm.c:171 ../src/misc_confirm.c:212
 #, 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
+#: ../src/misc_confirm.c:175 ../src/misc_confirm.c:216
 msgid "Remove Track From Playlist?"
 msgid_plural "Remove Tracks From Playlist?"
 msgstr[0] "Ta bort spår från spellista?"
 msgstr[1] "Ta bort spår från spellista?"
 
-#: ../src/misc_confirm.c:163
+#: ../src/misc_confirm.c:197
 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 "
@@ -4577,13 +4549,13 @@
 "Är du säker på att du vill ta bort följande spår helt från hårddisken? Antal "
 "spellistor som spåret finns i anges inom parentes."
 
-#: ../src/misc_confirm.c:167
+#: ../src/misc_confirm.c:201
 msgid "Delete Track from Harddisk?"
 msgid_plural "Delete Tracks from Harddisk?"
 msgstr[0] "Ta bort spår från hårddisk?"
 msgstr[1] "Ta bort spår från hårddisk?"
 
-#: ../src/misc_confirm.c:192
+#: ../src/misc_confirm.c:226
 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 "
@@ -4599,55 +4571,55 @@
 "Är du säker på att du vill ta bort följande spår helt från den lokala "
 "databasen? Antal spellistor som spåret finns i anges inom parentes."
 
-#: ../src/misc_confirm.c:196
+#: ../src/misc_confirm.c:230
 msgid "Remove Track from Local Database?"
 msgid_plural "Remove Tracks from Local Database?"
 msgstr[0] "Ta bort spår från lokal databas?"
 msgstr[1] "Ta bort spår från lokal databas?"
 
-#: ../src/misc_confirm.c:261
+#: ../src/misc_confirm.c:295
 #, c-format
 msgid "Deleted one track completely from iPod"
 msgid_plural "Deleted %d tracks completely from iPod"
 msgstr[0] "Tog bort ett spår helt från iPod"
 msgstr[1] "Tog bort %d spår helt från iPod"
 
-#: ../src/misc_confirm.c:267 ../src/misc_confirm.c:291
+#: ../src/misc_confirm.c:301 ../src/misc_confirm.c:325
 #, c-format
 msgid "Deleted %d track from playlist '%s'"
 msgid_plural "Deleted %d tracks from playlist '%s'"
 msgstr[0] "Tog bort %d spår från spellistan '%s'"
 msgstr[1] "Tog bort %d spår från spellistan '%s'"
 
-#: ../src/misc_confirm.c:285
+#: ../src/misc_confirm.c:319
 #, c-format
 msgid "Deleted one track from harddisk"
 msgid_plural "Deleted %d tracks from harddisk"
 msgstr[0] "Tog bort ett spår från hårddisken"
 msgstr[1] "Tog bort %d spår från hårddisken"
 
-#: ../src/misc_confirm.c:297
+#: ../src/misc_confirm.c:331
 #, c-format
 msgid "Deleted track from local database"
 msgid_plural "Deleted %d tracks from local database"
 msgstr[0] "Tog bort spår från den lokala databasen"
 msgstr[1] "Tog bort %d spår från den lokala databasen"
 
-#: ../src/misc_confirm.c:442
+#: ../src/misc_confirm.c:476
 msgid "Cannot remove entry 'All'"
 msgstr "Kan inte ta bort raden 'Alla'"
 
-#: ../src/misc_confirm.c:536
+#: ../src/misc_confirm.c:570
 #, c-format
 msgid "Removed all %d tracks from the iPod"
 msgstr "Tog bort alla %d spår från iPod"
 
-#: ../src/misc_confirm.c:541
+#: ../src/misc_confirm.c:575
 #, c-format
 msgid "Removed all podcasts from the iPod"
 msgstr "Tog bort alla podradiosändningar från iPod"
 
-#: ../src/misc_confirm.c:550 ../src/misc_confirm.c:624
+#: ../src/misc_confirm.c:584 ../src/misc_confirm.c:658
 #, c-format
 msgid "Deleted playlist '%s' including %d member track"
 msgid_plural "Deleted playlist '%s' including %d member tracks"
@@ -4655,34 +4627,34 @@
 msgstr[1] "Tog bort spellistan '%s' inklusive %d ingående spår"
 
 #. first use playlist name
-#: ../src/misc_confirm.c:566 ../src/misc_confirm.c:640
+#: ../src/misc_confirm.c:600 ../src/misc_confirm.c:674
 #, c-format
 msgid "Deleted playlist '%s'"
 msgstr "Tog bort spellistan '%s'"
 
-#: ../src/misc_confirm.c:600
+#: ../src/misc_confirm.c:634
 #, 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] "Tog bort spellistan '%s' inklusive %d ingående spår från hårddisken"
 msgstr[1] "Tog bort spellistan '%s' inklusive %d ingående spår från hårddisken"
 
-#: ../src/misc_confirm.c:617
+#: ../src/misc_confirm.c:651
 #, c-format
 msgid "Removed all %d tracks from the database"
 msgstr "Tog bort alla %d spår från databasen"
 
-#: ../src/misc_confirm.c:695
+#: ../src/misc_confirm.c:729
 #, 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
+#: ../src/misc_confirm.c:734
 #, 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?"
 
-#: ../src/misc_confirm.c:708
+#: ../src/misc_confirm.c:742
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and the following track "
@@ -4699,12 +4671,12 @@
 "Ä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."
 
-#: ../src/misc_confirm.c:719 ../src/misc_confirm.c:774
+#: ../src/misc_confirm.c:753 ../src/misc_confirm.c:808
 #, c-format
 msgid "Are you sure you want to delete the playlist '%s'?"
 msgstr "Är du säker på att du vill ta bort spellistan '%s'?"
 
-#: ../src/misc_confirm.c:745
+#: ../src/misc_confirm.c:779
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4721,12 +4693,12 @@
 "Är du säker på att du vill ta bort spellistan '%s' och följande spår helt "
 "från hårddisken? Antal spellistor som spåren finns i anges inom parentes."
 
-#: ../src/misc_confirm.c:753
+#: ../src/misc_confirm.c:787
 #, 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?"
 
-#: ../src/misc_confirm.c:762
+#: ../src/misc_confirm.c:796
 #, c-format
 msgid ""
 "Are you sure you want to delete playlist '%s' and remove the following track "
@@ -4743,14 +4715,26 @@
 "Är du säker på att du vill ta bort spellistan '%s' och följande spår helt "
 "från databasen? Antal spellistor som spåren finns i anges inom parentes."
 
-#: ../src/misc_confirm.c:841
+#: ../src/misc_confirm.c:869
 msgid ""
-"Data has been changed and not been saved.\n"
-"OK to exit gtkpod?"
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
+"changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
 msgstr ""
-"Data har ändrats och inte sparats.\n"
-"Ok att avsluta gtkpod?"
+"Data har ändrats och inte sparats. Om du avslutar gtkpod, kommer alla "
+"osparade ändringar att gå förlorade.\n"
+"\n"
+"Vill du spara dina ändringar först?"
 
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr "Spara ändringar innan du avslutar?"
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr "Avsluta utan att spara"
+
 #: ../src/misc_conversion.c:66
 msgid "File type"
 msgstr "Filtyp"
@@ -4907,142 +4891,153 @@
 msgid "Gapless Track Flag"
 msgstr "Flagga för spår utan mellanrum"
 
-#: ../src/misc_conversion.c:126
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
+msgstr "Sångtext"
+
+#: ../src/misc_conversion.c:127
 msgid "Name of file on PC, if available"
 msgstr "Filens namn på PC:n, om tillgängligt"
 
-#: ../src/misc_conversion.c:127
+#: ../src/misc_conversion.c:128
 msgid "Name of file on the iPod"
 msgstr "Filens namn på iPod"
 
 #. 10
-#: ../src/misc_conversion.c:129
+#: ../src/misc_conversion.c:130
 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:130
+#: ../src/misc_conversion.c:131
 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:136
+#: ../src/misc_conversion.c:137
 msgid "Beats per minute"
 msgstr "Taktslag per minut"
 
-#: ../src/misc_conversion.c:137
+#: ../src/misc_conversion.c:138
 msgid "Number of times the track has been played"
 msgstr "Antal gånger spåret har spelats"
 
-#: ../src/misc_conversion.c:138
+#: ../src/misc_conversion.c:139
 msgid "Star rating from 0 to 5"
 msgstr "Betyg med stjärnor från 0 till 5"
 
-#: ../src/misc_conversion.c:139
+#: ../src/misc_conversion.c:140
 msgid "Date and time track has been added"
 msgstr "Datum och tid då spåret lades till"
 
 #. 20
-#: ../src/misc_conversion.c:140
+#: ../src/misc_conversion.c:141
 msgid "Date and time track has last been played"
 msgstr "Datum och tid då spåret senast spelades"
 
-#: ../src/misc_conversion.c:141
+#: ../src/misc_conversion.c:142
 msgid "Date and time track has last been modified"
 msgstr "Datum och tid då spåret senast ändrades"
 
-#: ../src/misc_conversion.c:142
+#: ../src/misc_conversion.c:143
 msgid "Manual volume adjust"
 msgstr "Manuell volymjustering"
 
-#: ../src/misc_conversion.c:143
+#: ../src/misc_conversion.c:144
 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:146
+#: ../src/misc_conversion.c:147
 msgid "CD Nr. and total number of CDS in set"
 msgstr "Cd-nummer och totalt antal cd i albumet"
 
-#: ../src/misc_conversion.c:149
-msgid "The category (e.g. 'Technology' or 'Music') where the podcast was located."
+#: ../src/misc_conversion.c:150
+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:150
+#: ../src/misc_conversion.c:151
 msgid "Accessible by selecting the center button on the iPod."
 msgstr "Kan kommas åt genom att trycka på iPod-mittenknappen."
 
-#: ../src/misc_conversion.c:154
+#: ../src/misc_conversion.c:155
 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)"
 
 #. 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
+#: ../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 ../src/misc_conversion.c:174
 msgid "Used for sorting on the iPod"
 msgstr "Används för sortering på iPod"
 
-#: ../src/misc_conversion.c:735
+#: ../src/misc_conversion.c:737
 #, 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:745
+#: ../src/misc_conversion.c:747
 #, 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:762
+#: ../src/misc_conversion.c:764
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "Webbadressen '%s' är ogiltig"
 
-#: ../src/misc_conversion.c:774
+#: ../src/misc_conversion.c:776
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "Värddator för webbadressen '%s' är ogiltig"
 
-#: ../src/misc_conversion.c:790
+#: ../src/misc_conversion.c:792
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "Webbadressen '%s' innehåller felaktiga specialtecken"
 
-#: ../src/misc_playlist.c:67 ../src/misc_playlist.c:94
-#: ../src/misc_playlist.c:429
+#: ../src/misc_playlist.c:71 ../src/misc_playlist.c:108
+msgid "Please load the iPod before adding playlists."
+msgstr "Ladda iPod innan spellistor läggs till."
+
+#: ../src/misc_playlist.c:77 ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
 msgid "Please enter a name for the new playlist"
 msgstr "Skriv in ett namn på den nya spellistan"
 
-#: ../src/misc_playlist.c:154
+#: ../src/misc_playlist.c:174
 msgid "AR:"
 msgstr "AR:"
 
-#: ../src/misc_playlist.c:157
+#: ../src/misc_playlist.c:177
 msgid "AL:"
 msgstr "AL:"
 
-#: ../src/misc_playlist.c:160
+#: ../src/misc_playlist.c:180
 msgid "GE:"
 msgstr "GE:"
 
-#: ../src/misc_playlist.c:163
+#: ../src/misc_playlist.c:183
 msgid "CO:"
 msgstr "KO:"
 
-#: ../src/misc_playlist.c:166
+#: ../src/misc_playlist.c:186
 msgid "YE:"
 msgstr "ÅR:"
 
-#: ../src/misc_playlist.c:194
+#: ../src/misc_playlist.c:214
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../src/misc_playlist.c:272
+#: ../src/misc_playlist.c:292
 #, c-format
 msgid "Random (%d)"
 msgstr "Slumpmässig (%d)"
 
-#: ../src/misc_playlist.c:297
+#: ../src/misc_playlist.c:317
 msgid ""
 "Auto Store of track view disabled.\n"
 "\n"
@@ -5050,11 +5045,11 @@
 "Automatisk lagring av spårvy inaktiverad.\n"
 "\n"
 
-#: ../src/misc_playlist.c:356
+#: ../src/misc_playlist.c:376
 msgid "Not Listed"
 msgstr "Inte listad"
 
-#: ../src/misc_playlist.c:406
+#: ../src/misc_playlist.c:426
 #, c-format
 msgid "Created playlist '%s' with %d track."
 msgid_plural "Created playlist '%s' with %d tracks."
@@ -5062,92 +5057,94 @@
 msgstr[1] "Skapade spellistan '%s' med %d spår."
 
 #. n==0
-#: ../src/misc_playlist.c:417
+#: ../src/misc_playlist.c:437
 msgid "No tracks available, playlist not created"
 msgstr "Inga spår tillgängliga, spellistan skapades inte"
 
-#: ../src/misc_playlist.c:543
+#: ../src/misc_playlist.c:563
 #, c-format
 msgid "Most Listened (%d)"
 msgstr "Oftast lyssnade på (%d)"
 
-#: ../src/misc_playlist.c:584
+#: ../src/misc_playlist.c:604
 #, c-format
 msgid "Never Listened"
 msgstr "Aldrig lyssnade på"
 
-#: ../src/misc_playlist.c:624
+#: ../src/misc_playlist.c:644
 #, c-format
 msgid "Best Rated (%d)"
 msgstr "Med bäst betyg (%d)"
 
-#: ../src/misc_playlist.c:666
+#: ../src/misc_playlist.c:686
 msgid "Unrated tracks"
 msgstr "Spår utan betyg"
 
-#: ../src/misc_playlist.c:671
+#: ../src/misc_playlist.c:691
 #, c-format
 msgid "Rated %d"
 msgstr "Betyg %d"
 
-#: ../src/misc_playlist.c:714
+#: ../src/misc_playlist.c:734
 #, c-format
 msgid "Recent (%d)"
 msgstr "Senaste (%d)"
 
-#: ../src/misc_playlist.c:753
+#: ../src/misc_playlist.c:773
 msgid "Last Time"
 msgstr "Sista gången"
 
-#: ../src/misc_playlist.c:844
+#: ../src/misc_playlist.c:864
 msgid "Removal of dangling tracks with no files on PC was canceled."
 msgstr "Borttagning av spår med saknade filer utan filer på PC:n avbröts."
 
-#: ../src/misc_playlist.c:854
+#: ../src/misc_playlist.c:874
 msgid "Handling of dangling tracks with files on PC was canceled."
 msgstr "Hantering av spår med saknade filer som har filer på PC:n avbröts."
 
-#: ../src/misc_playlist.c:882
+#: ../src/misc_playlist.c:902
 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:943
+#: ../src/misc_playlist.c:963
 msgid "Dangling tracks with files on PC were handled."
 msgstr "Spår med saknade filer som har filer på PC:n har hanterats."
 
-#: ../src/misc_playlist.c:976
+#: ../src/misc_playlist.c:996
 msgid "Track"
 msgstr "Spår"
 
-#: ../src/misc_playlist.c:1019
+#: ../src/misc_playlist.c:1035
 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"
+"If you abort the operation, you can import the existing database before "
+"calling this function again.\n"
 msgstr ""
 "Du importerade inte befintlig iTunes databas. Det är troligtvis felaktigt "
 "och orsakar förlust av den befintliga databasen.\n"
 "\n"
-"Klicka på 'Ok' om du vill fortsätta ändå eller 'Avbryt' för att avbryta. Om "
-"du avbryter, kan du importera befintlig databas innan du använder den här "
+"Om du avbryter, kan du importera befintlig databas innan du använder den här "
 "funktionen igen.\n"
 
-#: ../src/misc_playlist.c:1033
+#: ../src/misc_playlist.c:1042
+msgid "Abort operation"
+msgstr "Avbryt åtgärd"
+
+#: ../src/misc_playlist.c:1056
 msgid "Creating a tree of known files"
 msgstr "Skapar träd med kända filer"
 
-#: ../src/misc_playlist.c:1077
+#: ../src/misc_playlist.c:1100
 msgid "Checking iPOD files against known files in DB"
 msgstr "Kontrollerar iPod-filer med kända filer i databasen"
 
-#: ../src/misc_playlist.c:1120
+#: ../src/misc_playlist.c:1143
 msgid "Orphaned"
 msgstr "Övergivna"
 
-#: ../src/misc_playlist.c:1147
+#: ../src/misc_playlist.c:1170
 #, c-format
 msgid ""
 "The following orphaned file had already been added to the iPod again. It "
@@ -5160,12 +5157,12 @@
 "%s\n"
 "\n"
 
-#: ../src/misc_playlist.c:1175
+#: ../src/misc_playlist.c:1198
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Processing..."
 msgstr "Hittade %d övergivna filer och %d spår med saknade filer. Behandlar..."
 
-#: ../src/misc_playlist.c:1199
+#: ../src/misc_playlist.c:1222
 #, c-format
 msgid ""
 "The following dangling track has a file on PC.\n"
@@ -5184,7 +5181,7 @@
 "Klicka på Ok för att överföra filerna vid nästa synkronisering. Avbryt för "
 "att lämna dem som de är."
 
-#: ../src/misc_playlist.c:1204
+#: ../src/misc_playlist.c:1227
 #, c-format
 msgid ""
 "The following dangling track doesn't have file on PC. \n"
@@ -5201,11 +5198,11 @@
 
 #. we want unique window for each
 #. gboolean modal,
-#: ../src/misc_playlist.c:1211
+#: ../src/misc_playlist.c:1234
 msgid "Dangling Tracks"
 msgstr "Spår med saknade filer"
 
-#: ../src/misc_playlist.c:1234
+#: ../src/misc_playlist.c:1257
 #, c-format
 msgid "Found %d orphaned and %d dangling files. Done."
 msgstr "Hittade %d övergivna filer och %d spår med saknade filer. Klar."
@@ -5227,7 +5224,8 @@
 
 #: ../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."
@@ -5240,72 +5238,72 @@
 msgid "Duplicate detection"
 msgstr "Detektering av duplikat"
 
-#: ../src/misc_track.c:1339
+#: ../src/misc_track.c:1347
 msgid "Local Database"
 msgstr "Lokal databas"
 
 #. artwork is set
-#: ../src/misc_track.c:1350
+#: ../src/misc_track.c:1358
 msgid "Embedded or filename was lost"
 msgstr "Inbäddad eller förlorat filnamn"
 
-#: ../src/misc_track.c:1354
+#: ../src/misc_track.c:1362
 msgid "Artwork not set"
 msgstr "Omslagsbild inte angiven"
 
-#: ../src/misc_track.c:1816
+#: ../src/misc_track.c:1836
 #, c-format
 msgid "Could not find source file for '%s'. Track not copied."
 msgstr "Kunde hitta källfilen för '%s'. Spåret kopierades inte."
 
-#: ../src/misc_track.c:2052
+#: ../src/misc_track.c:2072
 #, c-format
 msgid "drag and drop: ignored '%s'\n"
 msgstr "drag och släpp: ignorerade '%s'\n"
 
-#: ../src/mp3file.c:1336
+#: ../src/mp3file.c:1344
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Fel när ID3-fält skulle ändras: %s\n"
 
-#: ../src/mp3file.c:1360 ../src/mp3file.c:1453 ../src/mp3file.c:1608
-#: ../src/mp3file.c:2733
+#: ../src/mp3file.c:1368 ../src/mp3file.c:1552 ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870 ../src/mp3file.c:2929 ../src/mp3file.c:2956
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "FEL när filen skulle öppnas: '%s' (%s).\n"
 
-#: ../src/mp3file.c:1688
+#: ../src/mp3file.c:1793 ../src/mp3file.c:2993
 #, 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:2770
+#: ../src/mp3file.c:2907
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "Filen \"%s\" har spelningslängden noll. Ignoreras.\n"
 
-#: ../src/mp4file.c:243 ../src/mp4file.c:404
+#: ../src/mp4file.c:243 ../src/mp4file.c:475
 #, c-format
 msgid "'%s' does not appear to be a mp4 audio or video file.\n"
 msgstr "'%s' verkar inte vara en mp4 ljud- eller videofil.\n"
 
-#: ../src/mp4file.c:253 ../src/mp4file.c:414
+#: ../src/mp4file.c:253 ../src/mp4file.c:485
 #, 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:529
+#: ../src/mp4file.c:607
 #, 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:540
+#: ../src/mp4file.c:618
 #, 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:553
+#: ../src/mp4file.c:631
 #, c-format
 msgid ""
 "Import of '%s' failed: m4a/m4p/m4b not supported without the mp4v2 library. "
@@ -5314,7 +5312,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:559
+#: ../src/mp4file.c:637
 #, c-format
 msgid ""
 "m4a/m4p/m4b metadata update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5325,7 +5323,7 @@
 "inte utan biblioteket mp4v2. Du måste kompilera källkoden för gtkpod "
 "tillsammans med biblioteket mp4v2.\n"
 
-#: ../src/mp4file.c:565
+#: ../src/mp4file.c:643
 #, c-format
 msgid ""
 "m4a/m4p/m4b soundcheck update for '%s' failed: m4a/m4p/m4b not supported "
@@ -5360,156 +5358,136 @@
 "biblioteket ogg. Du måste kompilera källkoden för gtkpod tillsammans med "
 "biblioteket ogg.\n"
 
-#: ../src/prefs.c:357
+#: ../src/prefs.c:365
 #, c-format
 msgid "gtkpod version %s usage:\n"
 msgstr "Användning av gtkpod version %s:\n"
 
-#: ../src/prefs.c:358
+#: ../src/prefs.c:366
 msgid "  -h, --help:   display this message\n"
 msgstr "  -h, --help:   visa det här meddelandet\n"
 
-#: ../src/prefs.c:359
+#: ../src/prefs.c:367
 msgid "  -p <file>:    increment playcount for file by one\n"
 msgstr "  -p <filnamn>: öka spelningsantalet för filen med ett\n"
 
-#: ../src/prefs.c:360
+#: ../src/prefs.c:368
 msgid "  --hash <file>:print gtkpod hash for file\n"
 msgstr "  --hash <fil>: skriv ut gtkpod checksumma för filen\n"
 
-#: ../src/prefs.c:361
+#: ../src/prefs.c:369
 msgid "  -m path:      define the mountpoint of your iPod\n"
 msgstr "  -m sökväg:  definiera monteringspunkt för iPod\n"
 
-#: ../src/prefs.c:362
+#: ../src/prefs.c:370
 msgid "  --mountpoint: same as '-m'.\n"
 msgstr "  --mountpoint: samma som '-m'.\n"
 
-#: ../src/prefs.c:363
+#: ../src/prefs.c:371
 msgid "  -a:           import database automatically after start.\n"
 msgstr "  -a:           importera databas automatiskt efter start.\n"
 
-#: ../src/prefs.c:364
+#: ../src/prefs.c:372
 msgid "  --auto:       same as '-a'.\n"
 msgstr "  --auto:       samma som '-a'.\n"
 
-#: ../src/prefs.c:561
+#: ../src/prefs.c:569
 #, c-format
-msgid "Couldn't create ~/.gtkpod\n"
-msgstr "Kunde inte skapa ~/.gtkpod\n"
+msgid "Couldn't create '%s'\n"
+msgstr "Kunde inte skapa '%s'\n"
 
-#: ../src/prefs_window.c:133
-msgid "Please select command for 'Play Now'"
-msgstr "Välj kommando för 'Spela nu'"
+#: ../src/prefsdlg.c:51
+msgid "Hide"
+msgstr "Dölj"
 
-#: ../src/prefs_window.c:134
-msgid "Please select command for 'Enqueue'"
-msgstr "Välj kommando för 'Köa'"
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
+msgstr "Enbart ikoner"
 
-#: ../src/prefs_window.c:135
-msgid "Please select the mp3gain executable"
-msgstr "Välj körbart program mp3gain"
+#: ../src/prefsdlg.c:53
+msgid "Text only"
+msgstr "Enbart text"
 
-#: ../src/prefs_window.c:136
-msgid "Please select the aacgain executable"
-msgstr "Välj körbart program accgain"
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
+msgstr "Text under ikoner"
 
-#: ../src/prefs_window.c:137
-msgid "Select the mserv music root directory"
-msgstr "Välj mserv rotkatalog för musik"
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
+msgstr "Text bredvid ikoner"
 
-#: ../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:139
-msgid "Select the ogg/vorbis converter command"
-msgstr "Välj kommando för konvertering av ogg/vorbis."
-
-#: ../src/prefs_window.c:140
-msgid "Select the flac converter command"
-msgstr "Välj kommando för konvertering av FLAC."
-
-#: ../src/prefs_window.c:141
-msgid "Select the m4a converter command."
-msgstr "Välj kommando för konvertering av m4a."
-
-#: ../src/prefs_window.c:142
-msgid "Select the mp3 converter command."
-msgstr "Välj kommando för konvertering av mp3."
-
-#: ../src/prefs_window.c:143
-msgid "Select the wav converter command."
-msgstr "Välj kommando för konvertering av wav."
-
-#: ../src/prefs_window.c:201 ../src/repository.c:662
+#: ../src/repository.c:527
 #, 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>"
+"Are you sure you want to delete repository \"%s\"? This action cannot be "
+"undone!"
 msgstr ""
-"<i>Ta en titt på skripten som tillhandahålls i '%s'. Om du skriver ett nytt "
-"skript, skicka det gärna till \"jcsjcs snabela users.sourceforge.net\" för "
-"att lägga till det i nästa utgåva.</i>"
+"Är du säker på att du vill ta bort arkivet \"%s\"? Åtgärden kan inte ångras!"
 
-#: ../src/prefs_window.c:1205 ../src/prefs_window.c:1223
-msgid "Preferences not updated"
-msgstr "Inställningarna har inte uppdaterats"
+#: ../src/repository.c:531
+msgid "Delete repository?"
+msgstr "Ta bort arkiv?"
 
-#: ../src/prefs_window.c:1232
-msgid "Preferences applied"
-msgstr "Inställningar ändrade"
-
-#: ../src/repository.c:573 ../src/repository.c:2395
+#: ../src/repository.c:587 ../src/repository.c:2400
 msgid "Set backup file"
 msgstr "Ange fil för säkerhetskopia"
 
-#: ../src/repository.c:612
+#: ../src/repository.c:626
 msgid "Select directory for synchronization"
 msgstr "Markera katalog för synkronisering"
 
-#: ../src/repository.c:638
+#: ../src/repository.c:652
 msgid "Please select command to sync contacts"
 msgstr "Välj kommando för att synkronisera kontakter"
 
-#: ../src/repository.c:644
+#: ../src/repository.c:658
 msgid "Please select command to sync calendar"
 msgstr "Välj kommando för att synkronisera kalender"
 
-#: ../src/repository.c:650
+#: ../src/repository.c:664
 msgid "Please select command to sync notes"
 msgstr "Välj kommando för att synkronisera anteckningar"
 
-#: ../src/repository.c:729
+#: ../src/repository.c:676
+#, 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>Ta en titt på skripten som tillhandahålls i '%s'. Om du skriver ett nytt "
+"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/repository.c:743
 msgid "Smart playlist updated."
 msgstr "Smart spellista uppdaterad."
 
-#: ../src/repository.c:1190
+#: ../src/repository.c:1204
 msgid "Podcasts Repository"
 msgstr "Podsändningsarkiv"
 
-#: ../src/repository.c:1194
+#: ../src/repository.c:1208
 msgid "Local Repository"
 msgstr "Lokalt arkiv"
 
-#: ../src/repository.c:1348
+#: ../src/repository.c:1358
 msgid "Master Playlist"
 msgstr "Huvudspellista"
 
-#: ../src/repository.c:1352
+#: ../src/repository.c:1362
 msgid "Podcasts Playlist"
 msgstr "Podsändningsspellista"
 
-#: ../src/repository.c:1360
+#: ../src/repository.c:1370
 msgid "Regular Playlist"
 msgstr "Vanlig spellista"
 
-#: ../src/repository.c:2423
+#: ../src/repository.c:2428
 msgid "Set local repository file"
 msgstr "Ange lokal arkivfil"
 
-#: ../src/repository.c:2522
+#: ../src/repository.c:2526
 msgid "New Repository"
 msgstr "Nytt arkiv"
 
@@ -5522,40 +5500,53 @@
 msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
 msgstr "Kunde inte öppna '%s' för att beräkna SHA1-checksumma: %s\n"
 
-#: ../src/syncdir.c:237
+#: ../src/sort_window.c:237
+msgid "No sorting"
+msgstr "Ingen sortering"
+
+#: ../src/sort_window.c:271
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr ""
+"Du kan också använda tabellhuvuden, men här kan du sortera enligt en kolumn "
+"som inte visas."
+
+#: ../src/syncdir.c:246
 #, c-format
 msgid "Sync summary for %s/%s\n"
 msgstr "Sammanfattning av synkronisering för %s/%s\n"
 
-#: ../src/syncdir.c:246
+#: ../src/syncdir.c:255
 msgid "The following track has been added or updated:\n"
 msgid_plural "The following tracks have been added or updated:\n"
 msgstr[0] "Följande spår har lagts till eller uppdaterats:\n"
 msgstr[1] "Följande spår har lagts till eller uppdaterats:\n"
 
-#: ../src/syncdir.c:255
+#: ../src/syncdir.c:264
 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"
 
-#: ../src/syncdir.c:264
+#: ../src/syncdir.c:273
 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] "Följande spår har tagits bort från arkivet:\n"
 msgstr[1] "Följande spår har tagits bort från arkivet:\n"
 
-#: ../src/syncdir.c:271
+#: ../src/syncdir.c:280
 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] "Följande spår har tagits bort från spellistan:\n"
 msgstr[1] "Följande spår har tagits bort från spellistan:\n"
 
-#: ../src/syncdir.c:277
+#: ../src/syncdir.c:286
 msgid "Nothing was changed.\n"
 msgstr "Ingenting har ändrats.\n"
 
-#: ../src/syncdir.c:282
+#: ../src/syncdir.c:291
 msgid "Sync summary"
 msgstr "Sammanfattning av synkronisering"
 
@@ -5637,7 +5628,8 @@
 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:645
 #, c-format
@@ -5675,4 +5667,3 @@
 #, c-format
 msgid "%s does not appear to be a supported wav file.\n"
 msgstr "%s verkar inte vara en wav-fil som stöds.\n"
-

Added: gtkpod/branches/upstream/current/po/zh_CN.po
===================================================================
--- gtkpod/branches/upstream/current/po/zh_CN.po	                        (rev 0)
+++ gtkpod/branches/upstream/current/po/zh_CN.po	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,5551 @@
+# Simple Chinese Translation Catalogue
+# Copyright (C) 2003-2009  Jörg Schuler
+# This file is distributed under the same license as the gtkpod package.
+# Tan Zhixin <tanzhxin at gmail.com>, 2009
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gtkpod 0.99.14\n"
+"Report-Msgid-Bugs-To: gtkpod-devel at lists.sourceforge.net\n"
+"POT-Creation-Date: 2008-12-09 19:55+0900\n"
+"PO-Revision-Date: 2009-01-14 23:25+0800\n"
+"Last-Translator: Tan Zhixin <tanzhxin at gmail.com>\n"
+"Language-Team: n/a\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>0;\n"
+
+
+#: ../data/gtkpod.desktop.in.h:1
+msgid "Manage music and video on an Apple iPod"
+msgstr "管理Apple iPod的音乐和视频"
+
+#: ../data/gtkpod.desktop.in.h:2 ../data/gtkpod.glade.h:427
+msgid "gtkpod iPod Manager"
+msgstr "gtkpod 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 " <= cts <= "
+msgstr " <= cts <= "
+
+#: ../data/gtkpod.glade.h:4
+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' 或类似,然后按下回车键。"
+
+#: ../data/gtkpod.glade.h:5
+msgid "(Checked)"
+msgstr "(检查完毕)"
+
+#: ../data/gtkpod.glade.h:6
+msgid "0"
+msgstr "0"
+
+#: ../data/gtkpod.glade.h:7
+msgid "1"
+msgstr "1"
+
+#: ../data/gtkpod.glade.h:8
+msgid "2"
+msgstr "2"
+
+#: ../data/gtkpod.glade.h:9
+msgid "3"
+msgstr "3"
+
+#: ../data/gtkpod.glade.h:10
+msgid "4"
+msgstr "4"
+
+#: ../data/gtkpod.glade.h:11
+msgid "5"
+msgstr "5"
+
+#: ../data/gtkpod.glade.h:12
+msgid ":"
+msgstr ":"
+
+#: ../data/gtkpod.glade.h:13
+msgid "<"
+msgstr "<"
+
+#: ../data/gtkpod.glade.h:14
+msgid "<b>Advanced Options</b>"
+msgstr "<b>高级选项</b>"
+
+#: ../data/gtkpod.glade.h:15
+msgid "<b>Ascending</b>"
+msgstr "<b>升序</b>"
+
+#: ../data/gtkpod.glade.h:16
+msgid "<b>Auto Store</b>"
+msgstr "<b>自动保存</b>"
+
+#: ../data/gtkpod.glade.h:17
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>自动生成播放列表</b>"
+
+#: ../data/gtkpod.glade.h:18
+msgid "<b>Available Columns</b>"
+msgstr "<b>分列</b>"
+
+#: ../data/gtkpod.glade.h:19
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>兼容格式</b>"
+
+#: ../data/gtkpod.glade.h:20
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>转换设置</b>"
+
+#: ../data/gtkpod.glade.h:21
+msgid "<b>Cover Art Display</b>"
+msgstr "<b>显示封面</b>"
+
+#: ../data/gtkpod.glade.h:22
+msgid "<b>Cover Art</b>"
+msgstr "<b>专辑封面</b>"
+
+#: ../data/gtkpod.glade.h:23
+msgid "<b>Deletion Confirmation Messages</b>"
+msgstr "<b>删除确认信息</b>"
+
+#: ../data/gtkpod.glade.h:24
+msgid "<b>Descending</b>"
+msgstr "<b>降序</b>"
+
+#: ../data/gtkpod.glade.h:25
+msgid "<b>Displayed Columns</b>"
+msgstr "<b>显示列</b>"
+
+#: ../data/gtkpod.glade.h:26
+msgid "<b>Filter Tabs</b>"
+msgstr "<b>过滤器标签</b>"
+
+#: ../data/gtkpod.glade.h:27
+msgid "<b>General Options</b>"
+msgstr "<b>通用选项</b>"
+
+#: ../data/gtkpod.glade.h:28
+msgid "<b>General</b>"
+msgstr "<b>通用</b>"
+
+#: ../data/gtkpod.glade.h:29
+msgid "<b>Ignore Frequent Words</b>"
+msgstr "<b>忽略常用词语</b>"
+
+#: ../data/gtkpod.glade.h:30
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>导入并同步</b>"
+
+#: ../data/gtkpod.glade.h:31
+msgid "<b>Incompatible Formats</b>"
+msgstr "<b>不兼容格式</b>"
+
+#: ../data/gtkpod.glade.h:32
+msgid "<b>Information Messages</b>"
+msgstr "<b>消息</b>"
+
+#: ../data/gtkpod.glade.h:33
+msgid "<b>Lower Margin</b>"
+msgstr "<b>下边距</b>"
+
+#: ../data/gtkpod.glade.h:34
+msgid "<b>None</b>"
+msgstr "<b>无</b>"
+
+#: ../data/gtkpod.glade.h:35
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>实时转换</b>"
+
+#: ../data/gtkpod.glade.h:36
+msgid "<b>Playback</b>"
+msgstr "<b>回放</b>"
+
+#: ../data/gtkpod.glade.h:37
+msgid "<b>Playlist Options</b>"
+msgstr "<b>播放列表选项</b>"
+
+#: ../data/gtkpod.glade.h:38
+msgid "<b>Please select mountpoint and your iPod model</b>"
+msgstr "<b>请选择挂载点和你的iPod型号</b>"
+
+#: ../data/gtkpod.glade.h:39
+msgid "<b>Rules</b>"
+msgstr "<b>规则</b>"
+
+#: ../data/gtkpod.glade.h:40
+msgid "<b>Sort Order</b>"
+msgstr "<b>排列顺序</b>"
+
+#: ../data/gtkpod.glade.h:41
+msgid "<b>Synchronization</b>"
+msgstr "<b>同步</b>"
+
+#: ../data/gtkpod.glade.h:42
+msgid "<b>Tag Editing</b>"
+msgstr "<b>编辑标签</b>"
+
+#: ../data/gtkpod.glade.h:43
+msgid "<b>Tags</b>"
+msgstr "<b>标签</b>"
+
+#: ../data/gtkpod.glade.h:44
+msgid "<b>Toolbar Style</b>"
+msgstr "<b>工具栏样式</b>"
+
+#: ../data/gtkpod.glade.h:45
+msgid "<b>Tooltips</b>"
+msgstr "<b>工具提示</b>"
+
+#: ../data/gtkpod.glade.h:46
+msgid "<b>Upper Margin</b>"
+msgstr "<b>上边距</b>"
+
+#: ../data/gtkpod.glade.h:47
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>音量均衡器</b>"
+
+#: ../data/gtkpod.glade.h:48
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr "<b>试图添加一条已存在的音轨</b>"
+
+#: ../data/gtkpod.glade.h:49
+msgid "<b>gtkpod Options</b>"
+msgstr "<b>gtkpod选项</b>"
+
+#: ../data/gtkpod.glade.h:50
+msgid "<b>mserv Settings</b>"
+msgstr "<b>mserv选项</b>"
+
+#: ../data/gtkpod.glade.h:51
+msgid "<b>mserv</b>"
+msgstr "<b>mserv</b>"
+
+#: ../data/gtkpod.glade.h:52
+msgid "<i>aacgain</i> executable:"
+msgstr "<i>aac增益</i>调整:"
+
+#: ../data/gtkpod.glade.h:53
+msgid "<i>mp3gain</i> executable:"
+msgstr "<i>mp3增益</i>调整:"
+
+#: ../data/gtkpod.glade.h:54
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Please specify a time interval</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">请指定时间间隔</span>"
+
+#: ../data/gtkpod.glade.h:55
+msgid ""
+"<span weight='bold' size='larger'>Message</span>\n"
+"\n"
+"The quick brown fox jumps over the lazy dog."
+msgstr ""
+"<span weight='bold' size='larger'>消息</span>\n"
+"\n"
+"那只敏捷的棕毛狐狸跃过那只懒狗。"
+
+#: ../data/gtkpod.glade.h:58
+msgid "<span weight='bold' size='larger'>No playlist selected</span>"
+msgstr "<span weight='bold' size='larger'>没有选择播放列表</span>"
+
+#: ../data/gtkpod.glade.h:59
+msgid ">"
+msgstr ">"
+
+#: ../data/gtkpod.glade.h:60
+msgid "About unupdated tracks"
+msgstr "未更新的音轨"
+
+#: ../data/gtkpod.glade.h:61
+msgid "About updated tracks"
+msgstr "已更新的音轨"
+
+#: ../data/gtkpod.glade.h:62
+msgid "Add Column"
+msgstr "增加栏"
+
+#: ../data/gtkpod.glade.h:63
+msgid "Add Directories Recursively"
+msgstr "递归添加目录"
+
+#: ../data/gtkpod.glade.h:64
+msgid "Add Files"
+msgstr "添加文件"
+
+#: ../data/gtkpod.glade.h:65
+msgid "Add Files or Directories"
+msgstr "添加文件或目录"
+
+#: ../data/gtkpod.glade.h:66
+msgid "Add Fol_der"
+msgstr "添加目录"
+
+#: ../data/gtkpod.glade.h:67 ../src/fileselection.c:606
+msgid "Add Folder"
+msgstr "添加目录"
+
+#: ../data/gtkpod.glade.h:68
+msgid "Add Image_s"
+msgstr "添加图像"
+
+#: ../data/gtkpod.glade.h:69
+msgid "Add Images from a Directory"
+msgstr "从目录添加图像"
+
+#: ../data/gtkpod.glade.h:70
+msgid "Add Playlist"
+msgstr "添加播放列表"
+
+#: ../data/gtkpod.glade.h:71
+msgid "Add _Files"
+msgstr "添加文件"
+
+#: ../data/gtkpod.glade.h:72
+msgid "Add _Playlist"
+msgstr "添加播放列表"
+
+#: ../data/gtkpod.glade.h:73
+msgid "Add cover art using file name template"
+msgstr "从文件名模板添加封面"
+
+#: ../data/gtkpod.glade.h:74
+msgid ""
+"Add file masks to be excluded from import and synchronization, for example, "
+"<i>*.mp3</i>."
+msgstr "添加导入和同步时排除的文件,例如:<i>*.mp3</i>."
+
+#: ../data/gtkpod.glade.h:75
+msgid "Add new repository/iPod..."
+msgstr "添加新的音乐库/iPod"
+
+#: ../data/gtkpod.glade.h:76
+msgid "Add playlist from file"
+msgstr "从文件新建播放列表"
+
+#: ../data/gtkpod.glade.h:77
+msgid "Add subfolders recursively"
+msgstr "递归添加子目录"
+
+#: ../data/gtkpod.glade.h:78
+msgid "Added:"
+msgstr "添加:"
+
+#. 0
+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2995
+#: ../src/display_spl.c:84 ../src/misc_conversion.c:60
+msgid "Album"
+msgstr "专辑"
+
+#: ../data/gtkpod.glade.h:80
+msgid "Album Art"
+msgstr "专辑封面"
+
+#: ../data/gtkpod.glade.h:81
+msgid "All (AND)"
+msgstr "所有(和)"
+
+#: ../data/gtkpod.glade.h:82
+msgid "All Tracks Never Listened To"
+msgstr "所有从未听过的音轨"
+
+#: ../data/gtkpod.glade.h:83
+msgid "All Tracks Played Since Last Time"
+msgstr "上次以来的所有播放的音轨"
+
+#: ../data/gtkpod.glade.h:84
+msgid "All Tracks not Listed in any Playlist"
+msgstr "所有没进入播放列表的音轨"
+
+#: ../data/gtkpod.glade.h:85
+msgid "Allow duplicate files"
+msgstr "允许重复文件"
+
+#: ../data/gtkpod.glade.h:86
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr "当更新和同步时始终使用这种字符编码"
+
+#: ../data/gtkpod.glade.h:87
+msgid "Also use this encoding when writing tracks"
+msgstr "当新建时始终使用这种字符编码"
+
+#: ../data/gtkpod.glade.h:88
+msgid "Any (OR)"
+msgstr "任一(或)"
+
+#: ../data/gtkpod.glade.h:89
+msgid ""
+"Any rules\n"
+"All rules\n"
+"Ignore rules"
+msgstr ""
+"任一规则\n"
+"所有规则\n"
+"忽略"
+
+#: ../data/gtkpod.glade.h:92 ../src/display_sorttabs.c:2992
+#: ../src/display_spl.c:85 ../src/misc_conversion.c:61
+msgid "Artist"
+msgstr "艺术家"
+
+#: ../data/gtkpod.glade.h:93
+msgid "Artwork Preview"
+msgstr "预览"
+
+#: ../data/gtkpod.glade.h:94
+msgid "Automatically generate video thumbnails"
+msgstr "自动生成视频缩略"
+
+#: ../data/gtkpod.glade.h:95
+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:96
+msgid "Background color"
+msgstr "背景颜色"
+
+#: ../data/gtkpod.glade.h:97
+msgid "Best Rated Tracks"
+msgstr "评分最高的音轨"
+
+#: ../data/gtkpod.glade.h:98
+msgid "Bottom"
+msgstr "下方"
+
+#: ../data/gtkpod.glade.h:99 ../src/prefsdlg.c:588
+msgid "Browse"
+msgstr "浏览"
+
+#: ../data/gtkpod.glade.h:100
+msgid "Browse..."
+msgstr "浏览"
+
+#: ../data/gtkpod.glade.h:101
+msgid "Cache folder:"
+msgstr "缓存目录"
+
+#: ../data/gtkpod.glade.h:102
+msgid "Calendar"
+msgstr "日历"
+
+#: ../data/gtkpod.glade.h:103
+msgid "Calendar sync command:"
+msgstr "日历同步命令:"
+
+#: ../data/gtkpod.glade.h:104
+msgid "Call automatically when synchronizing iTunesDB"
+msgstr "同步iTunesDB时自动开始"
+
+#: ../data/gtkpod.glade.h:105
+msgid "Case sensitive sorting"
+msgstr "区分大小写排序"
+
+#: ../data/gtkpod.glade.h:106
+msgid "Category:"
+msgstr "类别:"
+
+#: ../data/gtkpod.glade.h:107
+msgid ""
+"Change all tracks\n"
+"simultaneously"
+msgstr ""
+"更新所有音轨\n"
+"同时"
+
+#: ../data/gtkpod.glade.h:109
+msgid "Check for existing files when copying from iPod."
+msgstr "当从iPod中复制文件时检查现有文件。"
+
+#: ../data/gtkpod.glade.h:110
+msgid "Choose a Different Colour for the CoverArt Display Background"
+msgstr "为插图背景选择颜色"
+
+#: ../data/gtkpod.glade.h:111
+msgid "Command for \"Enqueue\":"
+msgstr "'队列'命令:"
+
+#: ../data/gtkpod.glade.h:112
+msgid "Command for \"Play now\":"
+msgstr "'开始播放'命令:"
+
+#: ../data/gtkpod.glade.h:113
+msgid "Commands..."
+msgstr "命令"
+
+#. 5
+#: ../data/gtkpod.glade.h:114 ../src/display_spl.c:97
+#: ../src/misc_conversion.c:65
+msgid "Composer"
+msgstr "作曲"
+
+#: ../data/gtkpod.glade.h:115
+msgid "Confirm before removing tracks from the iPod or repository"
+msgstr "从iPod或音乐库移除音轨前确认"
+
+#: ../data/gtkpod.glade.h:116
+msgid "Confirm deletion of playlists or tracks from a playlist"
+msgstr "删除播放列表或者从播放列表中移除音轨前确认"
+
+#: ../data/gtkpod.glade.h:117
+msgid "Confirm deletion of tracks during synchronization"
+msgstr "确认同步时删除音轨"
+
+#: ../data/gtkpod.glade.h:118
+msgid "Confirm deletion of tracks:"
+msgstr "确认删除音轨"
+
+#: ../data/gtkpod.glade.h:119
+msgid "Contacts sync command:"
+msgstr "同步通讯录命令"
+
+#: ../data/gtkpod.glade.h:120
+msgid "Containing Displayed Tracks"
+msgstr "包含已显示音轨"
+
+#: ../data/gtkpod.glade.h:121
+msgid "Containing Selected Tracks"
+msgstr "包含已选择音轨"
+
+#: ../data/gtkpod.glade.h:122
+msgid "Conversion Preferences"
+msgstr "转换首选项"
+
+#: ../data/gtkpod.glade.h:123
+msgid "Conversion Progress Display"
+msgstr "转换进程显示"
+
+#: ../data/gtkpod.glade.h:124
+msgid "Conversion Settings..."
+msgstr "转换设置"
+
+#: ../data/gtkpod.glade.h:125
+msgid "Convert AAC (M4A)"
+msgstr "转换成AAC(M4A)"
+
+#: ../data/gtkpod.glade.h:126
+msgid "Convert FLAC"
+msgstr "转换成FLAC"
+
+#: ../data/gtkpod.glade.h:127
+msgid "Convert MP3"
+msgstr "转换成MP3"
+
+#: ../data/gtkpod.glade.h:128
+msgid "Convert Ogg Vorbis"
+msgstr "转换成Ogg Vorbis"
+
+#: ../data/gtkpod.glade.h:129
+msgid "Convert WAV"
+msgstr "转换成WAV"
+
+#: ../data/gtkpod.glade.h:130
+msgid "Convert compatible formats to a single format"
+msgstr "转换兼容格式到单一格式"
+
+#: ../data/gtkpod.glade.h:131
+msgid "Convert incompatible music formats to:"
+msgstr "转换不兼容音乐格式到:"
+
+#: ../data/gtkpod.glade.h:132
+msgid "Cover"
+msgstr "插图"
+
+#: ../data/gtkpod.glade.h:133
+msgid "Cover Art Search Preferences"
+msgstr "插图搜索首选项"
+
+#: ../data/gtkpod.glade.h:134
+msgid "Cover art file pattern:"
+msgstr "插图文件样式"
+
+#: ../data/gtkpod.glade.h:135
+msgid "Create New Playlist"
+msgstr "新建播放列表"
+
+#: ../data/gtkpod.glade.h:136
+msgid "Create Repository"
+msgstr "新建音乐库"
+
+#: ../data/gtkpod.glade.h:137
+msgid "Create _Playlist File"
+msgstr "新建播放列表"
+
+#: ../data/gtkpod.glade.h:138
+msgid "Customize..."
+msgstr "定制"
+
+#: ../data/gtkpod.glade.h:139
+msgid "Delete Repository"
+msgstr "删除音乐库"
+
+#: ../data/gtkpod.glade.h:140
+msgid "Delete missing tracks from the iPod or repository"
+msgstr "从iPod或音乐库删除缺失的音轨"
+
+#: ../data/gtkpod.glade.h:141
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr "同步播放列表时删除缺失的音轨"
+
+#: ../data/gtkpod.glade.h:142
+msgid "Details"
+msgstr "详细"
+
+#: ../data/gtkpod.glade.h:144
+#, 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 ""
+"选择格式串确定如何显示info, 比如'%a/%A/%T - %t.mp3' 或者 '%o'。你可以用分号分"
+"隔几个模板,gtkpod按照文件扩展信息选取对应的字段,艺术家: %a, 专辑: %A, 作"
+"曲: %c, 歌曲: %t, 风格: %G, track nr: %T, CD nr: %C, 年: %Y, 原始文件名 (需"
+"要文件扩展信息): %o, 字符 '%': %%."
+
+#: ../data/gtkpod.glade.h:146
+#, 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, track nr: %T, CD nr: %C, 年: %Y, 原始文件名 "
+"(需要文件扩展信息): %o, 字符 '%': %%."
+
+#: ../data/gtkpod.glade.h:147
+msgid ""
+"Directories to sync with are determined from the filenames of the tracks in "
+"the playlist."
+msgstr "从播放列表中的音轨文件名确定要同步的目录。"
+
+#: ../data/gtkpod.glade.h:148
+msgid "Display"
+msgstr "显示"
+
+#: ../data/gtkpod.glade.h:149
+msgid "Display conversion log"
+msgstr "显示转换日志"
+
+#: ../data/gtkpod.glade.h:150
+msgid "Display information about detected duplicate files"
+msgstr "显示重复文件的信息"
+
+#: ../data/gtkpod.glade.h:151
+msgid "Display messages and warnings at startup"
+msgstr "启动时显示警告信息"
+
+#: ../data/gtkpod.glade.h:152
+msgid "Display synchronization results"
+msgstr "显示同步结果"
+
+#: ../data/gtkpod.glade.h:153
+msgid "Display tooltips in main window"
+msgstr "在主窗口显示工具提示"
+
+#: ../data/gtkpod.glade.h:154
+msgid "Display tracks that match the criteria entered above."
+msgstr "显示符合以上要求的音轨"
+
+#: ../data/gtkpod.glade.h:155
+msgid "Don't automatically sync on startup"
+msgstr "启动时不要自动同步"
+
+#: ../data/gtkpod.glade.h:156
+msgid "Dummy\n"
+msgstr "Dummy\n"
+
+#: ../data/gtkpod.glade.h:158 ../src/context_menus.c:664
+msgid "Edit Smart Playlist"
+msgstr "编辑智能播放列表"
+
+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:751
+msgid "Edit Track Details"
+msgstr "编辑音轨信息"
+
+#: ../data/gtkpod.glade.h:160
+msgid "Empty Playlist"
+msgstr "空白播放列表"
+
+#: ../data/gtkpod.glade.h:161
+msgid "Encoding Preferences"
+msgstr "编码首选项"
+
+#: ../data/gtkpod.glade.h:162
+msgid "Encoding..."
+msgstr "编码"
+
+#: ../data/gtkpod.glade.h:163
+msgid "Excluded files..."
+msgstr "排除文件"
+
+#: ../data/gtkpod.glade.h:164
+msgid "Exclusions List"
+msgstr "排除列表"
+
+#: ../data/gtkpod.glade.h:165
+msgid "Expand columns beyond the track list width"
+msgstr "扩展栏位超过音轨列表宽度"
+
+#: ../data/gtkpod.glade.h:166
+msgid "Export can be continued at a later time if canceled."
+msgstr "取消后还可以下次继续导出"
+
+#: ../data/gtkpod.glade.h:167
+msgid "Feedback"
+msgstr "反馈"
+
+#: ../data/gtkpod.glade.h:168
+msgid "Filename Parse Preferences"
+msgstr "文件名检查首选项"
+
+#: ../data/gtkpod.glade.h:169
+msgid "Filename format: "
+msgstr "文件名格式:"
+
+#: ../data/gtkpod.glade.h:170
+msgid "Filename parse pattern:"
+msgstr "文件名检查样式:"
+
+#: ../data/gtkpod.glade.h:171
+msgid "Filter tab:"
+msgstr "过滤器标签"
+
+#: ../data/gtkpod.glade.h:172
+msgid "Filter tabs"
+msgstr "过滤器标签"
+
+#: ../data/gtkpod.glade.h:173
+msgid "Filter:"
+msgstr "过滤器:"
+
+#: ../data/gtkpod.glade.h:174
+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:175
+msgid "From the hard disk"
+msgstr "从硬盘"
+
+#: ../data/gtkpod.glade.h:176
+msgid "From the iPod"
+msgstr "从iPod"
+
+#: ../data/gtkpod.glade.h:177
+msgid "From the local database"
+msgstr "从本地数据库"
+
+#: ../data/gtkpod.glade.h:178 ../src/display_spl.c:182 ../src/info.c:794
+msgid "GB"
+msgstr "GB"
+
+#: ../data/gtkpod.glade.h:179 ../src/display_sorttabs.c:2998
+#: ../src/display_spl.c:89 ../src/misc_conversion.c:63
+msgid "Genre"
+msgstr "风格"
+
+#: ../data/gtkpod.glade.h:180
+msgid "Get Help _Online"
+msgstr "在线获得帮助"
+
+#: ../data/gtkpod.glade.h:181
+msgid "Group artist filter tab by compilation CDs"
+msgstr "CD集的艺术家组过滤器标签"
+
+#: ../data/gtkpod.glade.h:182
+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:183
+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
+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 "Ignore these words when at the beginning of the following fields:"
+msgstr "在下列区域的开头忽略这些字段"
+
+#: ../data/gtkpod.glade.h:186
+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:187
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr "包括\"评分最高的\"播放列表中从未使用的音轨"
+
+#: ../data/gtkpod.glade.h:188
+msgid "Info field template:"
+msgstr "Info区模板:"
+
+#: ../data/gtkpod.glade.h:189
+msgid "Initialize iPod"
+msgstr "初始化iPod"
+
+#: ../data/gtkpod.glade.h:190
+msgid ""
+"Insert before\n"
+"Insert after"
+msgstr ""
+"在之前插入\n"
+"在之后插入"
+
+#: ../data/gtkpod.glade.h:192
+msgid ""
+"Last Played\n"
+"Last Modified\n"
+"Added\n"
+msgstr ""
+"最后播放的\n"
+"最后修改的\n"
+"新增的\n"
+
+#: ../data/gtkpod.glade.h:196
+msgid "Live _updating"
+msgstr "在线更新"
+
+#: ../data/gtkpod.glade.h:197
+msgid "Load iPod(s)"
+msgstr "加载iPod"
+
+#: ../data/gtkpod.glade.h:198
+msgid "Logic:"
+msgstr "逻辑:"
+
+#: ../data/gtkpod.glade.h:199
+msgid ""
+"MP3\n"
+"AAC\n"
+msgstr ""
+"MP3\n"
+"AAC\n"
+
+#: ../data/gtkpod.glade.h:202
+msgid "Mass-modify tags when multiple tracks are selected"
+msgstr "当选择多条音轨时整体修改标签"
+
+#: ../data/gtkpod.glade.h:203
+msgid "Match only _checked tracks"
+msgstr "只匹配选择的音轨"
+
+#: ../data/gtkpod.glade.h:204
+msgid "Match:"
+msgstr "匹配:"
+
+#: ../data/gtkpod.glade.h:205
+msgid "Maximum cache size:"
+msgstr "最大缓存容量:"
+
+#: ../data/gtkpod.glade.h:206
+msgid "Maximum threads:"
+msgstr "最大线程数:"
+
+#: ../data/gtkpod.glade.h:207
+msgid "Metadata"
+msgstr "元数据"
+
+#: ../data/gtkpod.glade.h:208
+msgid "Model:"
+msgstr "型号:"
+
+#: ../data/gtkpod.glade.h:209
+msgid "Modified:"
+msgstr "修改:"
+
+#: ../data/gtkpod.glade.h:210
+msgid "Most Recently Played Tracks"
+msgstr "最近播放的音轨"
+
+#: ../data/gtkpod.glade.h:211
+msgid "Music"
+msgstr "音乐"
+
+#: ../data/gtkpod.glade.h:212
+msgid "Music root:"
+msgstr "音乐主目录"
+
+#: ../data/gtkpod.glade.h:213
+msgid "Never show this dialogue again"
+msgstr "不再显示此对话窗口"
+
+#: ../data/gtkpod.glade.h:214 ../src/display_spl.c:1652
+#: ../src/misc_playlist.c:76 ../src/misc_playlist.c:78
+#: ../src/misc_playlist.c:113 ../src/misc_playlist.c:115
+#: ../src/misc_playlist.c:448 ../src/misc_playlist.c:450
+msgid "New Playlist"
+msgstr "新建播放列表"
+
+#: ../data/gtkpod.glade.h:215
+msgid "No lower margin"
+msgstr "没有下边距"
+
+#: ../data/gtkpod.glade.h:216
+msgid "No upper margin"
+msgstr "没有上边距"
+
+#: ../data/gtkpod.glade.h:217
+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'),v0.51版本之前导入的音轨没有保存字符集信息,因此只能"
+"使用指定字符集"
+
+#: ../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 ""
+"通常如果音轨不在同步目录中时将被从播放列表中删除,而不是iPod和本地音乐库"
+"中。\n"
+"如果选择此选项,音轨将从iPod或本地音乐库中完全删除,除非音轨也包含在其他播放"
+"列表中。\n"
+"注意:如果是和主播放列表同步你必须选择此选项,如果你希望删除音轨的话,因为从"
+"主播放列表中删除也意味着从iPod中删除。"
+
+#: ../data/gtkpod.glade.h:221
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
+msgstr ""
+"通常这里指定的编码只会在新导入音轨时时使用,而对于已有的音轨,它们使用自身导"
+"入时的编码。你可以使用这个选项改变上述设置,因为可能最初导入时使用了错误编"
+"码。"
+
+#: ../data/gtkpod.glade.h:222
+msgid "Notes sync command:"
+msgstr "备忘录同步命令:"
+
+#: ../data/gtkpod.glade.h:223
+msgid "Number of filter tabs:"
+msgstr "过滤器标签数:"
+
+#: ../data/gtkpod.glade.h:224
+msgid "Number of tracks:"
+msgstr "音轨数:"
+
+#: ../data/gtkpod.glade.h:225
+msgid "On startup automatically sync with playlist directories"
+msgstr "启动时自动与播放列表目录同步"
+
+#: ../data/gtkpod.glade.h:226
+msgid "On startup automatically sync with the following directory"
+msgstr "启动时自动与下列目录同步"
+
+#: ../data/gtkpod.glade.h:227
+msgid "On startup automatically update (Live Playlist)"
+msgstr "启动时自动更新(在线播放列表)"
+
+#: ../data/gtkpod.glade.h:228
+msgid "One for each Album"
+msgstr "每个专辑选择一条"
+
+#: ../data/gtkpod.glade.h:229
+msgid "One for each Artist"
+msgstr "每个艺术家选择一条"
+
+#: ../data/gtkpod.glade.h:230
+msgid "One for each Composer"
+msgstr "每个作曲选择一条"
+
+#: ../data/gtkpod.glade.h:231
+msgid "One for each Genre"
+msgstr "每种类型选择一条"
+
+#: ../data/gtkpod.glade.h:232
+msgid "One for each Rating"
+msgstr "每个评分选择一条"
+
+#: ../data/gtkpod.glade.h:233
+msgid "One for each Year"
+msgstr "每个年代选择一条"
+
+#: ../data/gtkpod.glade.h:234
+msgid "Overwrite existing tags"
+msgstr "覆盖已有标签"
+
+#: ../data/gtkpod.glade.h:235
+msgid "Parse file name to set missing tags"
+msgstr "检查文件名的缺失标签"
+
+#: ../data/gtkpod.glade.h:236
+msgid "Path:"
+msgstr "路径:"
+
+#: ../data/gtkpod.glade.h:237
+msgid "Photo Window"
+msgstr "照片窗口"
+
+#: ../data/gtkpod.glade.h:238
+msgid "Playcount:"
+msgstr "播放次数:"
+
+#: ../data/gtkpod.glade.h:239
+msgid "Played:"
+msgstr "已播放:"
+
+#: ../data/gtkpod.glade.h:240
+msgid "Playlist name:"
+msgstr "播放列表名:"
+
+#: ../data/gtkpod.glade.h:241
+msgid "Playlist type:"
+msgstr "播放列表类型:"
+
+#: ../data/gtkpod.glade.h:242 ../src/display_playlists.c:2397
+msgid "Playlists"
+msgstr "播放列表"
+
+#: ../data/gtkpod.glade.h:243
+msgid "Please refer to the notice below."
+msgstr "请参考下面的注意事项。"
+
+#: ../data/gtkpod.glade.h:244
+msgid "Position:"
+msgstr "位置:"
+
+#: ../data/gtkpod.glade.h:245
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../data/gtkpod.glade.h:246
+msgid "Progress Information"
+msgstr "进度信息"
+
+#: ../data/gtkpod.glade.h:248
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file.  "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
+msgstr ""
+"指定生成视频文件缩略的shell命令。下面的这些格式串将被展开:- %f: 输入文件\n"
+"- %o: 输出文件(自动生成)\n"
+
+#: ../data/gtkpod.glade.h:252
+msgid "R_ename Album"
+msgstr "重命名专辑"
+
+#: ../data/gtkpod.glade.h:253
+msgid "Random Playlist from Displayed Tracks"
+msgstr "从显示音轨中生成随机播放列表"
+
+#: ../data/gtkpod.glade.h:254
+msgid "Randomize Current Playlist"
+msgstr "随机当前播放列表"
+
+#: ../data/gtkpod.glade.h:255
+msgid "Rating:"
+msgstr "评分:"
+
+#: ../data/gtkpod.glade.h:256
+msgid "Read embedded cover art information"
+msgstr "读取嵌入的插图信息"
+
+#: ../data/gtkpod.glade.h:257
+msgid "Read embedded tags from music files"
+msgstr "从音乐文件中读取嵌入的标签"
+
+#: ../data/gtkpod.glade.h:258
+msgid "Report a _Problem"
+msgstr "报告问题"
+
+#: ../data/gtkpod.glade.h:259
+msgid "Report problems when accessing mserv"
+msgstr "连接mserv时报告问题"
+
+#: ../data/gtkpod.glade.h:260
+msgid "Repository"
+msgstr "音乐库"
+
+#: ../data/gtkpod.glade.h:261
+msgid "Repository Options"
+msgstr "音乐库选项"
+
+#: ../data/gtkpod.glade.h:262
+msgid "Repository name:"
+msgstr "音乐库名:"
+
+#: ../data/gtkpod.glade.h:263
+msgid "Repository type:"
+msgstr "音乐库类型:"
+
+#: ../data/gtkpod.glade.h:264
+msgid "Repository/iPod Options"
+msgstr "音乐库/iPod选项"
+
+#: ../data/gtkpod.glade.h:265 ../src/context_menus.c:806
+msgid "Save Changes"
+msgstr "保存改动"
+
+#: ../data/gtkpod.glade.h:266
+msgid "Select '-1' for no upper limit."
+msgstr "无上限时选择'-1'"
+
+#: ../data/gtkpod.glade.h:267
+msgid "Select '0' for no lower limit."
+msgstr "无下限时选择'0'"
+
+#: ../data/gtkpod.glade.h:268
+msgid "Selected Filter Tab Entry from Database"
+msgstr "数据库中的过滤器标签"
+
+#: ../data/gtkpod.glade.h:269
+msgid "Selected Filter Tab Entry from Hard Disk"
+msgstr "硬盘中的过滤器标签"
+
+#: ../data/gtkpod.glade.h:270
+msgid "Selected Filter Tab Entry from Playlist"
+msgstr "播放列表中的过滤器标签"
+
+#: ../data/gtkpod.glade.h:271
+msgid "Selected Filter Tab Entry from iPod"
+msgstr "iPod中的过滤器标签"
+
+#: ../data/gtkpod.glade.h:272
+msgid "Selected Playlist Including Tracks from Database"
+msgstr "选择播放列表包括数据库的音轨"
+
+#: ../data/gtkpod.glade.h:273
+msgid "Selected Playlist Including Tracks from Hard Disk"
+msgstr "选择播放列表包括硬盘中的音轨"
+
+#: ../data/gtkpod.glade.h:274
+msgid "Selected Playlist Including Tracks from iPod"
+msgstr "选择播放列表包括iPod中的音轨"
+
+#: ../data/gtkpod.glade.h:275
+msgid "Selected Tab _Entry"
+msgstr "选定标签项"
+
+#: ../data/gtkpod.glade.h:276
+msgid "Selected Tracks from Database"
+msgstr "数据库中的音轨"
+
+#: ../data/gtkpod.glade.h:277
+msgid "Selected Tracks from Hard Disk"
+msgstr "硬盘中的音轨"
+
+#: ../data/gtkpod.glade.h:278
+msgid "Selected Tracks from Playlist"
+msgstr "播放列表中的音轨"
+
+#: ../data/gtkpod.glade.h:279
+msgid "Selected Tracks from iPod"
+msgstr "iPod中的音轨"
+
+#: ../data/gtkpod.glade.h:280
+msgid "Selected _Playlist"
+msgstr "选定播放列表"
+
+#: ../data/gtkpod.glade.h:281
+msgid "Selected _Tracks"
+msgstr "选定音轨"
+
+#: ../data/gtkpod.glade.h:282
+msgid "Selected playlist"
+msgstr "选定播放列表"
+
+#: ../data/gtkpod.glade.h:283
+msgid "Set Cover Art from _File"
+msgstr "从文件设置插图"
+
+#: ../data/gtkpod.glade.h:284
+msgid "Set still missing tags to file name"
+msgstr "从文件名设置缺失标签"
+
+#: ../data/gtkpod.glade.h:285
+msgid "Settings..."
+msgstr "设定"
+
+#: ../data/gtkpod.glade.h:286
+msgid "Show summary of sync result"
+msgstr "显示同步结果摘要"
+
+#: ../data/gtkpod.glade.h:287
+msgid "Skip the track"
+msgstr "忽略此音轨"
+
+#: ../data/gtkpod.glade.h:288 ../src/misc_playlist.c:116
+#: ../src/repository.c:1366
+msgid "Smart Playlist"
+msgstr "智能播放列表"
+
+#: ../data/gtkpod.glade.h:289
+msgid "Sort by:"
+msgstr "按此排序:"
+
+#: ../data/gtkpod.glade.h:290
+msgid "Sort tracks according to: "
+msgstr "按此对音轨排序:"
+
+#: ../data/gtkpod.glade.h:291
+msgid "Sorting Options"
+msgstr "排序选项"
+
+#: ../data/gtkpod.glade.h:292
+msgid "Sorting..."
+msgstr "排序"
+
+#: ../data/gtkpod.glade.h:293
+msgid "Source:"
+msgstr "来源:"
+
+#: ../data/gtkpod.glade.h:295
+#, 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:296
+msgid "Specify interval"
+msgstr "指定间隔"
+
+#: ../data/gtkpod.glade.h:297
+msgid "Start display automatically"
+msgstr "自动开始播放"
+
+#: ../data/gtkpod.glade.h:298
+msgid "Synchronise Contacts, Calendar and Notes"
+msgstr "同步通讯录、日历和备忘录"
+
+#: ../data/gtkpod.glade.h:299
+msgid "Synchronize All"
+msgstr "同步所有"
+
+#: ../data/gtkpod.glade.h:300
+msgid "Synchronize Calendar"
+msgstr "同步日历"
+
+#: ../data/gtkpod.glade.h:301
+msgid "Synchronize Contacts"
+msgstr "同步通讯录"
+
+#: ../data/gtkpod.glade.h:302
+msgid "Synchronize Notes"
+msgstr "同步备忘录"
+
+#: ../data/gtkpod.glade.h:303
+msgid "Tag and filename encoding:"
+msgstr "标签和文件名的字符编码:"
+
+#: ../data/gtkpod.glade.h:304
+msgid "Text color"
+msgstr "文字颜色"
+
+#: ../data/gtkpod.glade.h:305
+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:306
+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:307
+msgid "The track on the iPod is referenced in the playlist file."
+msgstr "播放列表指向iPod中的音轨"
+
+#: ../data/gtkpod.glade.h:308
+msgid "Time:"
+msgstr "时间:"
+
+#: ../data/gtkpod.glade.h:309 ../src/display_sorttabs.c:3004
+#: ../src/display_spl.c:83 ../src/misc_conversion.c:62
+msgid "Title"
+msgstr "歌曲"
+
+#: ../data/gtkpod.glade.h:310
+msgid ""
+"To fill additional information, <i>gtkpod</i> can use a database provided by "
+"the <i>mserv</i> music server. If you do not know what <i>mserv</i> is, "
+"leave this alone."
+msgstr ""
+"填写更多信息,<i>gtkpod</i>可以保存在<i>mserv</i>音乐数据库,如果你不知道什么"
+"是<i>mserv</i>,请留空。"
+
+#: ../data/gtkpod.glade.h:311
+msgid "Top"
+msgstr "最佳"
+
+#: ../data/gtkpod.glade.h:312
+msgid "Tracks"
+msgstr "音轨"
+
+#: ../data/gtkpod.glade.h:313
+msgid "Tracks Most Often Listened To"
+msgstr "最经常听的音轨"
+
+#: ../data/gtkpod.glade.h:314
+msgid "Tracks in Selected Tab _Entry"
+msgstr "选定标签的音轨"
+
+#: ../data/gtkpod.glade.h:315
+msgid "Tracks in Selected _Playlist"
+msgstr "选定播放列表的音轨"
+
+#: ../data/gtkpod.glade.h:316
+msgid "Transfer tracks in background mode"
+msgstr "在后台传输音轨"
+
+#: ../data/gtkpod.glade.h:317
+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:318
+msgid "Undo _Track"
+msgstr "取消音轨"
+
+#: ../data/gtkpod.glade.h:319
+msgid "Update _mserv Data from File"
+msgstr "从文件更新mserv数据"
+
+#: ../data/gtkpod.glade.h:320
+msgid "Update information about the existing track"
+msgstr "更新现有音轨的信息"
+
+#: ../data/gtkpod.glade.h:321
+msgid "Update/Sync All Playlists"
+msgstr "更新/同步所有播放列表"
+
+#: ../data/gtkpod.glade.h:322
+msgid "Update/Sync Playlist"
+msgstr "更新/同步播放列表"
+
+#: ../data/gtkpod.glade.h:323
+msgid "Use legacy format for MP3 tags"
+msgstr "MP3标签采用老格式"
+
+#: ../data/gtkpod.glade.h:324
+msgid "Use mserv database to fill track information"
+msgstr "用mserv数据库填写音轨信息"
+
+#: ../data/gtkpod.glade.h:325
+msgid ""
+"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"
+"for this filename."
+msgstr ""
+"文件名字符编码(首选项/'添加/更新/同步')采用\n"
+" "
+
+#: ../data/gtkpod.glade.h:327
+msgid "Username:"
+msgstr "用户名:"
+
+#: ../data/gtkpod.glade.h:328
+msgid "Video Thumbnail Generation"
+msgstr "生成视频缩略"
+
+#: ../data/gtkpod.glade.h:329
+msgid "Video thumbnailing program:"
+msgstr "生成视频缩略的程序:"
+
+#: ../data/gtkpod.glade.h:330
+msgid "View Full Size"
+msgstr "查看整个文件"
+
+#: ../data/gtkpod.glade.h:331
+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:332
+msgid "When updating tracks, display information:"
+msgstr "当更新音轨时显示:"
+
+#: ../data/gtkpod.glade.h:333
+msgid ""
+"Will show a list of tracks removed and a list of tracks newly added or "
+"updated."
+msgstr "将显示删除/新增/更新的音轨列表。"
+
+#: ../data/gtkpod.glade.h:334
+msgid "Write all changes made to the disk and the iPod(s)."
+msgstr "将所有改动写入到磁盘和iPod。"
+
+#: ../data/gtkpod.glade.h:335
+msgid "Write tags to disk when edited"
+msgstr "编辑时将标签写入磁盘"
+
+#: ../data/gtkpod.glade.h:337
+#, no-c-format
+msgid ""
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
+msgstr ""
+"你可以用';'分隔几个模板, 使用满足条件的第一个模板生成文件名。\n"
+"\n"
+"例如: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- 艺术家: %a\n"
+"- 专辑: %A\n"
+"- 作曲: %c\n"
+"- 歌曲: %t\n"
+"- 风格: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- 年代: %Y\n"
+"- skip data: %*\n"
+"- 特殊字符'%': %%."
+
+#: ../data/gtkpod.glade.h:352
+#, no-c-format
+msgid ""
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i>&lt;Album&gt;.jpg</i> in the parent directory\n"
+"- <i>%a</i>: Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i>&lt;"
+"artist&gt;.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
+msgstr ""
+"你可以用';'分隔几个模板, 使用满足条件的第一个模板生成文件名。\n"
+"\n"
+"例如:\n"
+"- <i>folder.jpg</i>: 采用<i>folder.jpg</i>为插图\n"
+"- <i>folder</i>: 采用<i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: 采用父目录中的<i>&lt;Album&gt;.jpg</i>\n"
+"- <i>%a</i>: 采用<i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: 先尝试<i>folder.jpg</i>, 然后<i>&lt;artist&gt;."
+"jpg</i>\n"
+"\n"
+"- 艺术家: %a\n"
+"- 专辑: %A\n"
+"- 作曲: %c\n"
+"- 歌曲: %t\n"
+"- 风格: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- 年代: %Y\n"
+"- skip data: %*\n"
+"- 特殊字符'%': %%."
+
+#: ../data/gtkpod.glade.h:371
+msgid "_About gtkpod"
+msgstr "关于gtkpod"
+
+#: ../data/gtkpod.glade.h:372
+msgid "_Add Album"
+msgstr "新增专辑"
+
+#: ../data/gtkpod.glade.h:373
+msgid "_Add Image"
+msgstr "新增图像"
+
+#: ../data/gtkpod.glade.h:374
+msgid "_Album"
+msgstr "专辑"
+
+#: ../data/gtkpod.glade.h:375
+msgid "_All Tracks"
+msgstr "所有音轨"
+
+#: ../data/gtkpod.glade.h:376
+msgid "_Arrange Filter Tabs"
+msgstr "整理过滤器标签"
+
+#: ../data/gtkpod.glade.h:377
+msgid "_Check iPod's Files"
+msgstr "检查iPod文件"
+
+#: ../data/gtkpod.glade.h:378
+msgid "_Contents"
+msgstr "内容"
+
+#: ../data/gtkpod.glade.h:379
+msgid "_Conversion Log"
+msgstr "转换日志"
+
+#: ../data/gtkpod.glade.h:380
+msgid "_Create Playlists"
+msgstr "创建播放列表"
+
+#: ../data/gtkpod.glade.h:381
+msgid "_Create iPod's Directories"
+msgstr "创建iPod文件夹"
+
+#: ../data/gtkpod.glade.h:382
+msgid "_Delete"
+msgstr "删除"
+
+#: ../data/gtkpod.glade.h:383
+msgid "_Display"
+msgstr "显示"
+
+#: ../data/gtkpod.glade.h:384
+msgid "_Displayed Tracks"
+msgstr "显示的音轨"
+
+#: ../data/gtkpod.glade.h:385
+msgid "_Edit"
+msgstr "编辑"
+
+#: ../data/gtkpod.glade.h:386
+msgid "_Enqueue"
+msgstr "队列"
+
+#: ../data/gtkpod.glade.h:387
+msgid "_Export Tracks from Database"
+msgstr "从数据库导出音轨"
+
+#: ../data/gtkpod.glade.h:388
+msgid "_Fewer Filter Tabs"
+msgstr "更少过滤器标签"
+
+#: ../data/gtkpod.glade.h:389
+msgid "_Filter Bar"
+msgstr "过滤器栏"
+
+#: ../data/gtkpod.glade.h:390
+msgid "_General"
+msgstr "通用"
+
+#: ../data/gtkpod.glade.h:391
+msgid "_Help"
+msgstr "帮助"
+
+#: ../data/gtkpod.glade.h:392
+msgid "_Info Window"
+msgstr "Info窗口"
+
+#: ../data/gtkpod.glade.h:393
+msgid "_Limit to"
+msgstr "限制"
+
+#: ../data/gtkpod.glade.h:394
+msgid "_Load iPod(s)"
+msgstr "加载iPod"
+
+#: ../data/gtkpod.glade.h:395
+msgid "_Local"
+msgstr "本地"
+
+#: ../data/gtkpod.glade.h:396
+msgid "_Lyrics"
+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 Filter Tabs"
+msgstr "更多过滤器标签"
+
+#: ../data/gtkpod.glade.h:400
+msgid "_Music"
+msgstr "iPod音乐"
+
+#: ../data/gtkpod.glade.h:401
+msgid "_Newly Added Tracks"
+msgstr "新添加的音轨"
+
+#: ../data/gtkpod.glade.h:402
+msgid "_Normalize Volume"
+msgstr "均衡音量"
+
+#: ../data/gtkpod.glade.h:403
+msgid "_PLS"
+msgstr "PLS"
+
+#: ../data/gtkpod.glade.h:404
+msgid "_Photos"
+msgstr "照片"
+
+#: ../data/gtkpod.glade.h:405
+msgid "_Play Now"
+msgstr "开始播放"
+
+#: ../data/gtkpod.glade.h:406
+msgid "_Podcasts"
+msgstr "Podcast"
+
+#: ../data/gtkpod.glade.h:407
+msgid "_Prefer Local"
+msgstr "本地偏好"
+
+#: ../data/gtkpod.glade.h:408
+msgid "_Remove Album"
+msgstr "移除专辑"
+
+#: ../data/gtkpod.glade.h:409
+#, fuzzy
+msgid "_Remove Cover Art"
+msgstr "移除插图"
+
+#: ../data/gtkpod.glade.h:410
+msgid "_Remove Images"
+msgstr "移除图像"
+
+#: ../data/gtkpod.glade.h:411
+msgid "_Save Changes"
+msgstr "保存改动"
+
+#: ../data/gtkpod.glade.h:412
+msgid "_Save Displayed Track Order"
+msgstr "顺序保存音轨"
+
+#: ../data/gtkpod.glade.h:413
+msgid "_Sorting"
+msgstr "排序中"
+
+#: ../data/gtkpod.glade.h:414
+msgid "_Synchronize Playlist with Dir(s)"
+msgstr "播放列表与目录同步"
+
+#: ../data/gtkpod.glade.h:415
+msgid "_Toolbar"
+msgstr "工具栏"
+
+#: ../data/gtkpod.glade.h:416
+msgid "_Tools"
+msgstr "工具"
+
+#: ../data/gtkpod.glade.h:417
+msgid "_Tooltips"
+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 "_Zoom"
+msgstr "缩放"
+
+#: ../data/gtkpod.glade.h:423
+msgid "_iPod"
+msgstr "iPod"
+
+#: ../data/gtkpod.glade.h:424
+msgid "checkbutton"
+msgstr "检查"
+
+#: ../data/gtkpod.glade.h:425
+msgid "gtk-revert-to-saved"
+msgstr "gtk-revert-to-saved"
+
+#: ../data/gtkpod.glade.h:426
+msgid "gtkpod Information"
+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:429
+msgid ""
+"iPod\n"
+"Local Repository (Standard)\n"
+"Local Repository (Podcasts)\n"
+msgstr ""
+"iPod\n"
+"本地音乐库(标准)\n"
+"本地音乐库(Podcast)\n"
+
+#: ../data/gtkpod.glade.h:433
+msgid "iPod mountpoint:"
+msgstr "iPod挂载点:"
+
+#: ../data/gtkpod.glade.h:434
+msgid "iTunesDB backup:"
+msgstr "iTunesDB备份:"
+
+#: ../data/gtkpod.glade.h:435
+msgid "mserv Preferences"
+msgstr "mserv首选项"
+
+#: ../data/gtkpod.glade.h:436
+msgid "mserv root:"
+msgstr "mserv根目录:"
+
+#: ../data/gtkpod.glade.h:437 ../src/details.c:1352
+msgid "n/a"
+msgstr "n/a"
+
+#: ../data/gtkpod.glade.h:438
+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 "新挂载在'%s'的iPod无法载入gtkpod\n"
+
+#: ../src/autodetection.c:403
+#, c-format
+msgid ""
+"Newly mounted iPod at '%s' appears to be already loaded!\n"
+"\n"
+msgstr ""
+"新挂载在'%s'的iPod似乎已经装入!\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 "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 "简体中文(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 "日语(automatic detection)"
+
+#: ../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 "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 "泰语(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 "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:163 ../src/charset.c:173 ../src/charset.c:232
+#: ../src/charset.c:248 ../src/charset.c:332
+msgid "System Charset"
+msgstr "系统字符集"
+
+#. we are not the first instance of gtkpod -- the socket is
+#. already being used, so we pass
+#: ../src/clientserver.c:215
+msgid ""
+"Another instance of gtkpod was detected. Playcount server not started.\n"
+msgstr "探测到另一个gtkpod,播放次数计数服务将不会启动。\n"
+
+#: ../src/confirmation.c:389
+msgid "Confirmation"
+msgstr "确认"
+
+#: ../src/context_menus.c:364
+#, c-format
+msgid "Copied \"%s\" playlist to %s"
+msgstr "复制播放列表\"%s\"到 %s "
+
+#: ../src/context_menus.c:403
+#, c-format
+msgid "Copied %d track to '%s'"
+msgid_plural "Copied %d tracks to '%s'"
+msgstr[0] "复制%d条音轨到'%s'"
+msgstr[1] "复制%d条音轨到'%s'"
+
+#: ../src/context_menus.c:431
+#, c-format
+msgid "Copied '%s' playlist to '%s' in '%s'"
+msgstr "复制播放列表'%1$s'到'%3$s'中的'%2$s'"
+
+#: ../src/context_menus.c:464
+#, c-format
+msgid "Copied %d track to '%s' in '%s'"
+msgid_plural "Copied %d tracks to %s in '%s'"
+msgstr[0] "复制%1$d条音轨到'%3$s'中的'%2$s'"
+msgstr[1] "复制%1$d条音轨到'%3$s'中的'%2$s'"
+
+#: ../src/context_menus.c:624 ../src/tools.c:854
+msgid "Play Now"
+msgstr "现在播放"
+
+#: ../src/context_menus.c:630 ../src/tools.c:867
+msgid "Enqueue"
+msgstr "队列"
+
+#: ../src/context_menus.c:636
+msgid "Copy Tracks to Filesystem"
+msgstr "复制音轨到文件系统"
+
+#: ../src/context_menus.c:643 ../src/file_export.c:1085
+msgid "Create Playlist File"
+msgstr "创建播放列表文件"
+
+#: ../src/context_menus.c:650
+msgid "Create new Playlist"
+msgstr "创建新的播放列表"
+
+#: ../src/context_menus.c:657
+msgid "Update Tracks from File"
+msgstr "从文件更新音轨"
+
+#: ../src/context_menus.c:671
+msgid "Sync Playlist with Dir(s)"
+msgstr "同步目录到播放列表"
+
+#: ../src/context_menus.c:681
+msgid "Remove All Tracks from iPod"
+msgstr "从iPod中删除所有音轨"
+
+#: ../src/context_menus.c:687 ../src/context_menus.c:705
+#: ../src/context_menus.c:822
+msgid "I'm sure"
+msgstr "我确定"
+
+#: ../src/context_menus.c:699
+msgid "Remove All Podcasts from iPod"
+msgstr "从iPod中删除所有Podcast"
+
+#: ../src/context_menus.c:714
+msgid "Delete Including Tracks"
+msgstr "删除时包括音轨"
+
+#: ../src/context_menus.c:722
+msgid "Delete But Keep Tracks"
+msgstr "删除但保留音轨"
+
+#: ../src/context_menus.c:730
+msgid "Edit iPod Properties"
+msgstr "编辑iPod属性"
+
+#: ../src/context_menus.c:737
+msgid "Edit Repository Properties"
+msgstr "编辑音乐库属性"
+
+#: ../src/context_menus.c:744
+msgid "Edit Playlist Properties"
+msgstr "编辑播放列表属性"
+
+#: ../src/context_menus.c:772
+msgid "View Full Size Artwork"
+msgstr "查看全部插图"
+
+#: ../src/context_menus.c:779
+msgid "Select Cover From File"
+msgstr "从文件选择插图"
+
+#: ../src/context_menus.c:792
+msgid "Load iPod"
+msgstr "加载iPod"
+
+#: ../src/context_menus.c:799
+msgid "Eject iPod"
+msgstr "弹出iPod"
+
+#: ../src/context_menus.c:816
+msgid "Remove All Tracks from Database"
+msgstr "从数据库删除所有音轨"
+
+#: ../src/context_menus.c:831
+msgid "Delete Including Tracks (Harddisk)"
+msgstr "删除时包括音轨(硬盘)"
+
+#: ../src/context_menus.c:839
+msgid "Delete Including Tracks (Database)"
+msgstr "删除时包括音轨(数据库)"
+
+#: ../src/context_menus.c:847
+msgid "Delete From iPod"
+msgstr "从iPod上删除"
+
+#: ../src/context_menus.c:855
+msgid "Delete From Playlist"
+msgstr "从播放列表中删除"
+
+#: ../src/context_menus.c:863
+msgid "Delete From Harddisk"
+msgstr "从硬盘中删除"
+
+#: ../src/context_menus.c:871
+msgid "Delete From Database"
+msgstr "从数据库中删除"
+
+#: ../src/context_menus.c:879
+msgid "Alphabetize"
+msgstr "按字母顺序排列"
+
+#: ../src/context_menus.c:897
+msgid "Remove Album"
+msgstr "删除专辑"
+
+#: ../src/context_menus.c:907
+msgid "Remove Photo"
+msgstr "删除照片"
+
+#: ../src/context_menus.c:924
+msgid "Rename Album"
+msgstr "重命名专辑"
+
+#: ../src/context_menus.c:983 ../src/context_menus.c:1032
+msgid "Copy selected playlist to..."
+msgstr "复制选定的播放列表到"
+
+#: ../src/context_menus.c:1085
+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 "Podcast"
+
+#: ../src/details.c:86
+msgid "Video Podcast"
+msgstr "视频Podcast"
+
+#: ../src/details.c:87
+msgid "Audiobook"
+msgstr "Audiobook"
+
+#: ../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 "TV Show"
+
+#: ../src/details.c:90
+msgid "TV Show & Music Video"
+msgstr "TV Show和音乐视频"
+
+#: ../src/details.c:837
+#, c-format
+msgid "%s (image data corrupted or unreadable)"
+msgstr "%s (图像数据损坏或无法读取)"
+
+#: ../src/details.c:975
+#, c-format
+msgid "Please report unknown mediatype %x\n"
+msgstr "请报告未知媒体类型 %x\n"
+
+#: ../src/details.c:1417
+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 "把图片拖动到详细窗口时发生错误:%s\n"
+
+#: ../src/details.c:1952 ../src/display_coverart.c:2297
+msgid "Successfully set new coverart for selected tracks"
+msgstr "成功为选定音轨设置新的插图"
+
+#. Set the resolution in the label
+#: ../src/display.c:570
+#, c-format
+msgid "<b>Image Dimensions: %d x %d</b>"
+msgstr "<b>图片尺寸: %d x %d</b>"
+
+#: ../src/display.c:814
+msgid "Edit selected entry of which sort tab?"
+msgstr "编辑选定那个标签项目?"
+
+#. no entry selected
+#: ../src/display.c:821 ../src/misc_confirm.c:469 ../src/misc_track.c:2158
+msgid "No entry selected."
+msgstr "没有选择项目"
+
+#: ../src/display.c:974 ../src/display.c:1320 ../src/display.c:1376
+#: ../src/display.c:1430 ../src/display.c:1485 ../src/display.c:1746
+#, c-format
+msgid "No entry selected in Sort Tab %d"
+msgstr "没有选择排序标签 %d"
+
+#: ../src/display.c:1015
+msgid "Remove entry of which sort tab from database?"
+msgstr "删除数据库中的哪个排序标签?"
+
+#: ../src/display.c:1024
+msgid "Remove tracks in selected entry of which filter tab from the iPod?"
+msgstr "删除iPod中的音轨时按照哪个过滤器标签?"
+
+#: ../src/display.c:1049
+msgid "Remove tracks in selected entry of which filter tab from the harddisk?"
+msgstr "删除硬盘中的音轨时按照哪个过滤器标签?"
+
+#: ../src/display.c:1082
+msgid "Remove tracks in selected entry of which filter tab from playlist?"
+msgstr "删除播放列表中的音轨时按照哪个过滤器标签?"
+
+#: ../src/display.c:1109 ../src/display.c:1147
+#, c-format
+msgid ""
+"iPod at '%s' is not loaded.\n"
+"Please load it first."
+msgstr ""
+"'%s'的iPod没有加载。\n"
+"请先加载。"
+
+#: ../src/display.c:1184 ../src/display.c:1218
+msgid "Update selected entry of which sort tab?"
+msgstr "按照哪个排序标签更新选定项目?"
+
+#: ../src/display.c:1314
+msgid "Export selected entry of which sort tab?"
+msgstr "按照哪个排序标签导出所选项目?"
+
+#: ../src/display.c:1370
+msgid "Create playlist file from selected entry of which sort tab?"
+msgstr "按照哪个排序标签创建播放列表?"
+
+#: ../src/display.c:1424
+msgid "Play tracks in selected entry of which sort tab?"
+msgstr "按照哪个排序标签来播放音轨?"
+
+#: ../src/display.c:1479
+msgid "Enqueue tracks in selected entry of which sort tab?"
+msgstr "选定项目中按照哪个排序标签来对音轨排队?"
+
+#: ../src/display.c:1736
+msgid "Normalize tracks in selected entry of which sort tab?"
+msgstr "选定项目按照哪个排序标签对音轨进行均衡化?"
+
+#: ../src/display_coverart.c:1874
+msgid "Failed to remove the album from the album hash store."
+msgstr "将专辑从album hash store删除失败。"
+
+#: ../src/display_coverart.c:2262
+#, c-format
+msgid "Error occurred dropping an image onto the coverart display: %s\n"
+msgstr "把图片作为插图显示时发生错误:%s\n"
+
+#: ../src/display_itdb.c:385
+#, c-format
+msgid "Failed to set cover art: '%s'\n"
+msgstr "设置插图失败:'%s'\n"
+
+#: ../src/display_itdb.c:871
+msgid "Music Library"
+msgstr "音乐库"
+
+#. add podcast playlist
+#: ../src/display_itdb.c:879 ../src/display_itdb.c:1003
+#: ../src/display_itdb.c:1039
+msgid "Podcasts"
+msgstr "Podcast"
+
+#: ../src/display_itdb.c:888 ../src/display_itdb.c:1007
+#: ../src/repository.c:1200
+msgid "iPod"
+msgstr "iPod"
+
+#: ../src/display_itdb.c:1005
+msgid "Local"
+msgstr "本地"
+
+#: ../src/display_itdb.c:1098
+#, c-format
+msgid "Increased playcount for '%s'"
+msgstr "'%s'增加播放计数"
+
+#: ../src/display_photo.c:158
+#, c-format
+msgid "Error reading iPod photo database (%s).\n"
+msgstr "读取照片数据库(%s)时发生错误。\n"
+
+#: ../src/display_photo.c:161
+msgid "Error reading iPod photo database.\n"
+msgstr "读取iPod照片数据库时发生错误。\n"
+
+#: ../src/display_photo.c:201
+msgid "Could not access the iPod's photo database."
+msgstr "无法连接iPod照片数据库。"
+
+#: ../src/display_photo.c:404
+msgid "Photo Albums"
+msgstr "照片簿"
+
+#: ../src/display_photo.c:414 ../src/display_photo.c:1587
+msgid "<Unnamed>"
+msgstr "<未命名的>"
+
+#: ../src/display_photo.c:848
+msgid "The Photo Library album cannot be removed"
+msgstr "照片簿无法删除"
+
+#: ../src/display_photo.c:870
+msgid "Do you want to remove the album's photos too?"
+msgstr "同时删除照片簿中的照片吗?"
+
+#: ../src/display_photo.c:876
+msgid "Yes. Do Not Display Again"
+msgstr "是的,不再显示。"
+
+#: ../src/display_photo.c:947
+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:962
+msgid ""
+"This will delete the photo selection from the Photo Library and all albums. "
+"Are you sure?"
+msgstr "这将从照片库和所有照片簿中删除选定照片。你确定吗?"
+
+#: ../src/display_photo.c:1036
+msgid "New Photo Album Name"
+msgstr "新照片簿的名称"
+
+#: ../src/display_photo.c:1037
+msgid "Please enter a new name for the photo album"
+msgstr "请为照片簿输入新名称"
+
+#: ../src/display_photo.c:1050 ../src/display_photo.c:1133
+msgid "An album with that name already exists."
+msgstr "已经存在一个同名照片簿。"
+
+#: ../src/display_photo.c:1119
+msgid "New Photo Album"
+msgstr "新照片簿"
+
+#: ../src/display_photo.c:1120
+msgid "Please enter a name for the new photo album"
+msgstr "请为新的照片簿输入名称"
+
+#: ../src/display_photo.c:1142
+msgid "The new album failed to be created."
+msgstr "新照片簿创建失败。"
+
+#: ../src/display_photo.c:1166
+msgid "Add Image to iPod"
+msgstr "将图片添加到iPod"
+
+#. Open a dialog directory chooser window
+#: ../src/display_photo.c:1221
+msgid "Add a Directory of Images to the iPod. Select the Directory."
+msgstr "添加图片到iPod,请选择目录。"
+
+#: ../src/display_photo.c:1601
+#, 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:537 ../src/display_playlists.c:579
+msgid "Error: drag from iPod not possible in offline mode."
+msgstr "错误:离线模式下无法对iPod拖拽操作"
+
+#: ../src/display_playlists.c:606 ../src/display_tracks.c:403
+#, c-format
+msgid "Copied one track"
+msgid_plural "Copied %d tracks"
+msgstr[0] "复制一条音轨"
+msgstr[1] "复制%d条音轨(s)"
+
+#: ../src/display_playlists.c:886 ../src/display_playlists.c:898
+msgid "Can't reorder sorted treeview."
+msgstr "无法按照树形视图重新排列。"
+
+#: ../src/display_playlists.c:975
+#, 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"
+
+#: ../src/display_playlists.c:2039
+msgid "Photos"
+msgstr "照片"
+
+#: ../src/display_sorttabs.c:479
+msgid "'Played' condition ignored because of error."
+msgstr "发生错误忽略'已播放'"
+
+#: ../src/display_sorttabs.c:482
+msgid "'Modified' condition ignored because of error."
+msgstr "发生错误忽略'已修改'"
+
+#: ../src/display_sorttabs.c:485
+msgid "'Added' condition ignored because of error."
+msgstr "发生错误忽略'已添加'"
+
+#: ../src/display_sorttabs.c:1568 ../src/misc_conversion.c:59
+msgid "All"
+msgstr "所有"
+
+#: ../src/display_sorttabs.c:1594
+msgid "Compilations"
+msgstr "汇集"
+
+#: ../src/display_sorttabs.c:3001
+msgid "Comp."
+msgstr "唱片公司"
+
+#: ../src/display_sorttabs.c:3007 ../src/display_spl.c:88
+#: ../src/display_tracks.c:2333 ../src/misc_conversion.c:84
+msgid "Year"
+msgstr "年代"
+
+#: ../src/display_sorttabs.c:3010
+msgid "Special"
+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 "kbps"
+
+#: ../src/display_spl.c:74
+msgid "Hz"
+msgstr "Hz"
+
+#: ../src/display_spl.c:75 ../src/display_spl.c:179 ../src/info.c:794
+msgid "MB"
+msgstr "MB"
+
+#: ../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:94 ../src/infodlg.c:78
+msgid "Play time"
+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:98 ../src/misc_conversion.c:77
+msgid "Playcount"
+msgstr "播放计数"
+
+#: ../src/display_spl.c:99
+msgid "Last played"
+msgstr "最后播放"
+
+#: ../src/display_spl.c:100
+msgid "Disc number"
+msgstr "Disc number"
+
+#: ../src/display_spl.c:101 ../src/misc_conversion.c:78
+msgid "Rating"
+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 "Season number"
+
+#: ../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: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:1143 ../src/display_spl.c:1158
+msgid "to"
+msgstr "至"
+
+#: ../src/display_spl.c:1436
+msgid "-"
+msgstr "-"
+
+#: ../src/display_spl.c:1451
+msgid "+"
+msgstr "+"
+
+#: ../src/display_tracks.c:398
+#, c-format
+msgid "Moved one track"
+msgid_plural "Moved %d tracks"
+msgstr[0] "移动音轨%d"
+msgstr[1] "移动音轨%d"
+
+#: ../src/display_tracks.c:2022
+#, 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)的一个bug不能以未排序方式查看。因为一旦你排序后,就"
+"无法再以原来未排序方式查看\n"
+
+#: ../src/display_tracks.c:2288
+msgid "Rtng"
+msgstr "Rtng"
+
+#: ../src/display_tracks.c:2291
+msgid "#"
+msgstr "#"
+
+#: ../src/display_tracks.c:2294
+msgid "CD"
+msgstr "CD"
+
+#: ../src/display_tracks.c:2297
+msgid "ID"
+msgstr "ID"
+
+#: ../src/display_tracks.c:2300
+msgid "Trnsfrd"
+msgstr "Trnsfrd"
+
+#: ../src/display_tracks.c:2309
+msgid "Cmpl"
+msgstr "Cmpl"
+
+#: ../src/display_tracks.c:2315
+msgid "Time"
+msgstr "时间"
+
+#: ../src/display_tracks.c:2318
+msgid "Plycnt"
+msgstr "Plycnt"
+
+#: ../src/display_tracks.c:2321
+msgid "Played"
+msgstr "已播放"
+
+#: ../src/display_tracks.c:2324
+msgid "Modified"
+msgstr "已修改"
+
+#: ../src/display_tracks.c:2327
+msgid "Added"
+msgstr "已添加"
+
+#: ../src/display_tracks.c:2330
+msgid "Released"
+msgstr "已发布"
+
+#: ../src/display_tracks.c:2336
+msgid "Vol."
+msgstr "Vol."
+
+#: ../src/display_tracks.c:2339
+msgid "Sndchk."
+msgstr "sndchk."
+
+#: ../src/fetchcover.c:359
+#, c-format
+msgid ""
+"The picture file %s already exists.\n"
+"This may be associated with other music files in the directory.\n"
+"\n"
+"Do you want to overwrite the existing file, possibly associating\n"
+"other music files in the same directory with this cover art file,\n"
+"to save the file with a unique file name, or to abort the fetchcover "
+"operation?"
+msgstr ""
+"图片文件%s已经存在。\n"
+"或许它已关联到目录中的其他音乐文件。\n"
+"\n"
+"你希望覆盖现有文件吗?可能这个插图文件关联到同一\n"
+"目录下的其他音乐文件,想要以唯一名称保存该文件,或是\n"
+"放弃这个操作?"
+
+#: ../src/fetchcover.c:368
+msgid "Cover art file already exists"
+msgstr "插图文件存在"
+
+#: ../src/fetchcover.c:370
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: ../src/fetchcover.c:371
+msgid "Rename"
+msgstr "重命名"
+
+#: ../src/fetchcover.c:372
+msgid "Abort"
+msgstr "放弃"
+
+#: ../src/file.c:238
+#, c-format
+msgid ""
+"'%s' is a directory, not a playlist file.\n"
+"\n"
+msgstr ""
+"'%s'是个目录,而不是播放列表文件。\n"
+"\n"
+
+#: ../src/file.c:268
+#, c-format
+msgid ""
+"'%s' is a not a known playlist file.\n"
+"\n"
+msgstr ""
+"'%s'是一个未知播放列表文件。\n"
+"\n"
+
+#: ../src/file.c:285 ../src/file_export.c:217 ../src/oggfile.c:62
+#: ../src/wavfile.c:107
+#, c-format
+msgid "Could not open '%s' for reading.\n"
+msgstr "无法读取'%s'。\n"
+
+#: ../src/file.c:371
+#, c-format
+msgid "Skipping '%s' because it is a directory.\n"
+msgstr "忽略目录文件'%s'\n"
+
+#: ../src/file.c:376
+#, c-format
+msgid "Skipping '%s' to avoid adding playlist file recursively\n"
+msgstr "忽略'%s'以免递归添加播放列表\n"
+
+#: ../src/file.c:631
+#, c-format
+msgid "Unknown token '%s' in template '%s'\n"
+msgstr "模板'%2$s'中有未知字符串'%1$s'\n"
+
+#: ../src/file.c:939
+#, c-format
+msgid "Local filename not valid (%s)"
+msgstr "本地文件名无效(%s)"
+
+#: ../src/file.c:998
+#, c-format
+msgid "No information found for user '%s' in '%s'"
+msgstr "'%2$s'中找不到用户'%1$s'的信息"
+
+#: ../src/file.c:1007
+#, c-format
+msgid "mserv data file (%s) not available for track (%s)"
+msgstr "mserv数据文件(%s)中没有音轨(%s)的信息"
+
+#: ../src/file.c:1015
+#, c-format
+msgid "Track (%s) not in mserv music root directory (%s)"
+msgstr "mserv音乐主目录(%2$s)中没有音轨(%1$s)"
+
+#: ../src/file.c:1046
+#, c-format
+msgid "Could not create '%s'"
+msgstr "无法创建'%s'"
+
+#: ../src/file.c:1083
+msgid "Error creating thumbnail file"
+msgstr "创建缩略文件时发生错误"
+
+#: ../src/file.c:1114 ../src/misc.c:1018
+#, c-format
+msgid "Unknown token '%%%c' in template '%s'"
+msgstr "模板'%2$s'中有未知字符串'%%%1$c'"
+
+#: ../src/file.c:1138
+#, c-format
+msgid ""
+"Unable to start video thumbnail generator\n"
+"(command line was: '%s'"
+msgstr ""
+"无法运行视频缩略工具\n"
+"命令为:'%s'"
+
+#: ../src/file.c:1142
+#, c-format
+msgid "Thumbnail generator returned status %d"
+msgstr "缩略生成工具返回信息%d"
+
+#: ../src/file.c:1291
+#, c-format
+msgid ""
+"The following track could not be processed (file does not exist): '%s'\n"
+msgstr "下列音轨无法完成处理(文件不存在):'%s'\n"
+
+#: ../src/file.c:1377
+#, c-format
+msgid "The following track could not be processed (filetype unknown): '%s'\n"
+msgstr "下列音轨无法完成处理(文件类型未知):'%s'\n"
+
+#: ../src/file.c:1476
+#, c-format
+msgid ""
+"The following track could not be processed (filetype is known but analysis "
+"failed): '%s'\n"
+msgstr "下列音轨无法完成处理(文件类型已知但文件解析失败):'%s'\n"
+
+#: ../src/file.c:1506 ../src/file.c:1560
+msgid "Nothing to update"
+msgstr "无需要更新的项目"
+
+#: ../src/file.c:1527
+#, c-format
+msgid "Updating %s"
+msgstr "更新%s中"
+
+#: ../src/file.c:1541
+msgid "Updated selected tracks with info from file."
+msgstr "从文件更新所选音轨的信息。"
+
+#: ../src/file.c:1575
+#, c-format
+msgid "Retrieving mserv data %s"
+msgstr "获取mserv数据%s"
+
+#: ../src/file.c:1580
+msgid "no filename available"
+msgstr "没有现成文件名"
+
+#: ../src/file.c:1585
+msgid "Updated selected tracks with data from mserv."
+msgstr "以mserv的数据更新选定音轨。"
+
+#: ../src/file.c:1606
+#, c-format
+msgid "The following track could not be updated"
+msgid_plural "The following %d tracks could not be updated"
+msgstr[0] "下列音轨无法更新"
+msgstr[1] "下列%d条音轨无法更新"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1612
+msgid "Failed Track Update"
+msgstr "更新音轨失败"
+
+#: ../src/file.c:1670
+#, c-format
+msgid "The following track has been updated"
+msgid_plural "The following %d tracks have been updated"
+msgstr[0] "下列音轨完成更新"
+msgstr[1] "下列%d条音轨完成更新"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1676
+msgid "Successful Track Update"
+msgstr "成功更新音轨"
+
+#: ../src/file.c:1735
+#, 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] "无法为下列音轨获取mserv信息"
+msgstr[1] "无法为下列%d条音轨获取mserv信息"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:1741
+msgid "mserv data retrieval problem"
+msgstr "获取mserv数据时发生问题"
+
+#: ../src/file.c:1829
+msgid "no local filename available, file on the iPod will be used instead"
+msgstr "本地文件不存在,将使用iPod上的文件代替"
+
+#: ../src/file.c:1835
+msgid "no local filename available and copy on iPod cannot be found"
+msgstr "本地文件不存在,iPod中的拷贝也找不到"
+
+#: ../src/file.c:1839 ../src/file.c:1857
+msgid "no local filename available"
+msgstr "本地文件不存在"
+
+#: ../src/file.c:1847
+msgid "local file could not be found, file on the iPod will be used instead"
+msgstr "找不到本地文件,将使用iPod上的文件代替"
+
+#: ../src/file.c:1853
+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:1956
+msgid "update failed (format not supported?)"
+msgstr "更新失败(格式不支持?)"
+
+#: ../src/file.c:2041 ../src/misc_playlist.c:936
+#, c-format
+msgid "Processing '%s'..."
+msgstr "处理'%s'中..."
+
+#: ../src/file.c:2047
+#, c-format
+msgid "Skipping '%s' because it matches exclude masks.\n"
+msgstr "忽略'%s'因为它满足排除条件。\n"
+
+#: ../src/file.c:2167 ../src/misc_track.c:1793 ../src/misc_track.c:1898
+#, c-format
+msgid ""
+"Podcast already present: '%s'\n"
+"\n"
+msgstr ""
+"Podcast已存在:'%s'\n"
+"\n"
+
+#: ../src/file.c:2232
+#, c-format
+msgid ""
+"Writing to video files not yet supported (%s).\n"
+"\n"
+msgstr ""
+"还不支持对视频文件的写入操作(%s)。\n"
+"\n"
+
+#: ../src/file.c:2284 ../src/file.c:2298
+#, c-format
+msgid "Couldn't change tags of file: %s\n"
+msgstr "无法改变文件的标签:%s\n"
+
+#: ../src/file.c:2400
+#, c-format
+msgid "Could not open '%s' for reading and writing.\n"
+msgstr "无法打开文件'%s'读写。\n"
+
+#: ../src/file.c:2407
+#, c-format
+msgid "Could not obtain lock on '%s'.\n"
+msgstr "无法对文件'%s'加锁。\n"
+
+#. error!
+#: ../src/file.c:2424 ../src/file.c:2433 ../src/file.c:2444 ../src/file.c:2454
+#, c-format
+msgid "Malformed line in '%s': %s\n"
+msgstr "'%s'中格式有误:%s\n"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/file.c:2483
+msgid "Remove offline playcounts?"
+msgstr "清除离线播放计数?"
+
+#. title
+#: ../src/file.c:2484
+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:2501
+#, c-format
+msgid "Error writing to '%s'.\n"
+msgstr "写入'%s'时发生错误。\n"
+
+#: ../src/file.c:2558 ../src/tools.c:270
+#, c-format
+msgid ""
+"Normalization failed: file type not supported (%s).\n"
+"\n"
+msgstr ""
+"均衡化失败:文件类型不支持(%s)。\n"
+"\n"
+
+#: ../src/file.c:2574 ../src/tools.c:287
+#, c-format
+msgid ""
+"Normalization failed: file not available (%s).\n"
+"\n"
+msgstr ""
+"均衡化失败:文件不存在(%s)。\n"
+"\n"
+
+#: ../src/file.c:2631
+#, c-format
+msgid ""
+"Lyrics not found, file not available (%s).\n"
+"\n"
+msgstr ""
+"找不到歌词,文件不存在(%s)。\n"
+"\n"
+
+#: ../src/file.c:2671
+#, c-format
+msgid ""
+"iPod File not available and ID3 saving disabled in options, cannot save "
+"lyrics to: %s.\n"
+"\n"
+msgstr ""
+"iPod文件不存在并且ID3保存功能被禁用,无法保存歌词到:%s \n"
+"\n"
+
+#: ../src/file.c:2712
+#, c-format
+msgid ""
+"Lyrics not written, file name not available (%s).\n"
+"\n"
+msgstr ""
+"歌词未写入,文件名不存在(%s)。\n"
+"\n"
+
+#: ../src/file_convert.c:328
+msgid "Summary status of conversion processes"
+msgstr "转换进度摘要"
+
+#: ../src/file_convert.c:576
+msgid "active"
+msgstr "活跃的"
+
+#: ../src/file_convert.c:581
+msgid "inactive"
+msgstr "不活跃的"
+
+#: ../src/file_convert.c:592
+#, c-format
+msgid "Active threads: %d. Scheduled tracks: %d."
+msgstr "活跃进程:%d    计划播放音轨:%d条"
+
+#: ../src/file_convert.c:1090
+#, c-format
+msgid "Original filename not available for '%s.'\n"
+msgstr "'%s'的原始文件不存在。\n"
+
+#: ../src/file_convert.c:1105
+#, c-format
+msgid "Filename '%s' is no longer valid for '%s'.\n"
+msgstr "文件名'%s'对'%s'无效。\n"
+
+#: ../src/file_convert.c:1156
+msgid "Ogg Vorbis"
+msgstr "Ogg Vorbis"
+
+#: ../src/file_convert.c:1162
+msgid "FLAC"
+msgstr "FLAC"
+
+#: ../src/file_convert.c:1217
+#, 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 ""
+"iPod不支持'%s'类型的文件,请在首选项中为'%s'设置适当的转换脚本。\n"
+"\n"
+
+#: ../src/file_convert.c:1303
+msgid "No information available"
+msgstr "无可用信息"
+
+#: ../src/file_convert.c:1342
+#, c-format
+msgid "Could not create '%s'. Filetype conversion will not work.\n"
+msgstr "无法创建'%s',文件类型转换失败。\n"
+
+#: ../src/file_convert.c:1667 ../src/file_convert.c:3119
+#, c-format
+msgid ""
+"Transfer of '%s' failed. %s\n"
+"\n"
+msgstr ""
+"移动'%s'失败。%s\n"
+"\n"
+
+#: ../src/file_convert.c:2073 ../src/file_convert.c:2352
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '%s'.\n"
+"\n"
+msgstr ""
+"转换'%s'失败:'%s'。\n"
+"\n"
+
+#: ../src/file_convert.c:2088
+#, 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:2117
+#, 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:2193
+#, 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:2248
+#, c-format
+msgid ""
+"Conversion of '%s' failed: Could not create directory '%s'.\n"
+"\n"
+msgstr ""
+"转换'%s'失败:无法创建目录'%s'。\n"
+"\n"
+
+#: ../src/file_convert.c:2383
+#, c-format
+msgid ""
+"Conversion of '%s' failed: '%s' returned exit status %d.\n"
+"\n"
+msgstr ""
+"转换'%s'失败: '%s'返回退出状态%d。\n"
+"\n"
+
+#: ../src/file_convert.c:2422
+#, c-format
+msgid ""
+"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
+"\n"
+msgstr ""
+"转换'%s'失败:无法设定转换后文件'%s'的stat。\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:327
+#, c-format
+msgid "Could find file for '%s' on the iPod\n"
+msgstr "无法找到iPod中'%s'的文件\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."
+msgid_plural "Copied %d of %d tracks."
+msgstr[0] "复制%2$d条音轨中的第%1$d条"
+msgstr[1] "复制%2$d条音轨中的第%1$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."
+msgid_plural "Created playlist with %d tracks."
+msgstr[0] "为这条音轨创建播放列表"
+msgstr[1] "为这%d条音轨创建播放列表"
+
+#: ../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:133
+#, c-format
+msgid "Matching SHA1 checksum for file %d/%d"
+msgstr "文件的SHA1验证匹配中 %d/%d"
+
+#: ../src/file_itunesdb.c:249
+#, c-format
+msgid "Could not open \"%s\" for reading extended info.\n"
+msgstr "无法打开\"%s\"以读取扩展信息。\n"
+
+#: ../src/file_itunesdb.c:256
+msgid "Could not create hash value from itunesdb\n"
+msgstr "无法从iTunesDB创建哈希值\n"
+
+#: ../src/file_itunesdb.c:272
+#, c-format
+msgid "Error while reading extended info: %s\n"
+msgstr "读取扩展信息时发生错误:%s\n"
+
+#: ../src/file_itunesdb.c:289
+#, 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:301
+#, c-format
+msgid ""
+"%s:\n"
+"Expected \"itunesdb_hash=\" but got:\"%s\"\n"
+msgstr ""
+"%s:\n"
+"期望是\"itunesdb_hash\",但是得到:\"%s\"\n"
+
+#: ../src/file_itunesdb.c:363
+#, c-format
+msgid ""
+"%s:\n"
+"Format error: %s\n"
+msgstr ""
+"%s:\n"
+"格式错误:%s\n"
+
+#: ../src/file_itunesdb.c:408
+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验证码)或者不在gtkpod以外"
+"的其他程序中使用iPod。\n"
+"\n"
+
+#: ../src/file_itunesdb.c:474
+msgid ""
+"Extended info will not be used. If you have non-transferred tracks,\n"
+"these will be lost.\n"
+msgstr "扩展信息将不会被使用,如果还有未传输的音轨,它们将会丢失。\n"
+
+#: ../src/file_itunesdb.c:482
+msgid "Offline iPod database successfully imported"
+msgstr "离线iPod数据库成功导入"
+
+#: ../src/file_itunesdb.c:485
+msgid "Local database successfully imported"
+msgstr "本地数据库成功导入"
+
+#: ../src/file_itunesdb.c:493
+#, c-format
+msgid ""
+"Offline iPod database import failed: '%s'\n"
+"\n"
+msgstr ""
+"离线iPod数据库导入失败:'%s'\n"
+"\n"
+
+#: ../src/file_itunesdb.c:497
+#, c-format
+msgid ""
+"Local database import failed: '%s'\n"
+"\n"
+msgstr ""
+"本地数据库导入失败:'%s'\n"
+"\n"
+
+#: ../src/file_itunesdb.c:504
+msgid ""
+"Offline iPod database import failed: \n"
+"\n"
+msgstr ""
+"离线iPod数据库导入失败:\n"
+"\n"
+
+#: ../src/file_itunesdb.c:507
+msgid ""
+"Local database import failed: \n"
+"\n"
+msgstr ""
+"本地数据库导入失败:\n"
+"\n"
+
+#: ../src/file_itunesdb.c:514
+#, c-format
+msgid ""
+"'%s' does not exist. Import aborted.\n"
+"\n"
+msgstr ""
+"'%s'不存在,放弃导入操作。\n"
+"\n"
+
+#: ../src/file_itunesdb.c:536
+msgid "Extended info will not be used.\n"
+msgstr "扩展信息将不会被使用。\n"
+
+#: ../src/file_itunesdb.c:543
+msgid "iPod Database Successfully Imported"
+msgstr "iPod数据库已成功导入"
+
+#: ../src/file_itunesdb.c:550
+#, c-format
+msgid ""
+"iPod Database Import Failed: '%s'\n"
+"\n"
+msgstr ""
+"iPod数据库导入失败:'%s'\n"
+"\n"
+
+#: ../src/file_itunesdb.c:556
+msgid ""
+"iPod Database Import Failed.\n"
+"\n"
+msgstr ""
+"iPod数据库导入失败。\n"
+"\n"
+
+#: ../src/file_itunesdb.c:565
+#, c-format
+msgid ""
+"'%s' (or similar) does not exist. Import aborted.\n"
+"\n"
+msgstr ""
+"'%s'(或类似)不存在,放弃导入。\n"
+"\n"
+
+#: ../src/file_itunesdb.c:886
+#, c-format
+msgid ""
+"Could not find iPod directory structure at '%s'.\n"
+"\n"
+"If you are sure that the iPod is properly mounted at '%s', it may not be "
+"initialized for use. In this case, gtkpod can initialize it for you.\n"
+"\n"
+"Do you want to create the directory structure now?"
+msgstr ""
+"在'%s'中无法找到iPod目录结构。\n"
+"\n"
+"如果你确定iPod正确挂载在'%s',并且似乎不工作。这种情况下,你可以用gtkpod强制"
+"初始化。\n"
+"\n"
+"你真的准备现在就创建目录结构吗?"
+
+#: ../src/file_itunesdb.c:890
+msgid "iPod directory structure not found"
+msgstr "iPod目录结构未找到"
+
+#: ../src/file_itunesdb.c:892
+msgid "Create directory structure"
+msgstr "创建目录结构"
+
+#: ../src/file_itunesdb.c:1198
+#, c-format
+msgid "Could not open \"%s\" for writing extended info.\n"
+msgstr "无法打开\"%s\"写入扩展信息。\n"
+
+#: ../src/file_itunesdb.c:1213
+msgid "Aborted writing of extended info.\n"
+msgstr "放弃扩展信息的写入操作。\n"
+
+#: ../src/file_itunesdb.c:1415
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: ../src/file_itunesdb.c:1429
+#, c-format
+msgid "%d%% (%d/%d  %d:%02d:%02d left)"
+msgstr "%d%% (%d/%d  还有%d:%02d:%02d)"
+
+#: ../src/file_itunesdb.c:1481
+msgid "Status: Deleting File"
+msgstr "状态:删除文件中"
+
+#: ../src/file_itunesdb.c:1542
+#, c-format
+msgid ""
+"Could not remove the following file: '%s'\n"
+"\n"
+msgstr ""
+"无法删除下列文件:'%s'\n"
+"\n"
+
+#: ../src/file_itunesdb.c:1651
+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] ""
+"下列音轨无法完成转换:\n"
+"\n"
+msgstr[1] ""
+"下列音轨无法完成转换:\n"
+"\n"
+
+#: ../src/file_itunesdb.c:1661
+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] ""
+"下列音轨无法完成传输:\n"
+"\n"
+msgstr[1] ""
+"下列音轨无法完成传输:\n"
+"\n"
+
+#. ID
+#. modal,
+#. gint id,
+#. gboolean modal,
+#: ../src/file_itunesdb.c:1670 ../src/misc_confirm.c:70
+#: ../src/misc_confirm.c:94
+msgid "Warning"
+msgstr "警告"
+
+#. title
+#: ../src/file_itunesdb.c:1671
+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无法弹出,请按照下面的指示修复并再次尝试弹出。按'ok'将重新安排对操作失败"
+"的音轨进行转换和传输。"
+
+#: ../src/file_itunesdb.c:1734
+#, c-format
+msgid "Status: Copying track"
+msgstr "状态:复制音轨中"
+
+#: ../src/file_itunesdb.c:1740
+#, c-format
+msgid "Status: Waiting for conversion to complete"
+msgstr "等待完成转换"
+
+#: ../src/file_itunesdb.c:1744
+#, c-format
+msgid "Status: Finished transfer"
+msgstr "状态:传输完成"
+
+#: ../src/file_itunesdb.c:1789
+#, 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] ""
+"因为你的iPod已经满了,无法再传输音轨。或者删除部分音轨或者在iPod上腾出磁盘空"
+"间"
+msgstr[1] ""
+"因为你的iPod已经满了,无法再传输%d条音轨。或者删除部分音轨或者在iPod上腾出磁"
+"盘空间"
+
+#: ../src/file_itunesdb.c:1871
+#, 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"
+"If you skip storing, you can import the existing database before calling "
+"this function again.\n"
+msgstr ""
+"你没有导入现有的iTunesDB('%s'),这可能是个错误并使现有数据库受到损失。\n"
+"\n"
+"如果跳过保存,你还可以在下次同步前再次导入现存数据库。\n"
+"\n"
+
+#: ../src/file_itunesdb.c:1875 ../src/misc_playlist.c:1039
+msgid "Existing iTunes database not imported"
+msgstr "现有的iTunes数据库没有被导入"
+
+#: ../src/file_itunesdb.c:1877 ../src/misc_playlist.c:1041
+msgid "Proceed anyway"
+msgstr "不管,继续原来操作"
+
+#: ../src/file_itunesdb.c:1878
+msgid "Skip storing"
+msgstr "跳过保存"
+
+#: ../src/file_itunesdb.c:1909
+msgid ""
+"iPod directory structure must be present before synching to the iPod can be "
+"performed.\n"
+msgstr "在开始同步iPod之前,iPod目录结构必须是已经存在。\n"
+
+#: ../src/file_itunesdb.c:1918
+msgid "Some tracks could not be deleted from the iPod. Export aborted!"
+msgstr "部分音轨无法从iPod中删除,放弃导出!"
+
+#: ../src/file_itunesdb.c:1936
+#, c-format
+msgid "Now writing database '%s'. Please wait..."
+msgstr "现在开始写入数据库'%s',请等待..."
+
+#: ../src/file_itunesdb.c:1985
+#, c-format
+msgid "Extended information file not deleted: '%s'"
+msgstr "扩展信息文件没有被删除:'%s'"
+
+#: ../src/file_itunesdb.c:2092
+#, c-format
+msgid "%s: Database saved"
+msgstr "%s:数据库已保存"
+
+#: ../src/file_itunesdb.c:2096
+#, c-format
+msgid "%s: Changes saved"
+msgstr "%s:改动已经保存"
+
+#: ../src/fileselection.c:142 ../src/fileselection.c:583
+msgid "Successfully added files"
+msgstr "成功添加文件"
+
+#: ../src/fileselection.c:144 ../src/fileselection.c:585
+msgid "Some files were not added successfully"
+msgstr "部分文件没有添加成功"
+
+#: ../src/fileselection.c:176 ../src/fileselection.c:276
+#: ../src/fileselection.c:601
+msgid "Please select a playlist or repository before adding tracks."
+msgstr "在添加音轨之前请先选择一个播放列表或者音乐库。"
+
+#: ../src/fileselection.c:187 ../src/fileselection.c:285
+msgid "Please load the iPod before adding tracks."
+msgstr "在添加音轨之前请先加载iPod"
+
+#: ../src/fileselection.c:197
+#, c-format
+msgid "Add files to '%s'"
+msgstr "添加文件到'%s'"
+
+#: ../src/fileselection.c:201
+#, c-format
+msgid "Add files to '%s/%s'"
+msgstr "添加文件到'%s/%s'"
+
+#. Create window title
+#: ../src/fileselection.c:293
+#, c-format
+msgid "Add playlist files to '%s'"
+msgstr "添加播放列表到'%s'"
+
+#. Create the file chooser, and handle the response
+#: ../src/fileselection.c:319
+msgid "Set Cover"
+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:193
+#, 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:199
+#, 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'的FLAC元数据更新失败:没有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/help.c:48
+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/help.c:52
+msgid ""
+"Patches were supplied by the following people (list may be incomplete -- "
+"please contact me)\n"
+msgstr "下列人员提供了补丁文件(名单可能不全--请联系我)\n"
+
+#: ../src/help.c:53
+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/help.c:54
+msgid "Hiroshi Kawashima: Japanese charset autodetection feature"
+msgstr "Hiroshi Kawashima: Japanese charset autodetection feature"
+
+#: ../src/help.c:55
+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/help.c:56
+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/help.c:57
+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/help.c:58
+msgid "Chris Cutler: automatic creation of various playlist types"
+msgstr "Chris Cutler: automatic creation of various playlist types"
+
+#: ../src/help.c:59
+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/help.c:60
+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/help.c:61
+msgid "Jens Lautenbach: some optical improvements"
+msgstr "Jens Lautenbach: some optical improvements"
+
+#: ../src/help.c:62
+msgid "Alex Tribble: iPod eject patch"
+msgstr "Alex Tribble: iPod eject patch"
+
+#: ../src/help.c:63
+msgid "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+msgstr "Yaroslav Halchenko: Orphaned and dangling tracks handling"
+
+#: ../src/help.c:64
+msgid ""
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
+msgstr ""
+"Andrew Huntwork: Filename case sensitivity fix and various other bugfixes"
+
+#: ../src/help.c:65
+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/help.c:66
+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/help.c:67
+msgid "Armando Atienza: Support with external playcounts"
+msgstr "Armando Atienza: Support with external playcounts"
+
+#: ../src/help.c:68
+msgid "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+msgstr "D.L. Sharp: Support for m4b files (bookmarkable AAC files)"
+
+#: ../src/help.c:69
+msgid "Jim Hall: Decent INSTALL file"
+msgstr "Jim Hall: Decent INSTALL file"
+
+#: ../src/help.c:70
+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/help.c:71
+msgid "Flavio Stanchina: bugfixes"
+msgstr "Flavio Stanchina: bugfixes"
+
+#: ../src/help.c:72
+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/help.c:73
+msgid "Steve Jay: use statvfs() instead of df (better portability, faster)"
+msgstr "Steve Jay: use statvfs() instead of df (better portability, faster)"
+
+#: ../src/help.c:75
+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/help.c:77
+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/help.c:81
+msgid "Daniel Kercher: sync scripts for abook and webcalendar"
+msgstr "Daniel Kercher: sync scripts for abook and webcalendar"
+
+#: ../src/help.c:83
+msgid "Clinton Gormley: sync scripts for thunderbird"
+msgstr "Clinton Gormley: sync scripts for thunderbird"
+
+#: ../src/help.c:85
+msgid "Sebastien Beridot: sync script for ldif addressbook format"
+msgstr "Sebastien Beridot: sync script for ldif addressbook format"
+
+#: ../src/help.c:87
+msgid "Sebastian Scherer: sync script for kNotes"
+msgstr "Sebastian Scherer: sync script for kNotes"
+
+#: ../src/help.c:89
+msgid "Nick Piper: sync script for Palm, type-ahead search"
+msgstr "Nick Piper: sync script for Palm, type-ahead search"
+
+#: ../src/help.c:91
+msgid "Uwe Hermann: help with support for iPod Video"
+msgstr "Uwe Hermann: help with support for iPod Video"
+
+#: ../src/help.c:93
+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/help.c:94
+msgid ""
+"Nicolas Chariot: icons of buttons\n"
+"\n"
+msgstr ""
+"Nicolas Chariot: icons of buttons\n"
+"\n"
+
+#: ../src/help.c:96
+msgid "This program borrows code from the following projects:"
+msgstr "本程序的代码参考了下列项目的工作:"
+
+#: ../src/help.c:97
+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/help.c:98
+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/help.c:99
+msgid "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
+msgstr "mp3info: mp3 playlength detection (http://ibiblio.org/mp3info/)"
+
+#: ../src/help.c:100
+msgid "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
+msgstr "xmms: dirbrowser, mp3 playlength detection (http://www.xmms.org)"
+
+#: ../src/help.c:102
+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/help.c:106
+msgid "French: David Le Brun (david at dyn-ns dot net)"
+msgstr "French: David Le Brun (david at dyn-ns dot net)"
+
+#: ../src/help.c:107
+msgid "French: Éric Lassauge (rpmfarm at free dot fr)"
+msgstr "French: Éric Lassauge (rpmfarm at free dot fr)"
+
+#: ../src/help.c:108
+msgid "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+msgstr "German: Jorg Schuler (jcsjcs at users dot sourceforge dot net)"
+
+#: ../src/help.c:109
+msgid "German: Kai-Ove"
+msgstr "German: Kai-Ove"
+
+#: ../src/help.c:110
+msgid "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+msgstr "Hebrew: Assaf Gillat (gillata at gmail dot com)"
+
+#: ../src/help.c:111
+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/help.c:112
+msgid "Italian: Daniele Forsi (dforsi at gmail dot com)"
+msgstr "Italian: Daniele Forsi (dforsi at gmail dot com)"
+
+#: ../src/help.c:113
+msgid "Japanese: Ayako Sano"
+msgstr "Japanese: Ayako Sano"
+
+#: ../src/help.c:114
+msgid "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+msgstr "Japanese: Kentaro Fukuchi (fukuchi at users dot sourceforge dot net)"
+
+#: ../src/help.c:115
+msgid "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+msgstr "Romanian: Alex Eftimie (alexeftimie at gmail dot com)"
+
+#: ../src/help.c:116
+msgid "Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+msgstr ""
+"Spanish: Alejandro Lamas Daviña (alejandro.lamas at ific dot uv dot es)"
+
+#: ../src/help.c:117
+msgid "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
+msgstr "Swedish: Stefan Asserhall (stefan.asserhall at comhem dot se)"
+
+#: ../src/help.c:122
+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/help.c:137
+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/help.c:142
+#, c-format
+msgid "(using libgpod %s)"
+msgstr "(using libgpod %s)"
+
+#: ../src/help.c:143 ../src/help.c:148
+msgid "Cross-platform multilingual interface to Apple's iPod™"
+msgstr "Cross-platform multilingual interface to Apple's iPod™"
+
+#: ../src/info.c:359 ../src/infodlg.c:190
+msgid "n/c"
+msgstr "n/c"
+
+#: ../src/info.c:364 ../src/info.c:852 ../src/infodlg.c:193
+msgid "offline"
+msgstr "离线"
+
+#: ../src/info.c:500
+#, c-format
+msgid " P:%d T:%d/%d"
+msgstr " P:%d T:%d/%d"
+
+#: ../src/info.c:794
+msgid "B"
+msgstr "B"
+
+#: ../src/info.c:794
+msgid "kB"
+msgstr "kB"
+
+#: ../src/info.c:794
+msgid "TB"
+msgstr "TB"
+
+#: ../src/info.c:837
+#, c-format
+msgid " %s Free"
+msgstr " %s 可用空间"
+
+#: ../src/info.c:842
+#, c-format
+msgid " %s Pending"
+msgstr " %s 等待中"
+
+#: ../src/info.c:847
+msgid " disconnected"
+msgstr "已断开"
+
+#: ../src/info.c:898
+msgid "No database or playlist selected"
+msgstr "没有选择数据库或者播放列表"
+
+#: ../src/info.c:903
+msgid "No tracks selected"
+msgstr "没有选择音轨"
+
+#: ../src/info.c:908
+msgid "No playlist selected"
+msgstr "没有选择播放列表"
+
+#: ../src/info.c:913
+msgid "No iPod or iPod playlist selected"
+msgstr "没有选择iPod或iPod播放列表"
+
+#: ../src/infodlg.c:53
+msgid ""
+"Total\n"
+"(iPod)"
+msgstr ""
+"总共\n"
+"(iPod)"
+
+#: ../src/infodlg.c:54
+msgid ""
+"Total\n"
+"(local)"
+msgstr ""
+"总共\n"
+"(本地)"
+
+#: ../src/infodlg.c:55
+msgid ""
+"Selected\n"
+"Playlist"
+msgstr ""
+"已选择\n"
+"播放列表"
+
+#: ../src/infodlg.c:56
+msgid ""
+"Displayed\n"
+"Tracks"
+msgstr "已显示音轨"
+
+#: ../src/infodlg.c:57
+msgid ""
+"Selected\n"
+"Tracks"
+msgstr ""
+"已选择\n"
+"音轨"
+
+#: ../src/infodlg.c:77
+msgid "Number of tracks"
+msgstr "音轨数"
+
+#: ../src/infodlg.c:79
+msgid "File size"
+msgstr "文件大小"
+
+#: ../src/infodlg.c:80
+msgid "Number of playlists"
+msgstr "播放列表数"
+
+#: ../src/infodlg.c:81
+msgid "Deleted tracks"
+msgstr "已删除的音轨"
+
+#: ../src/infodlg.c:82
+msgid "File size (deleted)"
+msgstr "(已删除的)文件大小"
+
+#: ../src/infodlg.c:83
+msgid "Non-transferred tracks"
+msgstr "没有传输完的音轨"
+
+#: ../src/infodlg.c:84
+msgid "File size (non-transferred)"
+msgstr "文件大小(没有传输完的)"
+
+#: ../src/infodlg.c:85
+msgid "Effective free space"
+msgstr "可用空间"
+
+#. Strings used several times
+#: ../src/ipod_init.c:48
+msgid "Select or enter your model"
+msgstr "选择或输入你的iPod型号"
+
+#: ../src/ipod_init.c:81 ../src/repository.c:560 ../src/repository.c:2374
+msgid "Select mountpoint"
+msgstr "选择挂载点"
+
+#: ../src/ipod_init.c:362
+#, c-format
+msgid "Error initialising iPod: %s\n"
+msgstr "初始化iPod时发生错误:%s\n"
+
+#: ../src/ipod_init.c:369
+msgid "Error initialising iPod, unknown error\n"
+msgstr "初始化iPod时发生错误:未知错误\n"
+
+#: ../src/ipod_init.c:425
+#, c-format
+msgid "<b>Please select your iPod model at </b><i>%s</i>"
+msgstr "<b>请在</b><i>%s</i>中选择你的iPod型号"
+
+#: ../src/ipod_init.c:466
+msgid ""
+"Could not determine the model you selected -- this could be a bug or "
+"incompatibilty in the GTK+ or glade library.\n"
+"\n"
+msgstr ""
+"无法确定你所选的型号--这可能是个bug或者是因为GTK+或glade库不兼容引起的。\n"
+"\n"
+
+#: ../src/misc.c:864
+#, c-format
+msgid "Could not process '%s' (no filename available)"
+msgstr "无法处理'%s'(文件名不存在)"
+
+#: ../src/misc.c:1101
+#, c-format
+msgid "Template ('%s') does not match file type '%s'\n"
+msgstr "模板('%s')和文件类型'%s'不匹配\n"
+
+#: ../src/misc.c:1187
+#, c-format
+msgid "Error creating %s: %s\n"
+msgstr "创建%s时发生错误:%s\n"
+
+#: ../src/misc.c:1642
+#, c-format
+msgid ""
+"Writing preferences file '%s' failed (%s).\n"
+"\n"
+msgstr ""
+"写入配置文件'%s'失败(%s)。\n"
+"\n"
+
+#: ../src/misc.c:1644
+msgid "unspecified error"
+msgstr "未知错误"
+
+#: ../src/misc.c:1652
+#, c-format
+msgid ""
+"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
+msgid "The following has occurred:"
+msgstr "出现下列问题:"
+
+#: ../src/misc_confirm.c:156
+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:160
+msgid "Delete Track Completely from iPod?"
+msgid_plural "Delete Tracks Completely from iPod?"
+msgstr[0] "从iPod中完全删除音轨?"
+msgstr[1] "从iPod中完全删除音轨?"
+
+#: ../src/misc_confirm.c:171 ../src/misc_confirm.c:212
+#, 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] "你确定你要从播放列表中删除下列音轨\"%s\"?"
+msgstr[1] "你确定你要从播放列表中删除下列音轨\"%s\"?"
+
+#: ../src/misc_confirm.c:175 ../src/misc_confirm.c:216
+msgid "Remove Track From Playlist?"
+msgid_plural "Remove Tracks From Playlist?"
+msgstr[0] "从播放列表中删除音轨?"
+msgstr[1] "从播放列表中删除音轨?"
+
+#: ../src/misc_confirm.c:197
+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:201
+msgid "Delete Track from Harddisk?"
+msgid_plural "Delete Tracks from Harddisk?"
+msgstr[0] "从硬盘中删除音轨"
+msgstr[1] "从硬盘中删除音轨"
+
+#: ../src/misc_confirm.c:226
+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:230
+msgid "Remove Track from Local Database?"
+msgid_plural "Remove Tracks from Local Database?"
+msgstr[0] "从本地数据库删除音轨?"
+msgstr[1] "从本地数据库删除音轨?"
+
+#: ../src/misc_confirm.c:295
+#, c-format
+msgid "Deleted one track completely from iPod"
+msgid_plural "Deleted %d tracks completely from iPod"
+msgstr[0] "已从iPod中完全删除一条音轨"
+msgstr[1] "已从iPod中完全删除%d条音轨"
+
+#: ../src/misc_confirm.c:301 ../src/misc_confirm.c:325
+#, c-format
+msgid "Deleted %d track from playlist '%s'"
+msgid_plural "Deleted %d tracks from playlist '%s'"
+msgstr[0] "从播放列表'%2$s'删除%1$d条音轨"
+msgstr[1] "从播放列表'%2$s'删除%1$d条音轨"
+
+#: ../src/misc_confirm.c:319
+#, c-format
+msgid "Deleted one track from harddisk"
+msgid_plural "Deleted %d tracks from harddisk"
+msgstr[0] "已从硬盘删除一条音轨"
+msgstr[1] "已从硬盘删除%d条音轨"
+
+#: ../src/misc_confirm.c:331
+#, c-format
+msgid "Deleted track from local database"
+msgid_plural "Deleted %d tracks from local database"
+msgstr[0] "已从本地数据库删除一条音轨"
+msgstr[1] "已从本地数据库删除%d条音轨"
+
+#: ../src/misc_confirm.c:476
+msgid "Cannot remove entry 'All'"
+msgstr "无法移除项目'所有'"
+
+#: ../src/misc_confirm.c:570
+#, c-format
+msgid "Removed all %d tracks from the iPod"
+msgstr "从iPod移除所有%d条音轨"
+
+#: ../src/misc_confirm.c:575
+#, c-format
+msgid "Removed all podcasts from the iPod"
+msgstr "从iPod移除所有音轨"
+
+#: ../src/misc_confirm.c:584 ../src/misc_confirm.c:658
+#, c-format
+msgid "Deleted playlist '%s' including %d member track"
+msgid_plural "Deleted playlist '%s' including %d member tracks"
+msgstr[0] "已删除播放列表'%s'包括%d条成员音轨"
+msgstr[1] "已删除播放列表'%s'包括%d条成员音轨"
+
+#. first use playlist name
+#: ../src/misc_confirm.c:600 ../src/misc_confirm.c:674
+#, c-format
+msgid "Deleted playlist '%s'"
+msgstr "删除播放列表'%s'"
+
+#: ../src/misc_confirm.c:634
+#, 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[1] "已删除播放列表'%s'包括%d条硬盘上的成员音轨"
+
+#: ../src/misc_confirm.c:651
+#, c-format
+msgid "Removed all %d tracks from the database"
+msgstr "从数据库中移除所有%d条音轨"
+
+#: ../src/misc_confirm.c:729
+#, c-format
+msgid "Are you sure you want to remove all tracks from your iPod?"
+msgstr "你确定你要移除iPod中的所有音轨?"
+
+#: ../src/misc_confirm.c:734
+#, c-format
+msgid "Are you sure you want to remove all podcasts from your iPod?"
+msgstr "你确定你要移除iPod中的所有播放列表?"
+
+#: ../src/misc_confirm.c:742
+#, 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] ""
+"你确定你要从iPod中完全删除播放列表'%s'和下列音轨?音轨关联的播放列表数在括号"
+"中标出。"
+msgstr[1] ""
+"你确定你要从iPod中完全删除播放列表'%s'和下列音轨?音轨关联的播放列表数在括号"
+"中标出。"
+
+#: ../src/misc_confirm.c:753 ../src/misc_confirm.c:808
+#, c-format
+msgid "Are you sure you want to delete the playlist '%s'?"
+msgstr "你确定要删除播放列表'%s'?"
+
+#: ../src/misc_confirm.c:779
+#, 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'和下列音轨?音轨关联的播放列表数在括号中标"
+"出。"
+
+#: ../src/misc_confirm.c:787
+#, c-format
+msgid "Are you sure you want to remove all tracks from the database?"
+msgstr "你确定要从数据库中移除所有音轨?"
+
+#: ../src/misc_confirm.c:796
+#, 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'和下列音轨?音轨关联的播放列表数在括号中"
+"标出。"
+
+#: ../src/misc_confirm.c:869
+msgid ""
+"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
+"changes will be lost.\n"
+"\n"
+"ADo you want to save your changes first?"
+msgstr ""
+"数据已经被改动且还没保存,如果你要退出gtkpod,所有还没有保存的改动都将丢"
+"失。\n"
+"\n"
+"你要先保存改动吗?"
+
+#: ../src/misc_confirm.c:873
+msgid "Save changes before quiting?"
+msgstr "退出前保存改动吗?"
+
+#: ../src/misc_confirm.c:877
+msgid "Quit without saving"
+msgstr "退出并且不保存改动"
+
+#: ../src/misc_conversion.c:66
+msgid "File type"
+msgstr "文件类型"
+
+#: ../src/misc_conversion.c:67
+msgid "PC File"
+msgstr "PC文件"
+
+#: ../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 "Track Nr(#)"
+
+#: ../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 "试音"
+
+#. 25
+#: ../src/misc_conversion.c:85
+msgid "CD Nr"
+msgstr "CD Nr"
+
+#: ../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 "Podcast URL"
+
+#: ../src/misc_conversion.c:91
+msgid "Podcast RSS"
+msgstr "Podcast 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 "TV剧集"
+
+#: ../src/misc_conversion.c:103
+msgid "TV Network"
+msgstr "TV网络"
+
+#: ../src/misc_conversion.c:104
+msgid "Season Nr"
+msgstr "Season Nr"
+
+#. 45
+#: ../src/misc_conversion.c:105
+msgid "Episode Nr"
+msgstr "Episode Nr"
+
+#: ../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 "按TV show排序"
+
+#: ../src/misc_conversion.c:113
+msgid "Gapless Track Flag"
+msgstr "Gapless Track Flag"
+
+#: ../src/misc_conversion.c:114
+msgid "Lyrics"
+msgstr "歌词"
+
+#: ../src/misc_conversion.c:127
+msgid "Name of file on PC, if available"
+msgstr "PC上的文件名(如果有)"
+
+#: ../src/misc_conversion.c:128
+msgid "Name of file on the iPod"
+msgstr "iPod中的文件名"
+
+#. 10
+#: ../src/misc_conversion.c:130
+msgid "Track Nr. and total number of tracks on CD"
+msgstr "Track Nr.和CD上的音轨总数"
+
+#: ../src/misc_conversion.c:131
+msgid "Whether the file has already been transferred to the iPod or not"
+msgstr "是否这个文件已经传输到iPod?"
+
+#: ../src/misc_conversion.c:137
+msgid "Beats per minute"
+msgstr "每分钟的节拍"
+
+#: ../src/misc_conversion.c:138
+msgid "Number of times the track has been played"
+msgstr "音轨已经播放的次数"
+
+#: ../src/misc_conversion.c:139
+msgid "Star rating from 0 to 5"
+msgstr "评分(0-5)"
+
+#: ../src/misc_conversion.c:140
+msgid "Date and time track has been added"
+msgstr "音轨添加的日期和时间"
+
+#. 20
+#: ../src/misc_conversion.c:141
+msgid "Date and time track has last been played"
+msgstr "音轨最后一次播放的日期和时间"
+
+#: ../src/misc_conversion.c:142
+msgid "Date and time track has last been modified"
+msgstr "音轨最后被修改的日期和时间"
+
+#: ../src/misc_conversion.c:143
+msgid "Manual volume adjust"
+msgstr "手工音量调节"
+
+#: ../src/misc_conversion.c:144
+msgid ""
+"Volume adjust in dB (replay gain) -- you need to activate 'soundcheck' on "
+"the iPod"
+msgstr "音量调节(重播)--你需要激活iPod中的'试音'"
+
+#. 25
+#: ../src/misc_conversion.c:147
+msgid "CD Nr. and total number of CDS in set"
+msgstr "CD Nr和整套的CD数"
+
+#: ../src/misc_conversion.c:150
+msgid ""
+"The category (e.g. 'Technology' or 'Music') where the podcast was located."
+msgstr "播放列表所在的类别(例如'技术'或'音乐')"
+
+#: ../src/misc_conversion.c:151
+msgid "Accessible by selecting the center button on the iPod."
+msgstr "通过iPod中间的按钮选择"
+
+#: ../src/misc_conversion.c:155
+msgid "Release date (for podcasts displayed next to the title on the iPod)"
+msgstr "发布时间(对于播放列表则显示在iPod中歌名后)"
+
+#. 50
+#: ../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 ../src/misc_conversion.c:174
+msgid "Used for sorting on the iPod"
+msgstr "用于iPod中排序"
+
+#: ../src/misc_conversion.c:737
+#, c-format
+msgid "The URI '%s' is not an absolute URI using the file scheme"
+msgstr "URI'%s'不是一个绝对地址"
+
+#: ../src/misc_conversion.c:747
+#, c-format
+msgid "The local file URI '%s' may not include a '#'"
+msgstr "本地文件URI'%s'可能没有包含'#'"
+
+#: ../src/misc_conversion.c:764
+#, c-format
+msgid "The URI '%s' is invalid"
+msgstr "URI'%s'是无效地址"
+
+#: ../src/misc_conversion.c:776
+#, c-format
+msgid "The hostname of the URI '%s' is invalid"
+msgstr "URI'%s'的主机名无效"
+
+#: ../src/misc_conversion.c:792
+#, c-format
+msgid "The URI '%s' contains invalidly escaped characters"
+msgstr "URI'%s'包含无效的特殊字符"
+
+#: ../src/misc_playlist.c:71 ../src/misc_playlist.c:108
+msgid "Please load the iPod before adding playlists."
+msgstr "在添加播放列表前请先加载iPod"
+
+#: ../src/misc_playlist.c:77 ../src/misc_playlist.c:114
+#: ../src/misc_playlist.c:449
+msgid "Please enter a name for the new playlist"
+msgstr "请为新的播放列表输入名称"
+
+#: ../src/misc_playlist.c:174
+msgid "AR:"
+msgstr "AR:"
+
+#: ../src/misc_playlist.c:177
+msgid "AL:"
+msgstr "AL:"
+
+#: ../src/misc_playlist.c:180
+msgid "GE:"
+msgstr "GE:"
+
+#: ../src/misc_playlist.c:183
+msgid "CO:"
+msgstr "CO:"
+
+#: ../src/misc_playlist.c:186
+msgid "YE:"
+msgstr "YE:"
+
+#: ../src/misc_playlist.c:214
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/misc_playlist.c:292
+#, c-format
+msgid "Random (%d)"
+msgstr "随机(%d)"
+
+#: ../src/misc_playlist.c:317
+msgid ""
+"Auto Store of track view disabled.\n"
+"\n"
+msgstr "音轨自动保存被禁用\n"
+
+#: ../src/misc_playlist.c:376
+msgid "Not Listed"
+msgstr "未列出"
+
+#: ../src/misc_playlist.c:426
+#, c-format
+msgid "Created playlist '%s' with %d track."
+msgid_plural "Created playlist '%s' with %d tracks."
+msgstr[0] "从当前%2$d条音轨创建播放列表'%1$s'"
+msgstr[1] "从当前%2$d条音轨创建播放列表'%1$s'"
+
+#. n==0
+#: ../src/misc_playlist.c:437
+msgid "No tracks available, playlist not created"
+msgstr "无音轨,无法创建播放列表"
+
+#: ../src/misc_playlist.c:563
+#, c-format
+msgid "Most Listened (%d)"
+msgstr "欣赏次数最多的(%d)"
+
+#: ../src/misc_playlist.c:604
+#, c-format
+msgid "Never Listened"
+msgstr "从未听过的"
+
+#: ../src/misc_playlist.c:644
+#, c-format
+msgid "Best Rated (%d)"
+msgstr "评分最高的(%d)"
+
+#: ../src/misc_playlist.c:686
+msgid "Unrated tracks"
+msgstr "未评分的音轨"
+
+#: ../src/misc_playlist.c:691
+#, c-format
+msgid "Rated %d"
+msgstr "评分 %d"
+
+#: ../src/misc_playlist.c:734
+#, c-format
+msgid "Recent (%d)"
+msgstr "最近(%d)"
+
+#: ../src/misc_playlist.c:773
+msgid "Last Time"
+msgstr "最后一次"
+
+#: ../src/misc_playlist.c:864
+msgid "Removal of dangling tracks with no files on PC was canceled."
+msgstr "取消移除在PC上没有对应文件的悬空音轨的操作"
+
+#: ../src/misc_playlist.c:874
+msgid "Handling of dangling tracks with files on PC was canceled."
+msgstr "取消整理在PC上没有对应文件的悬空音轨的操作"
+
+#: ../src/misc_playlist.c:902
+msgid "Dangling tracks with no files on PC were removed."
+msgstr "在PC上没有对应文件的悬空音轨被移除"
+
+#: ../src/misc_playlist.c:963
+msgid "Dangling tracks with files on PC were handled."
+msgstr "悬空音轨的PC对应文件已找到"
+
+#: ../src/misc_playlist.c:996
+msgid "Track"
+msgstr "音轨"
+
+#: ../src/misc_playlist.c:1035
+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"
+"If you abort the operation, you can import the existing database before "
+"calling this function again.\n"
+msgstr ""
+"你没有导入现有的iTunesDB('%s'),这可能是个错误并使现有数据库受到损失。\n"
+"\n"
+"如果放弃保存,你还可以在下次前再次导入现存数据库。\n"
+
+#: ../src/misc_playlist.c:1042
+msgid "Abort operation"
+msgstr "放弃操作"
+
+#: ../src/misc_playlist.c:1056
+msgid "Creating a tree of known files"
+msgstr "创建已知文件的树形图"
+
+#: ../src/misc_playlist.c:1100
+msgid "Checking iPOD files against known files in DB"
+msgstr "对照数据库中的记录检查iPod的文件"
+
+#: ../src/misc_playlist.c:1143
+msgid "Orphaned"
+msgstr "孤儿的"
+
+#: ../src/misc_playlist.c:1170
+#, 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:1198
+#, c-format
+msgid "Found %d orphaned and %d dangling files. Processing..."
+msgstr "找到%d个孤儿文件和%d条悬空音轨,处理中..."
+
+#: ../src/misc_playlist.c:1222
+#, 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] ""
+"下列悬空音轨在PC上找到对应文件。\n"
+"按下确认将在下次同步时把文件传输到iPod,取消则保持不变。"
+msgstr[1] ""
+"下列%d条悬空音轨在PC上找到对应文件。\n"
+"按下确认将在下次同步时把文件传输到iPod,取消则保持不变。"
+
+#: ../src/misc_playlist.c:1227
+#, 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] ""
+"下列悬空音轨在PC上找不到对应文件。\n"
+"按下确认将移除它,取消则保持不变。"
+msgstr[1] ""
+"下列%d条悬空音轨在PC上找不到对应文件。\n"
+"按下确认将移除它,取消则保持不变。"
+
+#. we want unique window for each
+#. gboolean modal,
+#: ../src/misc_playlist.c:1234
+msgid "Dangling Tracks"
+msgstr "悬空音轨"
+
+#: ../src/misc_playlist.c:1257
+#, 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."
+msgid_plural "Hashed %d of %d tracks."
+msgstr[0] "已验证%2$d条音轨中的%1$d条"
+msgstr[1] "已验证%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] "下列重复音轨已被移除。"
+msgstr[1] "下列%d条重复音轨已被移除。"
+
+#: ../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] "下列重复音轨没有添加到主播放列表。"
+msgstr[1] "下列%d条重复音轨没有添加到主播放列表。"
+
+#. gint id,
+#. gboolean modal,
+#: ../src/misc_track.c:212
+msgid "Duplicate detection"
+msgstr "检查重复文件"
+
+#: ../src/misc_track.c:1347
+msgid "Local Database"
+msgstr "本地数据库"
+
+#. artwork is set
+#: ../src/misc_track.c:1358
+msgid "Embedded or filename was lost"
+msgstr "嵌入或文件丢失"
+
+#: ../src/misc_track.c:1362
+msgid "Artwork not set"
+msgstr "没有设置封面"
+
+#: ../src/misc_track.c:1836
+#, c-format
+msgid "Could not find source file for '%s'. Track not copied."
+msgstr "找不到'%s'的源文件,不会复制音轨。"
+
+#: ../src/misc_track.c:2072
+#, c-format
+msgid "drag and drop: ignored '%s'\n"
+msgstr "拖拽:忽略'%s'\n"
+
+#: ../src/mp3file.c:1344
+#, c-format
+msgid "Error setting ID3 field: %s\n"
+msgstr "设置ID3标签时发生错误:%s\n"
+
+#: ../src/mp3file.c:1368 ../src/mp3file.c:1552 ../src/mp3file.c:1713
+#: ../src/mp3file.c:2870 ../src/mp3file.c:2929 ../src/mp3file.c:2956
+#, c-format
+msgid "ERROR while opening file: '%s' (%s).\n"
+msgstr "打开文件时发生错误:'%s' (%s).\n"
+
+#: ../src/mp3file.c:1793 ../src/mp3file.c:2993
+#, 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:2907
+#, c-format
+msgid "File \"%s\" has zero play length. Ignoring.\n"
+msgstr "文件\"%s\"播放时间长度为0,忽略。\n"
+
+#: ../src/mp4file.c:243 ../src/mp4file.c:475
+#, 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:485
+#, c-format
+msgid "Could not open '%s' for reading, or file is not an mp4 file.\n"
+msgstr "无法读取文件'%s',或者这不是个mp4文件。\n"
+
+#: ../src/mp4file.c:607
+#, c-format
+msgid "'%s' does not appear to be a mp4 audio file.\n"
+msgstr "'%s'似乎不是一个mp4音频文件。\n"
+
+#: ../src/mp4file.c:618
+#, c-format
+msgid "Could not open '%s' for writing, or file is not an mp4 file.\n"
+msgstr "无法写入文件'%s',或者它不是个mp4文件。\n"
+
+#: ../src/mp4file.c:631
+#, 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'失败:没有mp4v2库,不支持m4a/m4p/m4b。你必须编译gtkpod源文件并且加入"
+"mp4v2库支持。\n"
+
+#: ../src/mp4file.c:637
+#, 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/m4b 元数据更新失败:没有mp4v2库,不支持m4a/m4p/m4b。你必须编译gtkpod"
+"源文件并且加入mp4v2库支持。\n"
+
+#: ../src/mp4file.c:643
+#, 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/m4b试音更新失败:没有mp4v2库,不支持m4a/m4p/m4b。你必须编译"
+"gtkpod源文件并且加入mp4v2库支持。\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:365
+#, c-format
+msgid "gtkpod version %s usage:\n"
+msgstr "gtkpod版本%s的使用方法:\n"
+
+#: ../src/prefs.c:366
+msgid "  -h, --help:   display this message\n"
+msgstr "  -h, --help:   显示本信息\n"
+
+#: ../src/prefs.c:367
+msgid "  -p <file>:    increment playcount for file by one\n"
+msgstr "  -p <file>:    文件的播放次数+1\n"
+
+#: ../src/prefs.c:368
+msgid "  --hash <file>:print gtkpod hash for file\n"
+msgstr "  --hash <file>:  显示文件的哈希值\n"
+
+#: ../src/prefs.c:369
+msgid "  -m path:      define the mountpoint of your iPod\n"
+msgstr "  -m path:      指定你的iPod挂载点\n"
+
+#: ../src/prefs.c:370
+msgid "  --mountpoint: same as '-m'.\n"
+msgstr "  --mountpoint: 与'-m'相同。\n"
+
+#: ../src/prefs.c:569
+#, c-format
+msgid "Couldn't create '%s'\n"
+msgstr "无法创建 '%s'\n"
+
+#: ../src/prefsdlg.c:51
+msgid "Hide"
+msgstr "隐藏"
+
+#: ../src/prefsdlg.c:52
+msgid "Icons only"
+msgstr "仅图标"
+
+#: ../src/prefsdlg.c:53
+msgid "Text only"
+msgstr "仅文字"
+
+#: ../src/prefsdlg.c:54
+msgid "Text under icons"
+msgstr "文字在图标下"
+
+#: ../src/prefsdlg.c:55
+msgid "Text beside icons"
+msgstr "文字在图标旁"
+
+#: ../src/repository.c:527
+#, c-format
+msgid ""
+"Are you sure you want to delete repository \"%s\"? This action cannot be "
+"undone!"
+msgstr "你确定要删除音乐库 \"%s\"?这个操作将无法恢复!"
+
+#: ../src/repository.c:531
+msgid "Delete repository?"
+msgstr "删除音乐库?"
+
+#: ../src/repository.c:587 ../src/repository.c:2400
+msgid "Set backup file"
+msgstr "设置备份文件"
+
+#: ../src/repository.c:626
+msgid "Select directory for synchronization"
+msgstr "选择同步的文件夹"
+
+#: ../src/repository.c:652
+msgid "Please select command to sync contacts"
+msgstr "请选择同步通讯录的命令"
+
+#: ../src/repository.c:658
+msgid "Please select command to sync calendar"
+msgstr "请选择同步日历的命令"
+
+#: ../src/repository.c:664
+msgid "Please select command to sync notes"
+msgstr "请选择同步备忘录的命令"
+
+#: ../src/repository.c:676
+#, 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/repository.c:743
+msgid "Smart playlist updated."
+msgstr "智能播放列表已更新"
+
+#: ../src/repository.c:1204
+msgid "Podcasts Repository"
+msgstr "Podcast音乐库"
+
+#: ../src/repository.c:1208
+msgid "Local Repository"
+msgstr "本地音乐库"
+
+#: ../src/repository.c:1358
+msgid "Master Playlist"
+msgstr "主播放列表"
+
+#: ../src/repository.c:1362
+msgid "Podcasts Playlist"
+msgstr "Podcast播放列表"
+
+#: ../src/repository.c:1370
+msgid "Regular Playlist"
+msgstr "常规播放列表"
+
+#: ../src/repository.c:2428
+msgid "Set local repository file"
+msgstr "设置本地音乐库文件"
+
+#: ../src/repository.c:2526
+msgid "New Repository"
+msgstr "新音乐库"
+
+#: ../src/sha1.c:186
+msgid "Hashed file is 0 bytes long\n"
+msgstr "验证文件为0 bytes长度\n"
+
+#: ../src/sha1.c:239
+#, c-format
+msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
+msgstr "无法打开'%s'计算SHA1验证码:%s\n"
+
+#: ../src/sort_window.c:237
+msgid "No sorting"
+msgstr "不排序"
+
+#: ../src/sort_window.c:271
+msgid ""
+"You can also use the table headers, but this allows you to sort according to "
+"a column that is not displayed."
+msgstr "你也可以使用这个列表的表头,这样就会根据这一栏进行排序。"
+
+#: ../src/syncdir.c:246
+#, c-format
+msgid "Sync summary for %s/%s\n"
+msgstr " %s/%s 的同步摘要\n"
+
+#: ../src/syncdir.c:255
+msgid "The following track has been added or updated:\n"
+msgid_plural "The following tracks have been added or updated:\n"
+msgstr[0] "下列音轨已添加或更新:\n"
+msgstr[1] "下列音轨已添加或更新:\n"
+
+#: ../src/syncdir.c:264
+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] "下列音轨已从iPod中完全移除:\n"
+msgstr[1] "下列音轨已从iPod中完全移除:\n"
+
+#: ../src/syncdir.c:273
+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] "下列音轨已从音乐库中完全移除:\n"
+msgstr[1] "下列音轨已从音乐库中完全移除:\n"
+
+#: ../src/syncdir.c:280
+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] "下列音轨已从播放列表中完全移除:\n"
+msgstr[1] "下列音轨已从播放列表中完全移除:\n"
+
+#: ../src/syncdir.c:286
+msgid "Nothing was changed.\n"
+msgstr "无改动。\n"
+
+#: ../src/syncdir.c:291
+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."
+msgid_plural "Normalized %d of %d tracks."
+msgstr[0] "已完成%2$d条音轨中%1$d条的音量均衡设置"
+msgstr[1] "已完成%2$d条音轨中%1$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"
+"请检查首选项中'工具'部分的设置。\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"
+
+#~ msgid "韩语(EUC-KR)"
+#~ msgstr "韩语(EUC-KR)"

Modified: gtkpod/branches/upstream/current/scripts/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/scripts/Makefile.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/scripts/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -124,8 +124,6 @@
 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@
@@ -138,6 +136,7 @@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

Modified: gtkpod/branches/upstream/current/scripts/sync-evolution.sh
===================================================================
--- gtkpod/branches/upstream/current/scripts/sync-evolution.sh	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/scripts/sync-evolution.sh	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Script for syncing evolution addressbook data with iPod
 # (c) 2004 Clinton Gormley <clint at traveljury dot com>
 #

Modified: gtkpod/branches/upstream/current/scripts/sync-ldif.sh
===================================================================
--- gtkpod/branches/upstream/current/scripts/sync-ldif.sh	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/scripts/sync-ldif.sh	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # Placed under GPL; to know more, see:
 # 			http://www.gnu.org/licenses/licenses.html

Modified: gtkpod/branches/upstream/current/scripts/sync-thunderbird-nano.sh
===================================================================
--- gtkpod/branches/upstream/current/scripts/sync-thunderbird-nano.sh	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/scripts/sync-thunderbird-nano.sh	2009-01-24 20:05:38 UTC (rev 361)
@@ -29,7 +29,7 @@
 ENCODING=ISO-8859-15         # encoding used by ipod
 NAME=thunderbird             # default file export name
 FILE_FLAG=''		     # flag used to determine end of file
-let COUNT=0;		     # file counter
+COUNT=0			     # file counter
 
 # Unless called with "-e=none" this script requires "recode" available
 # from ftp://ftp.iro.umontreal.ca/pub/recode/recode-3.6.tar.gz
@@ -80,7 +80,7 @@
 for line in $(cat $IPOD_MOUNT/Contacts/${NAME}.vcf | sed "s/\ /[54321]/g")
 do
 	if [ "$FILE_FLAG" = 'END' ]; then
-		let COUNT=$COUNT+1;
+		COUNT=$((COUNT+1));
 	fi
 
 	echo $line | sed "s/\[54321\]/\ /g" >> $IPOD_MOUNT/Contacts/${NAME}$COUNT.vcf

Modified: gtkpod/branches/upstream/current/scripts/sync-tomboy.sh
===================================================================
--- gtkpod/branches/upstream/current/scripts/sync-tomboy.sh	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/scripts/sync-tomboy.sh	2009-01-24 20:05:38 UTC (rev 361)
@@ -77,6 +77,9 @@
 # Corrections By Oliver Sherouse <oliver.sherouse AT gmail DOT com>
 # (replaced some arithmetic expressions, improved conversion, correctly
 # indicate "-d" in 'usage' instead of "-p")
+#
+# 2008/04/06 (Olivier Crete <tester at tester dot ca>):
+# Strip all tomboy tags with the power of sed
 
 # overwrite default settings with optional command line arguments
 while getopts i:d:e: option; do
@@ -137,23 +140,14 @@
 	START=`echo $LIMITS | cut -d " " -f 1`
 	END=`echo $LIMITS | cut -d " " -f 2`
 
-	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 : -`
+	TITLE=`cat "$FILE" | grep '<title>.*</title>' | sed -e 's:.*<title>\(.*\)</title>.*:\1:' | sed -e 's/<[^>]*>//g' -e 's/:/-/g'`
 
-	# Get the Lines with the useful data
-	DATA=`echo "$DATA" | cut -d "
-" -f $(( $START + 2 ))-$END`
+	cat "$FILE" | tail -n +2 | sed -e '/<\/note-content>/ Q' \
+		-e '/^[[:space:]]*<title>.*<\/title>[[:space:]]*$/ d' \
+		-e '/^[[:space:]]*<[^>]*>[[:space:]]*$/ d' \
+		-e 's/<[^>]*>//g'  | $RECODE > "$IPOD_MOUNT/Notes/$TITLE"
 
-	printf "$DATA" | $RECODE > "$IPOD_MOUNT/Notes/$TITLE"
-
 	read FILE
   done
   echo  

Modified: gtkpod/branches/upstream/current/src/Makefile.am
===================================================================
--- gtkpod/branches/upstream/current/src/Makefile.am	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/Makefile.am	2009-01-24 20:05:38 UTC (rev 361)
@@ -45,13 +45,20 @@
     oggfile.c oggfile.h \
     podcast.c podcast.h \
     prefs.c prefs.h \
-    prefs_window.c prefs_window.h \
+    sort_window.c sort_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
+    wavfile.c wavfile.h \
+    help.c \
+    help.h \
+    prefsdlg.c \
+    infodlg.c \
+    infodlg.h \
+	rb_rating_helper.c rb_rating_helper.h \
+	rb_cell_renderer_rating.c rb_cell_renderer_rating.h
 
 gtkpod_LDADD = $(LIBS) $(INTLLIBS) @LIBOBJS@
 

Modified: gtkpod/branches/upstream/current/src/Makefile.in
===================================================================
--- gtkpod/branches/upstream/current/src/Makefile.in	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/Makefile.in	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  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.
@@ -62,14 +62,16 @@
 	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) \
+	sort_window.$(OBJEXT) repository.$(OBJEXT) sha1.$(OBJEXT) \
 	stock_icons.$(OBJEXT) syncdir.$(OBJEXT) tools.$(OBJEXT) \
-	wavfile.$(OBJEXT)
+	wavfile.$(OBJEXT) help.$(OBJEXT) prefsdlg.$(OBJEXT) \
+	infodlg.$(OBJEXT) rb_rating_helper.$(OBJEXT) \
+	rb_cell_renderer_rating.$(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@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -161,8 +163,6 @@
 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@
@@ -175,6 +175,7 @@
 MOUNT = @MOUNT@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -282,13 +283,20 @@
     oggfile.c oggfile.h \
     podcast.c podcast.h \
     prefs.c prefs.h \
-    prefs_window.c prefs_window.h \
+    sort_window.c sort_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
+    wavfile.c wavfile.h \
+    help.c \
+    help.h \
+    prefsdlg.c \
+    infodlg.c \
+    infodlg.h \
+	rb_rating_helper.c rb_rating_helper.h \
+	rb_cell_renderer_rating.c rb_cell_renderer_rating.h
 
 gtkpod_LDADD = $(LIBS) $(INTLLIBS) @LIBOBJS@
 EXTRA_DIST = getopt.h
@@ -384,7 +392,9 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/file_itunesdb.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fileselection.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/flacfile.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/help.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/info.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/infodlg.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ipod_init.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/misc.Po at am__quote@
@@ -398,9 +408,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/oggfile.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/podcast.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/prefs.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/prefs_window.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/prefsdlg.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rb_cell_renderer_rating.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rb_rating_helper.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)/sort_window.Po at am__quote@
 @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@
@@ -428,8 +441,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -441,8 +454,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -452,13 +465,12 @@
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique

Modified: gtkpod/branches/upstream/current/src/charset.c
===================================================================
--- gtkpod/branches/upstream/current/src/charset.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/charset.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -24,7 +24,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: charset.c 955 2007-01-16 10:15:27Z jcsjcs $
+|  $Id: charset.c 1902 2008-01-02 20:17:01Z Sikon $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -44,8 +44,8 @@
 static gchar *auto_charset = NULL;
 
 typedef struct {
-	gchar *descr;
-	gchar *name;
+	const gchar *descr;
+	const gchar *name;
 } CharsetInfo;
 
 
@@ -145,7 +145,10 @@
 
 /* Sets up the charsets to choose from in the "combo". It presets the
    charset stored in cfg->charset (or "System Charset" if none is set
-   there */
+   there
+
+   DEPRECATED - use charset_init_combo_box with GtkComboBox
+*/
 void charset_init_combo (GtkCombo *combo)
 {
     gchar *current_charset;
@@ -209,7 +212,113 @@
     g_free(current_charset);
 }
 
+/* Sets up the charsets to choose from in the "combo". It presets the
+   charset stored in cfg->charset (or "System Charset" if none is set
+   there */
+void charset_init_combo_box (GtkComboBox *combo)
+{
+    gchar *current_charset;
+    gchar *description;
+    const CharsetInfo *ci;
+	GtkCellRenderer *renderer;
+	GtkTreeIter use_iter;
+    static GtkListStore *charsets = NULL; /* list with choices -- takes a while to
+				     * initialize, so we only do it once */
+    
+    current_charset = prefs_get_string("charset");
+	
+    if ((current_charset == NULL) || (strlen (current_charset) == 0))
+    {
+		description = g_strdup (_("System Charset"));
+    }
+    else
+    {
+		description = charset_to_description (current_charset);
+    }
+	
+    if (charsets == NULL)
+    { /* set up list with charsets */
+		FILE *fp;
+		GtkTreeIter iter;
 
+		charsets = gtk_list_store_new (1, G_TYPE_STRING);
+		/* now add all the charset descriptions in the list above */
+		
+		gtk_list_store_append (charsets, &iter);
+		gtk_list_store_set (charsets, &iter, 0, _("System Charset"), -1);
+
+		for (ci = charset_info; ci->descr; ci++)
+		{
+			gtk_list_store_append (charsets, &iter);
+			gtk_list_store_set (charsets, &iter, 0, _(ci->descr), -1);
+		}
+		
+		/* let's add all available charsets returned by "iconv -l" */
+		/* The code assumes that "iconv -l" returns a list with the
+		   name of one charset in each line, each valid line being
+		   terminated by "//".  */
+		fp = popen ("iconv -l", "r");
+		
+		if (fp)
+		{
+			gchar buf[PATH_MAX];
+			
+			/* read one line of output at a time */
+			while (fgets (buf, PATH_MAX, fp))
+			{
+				/* only consider lines ending on "//" */
+				gchar *bufp = g_strrstr (buf, "//\n");
+				
+				if (bufp)
+				{
+					/* add everything before "//" to our charset list */
+					gchar *bufpp = buf;
+					*bufp = 0;  /* shorten string */
+					
+					while ((*bufpp == ' ') || (*bufpp == 0x09))
+						bufpp++; /* skip whitespace */
+					
+					if (*bufpp)
+					{
+						gtk_list_store_append (charsets, &iter);
+						gtk_list_store_set (charsets, &iter, 0, bufpp, -1);
+
+					}
+				}
+			}
+			
+			pclose (fp);
+		}
+    }
+    /* set pull down items */
+	renderer = gtk_cell_renderer_text_new ();
+	
+    gtk_combo_box_set_model (GTK_COMBO_BOX (combo), GTK_TREE_MODEL (charsets));
+	gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo));
+	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
+	gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), renderer, "text", 0);
+	
+	for (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (charsets), &use_iter);
+		 gtk_list_store_iter_is_valid (charsets, &use_iter);
+		 gtk_tree_model_iter_next (GTK_TREE_MODEL (charsets), &use_iter))
+	{
+		gchar *cur_desc;
+		gtk_tree_model_get (GTK_TREE_MODEL (charsets), &use_iter, 0, &cur_desc, -1);
+		
+		if(!g_utf8_collate(description, cur_desc))
+		{
+			g_free (cur_desc);
+			break;
+		}
+		
+		g_free (cur_desc);
+	}
+
+	gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &use_iter);
+    g_free (description);
+    g_free (current_charset);
+}
+
 /* returns the charset name belonging to the description "descr"
  * chosen from the combo. Return "NULL" when it could not be found, or
  * if it is the System Default Charset (locale). You must g_free

Modified: gtkpod/branches/upstream/current/src/charset.h
===================================================================
--- gtkpod/branches/upstream/current/src/charset.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/charset.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -24,7 +24,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: charset.h 589 2005-06-17 13:30:05Z jcsjcs $
+|  $Id: charset.h 1868 2007-12-28 20:17:18Z Sikon $
 */
 
 #ifndef __CHARSET_H__
@@ -41,6 +41,7 @@
 #define GTKPOD_JAPAN_AUTOMATIC "gtkpod-japan-automatic"
 
 void charset_init_combo (GtkCombo *combo);
+void charset_init_combo_box (GtkComboBox *combo);
 gchar *charset_from_description (gchar *descr);
 gchar *charset_to_description (gchar *charset);
 gchar *charset_to_utf8 (const gchar *str);

Modified: gtkpod/branches/upstream/current/src/clientserver.c
===================================================================
--- gtkpod/branches/upstream/current/src/clientserver.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/clientserver.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: clientserver.c 1023 2007-04-07 04:43:15Z jcsjcs $
+|  $Id: clientserver.c 1852 2007-12-20 15:25:48Z Sikon $
 */
 
 #include "config.h"
@@ -105,8 +105,9 @@
 	    if (connect(csock, (struct sockaddr *)server,
 			sizeof(struct sockaddr_un)) != -1)
 	    {
-		if (write(csock, SOCKET_TEST, strlen(SOCKET_TEST)) == 
-		    strlen (SOCKET_TEST))
+		size_t socket_test_len = strlen(SOCKET_TEST);
+		if (write(csock, SOCKET_TEST, socket_test_len) == 
+		    (ssize_t) socket_test_len)
 		    result = TRUE;
 	    }
 	    close(csock);
@@ -289,7 +290,8 @@
 		{
 		    gchar *buf = g_strdup_printf ("%s%s",
 						  SOCKET_PLYC, file);
-		    if (write(csock, buf, strlen(buf)) != strlen (buf))
+		    size_t buf_len = strlen(buf);
+		    if (write(csock, buf, buf_len) != (ssize_t) buf_len)
 		    {
 			fprintf (stderr, "Error communicating to server. Playcount registered in offline database.\n");
 			register_playcount (file);

Modified: gtkpod/branches/upstream/current/src/confirmation.c
===================================================================
--- gtkpod/branches/upstream/current/src/confirmation.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/confirmation.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,5 +1,4 @@
-/* Time-stamp: <2007-02-23 00:04:30 jcs>
-|
+/*
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
 | 
@@ -24,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: confirmation.c 995 2007-02-22 15:05:53Z jcsjcs $
+|  $Id: confirmation.c 2209 2009-01-13 13:45:55Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -211,6 +210,30 @@
     }
 }
 
+static void confirm_append_text (GladeXML *xml, const gchar *text)
+{
+	int i;
+	gchar **strings = g_strsplit (text, "\n", 0);
+	GtkTreeIter iter;
+	GtkAdjustment *adjustment;
+	GtkWidget *w = gtkpod_xml_get_widget (xml, "tree");
+	GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (w)));
+	
+	for (i = 0; strings[i]; i++)
+	{
+		if (strings[i][0])
+		{
+			gtk_list_store_append (store, &iter);
+			gtk_list_store_set (store, &iter, 0, strings[i], -1);
+		}
+	}
+	
+	w = gtkpod_xml_get_widget (xml, "scroller");
+	adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w));
+	gtk_adjustment_set_value (adjustment, adjustment->upper - adjustment->page_size);
+	
+	g_strfreev (strings);
+}
 
 /* gtkpod_confirmation(): open a confirmation window with the
    information given. If "OK" is clicked, ok_handler() is called,
@@ -296,39 +319,24 @@
     ConfData *cd;
     gint defx, defy;
     GladeXML *confirm_xml;
+    GtkListStore *store;
+    GtkTreeViewColumn *column;
+    GtkCellRenderer *renderer;
+    gchar *full_label;
 
     if (id_hash == NULL)
     {  /* initialize hash table to store IDs */
 	id_hash = g_hash_table_new_full (g_direct_hash, g_direct_equal,
-					      NULL, g_free);
+							  NULL, g_free);
     }
+	
     if (id >= 0)
     {
 	if ((cd = g_hash_table_lookup (id_hash, GINT_TO_POINTER(id))))
-	{ /* window with same ID already open -- add @text and return
-	   * */
-	    if (text && *text &&
-		cd->window && ((w = gtkpod_xml_get_widget (cd->window_xml, "text"))))
+	{ /* window with same ID already open -- add @text and return */
+	    if (text && *text && cd->window)
 	    {
-		GtkTextIter ti;
-		GtkTextBuffer *tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w));
-		if (!tb)
-		{   /* text buffer doesn't exist yet */
-		    GtkWidget *w1;
-		    tb = gtk_text_buffer_new(NULL);
-		    gtk_text_view_set_buffer(GTK_TEXT_VIEW(w), tb);
-		    gtk_text_view_set_editable(GTK_TEXT_VIEW(w), FALSE);
-		    gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(w), FALSE);
-		    if ((w1 =  gtkpod_xml_get_widget (cd->window_xml, "scroller")))
-			gtk_widget_show (w1);
-		    cd->scrolled = TRUE;
-		}
-		/* append new text to the end */
-		gtk_text_buffer_get_end_iter (tb, &ti);
-		gtk_text_buffer_insert (tb, &ti, text, -1);
-		/* scroll window such that new text is visible */
-		gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (w),
-                                    gtk_text_buffer_get_insert (tb));
+		confirm_append_text (cd->window_xml, text);
 	    }
 	    return GTK_RESPONSE_REJECT;
 	}
@@ -336,6 +344,7 @@
     else /* find free ID */
     {
 	id = 0;
+
 	do
 	{
 	    --id;
@@ -344,20 +353,25 @@
     }
 
     if (!confirm_again)
-    { /* This question was supposed to be asked "never again" ("don't
-	 confirm again" -- so we just call the ok_handler */
+    {
+	/* This question was supposed to be asked "never again" ("don't
+	   confirm again" -- so we just call the ok_handler */
 	if (ok_handler && !modal)
 	    ok_handler (user_data1, user_data2);
-	if (!modal)  return GTK_RESPONSE_ACCEPT;
-	else         return GTK_RESPONSE_OK;
+
+	if (!modal) 
+	    return GTK_RESPONSE_ACCEPT;
+
+	return GTK_RESPONSE_OK;
     }
 
     /* window = create_confirm_dialog (); */
-    confirm_xml = glade_xml_new (xml_file, "confirm_dialog", NULL);
+    confirm_xml = gtkpod_xml_new (xml_file, "confirm_dialog");
     window = gtkpod_xml_get_widget (confirm_xml, "confirm_dialog");
-
+    glade_xml_signal_autoconnect (confirm_xml);
+	
     /* insert ID into hash table */
-    cd = g_malloc (sizeof (ConfData));
+    cd = g_new0 (ConfData, 1);
     cd->window = window;
     cd->window_xml = confirm_xml;
     cd->option1_key = g_strdup(option1_key);
@@ -369,65 +383,79 @@
     cd->user_data1 = user_data1;
     cd->user_data2 = user_data2;
     g_hash_table_insert (id_hash, GINT_TO_POINTER(id), cd);
+	
+    full_label = g_markup_printf_escaped ("<span weight='bold' size='larger'>%s</span>\n\n%s",
+					  title ? title : _("Confirmation"), label ? label : "");
 
-    /* Set title */
-    if (title)
-	gtk_window_set_title (GTK_WINDOW(window), title);
-    else
-	gtk_window_set_title (GTK_WINDOW(window), _("Confirmation Dialogue"));
-
     /* Set label */
     w = gtkpod_xml_get_widget (confirm_xml, "label");
-    if (label)
-    {
-	gtk_widget_show (w);
-	gtk_label_set_text(GTK_LABEL(w), label);
-    }
-    else
-    {
-	gtk_widget_hide (w);
-    }
+    gtk_label_set_markup (GTK_LABEL(w), full_label);
+    g_free (full_label);
 
     /* Set text */
-    w = gtkpod_xml_get_widget (confirm_xml, "text");
+    w = gtkpod_xml_get_widget (confirm_xml, "tree");
+    store = gtk_list_store_new (1, G_TYPE_STRING);
+    gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (store));
+    g_object_unref (store);
+
+    column = gtk_tree_view_column_new ();
+    renderer = gtk_cell_renderer_text_new ();
+
+/*
+    gint mode, width;
+
+    g_object_get (G_OBJECT (renderer),
+		  "wrap-mode", &mode,
+		  "wrap-width", &width,
+		  NULL);
+
+    printf ("wrap-mode: %d wrap-width:%d\n", mode, width);
+*/
+
+    /* I have no idea why 400, but neither 1000 nor 0 result in the
+       right behavior... */
+    g_object_set (G_OBJECT (renderer),
+		  "wrap-mode", PANGO_WRAP_WORD_CHAR,
+		  "wrap-width", 400,
+		  NULL);
+
+    gtk_tree_view_column_pack_start (column, renderer, TRUE);
+    gtk_tree_view_column_set_attributes (column, renderer, "text", 0, NULL);
+    g_object_set_data (G_OBJECT (w), "renderer", renderer);
+
+    gtk_tree_view_append_column (GTK_TREE_VIEW (w), column);
+
     if (text)
     {
-	if (w)
-	{
-	    GtkTextBuffer *tb = gtk_text_buffer_new(NULL);
-	    gtk_text_buffer_set_text(tb, text, strlen(text));
-	    gtk_text_view_set_buffer(GTK_TEXT_VIEW(w), tb);
-	    gtk_text_view_set_editable(GTK_TEXT_VIEW(w), FALSE);
-	    gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(w), FALSE);
-	}
-	cd->scrolled = TRUE;
-	defx = prefs_get_int("size_conf_sw.x");
-	defy = prefs_get_int("size_conf_sw.y");
+		confirm_append_text (cd->window_xml, text);
+		cd->scrolled = TRUE;
+		defx = prefs_get_int("size_conf_sw.x");
+		defy = prefs_get_int("size_conf_sw.y");
     }
     else
-    { /* no text -> hide widget */
-	if ((w = gtkpod_xml_get_widget (confirm_xml, "scroller")))
-	    gtk_widget_hide (w);
-	cd->scrolled = FALSE;
-	defx = prefs_get_int("size_conf.x");
-	defy = prefs_get_int("size_conf.y");
+    {
+		/* no text -> hide widget */
+		if ((w = gtkpod_xml_get_widget (confirm_xml, "scroller")))
+			gtk_widget_hide (w);
+		
+		cd->scrolled = FALSE;
+		defx = prefs_get_int("size_conf.x");
+		defy = prefs_get_int("size_conf.y");
     }
-    gtk_window_set_default_size (GTK_WINDOW (window), defx, defy);
+	
+    gtk_widget_set_size_request (GTK_WIDGET (window), defx, defy);
 
     /* Set "Option 1" checkbox */
     w = gtkpod_xml_get_widget (confirm_xml, "option_vbox");
+	
     if (w && option1_key && option1_text)
     {
 	gboolean state, invert;
 	GtkWidget *option1_button =
 	    gtk_check_button_new_with_mnemonic (option1_text);
 
-	if ((option1_state==CONF_STATE_INVERT_TRUE) ||
-	    (option1_state==CONF_STATE_TRUE))  state = TRUE;
-	else                                   state = FALSE;
-	if ((option1_state==CONF_STATE_INVERT_FALSE) ||
-	    (option1_state==CONF_STATE_INVERT_TRUE))  invert = TRUE;
-	else                                          invert = FALSE;
+	state = ((option1_state==CONF_STATE_INVERT_TRUE) || (option1_state==CONF_STATE_TRUE));
+	invert = ((option1_state==CONF_STATE_INVERT_FALSE) || (option1_state==CONF_STATE_INVERT_TRUE));
 	cd->option1_invert = invert;
 
 	gtk_widget_show (option1_button);
@@ -448,12 +476,8 @@
 	GtkWidget *option2_button =
 	    gtk_check_button_new_with_mnemonic (option2_text);
 
-	if ((option2_state==CONF_STATE_INVERT_TRUE) ||
-	    (option2_state==CONF_STATE_TRUE))  state = TRUE;
-	else                                   state = FALSE;
-	if ((option2_state==CONF_STATE_INVERT_FALSE) ||
-	    (option2_state==CONF_STATE_INVERT_TRUE))  invert = TRUE;
-	else                                          invert = FALSE;
+	state = ((option2_state==CONF_STATE_INVERT_TRUE) || (option2_state==CONF_STATE_TRUE));
+	invert = ((option2_state==CONF_STATE_INVERT_FALSE) || (option2_state==CONF_STATE_INVERT_TRUE));
 	cd->option2_invert = invert;
 
 	gtk_widget_show (option2_button);
@@ -468,8 +492,10 @@
 
     /* Set "Never Again" checkbox */
     w = gtkpod_xml_get_widget (confirm_xml, "never_again");
+
     if (w && confirm_again_key)
-    { /* connect signal */
+    {
+	/* connect signal */
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
 				     !confirm_again);
 	g_signal_connect ((gpointer)w,
@@ -478,7 +504,8 @@
 			  GINT_TO_POINTER(id));
     }
     else if (w)
-    { /* hide "never again" button */
+    {
+	/* hide "never again" button */
 	gtk_widget_hide (w);
     }
 
@@ -489,7 +516,9 @@
     {
 	GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);
 	gtk_widget_grab_default (w);
-	if (!cancel_handler)  gtk_widget_hide (w);
+	
+	if (!cancel_handler)
+	    gtk_widget_hide (w);
     }
 
     /* Hide or default APPLY button */
@@ -497,7 +526,9 @@
     {
 	GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);
 	gtk_widget_grab_default (w);
-	if (!apply_handler)   gtk_widget_hide (w);
+
+	if (!apply_handler)
+	    gtk_widget_hide (w);
     }
 
     /* Hide or default OK button */
@@ -505,7 +536,9 @@
     {
 	GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);
 	gtk_widget_grab_default (w);
-	if (!ok_handler)     gtk_widget_hide (w);
+
+	if (!ok_handler)
+	    gtk_widget_hide (w);
     }
 
     /* Connect Close window */
@@ -520,6 +553,7 @@
 	gint response = gtk_dialog_run (GTK_DIALOG (window));
 	/* cleanup hash, store window size */
 	cleanup (GINT_TO_POINTER(id));
+
 	switch (response)
 	{
 	case GTK_RESPONSE_OK:
@@ -537,6 +571,69 @@
 			  G_CALLBACK (on_response),
 			  GINT_TO_POINTER(id));
 	gtk_widget_show (window);
+
 	return GTK_RESPONSE_ACCEPT;
     }
 }
+
+G_MODULE_EXPORT void on_confirm_tree_size_allocate (GtkWidget *sender, GtkAllocation *allocation, gpointer e)
+{
+    GtkCellRenderer *renderer = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (sender), "renderer"));
+    g_object_set (renderer, "wrap-width", allocation->width, NULL);
+}
+
+gint gtkpod_confirmation_simple (GtkWindow *parent,
+				 GtkMessageType icon,
+				 const gchar *primary_text,
+				 const gchar *secondary_text,
+				 const gchar *accept_button_text)
+{
+    return gtkpod_confirmation_hig(parent, icon, primary_text, secondary_text,
+				   accept_button_text, NULL, NULL, NULL);
+}
+
+gint gtkpod_confirmation_hig (GtkWindow *parent,
+			      GtkMessageType icon,
+			      const gchar *primary_text,
+			      const gchar *secondary_text,
+			      const gchar *accept_button_text,
+			      const gchar *cancel_button_text,
+			      const gchar *third_button_text,
+			      const gchar *help_context)
+{
+    gint result;
+
+    GtkWidget *dialog =
+	gtk_message_dialog_new(parent,
+			       GTK_DIALOG_MODAL,
+			       icon,
+			       GTK_BUTTONS_NONE,
+			       "%s",
+			       primary_text);
+
+    gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG(dialog),
+						"%s",
+						secondary_text);
+
+    if(third_button_text)
+	gtk_dialog_add_button(GTK_DIALOG(dialog), third_button_text, GTK_RESPONSE_APPLY);
+
+    gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+			   cancel_button_text ? cancel_button_text : GTK_STOCK_CANCEL,
+			   GTK_RESPONSE_CANCEL,
+			   accept_button_text ? accept_button_text : GTK_STOCK_OK,
+			   GTK_RESPONSE_OK,
+			   NULL);
+
+    result = gtk_dialog_run(GTK_DIALOG(dialog));
+    gtk_widget_destroy(dialog);
+
+    switch (result)
+    {
+    case GTK_RESPONSE_OK:
+    case GTK_RESPONSE_APPLY:
+	return result;
+    default:
+	return GTK_RESPONSE_CANCEL;
+    };
+}

Modified: gtkpod/branches/upstream/current/src/confirmation.h
===================================================================
--- gtkpod/branches/upstream/current/src/confirmation.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/confirmation.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -22,7 +22,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: confirmation.h 1065 2007-05-06 14:16:17Z jcsjcs $
+|  $Id: confirmation.h 1842 2007-12-18 18:11:45Z Sikon $
 */
 
 #ifndef __CONFIRMATION_H__
@@ -64,6 +64,21 @@
 				     gpointer user_data1,
 				     gpointer user_data2);
 
+gint gtkpod_confirmation_simple (GtkWindow *parent,
+								 GtkMessageType icon,
+								 const gchar *primary_text,
+								 const gchar *secondary_text,
+								 const gchar *accept_button_text);
+
+gint gtkpod_confirmation_hig (GtkWindow *parent,
+							  GtkMessageType icon,
+							  const gchar *primary_text,
+							  const gchar *secondary_text,
+							  const gchar *accept_button_text,
+							  const gchar *cancel_button_text,
+							  const gchar *third_button_text,
+							  const gchar *help_context);
+
 /* predefined IDs for use with gtkpod_confirmation() */
 enum {
     CONF_ID_IPOD_DIR = 0,

Modified: gtkpod/branches/upstream/current/src/context_menus.c
===================================================================
--- gtkpod/branches/upstream/current/src/context_menus.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/context_menus.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -24,7 +24,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: context_menus.c 1827 2007-12-13 22:55:50Z phantom_sf $
+|  $Id: context_menus.c 2027 2008-07-05 03:14:06Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -319,6 +319,8 @@
     g_return_if_fail (eitdb->itdb_imported == TRUE);
 
     gp_eject_ipod (itdb);
+    /* Set the coverart display based on the selected playlist */
+    coverart_display_update(TRUE);
 }
 
 
@@ -557,7 +559,7 @@
     GList *db;
     struct itdbs_head *itdbs_head;
     iTunesDB *itdb;
-    gchar *stock_id = NULL;
+    const gchar *stock_id = NULL;
     Playlist *pl;
 
   
@@ -1158,15 +1160,7 @@
     
      if (selected_tracks) g_list_free (selected_tracks);
     	selected_tracks = g_list_copy (coverart_get_displayed_tracks());
-    /*
-    int i;
-    for (i = 0; i < g_list_length(selected_tracks); ++i)
-    {
-    	Track *track;
-    	track = g_list_nth_data (selected_tracks, i);
-    	printf ("context_menu_init - Artist:%s  Album:%s  Title:%s\n", track->artist, track->album, track->title);
-    }
-    */
+    	
     if(selected_tracks)
 			create_context_menu (CM_CAD);
 }
@@ -1213,10 +1207,8 @@
     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)
     {
 	selected_tracks = g_list_copy (selected_playlist->members);

Modified: gtkpod/branches/upstream/current/src/date_parser.c
===================================================================
--- gtkpod/branches/upstream/current/src/date_parser.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/date_parser.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -28,7 +28,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -50,7 +50,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 
@@ -113,11 +113,12 @@
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -197,14 +198,9 @@
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -580,7 +576,7 @@
 /* e.g. +8:54.23           */
 /* e.g. 5d6m3s             */
 /* e.g. -3M5d              */
-#line 584 "date_parser.c"
+#line 580 "date_parser.c"
 
 #define INITIAL 0
 
@@ -598,6 +594,35 @@
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int lexdplex_destroy (void );
+
+int lexdpget_debug (void );
+
+void lexdpset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE lexdpget_extra (void );
+
+void lexdpset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *lexdpget_in (void );
+
+void lexdpset_in  (FILE * in_str  );
+
+FILE *lexdpget_out (void );
+
+void lexdpset_out  (FILE * out_str  );
+
+int lexdpget_leng (void );
+
+char *lexdpget_text (void );
+
+int lexdpget_lineno (void );
+
+void lexdpset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -638,7 +663,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( lexdptext, lexdpleng, 1, lexdpout )
+#define ECHO fwrite( lexdptext, lexdpleng, 1, lexdpout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -649,7 +674,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( lexdpin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -734,7 +759,7 @@
 #line 116 "date_parser.l"
 
 
-#line 738 "date_parser.c"
+#line 763 "date_parser.c"
 
 	if ( !(yy_init) )
 		{
@@ -1007,7 +1032,7 @@
 #line 273 "date_parser.l"
 ECHO;
 	YY_BREAK
-#line 1011 "date_parser.c"
+#line 1036 "date_parser.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1238,7 +1263,7 @@
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1262,6 +1287,14 @@
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) lexdprealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	(yy_n_chars) += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1640,7 +1673,9 @@
 		(yy_buffer_stack) = (struct yy_buffer_state**)lexdpalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
-		
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in lexdpensure_buffer_stack()" );
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -1658,6 +1693,8 @@
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in lexdpensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -1702,7 +1739,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 str a NUL-terminated string to scan
+ * @param yystr 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

Modified: gtkpod/branches/upstream/current/src/date_parser2.c
===================================================================
--- gtkpod/branches/upstream/current/src/date_parser2.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/date_parser2.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -28,7 +28,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -50,7 +50,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 
@@ -113,11 +113,12 @@
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -197,14 +198,9 @@
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -566,7 +562,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 570 "date_parser2.c"
+#line 566 "date_parser2.c"
 
 #define INITIAL 0
 
@@ -584,6 +580,35 @@
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int lexdp2lex_destroy (void );
+
+int lexdp2get_debug (void );
+
+void lexdp2set_debug (int debug_flag  );
+
+YY_EXTRA_TYPE lexdp2get_extra (void );
+
+void lexdp2set_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *lexdp2get_in (void );
+
+void lexdp2set_in  (FILE * in_str  );
+
+FILE *lexdp2get_out (void );
+
+void lexdp2set_out  (FILE * out_str  );
+
+int lexdp2get_leng (void );
+
+char *lexdp2get_text (void );
+
+int lexdp2get_lineno (void );
+
+void lexdp2set_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -624,7 +649,7 @@
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( lexdp2text, lexdp2leng, 1, lexdp2out )
+#define ECHO fwrite( lexdp2text, lexdp2leng, 1, lexdp2out )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -635,7 +660,7 @@
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( lexdp2in )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -723,7 +748,7 @@
 #line 87 "date_parser2.l"
 
 
-#line 727 "date_parser2.c"
+#line 752 "date_parser2.c"
 
 	if ( !(yy_init) )
 		{
@@ -929,7 +954,7 @@
 #line 150 "date_parser2.l"
 ECHO;
 	YY_BREAK
-#line 933 "date_parser2.c"
+#line 958 "date_parser2.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -1160,7 +1185,7 @@
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1184,6 +1209,14 @@
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) lexdp2realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	(yy_n_chars) += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1565,7 +1598,9 @@
 		(yy_buffer_stack) = (struct yy_buffer_state**)lexdp2alloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
-		
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in lexdp2ensure_buffer_stack()" );
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -1583,6 +1618,8 @@
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in lexdp2ensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -1627,7 +1664,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 str a NUL-terminated string to scan
+ * @param yystr 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

Modified: gtkpod/branches/upstream/current/src/details.c
===================================================================
--- gtkpod/branches/upstream/current/src/details.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/details.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: details.c 1755 2007-11-05 01:16:19Z phantom_sf $
+|  $Id: details.c 2149 2008-11-08 09:38:35Z jcsjcs $
 */
 
 /* This file provides functions for the details window */
@@ -54,7 +54,7 @@
 /* string constants for preferences */
 static const gchar *DETAILS_WINDOW_DEFX="details_window_defx";
 static const gchar *DETAILS_WINDOW_DEFY="details_window_defy";
-static const gchar *DETAILS_WINDOW_NOTEBOOK_PAGE="details_window_notebook_page";
+const gchar *DETAILS_WINDOW_NOTEBOOK_PAGE="details_window_notebook_page";
 
 /* enum types */
 typedef enum
@@ -436,8 +436,8 @@
 	    {
 		Track *tr = gl->data;
 		write_tags_to_file (tr);
-		/* display possible duplicates that have been removed */
 	    }
+	    /* display possible duplicates that have been removed */
 	    gp_duplicate_remove (NULL, NULL);
 	}
     }
@@ -571,7 +571,7 @@
 	}
     /* make sure artwork gets removed, even if both thumb_paths were
        unset ("") */
-    if (!frtrack->artwork->thumbnails)
+    if (!itdb_track_has_thumbnails (frtrack))
     {
 	changed |= gp_track_remove_thumbnails (totrack);
     }
@@ -779,6 +779,7 @@
 	break;
     case T_DESCRIPTION:
     case T_SUBTITLE:
+    case T_LYRICS:
     case T_COMMENT:
 	buf = g_strdup_printf ("details_textview_%d", item);
 	w = gtkpod_xml_get_widget (detail->xml, buf);
@@ -896,6 +897,7 @@
 	break;
     case T_COMMENT:
     case T_DESCRIPTION:
+    case T_LYRICS:
     case T_SUBTITLE:
 	w = gtkpod_xml_get_widget (detail->xml, textview);
 	tb= gtk_text_view_get_buffer (GTK_TEXT_VIEW (w));
@@ -1119,6 +1121,7 @@
     case T_COMMENT:
     case T_DESCRIPTION:
     case T_SUBTITLE:
+    case T_LYRICS:
 	if ((w = gtkpod_xml_get_widget (detail->xml, textview)))
 	{
 	    gchar *text;
@@ -1131,6 +1134,8 @@
 	    text = gtk_text_buffer_get_text (tb, &start, &end, TRUE);
 
 	    changed = track_set_text (track, text, item);
+
+	    g_free (text);
 	}
 	break;
     case T_COMPILATION:
@@ -1286,12 +1291,12 @@
 	    {
 		Track *tr = gl->data;
 		g_return_if_fail (tr);
-		remove_artwork |= (tr->artwork->thumbnails != NULL);
+		remove_artwork |= itdb_track_has_thumbnails (tr);
 	    }
 	}
 	else
 	{
-	    remove_artwork = (detail->track->artwork->thumbnails != NULL);
+	    remove_artwork = (itdb_track_has_thumbnails (detail->track));
 	}
 	i = g_list_index (detail->tracks, detail->track);
 	g_return_if_fail (i != -1);
@@ -1354,7 +1359,6 @@
 /* Update the displayed thumbnail */
 void details_update_thumbnail (Detail *detail)
 {
-    Thumb *thumb;
     GtkImage *img;
 
     g_return_if_fail (detail);
@@ -1368,25 +1372,20 @@
     {
 	detail->artwork_ok = TRUE;
 	/* Get large cover */
-	thumb = itdb_artwork_get_thumb_by_type (detail->track->artwork,
-						ITDB_THUMB_COVER_LARGE);
-	if (thumb)
-	{
-	    GdkPixbuf *pixbuf;
-	    pixbuf = itdb_thumb_get_gdk_pixbuf (detail->itdb->device,
-						thumb);
-	    if (pixbuf)
-	    {
-		gtk_image_set_from_pixbuf (img, pixbuf);
-		gdk_pixbuf_unref (pixbuf);
-	    }
-	    else
-	    {
-		gtk_image_set_from_stock (img, GTK_STOCK_DIALOG_WARNING,
-					  GTK_ICON_SIZE_DIALOG);
-		detail->artwork_ok = FALSE;
-	    }
-	}
+        GdkPixbuf *pixbuf = itdb_artwork_get_pixbuf (detail->itdb->device,
+						     detail->track->artwork,
+						     200, 200);
+        if (pixbuf)
+        {
+            gtk_image_set_from_pixbuf (img, pixbuf);
+            g_object_unref (pixbuf);
+        }
+        else
+        {
+            gtk_image_set_from_stock (img, GTK_STOCK_DIALOG_WARNING,
+                    GTK_ICON_SIZE_DIALOG);
+            detail->artwork_ok = FALSE;
+        }
 	details_set_item (detail,  detail->track, T_THUMB_PATH);
     }
 
@@ -1570,14 +1569,14 @@
 {
     Detail *detail;
     GtkWidget *w;
-    gint defx, defy, page;
+    gint defx, defy, page, num_pages;
     T_item i;
 
     g_return_if_fail (selected_tracks);
 
     detail = g_malloc0 (sizeof (Detail));
 
-    detail->xml = glade_xml_new (xml_file, "details_window", NULL);
+    detail->xml = gtkpod_xml_new (xml_file, "details_window");
 /*  no signals to connect -> comment out */
 /*     glade_xml_signal_autoconnect (detail->xml); */
     detail->window = gtkpod_xml_get_widget (detail->xml, "details_window");
@@ -1686,7 +1685,8 @@
     /* set notebook page */
     w = gtkpod_xml_get_widget (detail->xml, "details_notebook");
     page = prefs_get_int (DETAILS_WINDOW_NOTEBOOK_PAGE);
-    if ((page >= 0) && (page <= 4))
+    num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (w));
+    if ((page >= 0) && (page < num_pages))
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (w), page);
 
     /* set default size */
@@ -1852,7 +1852,7 @@
 					image_error = g_strdup(fcover->err_msg);
 								
 				free_fetchcover (fcover);
-				gdk_pixbuf_unref (pixbuf);
+				g_object_unref (pixbuf);
 				coverart_block_change (FALSE);
 			}
 			else

Modified: gtkpod/branches/upstream/current/src/details.h
===================================================================
--- gtkpod/branches/upstream/current/src/details.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/details.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-10 00:46:23 jcs>
+/* Time-stamp: <2008-11-08 17:35:16 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: details.h 1596 2007-06-26 14:33:01Z dforsi $
+|  $Id: details.h 2149 2008-11-08 09:38:35Z jcsjcs $
 */
 
 #ifndef __DETAILS_H__
@@ -53,6 +53,8 @@
 
 typedef struct _Detail Detail;
 
+extern const gchar *DETAILS_WINDOW_NOTEBOOK_PAGE;
+
 /* details window */
 void details_edit (GList *selected_tracks);
 void details_update_default_sizes (void);

Modified: gtkpod/branches/upstream/current/src/display.c
===================================================================
--- gtkpod/branches/upstream/current/src/display.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-12-13 01:02:57 jcs>
+/* Time-stamp: <2008-12-07 19:10:37 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 1825 2007-12-13 13:28:20Z dforsi $
+|  $Id: display.c 2156 2008-12-07 11:39:42Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -34,17 +34,19 @@
 #include "details.h"
 #include "display_private.h"
 #include "info.h"
+#include "infodlg.h"
 #include "ipod_init.h"
 #include "file_convert.h"
 #include "misc.h"
 #include "misc_track.h"
 #include "prefs.h"
-#include "prefs_window.h"
+#include "sort_window.h"
 #include "repository.h"
 #include "syncdir.h"
 #include "tools.h"
 #include <stdlib.h>
 #include <string.h>
+#include <cairo.h>
 #include <glib/gprintf.h>
 
 
@@ -87,6 +89,8 @@
     display_show_hide_toolbar ();
     /* Hide/Show tooltips */
     display_show_hide_tooltips ();
+    /* Hide/Show searchbar */
+    display_show_hide_searchbar ();
     /* change standard g_print () handler */
     g_set_print_handler ((GPrintFunc)gtkpod_warning);
 
@@ -104,7 +108,8 @@
     /* CAREFUL: must be done after calling ..._space_statusbar_init() */
     display_set_info_window_menu ();
     /* check if info window should be opened */
-    if (prefs_get_int("info_window"))  info_open_window ();
+    if (prefs_get_int("info_window"))
+		open_info_dialog ();
 }
 
 /* redisplay the entire display (playlists, sort tabs, track view) and
@@ -150,7 +155,7 @@
 }
 
 
-/* make sure only suitable delete menu items are available */
+/* make sure only suitable menu items are available */
 void display_adjust_menus (void)
 {
     GtkWidget *delete;
@@ -168,6 +173,13 @@
     edit3 = gtkpod_xml_get_widget (main_window_xml, "create_playlists_menu");
     edit4 = gtkpod_xml_get_widget (main_window_xml, "randomize_current_playlist_menu");
     edit5 = gtkpod_xml_get_widget (main_window_xml, "save_track_order_menu");
+
+#if 0
+    edit6 = gtkpod_xml_get_widget (main_window_xml, "add_files1");
+    edit7 = gtkpod_xml_get_widget (main_window_xml, "add_directory1");
+    edit8 = gtkpod_xml_get_widget (main_window_xml, "add_playlist1");
+#endif
+
     dtfpl = gtkpod_xml_get_widget (main_window_xml,
 				   "delete_selected_tracks_from_playlist");
     dtfip = gtkpod_xml_get_widget (main_window_xml,
@@ -197,6 +209,13 @@
     espl = gtkpod_xml_get_widget (main_window_xml,
 				  "edit_smart_playlist");
 
+#if 0
+    tb_edit1 = gtkpod_xml_get_widget (main_window_xml, "add_files_button");
+    tb_edit2 = gtkpod_xml_get_widget (main_window_xml, "add_dirs_button");
+    tb_edit3 = gtkpod_xml_get_widget (main_window_xml, "add_PL_button");
+    tb_edit4 = gtkpod_xml_get_widget (main_window_xml, "new_PL_button");
+#endif
+
     pl = pm_get_selected_playlist ();
 
     if (pl == NULL)
@@ -362,6 +381,34 @@
     }
 }
 
+/* make the search bar visible or hide it depending on the value set in
+ * the prefs
+ */
+void display_show_hide_searchbar (void)
+{
+	GtkWidget *upbutton = gtkpod_xml_get_widget (main_window_xml, "searchbar_up_button");
+	GtkWidget *searchbar = gtkpod_xml_get_widget (main_window_xml, "searchbar_hpanel");
+	GtkCheckMenuItem *mi = GTK_CHECK_MENU_ITEM (gtkpod_xml_get_widget (main_window_xml, "filterbar_menu"));
+
+	g_return_if_fail (upbutton);
+	g_return_if_fail (searchbar);
+	g_return_if_fail (mi);
+		
+	if (prefs_get_int ("display_search_entry"))
+	{
+		gtk_widget_show_all (searchbar);
+		gtk_widget_hide (upbutton);
+		gtk_check_menu_item_set_active (mi, TRUE);
+	}
+	else
+	{		
+		gtk_widget_hide_all (searchbar);
+		gtk_widget_show (upbutton);
+		gtk_widget_set_sensitive (upbutton, TRUE);
+		gtk_check_menu_item_set_active (mi, FALSE);
+	}
+}
+
 /* Adjust the menu item status according on the value set in the
    prefs. */
 void display_set_info_window_menu (void)
@@ -419,8 +466,6 @@
     /* Show/Hide tooltips of the special sorttabs */
     st_show_hide_tooltips ();
     /* Show/Hide tooltips of the prefs window */
-    prefs_window_show_hide_tooltips ();
-    /* Show/Hide tooltips of the prefs window */
     sort_window_show_hide_tooltips ();
 }
 
@@ -443,13 +488,51 @@
     }
     tm_update_default_sizes ();
     st_update_default_sizes ();
-    prefs_window_update_default_sizes ();
-    info_update_default_sizes ();
+    info_dialog_update_default_sizes ();
     details_update_default_sizes ();
     file_convert_update_default_sizes ();
 }
 
 /**
+ * on_drawing_area_exposed:
+ *
+ * Callback for the drawing area. When the drwaing area is covered,
+ * resized, changed etc.. This will be called the draw() function is then
+ * called from this and the cairo redrawing takes place.
+ * 
+ * @draw_area: drawing area where al the cairo drawing takes place 
+ * @event: gdk expose event
+ * 
+ * Returns:
+ * boolean indicating whether other handlers should be run.
+ */
+static gboolean on_coverart_preview_dialog_exposed (GtkWidget *drawarea, GdkEventExpose *event, gpointer data)
+{
+	GdkPixbuf *image = data;
+	
+	/* Draw the image using cairo */
+		cairo_t *cairo_context;
+		
+		/* get a cairo_t */
+		cairo_context = gdk_cairo_create (drawarea->window);
+		/* set a clip region for the expose event */
+		cairo_rectangle (cairo_context,
+				event->area.x, event->area.y,
+				event->area.width, event->area.height);
+		cairo_clip (cairo_context);
+	
+		gdk_cairo_set_source_pixbuf (
+				cairo_context,
+				image,
+				0,
+				0);
+		cairo_paint (cairo_context);
+		
+		cairo_destroy (cairo_context);
+		return FALSE;
+}
+
+/**
  * display_image_dialog
  * 
  * @GdkPixbuf: image
@@ -464,18 +547,17 @@
 	
 	GladeXML *preview_xml;
 	GtkWidget *dialog;
-	GtkWidget *canvasbox;
+	GtkWidget *drawarea;
 	GtkWidget *res_label;
 	GdkPixbuf *scaled = NULL;
 	gchar *text;
 		
-	preview_xml = glade_xml_new (xml_file, "coverart_preview_dialog", NULL);
-		
+	preview_xml = gtkpod_xml_new (xml_file, "coverart_preview_dialog");
 	dialog = gtkpod_xml_get_widget (preview_xml, "coverart_preview_dialog");
-	canvasbox = gtkpod_xml_get_widget (preview_xml, "coverart_preview_dialog_vbox");
+	drawarea = gtkpod_xml_get_widget (preview_xml, "coverart_preview_dialog_drawarea");
 	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 (drawarea);
 	g_return_if_fail (res_label);
 		
 	/* Set the dialog parent */
@@ -485,9 +567,7 @@
 	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);
+	text = g_markup_printf_escaped (_("<b>Image Dimensions: %d x %d</b>"), pixwidth, pixheight);
 	gtk_label_set_markup (GTK_LABEL (res_label), text);
 	g_free (text);
 	
@@ -506,29 +586,17 @@
 		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);
+	scaled = gdk_pixbuf_scale_simple (
+					image, 
+					pixwidth, 
+					pixheight, 
+					GDK_INTERP_BILINEAR);
 
-	gtk_box_pack_start_defaults (GTK_BOX(canvasbox), GTK_WIDGET (canvas));
-		
+	/* Set the draw area's minimum size */
+	gtk_widget_set_size_request  (drawarea, pixwidth, pixheight);
+	g_signal_connect (G_OBJECT (drawarea), "expose_event",  G_CALLBACK (on_coverart_preview_dialog_exposed), scaled);
+	
 	/* Display the dialog and block everything else until the
 	 * dialog is closed.
 	 */
@@ -536,11 +604,11 @@
 	gtk_dialog_run (GTK_DIALOG(dialog));
 			
 	/* Destroy the dialog as no longer required */
-	gdk_pixbuf_unref (scaled);
+	
+	g_object_unref (scaled);
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
-
 /* Utility function: returns a copy of the tracks currently
    selected. This means:
 
@@ -722,7 +790,8 @@
 */
 
 
-void on_edit_details_selected_playlist (GtkMenuItem     *menuitem,
+G_MODULE_EXPORT void
+on_edit_details_selected_playlist (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
     Playlist *pl = pm_get_selected_playlist ();
@@ -737,7 +806,8 @@
     }
 }
 
-void on_edit_details_selected_tab_entry (GtkMenuItem     *menuitem,
+G_MODULE_EXPORT void
+on_edit_details_selected_tab_entry (GtkMenuItem     *menuitem,
 					 gpointer         user_data)
 {
     gint inst = get_sort_tab_number (
@@ -755,7 +825,8 @@
     }
 }
 
-void on_edit_details_selected_tracks (GtkMenuItem     *menuitem,
+G_MODULE_EXPORT void
+on_edit_details_selected_tracks (GtkMenuItem     *menuitem,
 				      gpointer         user_data)
 {
     GList *tracks = tm_get_selected_tracks ();
@@ -773,7 +844,7 @@
 
 
 /* callback for "add new playlist" button */
-void
+G_MODULE_EXPORT void
 on_new_playlist_button                 (GtkButton       *button,
 					gpointer         user_data)
 {
@@ -791,7 +862,7 @@
 
 
 /* callback for "add new playlist" menu */
-void
+G_MODULE_EXPORT void
 on_new_playlist1_activate              (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -807,14 +878,7 @@
     }
 }
 
-void
-on_edit_preferences_activate          (GtkMenuItem     *menuitem,
-					gpointer         user_data)
-{
-    if(!widgets_blocked)  prefs_window_create (-1);
-}
-
-void
+G_MODULE_EXPORT void
 on_edit_repository_options_activate          (GtkMenuItem     *menuitem,
 					      gpointer         user_data)
 {
@@ -830,7 +894,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_load_ipods_mi           (GtkMenuItem     *menuitem,
 			    gpointer         user_data)
 {
@@ -838,7 +902,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_load_ipods_clicked               (GtkButton       *button,
 				     gpointer         user_data)
 {
@@ -846,7 +910,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_save_changes_mi           (GtkMenuItem     *menuitem,
 			      gpointer         user_data)
 {
@@ -855,7 +919,7 @@
 
 
 
-void
+G_MODULE_EXPORT void
 on_save_changes_clicked               (GtkButton       *button,
 				     gpointer         user_data)
 {
@@ -863,7 +927,7 @@
 }
 
 
-
+G_MODULE_EXPORT 
 void on_edit_smart_playlist (GtkMenuItem *mi,
 			     gpointer data)
 {
@@ -928,13 +992,14 @@
     }
 }
 
-void on_delete_selected_tracks_from_database (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_tracks_from_database (GtkMenuItem *mi,
 					      gpointer data)
 {
     delete_selected_tracks (DELETE_ACTION_DATABASE);
 }
 
-void
+G_MODULE_EXPORT void
 on_delete_selected_playlist_including_tracks_from_harddisk (GtkMenuItem *mi,
 							    gpointer data)
 {
@@ -942,7 +1007,8 @@
 }
 
 
-void on_delete_selected_entry_from_database (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_entry_from_database (GtkMenuItem *mi,
 					     gpointer data)
 {
     delete_selected_entry (DELETE_ACTION_DATABASE, 
@@ -950,7 +1016,8 @@
 }
 
 
-void on_delete_selected_entry_from_ipod (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_entry_from_ipod (GtkMenuItem *mi,
 					 gpointer data)
 {
     delete_selected_entry (DELETE_ACTION_IPOD,
@@ -958,21 +1025,24 @@
 }
 
 
-void on_delete_selected_tracks_from_playlist (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_tracks_from_playlist (GtkMenuItem *mi,
 					      gpointer data)
 {
     delete_selected_tracks (DELETE_ACTION_PLAYLIST);
 }
 
 
-void on_delete_selected_tracks_from_harddisk (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_tracks_from_harddisk (GtkMenuItem *mi,
 					      gpointer data)
 {
     delete_selected_tracks (DELETE_ACTION_LOCAL);
 }
 
 
-void on_delete_selected_entry_from_harddisk (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_entry_from_harddisk (GtkMenuItem *mi,
 					     gpointer data)
 {
     delete_selected_entry (DELETE_ACTION_LOCAL,
@@ -980,21 +1050,23 @@
 }
 
 
-void on_delete_selected_tracks_from_ipod (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_tracks_from_ipod (GtkMenuItem *mi,
 					  gpointer data)
 {
     delete_selected_tracks (DELETE_ACTION_IPOD);
 }
 
 
-void on_delete_selected_playlist (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_playlist (GtkMenuItem *mi,
 				  gpointer data)
 {
     delete_selected_playlist (DELETE_ACTION_PLAYLIST);
 }
 
 
-void
+G_MODULE_EXPORT void
 on_delete_selected_playlist_including_tracks_from_database (GtkMenuItem *mi,
 							    gpointer data)
 {
@@ -1002,7 +1074,8 @@
 }
 
 
-void on_delete_selected_entry_from_playlist (GtkMenuItem *mi,
+G_MODULE_EXPORT void
+on_delete_selected_entry_from_playlist (GtkMenuItem *mi,
 					     gpointer data)
 {
     delete_selected_entry (DELETE_ACTION_PLAYLIST,
@@ -1010,7 +1083,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_delete_selected_playlist_including_tracks_from_ipod (GtkMenuItem *mi,
 							gpointer data)
 {
@@ -1018,7 +1091,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_ipod_directories_menu               (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1056,7 +1129,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_check_ipod_files_activate           (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1095,7 +1168,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_update_playlist_activate (GtkMenuItem     *menuitem,
 			     gpointer         user_data)
 {
@@ -1103,7 +1176,7 @@
 }
 
 /* update tracks in tab entry */
-void
+G_MODULE_EXPORT void
 on_update_tab_entry_activate        (GtkMenuItem     *menuitem,
 				     gpointer         user_data)
 {
@@ -1113,15 +1186,22 @@
     if (inst != -1) gp_do_selected_entry (update_tracks, inst);
 }
 
-void
+G_MODULE_EXPORT void
 on_update_tracks_activate            (GtkMenuItem     *menuitem,
 				     gpointer         user_data)
 {
     gp_do_selected_tracks (update_tracks);
 }
 
+G_MODULE_EXPORT void
+on_mserv_from_file_playlist_menu_activate
+                                        (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+    gp_do_selected_playlist (mserv_from_file_tracks);
+}
 
-void
+G_MODULE_EXPORT void
 on_mserv_from_file_tracks_menu_activate
                                         (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -1130,7 +1210,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_mserv_from_file_entry_menu_activate (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -1141,7 +1221,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_sync_playlist_activate (GtkMenuItem     *menuitem,
 			     gpointer         user_data)
 {
@@ -1162,7 +1242,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_save_track_order1_activate           (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1170,7 +1250,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_toolbar_menu_activate               (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1180,7 +1260,17 @@
 }
 
 
-void
+G_MODULE_EXPORT void
+on_filterbar_menu_activate               (GtkMenuItem     *menuitem,
+					  gpointer         user_data)
+{
+    prefs_set_int("display_search_entry",
+	gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)));
+    display_show_hide_searchbar ();
+}
+
+
+G_MODULE_EXPORT void
 on_more_sort_tabs_activate             (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1189,7 +1279,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_less_sort_tabs_activate             (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1197,7 +1287,7 @@
     st_show_visible();
 }
 
-void
+G_MODULE_EXPORT void
 on_export_playlist_activate  (GtkMenuItem     *menuitem,
 			      gpointer         user_data)
 {
@@ -1214,7 +1304,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_export_tab_entry_activate (GtkMenuItem     *menuitem,
 			      gpointer         user_data)
 {
@@ -1235,7 +1325,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_export_tracks_activate     (GtkMenuItem     *menuitem,
 			      gpointer         user_data)
 {
@@ -1253,7 +1343,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_playlist_file_playlist_activate     (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -1270,7 +1360,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_playlist_file_tab_entry_activate    (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -1291,7 +1381,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_playlist_file_tracks_activate       (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -1308,7 +1398,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_play_playlist_activate              (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1324,7 +1414,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_play_tab_entry_activate             (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1345,7 +1435,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_play_tracks_activate                 (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1363,7 +1453,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_enqueue_playlist_activate           (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1379,7 +1469,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_enqueue_tab_entry_activate          (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1400,7 +1490,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_enqueue_tracks_activate              (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1418,14 +1508,14 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_arrange_sort_tabs_activate          (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
     st_arrange_visible_sort_tabs ();
 }
 
-void
+G_MODULE_EXPORT void
 on_tooltips_menu_activate              (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1435,21 +1525,21 @@
     
 }
 
-void
+G_MODULE_EXPORT void
 on_pl_containing_displayed_tracks_activate (GtkMenuItem     *menuitem,
 					    gpointer         user_data)
 {
     generate_displayed_playlist ();
 }
 
-void
+G_MODULE_EXPORT void
 on_pl_containing_selected_tracks_activate (GtkMenuItem     *menuitem,
 					    gpointer         user_data)
 {
     generate_selected_playlist ();
 }
 
-void
+G_MODULE_EXPORT void
 on_pl_for_each_artist_activate         (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1465,7 +1555,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_pl_for_each_album_activate         (GtkMenuItem     *menuitem,
 				       gpointer         user_data)
 {
@@ -1481,7 +1571,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_pl_for_each_genre_activate         (GtkMenuItem     *menuitem,
 				       gpointer         user_data)
 {
@@ -1497,7 +1587,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_pl_for_each_composer_activate         (GtkMenuItem     *menuitem,
 					  gpointer         user_data)
 {
@@ -1514,7 +1604,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_pl_for_each_year_activate           (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -1531,7 +1621,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_most_listened_tracks1_activate       (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1548,7 +1638,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_all_tracks_never_listened_to1_activate
 					(GtkMenuItem     *menuitem,
 					gpointer         user_data)
@@ -1565,7 +1655,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_most_rated_tracks_playlist_s1_activate
 					(GtkMenuItem     *menuitem,
 					gpointer         user_data)
@@ -1583,7 +1673,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_most_recent_played_tracks_activate   (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1599,7 +1689,7 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_played_since_last_time1_activate    (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1615,14 +1705,14 @@
     }
 }
 
-void
+G_MODULE_EXPORT void
 on_sorting_activate                    (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
     sort_window_create ();
 }
 
-void
+G_MODULE_EXPORT void
 on_normalize_selected_playlist_activate
 					(GtkMenuItem     *menuitem,
 					gpointer         user_data)
@@ -1635,7 +1725,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_normalize_selected_tab_entry_activate
 					(GtkMenuItem     *menuitem,
 					gpointer         user_data)
@@ -1660,7 +1750,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_normalize_selected_tracks_activate   (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1670,7 +1760,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_normalize_displayed_tracks_activate  (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1680,7 +1770,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_normalize_all_tracks                (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1699,7 +1789,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_normalize_newly_added_tracks        (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1716,16 +1806,17 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_info_window1_activate               (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
     if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)))
-	 info_open_window ();
-    else info_close_window ();
+		open_info_dialog ();
+    else
+		close_info_dialog ();
 }
 
-void
+G_MODULE_EXPORT void
 on_conversion_log1_activate               (GtkMenuItem     *menuitem,
 					   gpointer         user_data)
 {
@@ -1741,7 +1832,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_sync_all_activate                   (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -1762,7 +1853,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_sync_calendar_activate              (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1778,7 +1869,7 @@
 }
 
 
-void
+G_MODULE_EXPORT void
 on_sync_contacts_activate              (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {
@@ -1793,8 +1884,7 @@
     }
 }
 
-
-void
+G_MODULE_EXPORT void
 on_sync_notes_activate                 (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -1808,8 +1898,7 @@
 	message_sb_no_ipod_itdb_selected ();
     }
 }
-
-void
+G_MODULE_EXPORT void
 on_all_tracks_not_listed_in_any_playlist1_activate
                                         (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -1826,8 +1915,7 @@
     }
 }
 
-
-void
+G_MODULE_EXPORT void
 on_random_playlist_activate            (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -1843,15 +1931,13 @@
     }
 }
 
-
-void
+G_MODULE_EXPORT void
 on_randomize_current_playlist_activate (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     randomize_current_playlist();
 }
-
-void
+G_MODULE_EXPORT void
 on_pl_for_each_rating_activate         (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {

Modified: gtkpod/branches/upstream/current/src/display.h
===================================================================
--- gtkpod/branches/upstream/current/src/display.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display.h 1765 2007-11-08 20:02:42Z phantom_sf $
+|  $Id: display.h 2148 2008-11-08 08:02:15Z jcsjcs $
 */
 
 #ifndef __DISPLAY_H__
@@ -191,6 +191,7 @@
   TM_COLUMN_SORT_ALBUMARTIST, /* 45 */
   TM_COLUMN_SORT_COMPOSER,
   TM_COLUMN_SORT_TVSHOW,
+  TM_COLUMN_LYRICS,
   TM_NUM_COLUMNS
 } TM_item;
 
@@ -257,6 +258,7 @@
     T_SORT_COMPOSER,
     T_SORT_TVSHOW,
     T_GAPLESS_TRACK_FLAG,
+    T_LYRICS,
     T_ITEM_NUM,
 } T_item;
 
@@ -265,11 +267,13 @@
 #define TM_NUM_TAGS_PREFS (5)
 
 /* "Column numbers" in playlist model */
-enum  {
+typedef enum  {
   PM_COLUMN_ITDB = 0,
+  PM_COLUMN_TYPE,
   PM_COLUMN_PLAYLIST,
+  PM_COLUMN_PHOTOS,
   PM_NUM_COLUMNS
-};
+} PM_column_type;
 
 /* Drag and drop types */
 enum {
@@ -290,6 +294,7 @@
 void display_cleanup (void);
 void display_adjust_menus (void);
 void display_show_hide_toolbar (void);
+void display_show_hide_searchbar (void);
 void display_reset (gint inst);
 GList *display_get_selection (guint32 inst);
 GList *display_get_selected_members (gint inst);
@@ -298,9 +303,10 @@
 void display_image_dialog (GdkPixbuf *image);
 
 Playlist* pm_get_selected_playlist (void);
+iTunesDB* pm_get_selected_itdb (void);
 gint pm_get_position_for_itdb (iTunesDB *itdb);
 void pm_remove_playlist (Playlist *playlist, gboolean select);
-void pm_add_playlist (Playlist *playlist, gint position);
+void pm_add_child (iTunesDB *itdb, PM_column_type type, gpointer item, gint position);
 void pm_add_itdb (iTunesDB *itdb, gint pos);
 void pm_select_playlist (Playlist *playlist);
 void pm_unselect_playlist (Playlist *playlist);
@@ -310,10 +316,11 @@
 void pm_track_changed (Track *track);
 void pm_sort (GtkSortType order);
 void pm_stop_editing (gboolean cancel);
-void pm_set_renderer_pix (GtkCellRenderer *renderer,
+void pm_set_playlist_renderer_pix (GtkCellRenderer *renderer,
 			  Playlist *playlist);
-void pm_set_renderer_text (GtkCellRenderer *renderer,
+void pm_set_playlist_renderer_text (GtkCellRenderer *renderer,
 			   Playlist *playlist);
+void pm_show_all_playlists ();
 
 void st_stop_editing (gint inst, gboolean cancel);
 gboolean st_set_selection (Itdb_Track *track);
@@ -325,6 +332,7 @@
 void st_arrange_visible_sort_tabs (void);
 void st_adopt_order_in_playlist (void);
 TabEntry *st_get_selected_entry (gint inst);
+void st_update_paned_position ();
 
 void cal_open_calendar (gint inst, T_item item);
 void sp_go (guint32 inst);

Modified: gtkpod/branches/upstream/current/src/display_coverart.c
===================================================================
--- gtkpod/branches/upstream/current/src/display_coverart.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_coverart.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,11 +23,11 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display_coverart.c 1776 2007-11-12 22:38:00Z phantom_sf $
-*/
+|  $Id: display_coverart.c 2051 2008-07-18 09:04:25Z phantom_sf $
+ */
 
 #ifdef HAVE_CONFIG_H
-	#include <config.h>
+#include <config.h>
 #endif
 
 #include "display_private.h"
@@ -40,6 +40,9 @@
 #include "fileselection.h"
 #include "fetchcover.h"
 #include "info.h"
+#include "gdk/gdk.h"
+#include <pango/pangocairo.h>
+#include <math.h>
 
 #define DEBUG 0
 
@@ -47,23 +50,33 @@
 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 void set_highlight (Cover_Item *cover, gint index);
-static void raise_cdimages (GPtrArray *cdcovers);
+static void set_display_window_dimensions ();
+static void set_highlight (Cover_Item *cover, gint index, cairo_t *cr);
+static void set_shadow_reflection (Cover_Item *cover, cairo_t *cr);
 static void remove_track_from_album (Album_Item *album, Track *track, gchar *key, gint index, GList *keylistitem);
+static GdkPixbuf *coverart_get_default_track_thumb (gint default_img_size);
+static GdkPixbuf *coverart_get_track_thumb (Track *track, Itdb_Device *device, gint default_img_size);
+
+/* callback declarations */
+static gboolean on_gtkpod_window_configure (GtkWidget *widget, GdkEventConfigure *event, gpointer data);
 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 gboolean on_contentpanel_scroll_wheel_turned (GtkWidget *widget, GdkEventScroll *event, gpointer user_data);
+static gint on_main_cover_image_clicked (GtkWidget *widget, 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, 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);
+
+/* dnd declarations */
 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);
 
+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 set_slider_range (gint index);
+static GdkColor *convert_hexstring_to_gdk_color (gchar *hexstring);
+static gboolean on_drawing_area_exposed (GtkWidget *draw_area, GdkEventExpose *event);
+static void draw (cairo_t *cairo_context);
+static void redraw (gboolean force_pixbuf_update);
+
 /* Prefs keys */
 const gchar *KEY_DISPLAY_COVERART="display_coverart";
 
@@ -79,10 +92,8 @@
 static gint DEFAULT_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 */
-static gchar *HIGHLIGHT_FILE;
-/* Path of the png file used for the display of the main cd cover */
-static gchar *HIGHLIGHT_FILE_MAIN;
+/* Flag set to force an update of covers if a modification has been made */
+static gboolean force_pixbuf_covers = FALSE;
 /* signal handler id for the components */
 static gulong slide_signal_id;
 static gulong rbutton_signal_id;
@@ -90,812 +101,1098 @@
 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 }
+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 ()
 {
-	gint i;
-	Cover_Item *cover;
-	Album_Item *album;
-	gchar *key;
-	
-	printf("Album list\n");
-	for(i = 0; i < g_list_length(album_key_list); ++i)
-	{
-		key = g_list_nth_data(album_key_list, i);
-		if (key == NULL)
-			printf("Album key is null\n");
-		else
-		{
-			album  = g_hash_table_lookup (album_hash, key);
-			printf("Index = %d -> Album Details: Artist = %s, Album = %s, No. Tracks = %d\n", i, album->artist, album->albumname, g_list_length (album->tracks));
-		}
-	}
-	
-	printf("Cover List\n");
-	for(i = 0; i < IMG_TOTAL; ++i)
+  gint i;
+  Cover_Item *cover;
+  Album_Item *album;
+  gchar *key;
+
+  printf("Album list\n");
+  for(i = 0; i < g_list_length(album_key_list); ++i)
   {
-  	cover = g_ptr_array_index(cdwidget->cdcovers, i);
-  	if (cover->album == NULL)
-  		printf("Cover album is null\n");
-  	else
-  		printf("Cover Details: Artist = %s, Album = %s\n", cover->album->artist, cover->album->albumname);
+    key = g_list_nth_data(album_key_list, i);
+    if (key == NULL)
+      printf("Album key is null\n");
+    else
+    {
+      album  = g_hash_table_lookup (album_hash, key);
+      printf("Index = %d -> Album Details: Artist = %s, Album = %s, No. Tracks = %d\n", i, album->artist, album->albumname, g_list_length (album->tracks));
+    }
   }
+
+  printf("Cover List\n");
+  for(i = 0; i < IMG_TOTAL; ++i)
+  {
+    cover = g_ptr_array_index(cdwidget->cdcovers, i);
+    if (cover->album == NULL)
+      printf("Cover album is null\n");
+    else
+      printf("Cover Details: Artist = %s, Album = %s\n", cover->album->artist, cover->album->albumname);
+  }
 }
 #endif
 
 /**
- * 
- * free_CDWidget
- * 
- * destroy the CD Widget and free everything currently
- * in memory.
+ * coverart_init:
+ *
+ * Initialises the image file used if an album has no cover. 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.
+ *
+ * Currently called from gtkpod_init. Should not need to be called
+ * subsequent to this.
+ *
+ * @progpath: path of the gtkpod binary being loaded.
+ *
  */
- static void free_CDWidget ()
- {
- 	gint i;
- 	g_signal_handler_disconnect (cdwidget->leftbutton, lbutton_signal_id);
- 	g_signal_handler_disconnect (cdwidget->rightbutton, rbutton_signal_id);
- 	g_signal_handler_disconnect (cdwidget->cdslider, slide_signal_id);
- 	g_signal_handler_disconnect (cdwidget->contentpanel, contentpanel_signal_id);
- 	g_signal_handler_disconnect (gtkpod_window, window_signal_id);
+void coverart_init (gchar *progpath)
+{
+  gchar *progname;
 
- 	/* Components not freed as they are part of the glade xml file */
- 	cdwidget->leftbutton = NULL;
- 	cdwidget->rightbutton = NULL;
- 	cdwidget->cdslider = NULL;
- 	cdwidget->contentpanel = NULL;
- 	cdwidget->canvasbox = NULL;
-	cdwidget->controlbox = NULL;
-		
-	/* native variables rather than references so should be destroyed when freed */
- 	cdwidget->first_imgindex = 0;
- 	cdwidget->block_display_change = FALSE;
+  progname = g_find_program_in_path (progpath);
+  static const gchar *SEPsrcSEPgtkpod = G_DIR_SEPARATOR_S "src" G_DIR_SEPARATOR_S "gtkpod";
 
-	Cover_Item *cover;
-	for(i = 0; i < IMG_TOTAL; ++i)
+  if (!g_path_is_absolute (progname))
   {
-  	cover = g_ptr_array_index(cdwidget->cdcovers, i);
-  	/* Nullify pointer to album reference. Will be freed below */
-  	cover->album = NULL;
+    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;
   }
-  	
- 	g_ptr_array_free (cdwidget->cdcovers, TRUE);
- 		
- 	/* Destroying canvas should destroy the background and cvrtext */
- 	cdwidget->bground = NULL;
- 	cdwidget->cvrtext = NULL;
- 	gtk_widget_destroy (GTK_WIDGET(cdwidget->canvas));
-	
-	/* Remove all null tracks before any sorting should take place */	
- 	album_key_list = g_list_remove_all (album_key_list, NULL);
- 		
- 	g_hash_table_foreach_remove(album_hash, (GHRFunc) gtk_true, NULL);
-	g_hash_table_destroy (album_hash);
-	g_list_free (album_key_list);
-		
-	g_free (cdwidget);
-	cdwidget = NULL;
+
+  if (g_str_has_suffix (progname, SEPsrcSEPgtkpod))
+  {
+    gchar *suffix = g_strrstr (progname, SEPsrcSEPgtkpod);
+
+    if (suffix)
+    {
+      *suffix = 0;
+      DEFAULT_FILE = g_build_filename (progname, "data", "default-cover.png", NULL);
+    }
+  }
+
+  g_free (progname);
+  if (DEFAULT_FILE && !g_file_test (DEFAULT_FILE, G_FILE_TEST_EXISTS))
+  {
+    g_free (DEFAULT_FILE);
+    DEFAULT_FILE = NULL;
+  }
+
+  if (!DEFAULT_FILE)
+  {
+    DEFAULT_FILE = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "default-cover.png", NULL);
+  }
 }
- 
+
 /**
- * set_highlight:
+ * coverart_init_display:
  *
- * Sets the highlighted image to the cover to give shine 
- * and a reflection.
- * 
- * @cover: A Cover_Item object which the higlighted is added to.
- *  
+ * Initialise the boxes and canvases of the coverart_display.
+ *
  */
-static void set_highlight (Cover_Item *cover, gint index)
+void coverart_init_display ()
 {
-  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_error_free (error);
-		g_return_if_fail (image);
-	}
+  /* Alway initialise these buttons whether the coverart is displayed or not as these are the
+   * up/down buttons on the display window and should be properly initialised
+   */
+  GtkWidget *upbutton = gtkpod_xml_get_widget (main_window_xml, "cover_up_button");
+  GtkWidget *downbutton = gtkpod_xml_get_widget (main_window_xml, "cover_down_button");
+  GtkWidget *lbutton = gtkpod_xml_get_widget (main_window_xml, "cover_display_leftbutton");
+  GtkWidget *rbutton = gtkpod_xml_get_widget (main_window_xml, "cover_display_rightbutton");
+  GtkWidget *slider = gtkpod_xml_get_widget (main_window_xml, "cover_display_scaler");
 
-  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,
-			   "pixbuf", scaled,
-			   NULL);
-  gdk_pixbuf_unref (scaled);				
+  /* show/hide coverart display -- default to show */
+  if (prefs_get_int (KEY_DISPLAY_COVERART))
+  {
+    gtk_widget_hide (upbutton);
+    gtk_widget_show (downbutton);
+    gtk_widget_show (lbutton);
+    gtk_widget_show (rbutton);
+    gtk_widget_show (slider);
+    if (cdwidget != NULL)
+      gtk_widget_show_all (cdwidget->contentpanel);
+  }
+  else
+  {
+    gtk_widget_show (upbutton);
+    gtk_widget_hide (downbutton);
+    gtk_widget_hide (lbutton);
+    gtk_widget_hide (rbutton);
+    gtk_widget_hide (slider);
+    if (cdwidget != NULL)
+      gtk_widget_hide_all (cdwidget->contentpanel);
+    return;
+  }
+
+  cdwidget = g_new0(CD_Widget, 1);
+
+  cdwidget->canvasbox = gtkpod_xml_get_widget (main_window_xml, "cover_display_canvasbox");
+  cdwidget->contentpanel = gtkpod_xml_get_widget (main_window_xml, "cover_display_window");
+  cdwidget->controlbox = gtkpod_xml_get_widget (main_window_xml, "cover_display_controlbox");
+  cdwidget->leftbutton = GTK_BUTTON (gtkpod_xml_get_widget (main_window_xml, "cover_display_leftbutton"));
+  cdwidget->rightbutton = GTK_BUTTON (gtkpod_xml_get_widget (main_window_xml, "cover_display_rightbutton"));
+  cdwidget->cdslider = GTK_HSCALE (gtkpod_xml_get_widget (main_window_xml, "cover_display_scaler"));
+  /* create a new drawing area */
+  cdwidget->draw_area = gtk_drawing_area_new();
+  cdwidget->cdcovers = g_ptr_array_sized_new (IMG_TOTAL);
+
+  g_return_if_fail (cdwidget->contentpanel);
+  g_return_if_fail (cdwidget->canvasbox);
+  g_return_if_fail (cdwidget->controlbox);
+  g_return_if_fail (cdwidget->leftbutton);
+  g_return_if_fail (cdwidget->rightbutton);
+  g_return_if_fail (cdwidget->cdslider);
+  g_return_if_fail (cdwidget->draw_area);
+
+  /* Initialise the album hash backing store */
+  album_hash = g_hash_table_new_full ( g_str_hash, g_str_equal,
+      (GDestroyNotify) g_free,
+      (GDestroyNotify) free_album);
+  album_key_list = NULL;
+  set_display_window_dimensions ();
+
+  gint i;
+  Cover_Item *cover;
+  for(i = 0; i < IMG_TOTAL; ++i)
+  {
+    cover = g_new0(Cover_Item, 1);
+    g_ptr_array_add(cdwidget->cdcovers, cover);
+    cover = NULL;
+  }
+  gtk_box_pack_start_defaults (GTK_BOX(cdwidget->canvasbox), GTK_WIDGET(cdwidget->draw_area));
+
+  /* create the expose event for the drawing area */
+  g_signal_connect (G_OBJECT (cdwidget->draw_area), "expose_event",  G_CALLBACK (on_drawing_area_exposed), NULL);
+  gtk_widget_add_events (cdwidget->draw_area, GDK_BUTTON_PRESS_MASK);
+  /* set up some callback events on the main scaled image */
+  g_signal_connect(GTK_OBJECT(cdwidget->draw_area), "button-press-event", GTK_SIGNAL_FUNC(on_main_cover_image_clicked), NULL);
+
+  /* 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);
+
+  lbutton_signal_id = g_signal_connect (G_OBJECT(cdwidget->leftbutton), "clicked",
+      G_CALLBACK(on_cover_display_button_clicked), NULL);
+
+  rbutton_signal_id = g_signal_connect (G_OBJECT(cdwidget->rightbutton), "clicked",
+      G_CALLBACK(on_cover_display_button_clicked), NULL);
+
+  slide_signal_id = g_signal_connect (G_OBJECT(cdwidget->cdslider), "value-changed",
+      G_CALLBACK(on_cover_display_slider_value_changed), NULL);
+
+  window_signal_id = g_signal_connect (gtkpod_window, "configure_event",
+      G_CALLBACK (on_gtkpod_window_configure), NULL);
+
+  gtk_widget_show_all (cdwidget->contentpanel);
+
+  coverart_block_change (FALSE);
 }
 
 /**
- * raise_cdimages:
+ * set_display_window_dimensions:
  *
- * Ensures that once all the canvas items have been created on the
- * main canvas, they are have the correct Z-order, ie. main cd image
- * is at the top and fully visible.
- * 
- * @cdcovers: array of pointers to the cd cover objects
- *  
+ * Initialises the display component width and height.
+ * Sets the podpane's paned position value too.
  */
-static void raise_cdimages (GPtrArray *cdcovers)
+static void set_display_window_dimensions ()
 {
-	Cover_Item *cover;
-	gint i, maxindex;
-	
-	maxindex = IMG_TOTAL - 1;
-	
-	for(i = 0; i < maxindex / 2; ++i)
-	{
-		cover = g_ptr_array_index(cdcovers, i);
-		gnome_canvas_item_raise_to_top(cover->cdcvrgrp);
-		
-		cover = g_ptr_array_index(cdcovers, maxindex - i);
-		gnome_canvas_item_raise_to_top(cover->cdcvrgrp);
-	}	
-	cover = g_ptr_array_index(cdcovers, IMG_MAIN);
-	gnome_canvas_item_raise_to_top(cover->cdcvrgrp);
-	
-	gnome_canvas_item_raise_to_top(GNOME_CANVAS_ITEM(cdwidget->cvrtext));
-}
+  GtkWidget *podpane;
 
-/**
- * 
- * force_update_covers:
- * 
- * Call the resetting of the covers and override the cached images so that they
- * are loaded with the latest files existing on the filesystem.
- * 
- */
-void force_update_covers ()
-{
-	set_covers (TRUE);
+  g_object_get (gtkpod_window,
+      "default_height", &HEIGHT,
+      NULL);
+
+  HEIGHT = HEIGHT / 2.5;
+  DEFAULT_HEIGHT = HEIGHT;
+
+  podpane = gtkpod_xml_get_widget (main_window_xml, "paned0");
+  g_return_if_fail (podpane);
+
+  WIDTH = HEIGHT;
+  gtk_paned_set_position (GTK_PANED(podpane), WIDTH);
+  DEFAULT_WIDTH = WIDTH;
+
+  gtk_widget_set_size_request(GTK_WIDGET(cdwidget->canvasbox), WIDTH, HEIGHT);
+  /* set the size of the drawing area */
+  gtk_widget_set_size_request (GTK_WIDGET(cdwidget->draw_area), WIDTH, HEIGHT);
 }
 
 /**
- * set_covers:
+ * coverart_block_change:
  *
- * Internal function responsible for the resetting of the artwork
- * covers in response to some kind of change in selection, eg. new
- * selection in sort tab, button click etc...
- * 
- * @force_imgupdate: forces the resetting of the cached images so that the
- * values are reread from the tracks and updated. Used sparingly.
+ * Select covers events can be switched off when automatic
+ * selections of tracks are taking place.
+ *
+ * @val: indicating whether to block or unblock select cover events
+ *
  */
-static void set_covers (gboolean force_imgupdate)
-{ 
-  gint i, dataindex;
-  gchar *key;
-  Cover_Item *cover;
-
-  if (cdwidget && cdwidget->cdcovers)
+void coverart_block_change (gboolean val)
+{
+  if (GTK_WIDGET_REALIZED(gtkpod_window))
   {
-    for(i = 0; i < IMG_TOTAL; ++i)
+    if (val)
     {
-		cover = g_ptr_array_index(cdwidget->cdcovers, i);
-		dataindex = cdwidget->first_imgindex + i;
-
-		/* Get the key from the key list appropriate to the index
-		 * provided by the first image index property
-		 */
-		key = g_list_nth_data (album_key_list, dataindex);
-		
-		set_cover_item (i, cover, key, force_imgupdate);	
+      GdkCursor *cursor = gdk_cursor_new (GDK_WATCH);
+      gdk_window_set_cursor (gtkpod_window->window, cursor);
+      gdk_cursor_unref (cursor);
     }
+    else
+      gdk_window_set_cursor (gtkpod_window->window, NULL);
   }
+
+  if (cdwidget != NULL)
+    cdwidget->block_display_change = val;
 }
 
 /**
- * set_cover_item:
+ * redraw:
  *
- * Internal function called  by set_covers to reset an artwork cover.
- * 
+ * Draw the artist and album text strings.
+ *
+ * @cairo_context: the context of the artwork display
+ * @text: the text to be added to the artwork display
+ * @x: the x coordinate of its location
+ * @y: the y coordinate of its location
+ *
  */
-static void set_cover_item (gint index, Cover_Item *cover, gchar *key, gboolean force_imgupdate)
+static void draw_string (cairo_t *cairo_context,
+    const gchar *text,
+    gdouble x,
+    gdouble y)
 {
-	GdkPixbuf *reflection;
-	GdkPixbuf *scaled;
-	Album_Item *album;
-  
-	if (key == NULL)
-	{
-		/* Clear everything */
-	  gnome_canvas_item_hide (cover->cdimage);
-	  /* Set the reflection to blank too */
-	  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)
-		{
-	 		/* Hide the artist/album text*/
-	 		gnome_canvas_item_hide (GNOME_CANVAS_ITEM (cdwidget->cvrtext));
-		}		
-		return;
-	}
-	
-	/* Key is not null */
-	
-	/* Find the Album Item appropriate to the key */
-	album  = g_hash_table_lookup (album_hash, key);
-	cover->album = album;
-	
-	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, 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 */
-	scaled = gdk_pixbuf_scale_simple (album->albumart, cover->img_width, cover->img_height, GDK_INTERP_NEAREST);
-	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);
-	
-	/* Set the text if the index is the central image cover */
-	if (index == IMG_MAIN)
-	{
-		gchar *text;
-		text = g_strconcat (album->artist, "\n", album->albumname, NULL);
-		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);
-	}
+  static PangoFontDescription *desc = NULL;
+  GdkColor *color = coverart_get_foreground_display_color ();
+  PangoLayout *layout;
+  PangoRectangle extents;
+
+  gdk_cairo_set_source_color (cairo_context, color);
+  g_free (color);
+
+  if(!desc)
+  {
+    desc = pango_font_description_from_string ("Sans Bold 9");
+  }
+
+  layout = pango_cairo_create_layout (cairo_context);
+  pango_layout_set_text (layout, text, -1);
+  pango_layout_set_font_description (layout, desc);
+  pango_layout_get_pixel_extents (layout, NULL, &extents);
+
+  cairo_move_to (cairo_context,
+      x + extents.x - (extents.width / 2),
+      y + extents.y - (extents.height / 2));
+
+  pango_cairo_show_layout (cairo_context, layout);
+
+  g_object_unref (layout);
 }
 
 /**
- * on_cover_display_slider_value_changed:
+ * redraw:
  *
- * Call handler used for cycling the cover images with the slider.
- * 
- * @range: GTKHScale object used as the slider
- * @user_data: any data needed by the function (not required) 
- *  
+ * Utility function for set all the x, y, width and height
+ * dimensions applicable to a single cover widget
+ *
+ * @force_pixbuf_update: flag indicating whether to force an update of the pixbuf covers
  */
-static void on_cover_display_slider_value_changed (GtkRange *range, gpointer user_data)
+static void redraw (gboolean force_pixbuf_update)
 {
-  gint index, displaytotal;
-	
-	if (cdwidget->block_display_change)
-		return;
-		
-	index = gtk_range_get_value (range);
-	displaytotal = g_list_length(album_key_list);
-  
-  if (displaytotal <= 0)
-  	return;
-    
-  /* Use the index value from the slider for the main image index */
-  cdwidget->first_imgindex = index;
-  
-  if (cdwidget->first_imgindex > (displaytotal - IMG_MAIN))
-  	cdwidget->first_imgindex = displaytotal - IMG_MAIN;
-	
-  set_covers (FALSE);
-}
+  force_pixbuf_covers = force_pixbuf_update;
+  GdkRegion *region = gdk_drawable_get_clip_region (cdwidget->draw_area->window);
+  /* redraw the cairo canvas completely by exposing it */
+  gdk_window_invalidate_region (cdwidget->draw_area->window, region, TRUE);
+  gdk_window_process_updates (cdwidget->draw_area->window, TRUE);
+  gdk_region_destroy (region);
 
-/**
- * on_cover_display_button_clicked:
- *
- * Call handler for the left and right buttons. Cause the images to
- * be cycled in the direction indicated by the button.
- * 
- * @widget: button which emitted the signal
- * @data: any data needed by the function (not required) 
- *  
- */ 
-static void on_cover_display_button_clicked (GtkWidget *widget, gpointer data)
-{
-	GtkButton *button;
-	const gchar *label;
-	gint displaytotal;
-  
-  button = GTK_BUTTON(widget);
-  label = gtk_button_get_label(button);
-    
-  if(g_str_equal(label, (gchar *) ">"))
-  	cdwidget->first_imgindex++;
+  if (g_list_length (album_key_list) <= 1)
+  {
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->cdslider), FALSE);
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->leftbutton), FALSE);
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->rightbutton), FALSE);
+  }
   else
-   	cdwidget->first_imgindex--;
-   	
-  displaytotal = g_list_length(album_key_list) - 8;
-  
-  if (displaytotal <= 0)
-  	return;
-  
-  /* Use the index value from the slider for the main image index */
-  if (cdwidget->first_imgindex < 0)
-  	cdwidget->first_imgindex = 0;
-  else if (cdwidget->first_imgindex > (displaytotal - 1))
-  	cdwidget->first_imgindex = displaytotal - 1;
-      	
-	/* Change the value of the slider to do the work of scrolling the covers */
-	gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), cdwidget->first_imgindex);
-
-	/* debug_albums(); */
+  {
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->cdslider), TRUE);
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->leftbutton), TRUE);
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->rightbutton), TRUE);
+  }
 }
 
 /**
- * on_main_cover_image_clicked:
+ * draw:
  *
- * Call handler used for displaying the tracks associated with
- * the main displayed album cover.
- * 
- * @GnomeCanvas: main cd cover image canvas
- * @event: event object used to determine the event type
- * @data: any data needed by the function (not required) 
- *  
+ * Paint the coverart display using cairo.
+ *
+ * @cairo_context: the coverart display context
  */
-static gint on_main_cover_image_clicked (GnomeCanvasItem *canvasitem, GdkEvent *event, gpointer data)
+static void draw (cairo_t *cairo_context)
 {
-	Cover_Item *cover;
-	guint mbutton;
-	
-	if(event->type != GDK_BUTTON_PRESS)
-		return FALSE;
-		
-	mbutton = event->button.button;
-	
-	if (mbutton == 1)
-	{
-		Track *track;
-		Album_Item *album;
-		/* Left mouse button clicked so find all tracks with displayed cover */
-		cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
-		/* Stop redisplay of the artwork as its already
-		 * in the correct location
-		 */
-		coverart_block_change (TRUE);
-	
-		/* Select the correct track in the sorttabs */
-		album = cover->album;
-		g_return_val_if_fail (album, FALSE);
-		
-		/* Clear the tracks listed in the display */
-		tm_remove_all_tracks ();
-		
-		GList *tracks = album->tracks;
-		while (tracks)
-		{
-			track = (Track *) tracks->data;
-			tm_add_track_to_track_model (track, NULL);
-			tracks = tracks->next;
-		}
-		
-		/* Turn the display change back on */
-		coverart_block_change (FALSE);
-	}
-	else if ((mbutton == 3) && (event->button.state & GDK_SHIFT_MASK))
-	{
-		/* Right mouse button clicked and shift pressed.
-		 * Go straight to edit details window
-		 */
-		 GList *tracks = coverart_get_displayed_tracks();
-		details_edit (tracks);
-	}
-	else if (mbutton == 3)
-	{
-		/* Right mouse button clicked on its own so display
-		 * popup menu
-		 */
-		 /*int i;
-		 GList *tracks = coverart_get_displayed_tracks();
-		 for (i = 0; i < g_list_length(tracks); ++i)
+  gint cover_index[] = {0, 8, 1, 7, 2, 6, 3, 5, 4};
+  /* Draw the background */
+  GdkColor *color = coverart_get_background_display_color ();
+
+  cairo_save (cairo_context);
+  gdk_cairo_set_source_color (cairo_context, color);
+  cairo_set_operator (cairo_context, CAIRO_OPERATOR_SOURCE);
+  cairo_paint (cairo_context);
+  cairo_restore (cairo_context);
+  g_free (color);
+
+  Album_Item *album;
+  gint i, album_index;
+  Cover_Item *cover;
+  gchar *key;
+
+  for(i = 0; i < IMG_TOTAL; ++i)
+  {
+    cover = g_ptr_array_index(cdwidget->cdcovers, cover_index[i]);
+    album_index = cdwidget->first_imgindex + cover_index[i];
+
+    /* Get the key from the key list appropriate to the index
+     * provided by the first image index property
+     */
+    key = g_list_nth_data (album_key_list, album_index);
+
+    if (key == NULL)
+      continue;
+
+    /* Find the Album Item appropriate to the key */
+    album  = g_hash_table_lookup (album_hash, key);
+    cover->album = album;
+
+    if (force_pixbuf_covers)
     {
-    	Track *track;
-    	track = g_list_nth_data (tracks, i);
-    	printf ("display_coverart-main_image_clicked - Artist:%s  Album:%s  Title:%s\n", track->artist, track->album, track->title);
-    }*/
-		cad_context_menu_init ();
-	}
-	
-	return FALSE;
+      g_object_unref (album->albumart);
+      album->albumart = NULL;
+      if (album->scaled_art != NULL)
+      {
+        g_object_unref (album->scaled_art);
+        album->scaled_art = 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, DEFAULT_IMG_SIZE);
+    }
+
+    /* Set the x, y, height and width of the CD cover */
+    set_cover_dimensions (
+        cover,
+        cover_index[i],
+        gdk_pixbuf_get_width (album->albumart),
+        gdk_pixbuf_get_height (album->albumart));
+
+    /* Set the Cover */
+    GdkPixbuf *scaled;
+    if (album->scaled_art == NULL)
+      scaled = gdk_pixbuf_scale_simple (
+          album->albumart,
+          cover->img_width,
+          cover->img_height,
+          GDK_INTERP_BILINEAR);
+    else
+      scaled = album->scaled_art;
+
+    gdk_cairo_set_source_pixbuf (
+        cairo_context,
+        scaled,
+        cover->img_x,
+        cover->img_y);
+    cairo_paint (cairo_context);
+
+    /* Draw a black line around the cd cover */
+    cairo_set_line_width (cairo_context, 1);
+    cairo_set_source_rgb (cairo_context, 0, 0, 0);
+
+    cairo_rectangle (
+        cairo_context,
+        cover->img_x,
+        cover->img_y,
+        cover->img_width,
+        cover->img_height);
+
+    cairo_stroke (cairo_context);
+
+    /* Display the highlight */
+    set_highlight (cover, cover_index[i], cairo_context);
+
+    /* flip image vertically to create reflection */
+    GdkPixbuf *reflection;
+    reflection = gdk_pixbuf_flip (scaled, FALSE);
+
+    gdk_cairo_set_source_pixbuf (
+        cairo_context,
+        reflection,
+        cover->img_x,
+        cover->img_y + cover->img_height + 2);
+    cairo_paint (cairo_context);
+
+    g_object_unref (reflection);
+    g_object_unref (scaled);
+
+    /* Set the reflection shadow */
+    set_shadow_reflection (cover, cairo_context);
+
+    cairo_save(cairo_context);
+
+    /* Set the text if the index is the central image cover */
+    if (cover_index[i] == IMG_MAIN)
+    {
+      draw_string (cairo_context, album->artist, WIDTH / 2,
+          cover->img_y + cover->img_height + 15);
+
+      draw_string (cairo_context, album->albumname, WIDTH / 2,
+          cover->img_y + cover->img_height + 30);
+    }
+    cairo_restore(cairo_context);
+  }
+
+  force_pixbuf_covers = FALSE;
+
+  /* free the scaled pixbufs from the non visible covers either side of the current display.
+   * Experimental feature that should save on memory.
+   */
+  key = g_list_nth_data (album_key_list, cdwidget->first_imgindex - 1);
+  if (key != NULL)
+  {
+    album  = g_hash_table_lookup (album_hash, key);
+    if (album->scaled_art)
+    {
+      g_object_unref (album->scaled_art);
+      album->scaled_art = NULL;
+    }
+  }
+
+  key = g_list_nth_data (album_key_list, cdwidget->first_imgindex + IMG_TOTAL + 1);
+  if (key != NULL)
+  {
+    album  = g_hash_table_lookup (album_hash, key);
+    if (album->scaled_art)
+    {
+      g_object_unref (album->scaled_art);
+      album->scaled_art = NULL;
+    }
+  }
 }
 
 /**
- * coverart_clear_images:
+ * coverart_display_update:
  *
- * reset the cd cover images to default blank pixbufs and
- * nullify the covers' pointers to any tracks.
- * 
+ * Refreshes the coverart display depending on the playlist selection. Using the
+ * clear_track_list, the refresh can be quicker is set to FALSE. However, the track
+ * list is not updated in this case. Using TRUE, the display is completely cleared and
+ * redrawn.
+ *
+ * @clear_track_list: flag indicating whether to clear the displaytracks list or not
+ *
  */
-void coverart_clear_images ()
+void coverart_display_update (gboolean clear_track_list)
 {
-	gint i;
-	Cover_Item *cover = NULL;
-	
-	for (i = 0; i < IMG_TOTAL; i++)
-	{
-		/* Reset the pixbuf */
-		cover = g_ptr_array_index(cdwidget->cdcovers, i);
-		cover->album = NULL;
-		gnome_canvas_item_hide (cover->cdimage);
-		gnome_canvas_item_hide (cover->cdreflection);
-		
-		if (cover->highlight != NULL)
-			gnome_canvas_item_hide (cover->highlight);
-		
-		if (i == IMG_MAIN)
-		{
-			/* Set the text to display details of the main image */
-			gnome_canvas_item_hide (GNOME_CANVAS_ITEM (cdwidget->cvrtext));
-		}
-	}
+  gint i;
+  GList *tracks;
+  Track *track;
+  Album_Item *album;
+  Playlist *playlist;
+
+  if ( ! prefs_get_int (KEY_DISPLAY_COVERART))
+    return;
+
+  /* initialize display if not already done */
+  if (!cdwidget)
+    coverart_init_display ();
+
+  /* Ensure that the setting of images hasnt been turned off
+   * due to being in the middle of a selection operation
+   */
+  if (cdwidget->block_display_change)
+    return;
+
+  if (clear_track_list)
+  {
+    /* Free up the hash table and the key list */
+    g_hash_table_foreach_remove(album_hash, (GHRFunc) gtk_true, NULL);
+    g_list_free (album_key_list);
+    album_key_list = NULL;
+
+    /* Find the selected playlist */
+    playlist = pm_get_selected_playlist ();
+
+    if (playlist)
+      tracks = playlist->members;
+
+    if (! playlist || ! tracks)
+    {
+      redraw (FALSE);
+      return;
+    }
+
+    while (tracks)
+    {
+      gchar *album_key;
+      track = tracks->data;
+
+      album_key = g_strconcat (track->artist, "_", track->album, NULL);
+      /* Check whether an album item has already been created in connection
+       * with the track's artist and album
+       */
+      album = g_hash_table_lookup (album_hash, album_key);
+      if (album == NULL)
+      {
+        /* Album item not found so create a new one and populate */
+        album = g_new0 (Album_Item, 1);
+        album->albumart = NULL;
+        album->scaled_art = NULL;
+        album->albumname = g_strdup (track->album);
+        album->artist = g_strdup (track->artist);
+        album->tracks = NULL;
+        album->tracks = g_list_append (album->tracks, track);
+
+        /* 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, album_key);
+      }
+      else
+      {
+        /* 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;
+    }
+
+    cdwidget->first_imgindex = 0;
+  }
+
+  /* Remove all null tracks before any sorting should take place */
+  album_key_list = g_list_remove_all (album_key_list, NULL);
+
+  /* Sort the tracks to the order set in the preference */
+  coverart_sort_images (prefs_get_int("st_sort"));
+
+  /* Add 4 null tracks to the end of the track list for padding */
+  for (i = 0; i < IMG_MAIN; ++i)
+    album_key_list = g_list_append (album_key_list, NULL);
+
+  /* Add 4 null tracks to the start of the track list for padding */
+  for (i = 0; i < IMG_MAIN; ++i)
+    album_key_list = g_list_prepend (album_key_list, NULL);
+
+  redraw (FALSE);
+
+  set_slider_range (cdwidget->first_imgindex);
+
+  /*
+      printf("######### ORIGINAL LINE UP ########\n");
+      debug_albums ();
+      printf("######### END OF ORIGINAL LINE UP #######\n");
+   */
 }
 
 /**
- * coverart_get_track_thumb:
+ * set_cover_dimensions:
  *
- * 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.
+ * Utility function for set all the x, y, width and height
+ * dimensions applicable to a single cover widget
+ *
+ * @cover: cover widget for which dimensions are to be set
+ * @cover_index: index of the widget. Used to determine whether
+ * 												cover is the main cover or not
  */
-GdkPixbuf *coverart_get_track_thumb (Track *track, Itdb_Device *device, gint default_size)
+static void set_cover_dimensions (Cover_Item *cover, int cover_index, gdouble img_width, gdouble img_height)
 {
-	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);
+  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;
 
-	thumb = itdb_artwork_get_thumb_by_type (track->artwork,
-						ITDB_THUMB_COVER_LARGE);
-	if (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 (default_size);
-	}
-	
-	return pixbuf;
+  if (img_width > (WIDTH / 2))
+  {
+    display_ratio = img_width / img_height;
+    img_width = (WIDTH / 2);
+    img_height = img_width / display_ratio;
+  }
+
+  small_img_width = img_width * 0.75;
+  small_img_height = img_height * 0.75;
+
+  /* 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 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;
+
+  if (cover_index == IMG_MAIN)
+  {
+    cover->img_height = img_height;
+    cover->img_width = img_width;
+  }
+  else
+  {
+    cover->img_height = small_img_height;
+    cover->img_width = small_img_width;
+  }
 }
 
 /**
- * coverart_get_displayed_tracks:
+ * set_highlight:
  *
- * Get all tracks suggested by the displayed album cover.
- * 
- * Returns:
- * GList containing references to all the displayed covered tracks
+ * Sets the highlighted image to the cover to give shine
+ * and a reflection.
+ *
+ * @cover: A Cover_Item object which the higlighted is added to.
+ *
  */
-GList *coverart_get_displayed_tracks (void)
+static void set_highlight (Cover_Item *cover, gint index, cairo_t * cr)
 {
-	Cover_Item *cover;
+  if(index == IMG_MAIN)
+    return;
 
-	cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
-	g_return_val_if_fail (cover->album, NULL);
-	return cover->album->tracks;
-}
+  cairo_save(cr);
+  cairo_pattern_t *pat;
+  pat = cairo_pattern_create_linear (
+      cover->img_x,
+      cover->img_y,
+      cover->img_x,
+      cover->img_y + (((gdouble) cover->img_height) / 2.5));
+  cairo_pattern_add_color_stop_rgba (pat, 0.0, 1, 1, 1, 0);
+  cairo_pattern_add_color_stop_rgba (pat, 0.4, 1, 1, 1, 0.6);
+  cairo_pattern_add_color_stop_rgba (pat, 0.9, 1, 1, 1, 0);
+  cairo_pattern_set_extend (pat, CAIRO_EXTEND_REPEAT);
 
-/**
- * coverart_display_big_artwork:
- * 
- * Display a big version of the artwork in a dialog
- * 
- */
-void coverart_display_big_artwork ()
-{
-	Cover_Item *cover;
-	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);
-		}
-	}
-	
-	/* 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)
-	{
-		/* Could not get a viable thumbnail so get default pixbuf */
-		imgbuf = coverart_get_default_track_thumb (256);
-	}
-	
-	display_image_dialog (imgbuf);
-		
-	/* Unreference pixbuf if it is not pointing to
-	 * the album's artwork
-	 */
-	if (cover->album->albumart == NULL)
-		gdk_pixbuf_unref (imgbuf);
+  cairo_rectangle (
+      cr,
+      cover->img_x,
+      cover->img_y,
+      cover->img_width,
+      cover->img_height);
+  cairo_rotate (cr, M_PI / 4);
+  cairo_set_source (cr, pat);
+  cairo_fill (cr);
+  cairo_pattern_destroy (pat);
+  cairo_restore(cr);
 }
 
 /**
- * coverart_get_default_track_thumb:
+ * set_shadow_reflection:
  *
- * Retrieve the artwork pixbuf from the default image file.
- * 
- * Returns:
- * pixbuf of the default file for tracks with no cover art.
+ * Sets the shadow reflection to the same as the
+ * background of the display.
+ *
+ * @cover: A Cover_Item object which the higlighted is added to.
+ *
  */
-GdkPixbuf *coverart_get_default_track_thumb (gint default_img_size)
+static void set_shadow_reflection (Cover_Item *cover, cairo_t *cr)
 {
-	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);
-	
+  GdkColor *color = coverart_get_background_display_color();
+  gdouble r = ((gdouble) (color->red >> 8)) / 255;
+  gdouble g = ((gdouble) (color->green >>8)) / 255;
+  gdouble b = ((gdouble) (color->blue >> 8)) / 255;
+  g_free (color);
 
-	return scaled;
+  cairo_pattern_t *pat;
+  pat = cairo_pattern_create_linear (
+      cover->img_x,
+      cover->img_y + cover->img_height + 2,
+      cover->img_x,
+      cover->img_y + cover->img_height + 2 + cover->img_height);
+  cairo_pattern_add_color_stop_rgba (pat, 0, r, g, b, 0.3);
+  cairo_pattern_add_color_stop_rgba (pat, 0.5, r, g, b, 1);
+  cairo_rectangle (
+      cr,
+      cover->img_x,
+      cover->img_y + cover->img_height + 2,
+      cover->img_width + 10,
+      cover->img_height);
+  cairo_set_source (cr, pat);
+  cairo_fill (cr);
+  cairo_pattern_destroy (pat);
 }
 
 /**
- * coverart_init:
  *
- * Initialises the image file used if an album has no cover. 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.
+ * Function to cause a refresh on the given track.
+ * The signal will be one of:
  *
- * @progpath: path of the gtkpod binary being loaded.
- *  
+ *    COVERART_REMOVE_SIGNAL - track deleted
+ *    COVERART_CREATE_SIGNAL - track created
+ *    COVERART_CHANGE_SIGNAL - track modified
+ *
+ * If the track was in the current display of artwork then the
+ * artwork will be updated. If it was not then a refresh is unnecessary
+ * and the function will return accordingly.
+ *
+ * @track: affected track
+ * @signal: flag indicating the type of track change that has occurred.
  */
-void coverart_init (gchar *progpath)
+void coverart_track_changed (Track *track, gint signal)
 {
-	gchar *progname;
-	
-	progname = g_find_program_in_path (progpath);
+  GList *keypos;
+  gchar *trk_key;
+  Album_Item *album;
+  gint index;
+  gboolean findremove;
+  /*
+   * Scenarios:
+   * a) A track is being deleted that is not in the display
+   * b) A track is being deleted that is in the display
+   * c) A track has changed is some way so maybe the coverart
+   * d) A track has been created and its artist and album are already in the displaylist
+   * e) A track has been created and its artist and album are not in the displaylist
+   */
 
-  if (progname)
+  /* 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);
+
+  switch (signal)
   {
-  	static const gchar *SEPsrcSEPgtkpod = G_DIR_SEPARATOR_S "src" G_DIR_SEPARATOR_S "gtkpod";
+  case COVERART_REMOVE_SIGNAL:
+    g_return_if_fail (keypos);
+    g_free (trk_key);
 
-    if (!g_path_is_absolute (progname))
+    /* Reassign trk_key to the key from the list */
+    trk_key = keypos->data;
+    index = g_list_position (album_key_list, keypos);
+
+    album = g_hash_table_lookup (album_hash, trk_key);
+
+    /* Remove the track from the album item */
+    remove_track_from_album (album, track, trk_key, index, keypos);
+
+    /* Check if album is being displayed by checking the index */
+    if (index >= cdwidget->first_imgindex && index <= (cdwidget->first_imgindex + IMG_TOTAL))
     {
-	  	gchar *cur_dir = g_get_current_dir ();
-	  	gchar *prog_absolute;
+      /* reset the covers and should reset to original position but without the index */
+      redraw (FALSE);
+    }
 
-	  	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;
-  	}
+    /* Size of key list may have changed so reset the slider
+     * to appropriate range and index.
+     */
+    set_slider_range (index - IMG_MAIN);
+    break;
+  case COVERART_CREATE_SIGNAL:
+    /* Check whether an album item has already been created in connection
+     * with the track's artist and album
+     */
+    album = g_hash_table_lookup (album_hash, trk_key);
+    if (album == NULL)
+    {
+      /* Album item not found so create a new one and populate */
+      album = g_new0 (Album_Item, 1);
+      album->albumart = NULL;
+      album->scaled_art = NULL;
+      album->albumname = g_strdup (track->album);
+      album->artist = g_strdup (track->artist);
+      album->tracks = NULL;
+      album->tracks = g_list_append (album->tracks, track);
 
-    if (g_str_has_suffix (progname, SEPsrcSEPgtkpod))
+      /* Insert the new Album Item into the hash */
+      g_hash_table_insert (album_hash, trk_key, album);
+
+      /* Add the key to the list for sorting and other functions */
+      /* But first ... */
+      /* Remove all null tracks before any sorting should take place */
+      album_key_list = g_list_remove_all (album_key_list, NULL);
+
+      if (prefs_get_int("st_sort") == SORT_ASCENDING)
+      {
+        album_key_list = g_list_insert_sorted (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
+      }
+      else if (prefs_get_int("st_sort") == SORT_DESCENDING)
+      {
+        /* Already in descending order so reverse into ascending order */
+        album_key_list = g_list_reverse (album_key_list);
+        /* Insert the track */
+        album_key_list = g_list_insert_sorted (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
+        /* Reverse again */
+        album_key_list = g_list_reverse (album_key_list);
+      }
+      else
+      {
+        /* NO SORT */
+        album_key_list = g_list_append (album_key_list, trk_key);
+      }
+
+      /* Readd in the null tracks */
+      /* Add 4 null tracks to the end of the track list for padding */
+      gint i;
+      for (i = 0; i < IMG_MAIN; ++i)
+        album_key_list = g_list_append (album_key_list, NULL);
+
+      /* Add 4 null tracks to the start of the track list for padding */
+      for (i = 0; i < IMG_MAIN; ++i)
+        album_key_list = g_list_prepend (album_key_list, NULL);
+
+      redraw (FALSE);
+    }
+    else
     {
-	  	gchar *suffix = g_strrstr (progname, SEPsrcSEPgtkpod);
+      /* 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);
+    }
 
-	  	if (suffix)
-	  	{
-	     	*suffix = 0;
-	     	DEFAULT_FILE = g_build_filename (progname, "data", "default-cover.png", NULL);
-	     	HIGHLIGHT_FILE = g_build_filename (progname, "data", "cdshine.png", NULL);
-	     	HIGHLIGHT_FILE_MAIN = g_build_filename (progname, "data", "cdshine_main.png", NULL);
-	  	}
-  	}
-    
-    g_free (progname);
-    if (DEFAULT_FILE && !g_file_test (DEFAULT_FILE, G_FILE_TEST_EXISTS))
+    /* Set the slider to the newly inserted track.
+     * In fact sets image_index to 4 albums previous
+     * to newly inserted album to ensure this album is
+     * the main middle one.
+     */
+    keypos = g_list_find_custom (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
+    index = g_list_position (album_key_list, keypos);
+    set_slider_range (index - IMG_MAIN);
+
+    break;
+  case COVERART_CHANGE_SIGNAL:
+    /* A track is declaring itself as changed so what to do? */
+    findremove = FALSE;
+    if (keypos == NULL)
     {
-	  	g_free (DEFAULT_FILE);
-	  	DEFAULT_FILE = NULL;
+      /* The track could not be found according to the key!
+       * The ONLY way this could happen is if the user changed the
+       * artist or album of the track. Well it should be rare but the only
+       * way to remove it from its "old" album item is to search each one
+       */
+      findremove = TRUE;
     }
-    
-    if (HIGHLIGHT_FILE && !g_file_test (HIGHLIGHT_FILE, G_FILE_TEST_EXISTS))
+    else
     {
-	  	g_free (HIGHLIGHT_FILE);
-	  	HIGHLIGHT_FILE = NULL;
+      /* Track has a valid key so can get the album back.
+       * Either has happened:
+       * a) Artist/Album key has been changed so the track is being moved to another existing album
+       * b) Some other change has occurred that is irrelevant to this code.
+       */
+
+      /* To determine if a) is the case need to determine whether track exists in the
+       * album items track list. If it does then b) is true and nothing more is required.
+       */
+      album = g_hash_table_lookup (album_hash, trk_key);
+      g_return_if_fail (album);
+
+      index = g_list_index (album->tracks, track);
+      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;
+          redraw(TRUE);
+        }
+
+        return;
+      }
+      else
+      {
+        /* Track does not exist in the album list so the artist/album key has definitely changed */
+        findremove = TRUE;
+      }
     }
-    
-    if (HIGHLIGHT_FILE_MAIN && !g_file_test (HIGHLIGHT_FILE_MAIN, G_FILE_TEST_EXISTS))
+
+    if (findremove)
     {
-	  	g_free (HIGHLIGHT_FILE_MAIN);
-	  	HIGHLIGHT_FILE_MAIN = NULL;
+      /* It has been determined that the track has had its key changed
+       * and thus a search must be performed to find the "original" album
+       * that the track belonged to, remove it then add the track to the new
+       * album.
+       */
+      GList *klist;
+      gchar *key;
+      klist = g_list_first (album_key_list);
+      while (klist != NULL)
+      {
+        key = (gchar *) klist->data;
+        index = g_list_index (album_key_list, key);
+        if (key != NULL)
+        {
+          album = g_hash_table_lookup (album_hash, key);
+
+          gint album_trk_index;
+          album_trk_index = g_list_index (album->tracks, track);
+          if (album_trk_index != -1)
+          {
+            /* The track is in this album so remove it in preparation for readding
+             * under the new album key
+             */
+            remove_track_from_album (album, track, key, index, klist);
+            redraw(FALSE);
+            /* Found the album and removed so no need to continue the loop */
+            break;
+          }
+        }
+        klist = klist->next;
+      }
+
+      /* Create a new album item or find existing album to house the "brand new" track */
+      coverart_track_changed (track, COVERART_CREATE_SIGNAL);
     }
   }
-  
-  if (!DEFAULT_FILE)
-  {
-		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);
-  }
-  if (!HIGHLIGHT_FILE_MAIN)
-  {
-		HIGHLIGHT_FILE_MAIN = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "cdshine_main.png", NULL);
-	}
 }
 
 /**
- * on_cover_up_button_clicked:
+ * on_drawing_area_exposed:
  *
- * callback for the cover_up_button. Shows all the cover_art widgets
- * when clicked.
+ * Callback for the drawing area. When the drwaing area is covered,
+ * resized, changed etc.. This will be called the draw() function is then
+ * called from this and the cairo redrawing takes place.
  *
- * @widget, data unused standard parameters
- *  
+ * @draw_area: drawing area where al the cairo drawing takes place
+ * @event: gdk expose event
+ *
+ * Returns:
+ * boolean indicating whether other handlers should be run.
  */
-void on_cover_up_button_clicked (GtkWidget *widget, gpointer data)
+static gboolean on_drawing_area_exposed (GtkWidget *draw_area, GdkEventExpose *event)
 {
-	prefs_set_int (KEY_DISPLAY_COVERART, TRUE);
-	
-	if (cdwidget == NULL)
-		coverart_set_images (TRUE);
-		
-	gtk_widget_show_all (cdwidget->contentpanel);
-	gtk_widget_show (GTK_WIDGET(cdwidget->cdslider));
-	gtk_widget_show (GTK_WIDGET(cdwidget->leftbutton));
-	gtk_widget_show (GTK_WIDGET(cdwidget->rightbutton));
-	
-	gtk_widget_hide (widget);
-	
-	GtkWidget *downbutton = gtkpod_xml_get_widget (main_window_xml, "cover_down_button");
-	gtk_widget_show (downbutton);
+  cairo_t *cairo_draw_context;
+
+  /* get a cairo_t */
+  cairo_draw_context = gdk_cairo_create (draw_area->window);
+
+  /* set a clip region for the expose event */
+  cairo_rectangle (cairo_draw_context,
+      event->area.x, event->area.y,
+      event->area.width, event->area.height);
+  cairo_clip (cairo_draw_context);
+  draw(cairo_draw_context);
+  cairo_destroy (cairo_draw_context);
+
+  return FALSE;
 }
 
 /**
- * on_cover_down_button_clicked:
+ * gtkpod_window_configure_callback:
  *
- * callback for the cover_down_button. Hides all the cover_art widgets
- * when clicked.
+ * Callback for the gtkpod app window. When the window
+ * is resized the background of the cdwidget is given a size
+ * of the same size. Ensure the background is always black
+ * and no overlapping internal components occur.
  *
- * @widget, data unused standard parameters
- *  
+ * @widget: gtkpod app window
+ * @event: gdk configure event
+ * @data: any user data passed to the function
+ *
+ * Returns:
+ * boolean indicating whether other handlers should be run.
  */
-void on_cover_down_button_clicked (GtkWidget *widget, gpointer data)
+static gboolean on_gtkpod_window_configure (GtkWidget *widget, GdkEventConfigure *event, gpointer data)
 {
-	prefs_set_int (KEY_DISPLAY_COVERART, FALSE);
-	
-	gtk_widget_hide_all (cdwidget->contentpanel);
-	gtk_widget_hide (GTK_WIDGET(cdwidget->cdslider));
-	gtk_widget_hide (GTK_WIDGET(cdwidget->leftbutton));
-	gtk_widget_hide (GTK_WIDGET(cdwidget->rightbutton));
-	
-	if (cdwidget != NULL)
-	{
-		/* dispose of existing CD Widget */
-		free_CDWidget();
-	}
-	gtk_widget_hide (widget);
-	
-	GtkWidget *upbutton = gtkpod_xml_get_widget (main_window_xml, "cover_up_button");
-	gtk_widget_show (upbutton);
+  if (cdwidget == NULL)
+    return FALSE;
+
+  redraw (FALSE);
+
+  return FALSE;
 }
 
 /**
@@ -905,1229 +1202,1064 @@
  * paned0. Only worthwhile things are carried out when
  * the position of paned0 has changed, ie. the bar was moved.
  * Moving the bar will scale the cover images appropriately.
- * 
+ * Signal connected via the glade XML file.
+ *
  * @widget: gtkpod app window
  * @event: gdk event button
  * @data: any user data passed to the function
- * 
+ *
  * Returns:
  * boolean indicating whether other handlers should be run.
  */
-gboolean on_paned0_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
+G_MODULE_EXPORT gboolean on_paned0_button_release_event (GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-		if ( ! prefs_get_int (KEY_DISPLAY_COVERART))
-		return FALSE;
-		
-	gint width;
-	
-	width = gtk_paned_get_position (GTK_PANED(widget));
-	if ((width >= DEFAULT_WIDTH) && (width != WIDTH))
-	{
-		WIDTH = width;
-		gnome_canvas_item_set (GNOME_CANVAS_ITEM(cdwidget->cvrtext), 
-				       "x", (gdouble) WIDTH / 2,
-				       NULL);
-		
-		set_covers (FALSE);		
-	}
-		
-	return FALSE;
+  if ( ! prefs_get_int (KEY_DISPLAY_COVERART))
+    return FALSE;
+
+  gint width;
+
+  width = gtk_paned_get_position (GTK_PANED(widget));
+  if ((width >= DEFAULT_WIDTH) && (width != WIDTH))
+  {
+    WIDTH = width;
+    redraw (FALSE);
+  }
+
+  return FALSE;
 }
 
+/**
+ * on_contentpanel_scroll_wheel_turned:
+ *
+ * Call handler for the scroll wheel. Cause the images to
+ * be cycled in the direction indicated by the scroll wheel.
+ *
+ * @widget: CoverArt Display
+ * @event: scroll wheel event
+ * @data: any data needed by the function (not required)
+ *
+ */
 static gboolean on_contentpanel_scroll_wheel_turned (GtkWidget *widget, GdkEventScroll *event, gpointer user_data)
 {
-	gint displaytotal;
-	
-	if (event->direction == GDK_SCROLL_DOWN)
-		cdwidget->first_imgindex++;
+  gint displaytotal;
+
+  if (event->direction == GDK_SCROLL_DOWN)
+    cdwidget->first_imgindex++;
   else
-   	cdwidget->first_imgindex--;
-   	
+    cdwidget->first_imgindex--;
+
   displaytotal = g_list_length(album_key_list) - 8;
-  
+
   if (displaytotal <= 0)
-  	return TRUE;
-  
+    return TRUE;
+
   /* Use the index value from the slider for the main image index */
   if (cdwidget->first_imgindex < 0)
-  	cdwidget->first_imgindex = 0;
+    cdwidget->first_imgindex = 0;
   else if (cdwidget->first_imgindex > (displaytotal - 1))
-  	cdwidget->first_imgindex = displaytotal - 1;
-      	
-	/* Change the value of the slider to do the work of scrolling the covers */
-	gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), cdwidget->first_imgindex);
-	
-	return TRUE;	
+    cdwidget->first_imgindex = displaytotal - 1;
+
+  /* Change the value of the slider to do the work of scrolling the covers */
+  gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), cdwidget->first_imgindex);
+
+  return TRUE;
 }
-      
+
 /**
- * gtkpod_window_configure_callback:
+ * on_cover_display_button_clicked:
  *
- * Callback for the gtkpod app window. When the window
- * is resized the background of the cdwidget is given a size
- * of the same size. Ensure the background is always black
- * and no overlapping internal components occur.
- * 
- * @widget: gtkpod app window
- * @event: gdk configure event
- * @data: any user data passed to the function
- * 
- * Returns:
- * boolean indicating whether other handlers should be run.
+ * Call handler for the left and right buttons. Cause the images to
+ * be cycled in the direction indicated by the button.
+ *
+ * @widget: button which emitted the signal
+ * @data: any data needed by the function (not required)
+ *
  */
-static gboolean gtkpod_window_configure_callback (GtkWidget *widget, GdkEventConfigure *event, gpointer data)
+static void on_cover_display_button_clicked (GtkWidget *widget, gpointer data)
 {
-	if (cdwidget == NULL)
-		return FALSE;
-		
-	gnome_canvas_item_set (cdwidget->bground, 
-			       "x1",(double) 0, 
-			       "y1",(double) 0,
-			       "x2",(double) event->width,
-			       "y2",(double) event->height,
-			       NULL);
-	gnome_canvas_item_request_update (cdwidget->bground);
-				
-	return FALSE;
+  GtkButton *button;
+  const gchar *label;
+  gint displaytotal;
+
+  button = GTK_BUTTON(widget);
+  label = gtk_button_get_label(button);
+
+  if(g_str_equal(label, (gchar *) ">"))
+    cdwidget->first_imgindex++;
+  else
+    cdwidget->first_imgindex--;
+
+  displaytotal = g_list_length(album_key_list) - 8;
+
+  if (displaytotal <= 0)
+    return;
+
+  /* Use the index value from the slider for the main image index */
+  if (cdwidget->first_imgindex < 0)
+    cdwidget->first_imgindex = 0;
+  else if (cdwidget->first_imgindex > (displaytotal - 1))
+    cdwidget->first_imgindex = displaytotal - 1;
+
+  /* Change the value of the slider to do the work of scrolling the covers */
+  gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), cdwidget->first_imgindex);
+
+  /* debug_albums(); */
 }
 
 /**
- * set_display_dimensions:
+ * on_cover_display_slider_value_changed:
  *
- * Initialises the display component width and height.
- * Sets the podpane's paned position value too.
+ * Call handler used for cycling the cover images with the slider.
+ *
+ * @range: GTKHScale object used as the slider
+ * @user_data: any data needed by the function (not required)
+ *
  */
-static void set_display_dimensions ()
+static void on_cover_display_slider_value_changed (GtkRange *range, gpointer user_data)
 {
-	GtkWidget *podpane;
-		  		
-	g_object_get (gtkpod_window,
-								"default_height", &HEIGHT,
-								NULL);
-		
-	HEIGHT = HEIGHT / 2.5;
-	DEFAULT_HEIGHT = HEIGHT;
-	
-	podpane = gtkpod_xml_get_widget (main_window_xml, "paned0");	
-	g_return_if_fail (podpane);
+  gint index, displaytotal;
 
-	WIDTH = HEIGHT;	
-	gtk_paned_set_position (GTK_PANED(podpane), WIDTH);
-	DEFAULT_WIDTH = WIDTH;
+  if (cdwidget->block_display_change)
+    return;
+
+  index = gtk_range_get_value (range);
+  displaytotal = g_list_length(album_key_list);
+
+  if (displaytotal <= 0)
+    return;
+
+  /* Use the index value from the slider for the main image index */
+  cdwidget->first_imgindex = index;
+
+  if (cdwidget->first_imgindex > (displaytotal - IMG_MAIN))
+    cdwidget->first_imgindex = displaytotal - IMG_MAIN;
+
+  redraw (FALSE);
 }
 
 /**
- * set_cover_dimensions:
+ * on_cover_up_button_clicked:
  *
- * Utility function for set all the x, y, width and height
- * dimensions applicable to a single cover widget
- * 
- * @cover: cover widget for which dimensions are to be set
- * @cover_index: index of the widget. Used to determine whether
- * 												cover is the main cover or not
+ * callback for the cover_up_button. Shows all the cover_art widgets
+ * when clicked.
+ *
+ * @widget, data unused standard parameters
+ *
  */
-static void set_cover_dimensions (Cover_Item *cover, int cover_index, gdouble img_width, gdouble img_height)
+G_MODULE_EXPORT void on_cover_up_button_clicked (GtkWidget *widget, gpointer data)
 {
-	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 = img_width * 0.75;
-	small_img_height = img_height * 0.75;
-	
-	/* 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 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;
-		
-	if (cover_index == IMG_MAIN)
-	{
-		cover->img_height = img_height;
-		cover->img_width = img_width;
-	}
-	else
-	{
-		cover->img_height = small_img_height;
-		cover->img_width = small_img_width;
-	}
+  prefs_set_int (KEY_DISPLAY_COVERART, TRUE);
+
+  if (cdwidget == NULL)
+    coverart_display_update (TRUE);
+
+  gtk_widget_show_all (cdwidget->contentpanel);
+  gtk_widget_show (GTK_WIDGET(cdwidget->cdslider));
+  gtk_widget_show (GTK_WIDGET(cdwidget->leftbutton));
+  gtk_widget_show (GTK_WIDGET(cdwidget->rightbutton));
+
+  gtk_widget_hide (widget);
+
+  GtkWidget *downbutton = gtkpod_xml_get_widget (main_window_xml, "cover_down_button");
+  gtk_widget_show (downbutton);
 }
 
 /**
- * 
- * set_scale_range:
- * 
- * Set the scale range - maximum value should be display
- * track list length - (8 NULL images + 1 as index value), 
- * ie. the ones either end of the list.
- * 
+ * on_cover_down_button_clicked:
+ *
+ * callback for the cover_down_button. Hides all the cover_art widgets
+ * when clicked.
+ *
+ * @widget, data unused standard parameters
+ *
  */
-static void set_slider_range (gint index)
+G_MODULE_EXPORT void on_cover_down_button_clicked (GtkWidget *widget, gpointer data)
 {
-	gint slider_ubound = g_list_length (album_key_list) - IMG_TOTAL;
-	if(slider_ubound < 1)
-	{
-		/* If only one album cover is displayed then slider_ubbound returns
-		 * 0 and causes a slider assertion error. Avoid this by disabling the
-		 * slider, which makes sense because only one cover is displayed.
-		 */
-		slider_ubound = 1;
-		gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->cdslider), FALSE); 
-		gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->leftbutton), FALSE); 
-		gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->rightbutton), FALSE); 
-	}
-	else
-	{
-	 	gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->cdslider), TRUE);
-	 	gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->leftbutton), TRUE); 
-		gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->rightbutton), TRUE);
-	}
-	
-	gtk_range_set_range (GTK_RANGE (cdwidget->cdslider), 0, slider_ubound);
-	if (index >= 0 && index <= slider_ubound)
-		gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), index);
-	else
-		gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), 0);
+  prefs_set_int (KEY_DISPLAY_COVERART, FALSE);
+
+  gtk_widget_hide_all (cdwidget->contentpanel);
+  gtk_widget_hide (GTK_WIDGET(cdwidget->cdslider));
+  gtk_widget_hide (GTK_WIDGET(cdwidget->leftbutton));
+  gtk_widget_hide (GTK_WIDGET(cdwidget->rightbutton));
+
+  if (cdwidget != NULL)
+  {
+    /* dispose of existing CD Widget */
+    free_CDWidget();
+  }
+  gtk_widget_hide (widget);
+
+  GtkWidget *upbutton = gtkpod_xml_get_widget (main_window_xml, "cover_up_button");
+  gtk_widget_show (upbutton);
 }
 
 /**
- * prepare_canvas:
+ * on_main_cover_image_clicked:
  *
- * Initialise the canvas and prepare the 9 cover items, along
- * with shadow and correct positions/dimensions.
+ * Call handler used for displaying the tracks associated with
+ * the main displayed album cover.
+ *
+ * @GnomeCanvas: main cd cover image canvas
+ * @event: event object used to determine the event type
+ * @data: any data needed by the function (not required)
+ *
  */
-static void prepare_canvas ()
+static gint on_main_cover_image_clicked (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
-	gint i;
-	Cover_Item *cover;
-	
-	gtk_widget_set_size_request(GTK_WIDGET(cdwidget->canvasbox), WIDTH, HEIGHT);
-	/* create a new canvas */
-	cdwidget->canvas = GNOME_CANVAS(gnome_canvas_new_aa());
-	g_return_if_fail (cdwidget->canvas);
-	
-	/* set the size and scroll region of the canvas */
-	gtk_widget_set_size_request(GTK_WIDGET(cdwidget->canvas), WIDTH, HEIGHT);
-	gnome_canvas_set_center_scroll_region (cdwidget->canvas, FALSE);
-	
-	cdwidget->bground = gnome_canvas_item_new(gnome_canvas_root(cdwidget->canvas),
-			    gnome_canvas_rect_get_type(),
-			    "x1",(double) 0, 
-			    "y1",(double) 0,
-			    "x2",(double) WIDTH,
-			    "y2",(double) HEIGHT,
-			    "fill_color", "black",
-			    NULL);
-			    
-	gnome_canvas_item_lower_to_bottom(cdwidget->bground);
-	
-	cdwidget->cdcovers = g_ptr_array_sized_new (IMG_TOTAL);
-	for(i = 0; i < IMG_TOTAL; ++i)
-	{
-		cover = g_new0(Cover_Item, 1);
-		
-		cover->cdcvrgrp = gnome_canvas_item_new(gnome_canvas_root(cdwidget->canvas),
-												gnome_canvas_group_get_type(),
-												NULL);
-												
-		cover->cdimage = gnome_canvas_item_new((GnomeCanvasGroup *) cover->cdcvrgrp,
-										GNOME_TYPE_CANVAS_PIXBUF,
-										NULL);
-		
-		cover->cdreflection = gnome_canvas_item_new((GnomeCanvasGroup *) cover->cdcvrgrp,
-										GNOME_TYPE_CANVAS_PIXBUF,
-										NULL);
-		
-		cover->highlight = gnome_canvas_item_new((GnomeCanvasGroup *) cover->cdcvrgrp,
-																						GNOME_TYPE_CANVAS_PIXBUF,
-	    	   																	NULL);	
-			
-		if(i == IMG_MAIN)
-		{	
-			/* 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", " ",
-										"x", (gdouble) WIDTH / 2,
-										"y", (gdouble) 0,
-										"justification", GTK_JUSTIFY_CENTER,
-  									"anchor", GTK_ANCHOR_NORTH,
-  									"fill_color", "white",
-  									"font", "-*-clean-medium-r-normal-*-12-*-*-*-*-*-*",
-										NULL));
-		}
+  Cover_Item *cover;
+  guint mbutton;
 
-		g_ptr_array_add(cdwidget->cdcovers, cover);
-		cover = NULL;
-	}
-	
-	raise_cdimages (cdwidget->cdcovers);
+  if(event->type != GDK_BUTTON_PRESS)
+    return FALSE;
+
+  mbutton = event->button.button;
+
+  if (mbutton == 1)
+  {
+    Track *track;
+    Album_Item *album;
+    /* Left mouse button clicked so find all tracks with displayed cover */
+    cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
+    /* Stop redisplay of the artwork as its already
+     * in the correct location
+     */
+    coverart_block_change (TRUE);
+
+    /* Select the correct track in the sorttabs */
+    album = cover->album;
+    g_return_val_if_fail (album, FALSE);
+
+    /* Clear the tracks listed in the display */
+    tm_remove_all_tracks ();
+
+    GList *tracks = album->tracks;
+    while (tracks)
+    {
+      track = (Track *) tracks->data;
+      tm_add_track_to_track_model (track, NULL);
+      tracks = tracks->next;
+    }
+
+    /* Turn the display change back on */
+    coverart_block_change (FALSE);
+  }
+  else if ((mbutton == 3) && (event->button.state & GDK_SHIFT_MASK))
+  {
+    /* Right mouse button clicked and shift pressed.
+     * Go straight to edit details window
+     */
+    GList *tracks = coverart_get_displayed_tracks();
+    details_edit (tracks);
+  }
+  else if (mbutton == 3)
+  {
+    /* Right mouse button clicked on its own so display
+     * popup menu
+     */
+    /*int i;
+	  GList *tracks = coverart_get_displayed_tracks();
+	  for (i = 0; i < g_list_length(tracks); ++i)
+	  {
+	  Track *track;
+	  track = g_list_nth_data (tracks, i);
+	  printf ("display_coverart-main_image_clicked - Artist:%s  Album:%s  Title:%s\n", track->artist, track->album, track->title);
+	  }*/
+    cad_context_menu_init ();
+  }
+
+  return FALSE;
 }
 
 /**
- * 
- * free_album:
- * 
- * Destroy an album struct once no longer needed.
- * 
- */ 
-static void free_album (Album_Item *album)
+ * coverart_get_track_thumb:
+ *
+ * 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.
+ */
+static GdkPixbuf *coverart_get_track_thumb (Track *track, Itdb_Device *device, gint default_size)
 {
-	if (album != NULL)
-	{
-		if (album->tracks)
-		{
-			g_list_free (album->tracks);
-		}
-		
-		g_free (album->albumname);
-		g_free (album->artist);
-		
-		if (album->albumart)
-			gdk_pixbuf_unref (album->albumart);
-	}
+  GdkPixbuf *pixbuf = NULL;
+  GdkPixbuf *image = NULL;
+  ExtraTrackData *etd;
+  gint w, h;
+  float ratio;
+
+  etd = track->userdata;
+  g_return_val_if_fail (etd, NULL);
+
+  image = itdb_track_get_thumbnail (track, 200, 200);
+  if (image)
+  {
+    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_BILINEAR);
+      }
+      else
+        pixbuf = gdk_pixbuf_copy (image);
+
+      g_object_unref (image);
+    }
+    else
+    {
+      pixbuf = gdk_pixbuf_scale_simple(image, DEFAULT_IMG_SIZE, DEFAULT_IMG_SIZE, GDK_INTERP_BILINEAR);
+      g_object_unref (image);
+    }
+  }
+
+  if (pixbuf ==  NULL)
+  {
+    /* Could not get a viable thumbnail so get default pixbuf */
+    pixbuf = coverart_get_default_track_thumb (default_size);
+  }
+
+  return pixbuf;
 }
 
 /**
- * coverart_init_display:
+ * coverart_get_displayed_tracks:
  *
- * Initialise the boxes and canvases of the coverart_display.
- *  
+ * Get all tracks suggested by the displayed album cover.
+ *
+ * Returns:
+ * GList containing references to all the displayed covered tracks
  */
-void coverart_init_display ()
+GList *coverart_get_displayed_tracks (void)
 {
-	/* Alway initialise these buttons whether the coverart is displayed or not as these are the
-	 * up/down buttons on the display window and should be properly initialised
-	 */
-	GtkWidget *upbutton = gtkpod_xml_get_widget (main_window_xml, "cover_up_button");
-	GtkWidget *downbutton = gtkpod_xml_get_widget (main_window_xml, "cover_down_button");
-	GtkWidget *lbutton = gtkpod_xml_get_widget (main_window_xml, "cover_display_leftbutton");
-	GtkWidget *rbutton = gtkpod_xml_get_widget (main_window_xml, "cover_display_rightbutton");
-	GtkWidget *slider = gtkpod_xml_get_widget (main_window_xml, "cover_display_scaler");
-		
-	/* show/hide coverart display -- default to show */
-	if (prefs_get_int (KEY_DISPLAY_COVERART))
-	{
-		gtk_widget_hide (upbutton);
-		gtk_widget_show (downbutton);
-		gtk_widget_show (lbutton);
-		gtk_widget_show (rbutton);
-		gtk_widget_show (slider);
-		if (cdwidget != NULL)
-			gtk_widget_show_all (cdwidget->contentpanel);
-	}
-	else
-	{
-		gtk_widget_show (upbutton);
-		gtk_widget_hide (downbutton);
-		gtk_widget_hide (lbutton);
-		gtk_widget_hide (rbutton);
-		gtk_widget_hide (slider);
-		if (cdwidget != NULL)
-			gtk_widget_hide_all (cdwidget->contentpanel);
-		return;
-	}
-			
-	cdwidget = g_new0(CD_Widget, 1);
-	
-	cdwidget->canvasbox = gtkpod_xml_get_widget (main_window_xml, "cover_display_canvasbox"); 
-	cdwidget->contentpanel = gtkpod_xml_get_widget (main_window_xml, "cover_display_window");
-	cdwidget->controlbox = gtkpod_xml_get_widget (main_window_xml, "cover_display_controlbox");
-	cdwidget->leftbutton = GTK_BUTTON (gtkpod_xml_get_widget (main_window_xml, "cover_display_leftbutton"));
-	cdwidget->rightbutton = GTK_BUTTON (gtkpod_xml_get_widget (main_window_xml, "cover_display_rightbutton"));
-	cdwidget->cdslider = GTK_HSCALE (gtkpod_xml_get_widget (main_window_xml, "cover_display_scaler"));
-  
-	g_return_if_fail (cdwidget->contentpanel);
-	g_return_if_fail (cdwidget->canvasbox);
-	g_return_if_fail (cdwidget->controlbox);
-	g_return_if_fail (cdwidget->leftbutton);
-	g_return_if_fail (cdwidget->rightbutton);
-	g_return_if_fail (cdwidget->cdslider);
-  
-  /* Initialise the album has backing store */
-  album_hash = g_hash_table_new_full ( g_str_hash,
-  																																			g_str_equal,
-  																																			(GDestroyNotify) g_free,
-  																																			(GDestroyNotify) free_album);
-	album_key_list = NULL;
-  
-	set_display_dimensions ();
-	
-	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);
+  Cover_Item *cover;
 
-	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);
-					
-	lbutton_signal_id = g_signal_connect (G_OBJECT(cdwidget->leftbutton), "clicked",
-		      G_CALLBACK(on_cover_display_button_clicked), NULL);
-		      
-	rbutton_signal_id = g_signal_connect (G_OBJECT(cdwidget->rightbutton), "clicked",
-		      G_CALLBACK(on_cover_display_button_clicked), NULL);	
-	
-	slide_signal_id = g_signal_connect (G_OBJECT(cdwidget->cdslider), "value-changed",
-		      G_CALLBACK(on_cover_display_slider_value_changed), NULL);
-	
-	window_signal_id = g_signal_connect (gtkpod_window, "configure_event", 
-  		G_CALLBACK (gtkpod_window_configure_callback), NULL);
-  
-  gtk_widget_show_all (cdwidget->contentpanel);
-  		
-	coverart_block_change (FALSE);
+  cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
+  g_return_val_if_fail (cover->album, NULL);
+  return cover->album->tracks;
 }
 
 /**
+ * coverart_get_default_track_thumb:
+ *
+ * Retrieve the artwork pixbuf from the default image file.
+ *
+ * Returns:
+ * pixbuf of the default file for tracks with no cover art.
+ */
+static 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_BILINEAR);
+  g_object_unref (pixbuf);
+
+  return scaled;
+}
+
+/**
+ *
+ * set_scale_range:
+ *
+ * Set the scale range - maximum value should be display
+ * track list length - (8 NULL images + 1 as index value),
+ * ie. the ones either end of the list.
+ *
+ */
+static void set_slider_range (gint index)
+{
+  gint slider_ubound = g_list_length (album_key_list) - IMG_TOTAL;
+  if(slider_ubound < 1)
+  {
+    /* If only one album cover is displayed then slider_ubbound returns
+     * 0 and causes a slider assertion error. Avoid this by disabling the
+     * slider, which makes sense because only one cover is displayed.
+     */
+    slider_ubound = 1;
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->cdslider), FALSE);
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->leftbutton), FALSE);
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->rightbutton), FALSE);
+  }
+  else
+  {
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->cdslider), TRUE);
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->leftbutton), TRUE);
+    gtk_widget_set_sensitive (GTK_WIDGET(cdwidget->rightbutton), TRUE);
+  }
+
+  gtk_range_set_range (GTK_RANGE (cdwidget->cdslider), 0, slider_ubound);
+  if (index >= 0 && index <= slider_ubound)
+    gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), index);
+  else
+    gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), 0);
+}
+
+/**
  * coverart_select_cover
- * 
+ *
  * When a track / album is selected, the artwork cover
  * is selected in the display
- * 
+ *
  * @track: chosen track
- * 
+ *
  */
 void coverart_select_cover (Track *track)
 {
   gint displaytotal, index;
-	
-	/* Only select covers if the display is visible */
-	if (! prefs_get_int (KEY_DISPLAY_COVERART) || cdwidget == NULL)
-		return;
-		
-	/* Only select covers if fire display change is enabled */
-	if (cdwidget->block_display_change)
-		return;
-			
-	displaytotal = g_list_length(album_key_list);
+
+  /* Only select covers if the display is visible */
+  if (! prefs_get_int (KEY_DISPLAY_COVERART) || cdwidget == NULL)
+    return;
+
+  /* Only select covers if fire display change is enabled */
+  if (cdwidget->block_display_change)
+    return;
+
+  displaytotal = g_list_length(album_key_list);
   if (displaytotal <= 0)
-  	return;
-  	
+    return;
+
   gchar *trk_key;
   trk_key = g_strconcat (track->artist, "_", track->album, NULL);
- 	
- 	/* Determine the index of the found track */
- 	GList *key = g_list_find_custom (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
- 	g_return_if_fail (key);
- 	index = g_list_position (album_key_list, key);
- 	g_free (trk_key);
- 	 
- 	/* Use the index value for the main image index */
+
+  /* Determine the index of the found track */
+  GList *key = g_list_find_custom (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
+  g_return_if_fail (key);
+  index = g_list_position (album_key_list, key);
+  g_free (trk_key);
+
+  /* Use the index value for the main image index */
   cdwidget->first_imgindex = index - IMG_MAIN;
   if (cdwidget->first_imgindex < 0)
-  	cdwidget->first_imgindex = 0;
+    cdwidget->first_imgindex = 0;
   else if((cdwidget->first_imgindex + IMG_TOTAL) >= displaytotal)
-  	cdwidget->first_imgindex = displaytotal - IMG_TOTAL;
-      
-  set_covers (FALSE);
-  
+    cdwidget->first_imgindex = displaytotal - IMG_TOTAL;
+
+  redraw (FALSE);
+
   /* Set the index value of the slider but avoid causing an infinite
    * cover selection by blocking the event
    */
   g_signal_handler_block (cdwidget->cdslider, slide_signal_id);
-	gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), index);
-	g_signal_handler_unblock (cdwidget->cdslider, slide_signal_id);
- }
+  gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), index);
+  g_signal_handler_unblock (cdwidget->cdslider, slide_signal_id);
+}
 
 /**
+ * coverart_display_big_artwork:
+ *
+ * Display a big version of the artwork in a dialog
+ *
+ */
+void coverart_display_big_artwork ()
+{
+  Cover_Item *cover;
+  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);
+    }
+  }
+
+  /* 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)
+  {
+    /* Could not get a viable thumbnail so get default pixbuf */
+    imgbuf = coverart_get_default_track_thumb (256);
+  }
+
+  display_image_dialog (imgbuf);
+
+  /* Unreference pixbuf if it is not pointing to
+   * the album's artwork
+   */
+  if (cover->album->albumart == NULL)
+    g_object_unref (imgbuf);
+}
+
+/**
  * compare_album_keys:
- * 
+ *
  * Comparison function for comparing keys in
  * the key list to sort them into alphabetical order.
  * Could use g_ascii_strcasecmp directly but the NULL
  * strings cause assertion errors.
- * 
+ *
  * @a: first album key to compare
  * @b: second album key to compare
- * 
+ *
  */
- static gint compare_album_keys (gchar *a, gchar *b)
- {
- 	if (a == NULL) return -1;
- 	if (b == NULL) return -1;
- 	
- 	return g_ascii_strcasecmp (a, b);	
- 	
- }
- 
+static gint compare_album_keys (gchar *a, gchar *b)
+{
+  if (a == NULL) return -1;
+  if (b == NULL) return -1;
+
+  return g_ascii_strcasecmp (a, b);
+
+}
+
 /**
  * coverart_sort_images:
- * 
+ *
  * When the alphabetize function is initiated this will
  * sort the covers in the same way. Used at any point to
- * sort the covers BUT must be called after an initial coverart_set_images
- * as the latter initialises the album_key_list list 
- * 
+ * sort the covers BUT must be called after an initial coverart_display_update
+ * as the latter initialises the album_key_list list
+ *
  * @order: order type
- * 
+ *
  */
 static void coverart_sort_images (GtkSortType order)
 {
- 	if (order == SORT_NONE)
- 	{
- 		/* No sorting means original order so this should have been called after a coverart_set_images (TRUE)
- 		 * when the TRUE means the tracks were freshly established from the playlist and the hash and key_list
- 		 * recreated.
- 		 */
- 		return;
- 	}
- 	else
- 	{
- 		album_key_list = g_list_sort (album_key_list, (GCompareFunc) compare_album_keys);
- 	}
- 	
- 	if (order == GTK_SORT_DESCENDING)
- 	{
- 		album_key_list = g_list_reverse (album_key_list);		
- 	}
- }
+  if (order == SORT_NONE)
+  {
+    /* No sorting means original order so this should have been called after a coverart_display_update (TRUE)
+     * when the TRUE means the tracks were freshly established from the playlist and the hash and key_list
+     * recreated.
+     */
+    return;
+  }
+  else
+  {
+    album_key_list = g_list_sort (album_key_list, (GCompareFunc) compare_album_keys);
+  }
 
-/**
- * 
- * Convenience function that will only allow set images to be
- * called if the track that was affected was in the list of displaytracks
- * used by the coverart display. So if a whole album is deleted then this
- * will only reset the display if the first track in the album is deleted.
- * 
- * @track: affected track
- */
-void coverart_track_changed (Track *track, gint signal)
-{
-	GList *keypos;
-	gchar *trk_key;
-	Album_Item *album;
-	gint index;
-	gboolean findremove;
-	/*
-	 * Scenarios:
-	 * a) A track is being deleted that is not in the display
-	 * b) A track is being deleted that is in the display
-	 * c) A track has changed is some way so maybe the coverart
-	 * d) A track has been created and its artist and album are already in the displaylist
-	 * 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);
-	
-	switch (signal)
-	{
-		case COVERART_REMOVE_SIGNAL:				
-			g_return_if_fail (keypos);
-			g_free (trk_key);
-			
-			/* Reassign trk_key to the key from the list */
- 			trk_key = keypos->data;
- 			index = g_list_position (album_key_list, keypos);
- 	
-			album = g_hash_table_lookup (album_hash, trk_key);
-			
- 			/* Remove the track from the album item */
- 			remove_track_from_album (album, track, trk_key, index, keypos);
- 			 
- 			/* Check if album is being displayed by checking the index */
-			if (index >= cdwidget->first_imgindex && index <= (cdwidget->first_imgindex + IMG_TOTAL))
- 			{	
-				/* reset the covers and should reset to original position but without the index */
-				set_covers (FALSE);
- 			}
- 			
- 			/* Size of key list may have changed so reset the slider 
- 			 * to appropriate range and index.
- 			 */
- 			set_slider_range (index - IMG_MAIN);
-			break;
-		case COVERART_CREATE_SIGNAL:
-			/* Check whether an album item has already been created in connection
-			 * with the track's artist and album
-			 */
-			album = g_hash_table_lookup (album_hash, trk_key);
-			if (album == NULL)
-			{
-				/* Album item not found so create a new one and populate */
-				album = g_new0 (Album_Item, 1);
-				album->albumart = NULL;
-				album->albumname = g_strdup (track->album);
-				album->artist = g_strdup (track->artist);
-				album->tracks = NULL;
-				album->tracks = g_list_append (album->tracks, track);
-				
-				/* Insert the new Album Item into the hash */
-				g_hash_table_insert (album_hash, trk_key, album);
-				
-				/* Add the key to the list for sorting and other functions */
-				/* But first ... */
-				/* Remove all null tracks before any sorting should take place */	
- 				album_key_list = g_list_remove_all (album_key_list, NULL);
- 			
-				if (prefs_get_int("st_sort") == SORT_ASCENDING)
-				{
-					album_key_list = g_list_insert_sorted (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
-				}
-				else if (prefs_get_int("st_sort") == SORT_DESCENDING)
-				{
-					/* Already in descending order so reverse into ascending order */
-					album_key_list = g_list_reverse (album_key_list);
-					/* Insert the track */
-					album_key_list = g_list_insert_sorted (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
-					/* Reverse again */
-					album_key_list = g_list_reverse (album_key_list);
-				}
-				else
-				{
-					/* NO SORT */
-					album_key_list = g_list_append (album_key_list, trk_key);
-				}
-			
-				/* Readd in the null tracks */
-				/* Add 4 null tracks to the end of the track list for padding */
-				gint i;
-				for (i = 0; i < IMG_MAIN; ++i)
-					album_key_list = g_list_append (album_key_list, NULL);
-	
-				/* Add 4 null tracks to the start of the track list for padding */
-				for (i = 0; i < IMG_MAIN; ++i)
-					album_key_list = g_list_prepend (album_key_list, NULL);
-		
-				set_covers (FALSE);
-			}
-			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);
-			}
-			
-			/* Set the slider to the newly inserted track.
-			 * In fact sets image_index to 4 albums previous
-			 * to newly inserted album to ensure this album is
-			 * the main middle one.
-			 */
-			keypos = g_list_find_custom (album_key_list, trk_key, (GCompareFunc) compare_album_keys);
-			index = g_list_position (album_key_list, keypos);
- 			set_slider_range (index - IMG_MAIN);
- 				
-			break;
-		case COVERART_CHANGE_SIGNAL:
-			/* A track is declaring itself as changed so what to do? */
-			findremove = FALSE;
-			if (keypos == NULL)
-			{
-				/* The track could not be found according to the key!
-				 * The ONLY way this could happen is if the user changed the
-				 * artist or album of the track. Well it should be rare but the only
-				 * way to remove it from its "old" album item is to search each one
-				 */
-				 findremove = TRUE;
-			}
-			else
-			{
-			/* Track has a valid key so can get the album back.
-			 * Either has happened:
-			 * a) Artist/Album key has been changed so the track is being moved to another existing album
-			 * b) Some other change has occurred that is irrelevant to this code.
-			 */
-			 
-			 /* To determine if a) is the case need to determine whether track exists in the 
-			  * album items track list. If it does then b) is true and nothing more is required.
-			  */
-			  album = g_hash_table_lookup (album_hash, trk_key);
-			  g_return_if_fail (album);
-			  
-			  index = g_list_index (album->tracks, track);
-			  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
-			  {
-			  	/* Track does not exist in the album list so the artist/album key has definitely changed */
-			  	findremove = TRUE;
-			  }
-			}
-			
-			if (findremove)
-			{
-				/* It has been determined that the track has had its key changed
-				 * and thus a search must be performed to find the "original" album
-				 * that the track belonged to, remove it then add the track to the new
-				 * album.
-				 */
-			  GList *klist;
-				gchar *key;
-				klist = g_list_first (album_key_list);
-				while (klist != NULL)
-				{
-					key = (gchar *) klist->data;
-					index = g_list_index (album_key_list, key); 
-					if (key != NULL)
-					{
-						album = g_hash_table_lookup (album_hash, key);
-						
-						gint album_trk_index;
-						album_trk_index = g_list_index (album->tracks, track);
-						if (album_trk_index != -1)
-						{
-							/* The track is in this album so remove it in preparation for readding
-						 	* under the new album key
-						 	*/
-					 		remove_track_from_album (album, track, key, index, klist);
- 							set_covers(FALSE);
-					 		/* Found the album and removed so no need to continue the loop */
-					 		break;
-						}
-					}
-					klist = klist->next;
-				}
-				
-				/* Create a new album item or find existing album to house the "brand new" track */
-				coverart_track_changed (track, COVERART_CREATE_SIGNAL);
-			}
-			
-	}
+  if (order == GTK_SORT_DESCENDING)
+  {
+    album_key_list = g_list_reverse (album_key_list);
+  }
 }
 
 /**
- * 
+ *
  * remove_track_from_album:
- * 
+ *
  * Removes track from an album item and removes the latter
  * if it no longer has any tracks in it.
- * 
+ *
  * @album: album to be checked for removal.
  * @track: track to be removed from the Album_Item
  * @key: string concatentation of the artist_album of track. Key for hash
  * @index: position of the key in the album key list
  * @keylistitem: the actual GList item in the album key list
  */
- static void remove_track_from_album (Album_Item *album, Track *track, gchar *key, gint index, GList *keylistitem)
- {
-	/* Use the index value to determine if the cover is being displayed */
- 	if (index >= cdwidget->first_imgindex && index <= (cdwidget->first_imgindex + IMG_TOTAL))
- 	{
- 		/* Cover is being displayed so need to do some clearing up */
-		coverart_clear_images ();
- 	}
- 			
- 	album->tracks = g_list_remove (album->tracks, track);
- 	if (g_list_length (album->tracks) == 0)
- 	{
- 		/* No more tracks related to this album item so delete it */
- 		gboolean delstatus = g_hash_table_remove (album_hash, key);
- 		if (! delstatus)
- 			gtkpod_warning (_("Failed to remove the album from the album hash store."));
- 		/*else
- 			printf("Successfully removed album\n");
- 		*/
- 		album_key_list = g_list_remove_link (album_key_list, keylistitem);
- 	
- 		if (index < (cdwidget->first_imgindex + IMG_MAIN) && index > IMG_MAIN)
- 		{
- 			/* index of track is less than visible cover's indexes so subtract 1 from
- 			 * first img index. Will mean that when deleteing album item then
- 		 	 * set covers will be called at the correct position.
- 		 	 * 
- 		 	 * However, index must be greater than IMG_MAIN else a NULL track will
- 		 	 * become the IMG_MAIN tracks displayed.
- 		 	 */
- 			cdwidget->first_imgindex--;
- 		}
- 	}
- }
+static void remove_track_from_album (Album_Item *album, Track *track, gchar *key, gint index, GList *keylistitem)
+{
+  album->tracks = g_list_remove (album->tracks, track);
+  if (g_list_length (album->tracks) == 0)
+  {
+    /* No more tracks related to this album item so delete it */
+    gboolean delstatus = g_hash_table_remove (album_hash, key);
+    if (! delstatus)
+      gtkpod_warning (_("Failed to remove the album from the album hash store."));
+    /*else
+	  printf("Successfully removed album\n");
+     */
+    album_key_list = g_list_remove_link (album_key_list, keylistitem);
 
+    if (index < (cdwidget->first_imgindex + IMG_MAIN) && index > IMG_MAIN)
+    {
+      /* index of track is less than visible cover's indexes so subtract 1 from
+       * first img index. Will mean that when deleteing album item then
+       * set covers will be called at the correct position.
+       *
+       * However, index must be greater than IMG_MAIN else a NULL track will
+       * become the IMG_MAIN tracks displayed.
+       */
+      cdwidget->first_imgindex--;
+    }
+  }
+}
+
 /**
- * coverart_set_images:
+ * coverart_set_cover_from_file:
  *
- * Takes a list of tracks and sets the 9 image cover display.
+ * Add a cover to the displayed track by setting it from a
+ * picture file.
  *
- * @clear_track_list: flag indicating whether to clear the displaytracks list or not
- *  
  */
-void coverart_set_images (gboolean clear_track_list)
+void coverart_set_cover_from_file ()
 {
-	gint i;
-	GList *tracks;
-	Track *track;
-	Album_Item *album;
-	Playlist *playlist;
+  gchar *filename;
+  Track *track;
+  Cover_Item *cover;
+  GList *tracks;
 
-	if ( ! prefs_get_int (KEY_DISPLAY_COVERART))
-		return;
-		
-	/* initialize display if not already done */
-	if (!cdwidget)  coverart_init_display ();
+  filename = fileselection_get_cover_filename ();
 
-	/* Ensure that the setting of images hasnt been turned off
-	 * due to being in the middle of a selection operation
-	 */
-	if (cdwidget->block_display_change)
-		return;
+  if (filename)
+  {
+    cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
+    tracks = cover->album->tracks;
 
-	/* Reset the display back to black, black and more black */
-	coverart_clear_images ();
-	
-	if (clear_track_list)
-	{
-		/* Find the selected playlist */
-		playlist = pm_get_selected_playlist ();
-		if (playlist == NULL)
-			return;
-		
-		tracks = playlist->members;
-		/* Free up the hash table and the key list */
-		g_hash_table_foreach_remove(album_hash, (GHRFunc) gtk_true, NULL);
-				
-		g_list_free (album_key_list);
-    
-    album_key_list = NULL;;
-    
-		if (tracks == NULL)
-			return;
-		
-		while (tracks)
-		{
-		    gchar *album_key;
-			track = tracks->data;
-			
-			album_key = g_strconcat (track->artist, "_", track->album, NULL);
-			/* Check whether an album item has already been created in connection
-			 * with the track's artist and album
-			 */
-			album = g_hash_table_lookup (album_hash, album_key);
-			if (album == NULL)
-			{
-				/* Album item not found so create a new one and populate */
-				album = g_new0 (Album_Item, 1);
-				album->albumart = NULL;
-				album->albumname = g_strdup (track->album);
-				album->artist = g_strdup (track->artist);
-				album->tracks = NULL;
-				album->tracks = g_list_append (album->tracks, track);
-				
-				/* 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, album_key);
-			}
-			else
-			{
-			    /* 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;
-		}
-		
-		cdwidget->first_imgindex = 0;
-	}
-		
-	/* Remove all null tracks before any sorting should take place */	
- 	album_key_list = g_list_remove_all (album_key_list, NULL);
- 		
-	/* Sort the tracks to the order set in the preference */
-	coverart_sort_images (prefs_get_int("st_sort"));
-	
-	/* Add 4 null tracks to the end of the track list for padding */
-	for (i = 0; i < IMG_MAIN; ++i)
-		album_key_list = g_list_append (album_key_list, NULL);
-	
-	/* Add 4 null tracks to the start of the track list for padding */
-	for (i = 0; i < IMG_MAIN; ++i)
-		album_key_list = g_list_prepend (album_key_list, NULL);
-		
-	set_covers (FALSE);
-	
-	set_slider_range (cdwidget->first_imgindex);
-	
-	/*
-	printf("######### ORIGINAL LINE UP ########\n");
-	debug_albums ();
-	printf("######### END OF ORIGINAL LINE UP #######\n");
-	*/
+    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 */
+    g_object_unref (cover->album->albumart);
+    cover->album->albumart = NULL;
+    if (cover->album->scaled_art != NULL)
+    {
+      g_object_unref (cover->album->scaled_art);
+      cover->album->scaled_art = NULL;
+    }
+  }
+
+  g_free (filename);
+
+  redraw (FALSE);
 }
 
 /**
- * coverart_block_change:
+ * coverart_get_background_display_color:
  *
- * Select covers events can be switched off when automatic
- * selections of tracks are taking place.
+ * Used by coverart draw functions to determine the background color
+ * of the coverart display, which is selected from the preferences.
  *
- * @val: indicating whether to block or unblock select cover events
- *  
  */
-void coverart_block_change (gboolean val)
+GdkColor *coverart_get_background_display_color ()
 {
-  if (GTK_WIDGET_REALIZED(gtkpod_window))
+  gchar *hex_string;
+  GdkColor *color;
+
+  if (album_key_list == NULL || g_list_length (album_key_list) == 0)
+    hex_string = "#FFFFFF";
+  else if ( ! prefs_get_string_value ("coverart_display_bg_color", NULL))
+    hex_string = "#000000";
+  else
+    prefs_get_string_value ("coverart_display_bg_color", &hex_string);
+
+  color = convert_hexstring_to_gdk_color (hex_string);
+  return color;
+}
+
+/**
+ * coverart_get_foreground_display_color:
+ *
+ * Used by coverart draw functions to determine the foreground color
+ * of the coverart display, which is selected from the preferences. The
+ * foreground color refers to the color used by the artist and album text.
+ *
+ */
+GdkColor *coverart_get_foreground_display_color ()
+{
+  gchar *hex_string;
+  GdkColor *color;
+
+  if (album_key_list == NULL || g_list_length (album_key_list) == 0)
+    hex_string = "#000000";
+  else if ( ! prefs_get_string_value ("coverart_display_bg_color", NULL))
+    hex_string = "#FFFFFF";
+  else
+    prefs_get_string_value ("coverart_display_fg_color", &hex_string);
+
+  color = convert_hexstring_to_gdk_color (hex_string);
+  return color;
+}
+
+/**
+ *
+ * free_album:
+ *
+ * Destroy an album struct once no longer needed.
+ *
+ */
+static void free_album (Album_Item *album)
+{
+  if (album != NULL)
   {
-      if (val)
-      {
-	  GdkCursor *cursor = gdk_cursor_new (GDK_WATCH);
-	  gdk_window_set_cursor (gtkpod_window->window, cursor);
-	  gdk_cursor_unref (cursor);
-      }
-      else
-	  gdk_window_set_cursor (gtkpod_window->window, NULL);
+    if (album->tracks)
+    {
+      g_list_free (album->tracks);
+    }
+
+    g_free (album->albumname);
+    g_free (album->artist);
+
+    if (album->albumart)
+      g_object_unref (album->albumart);
+
+    if (album->scaled_art)
+      g_object_unref (album->scaled_art);
   }
-
-  if (cdwidget != NULL)
-      cdwidget->block_display_change = val;
 }
 
 /**
- * coverart_set_cover_from_file:
  *
- * Add a cover to the displayed track by setting it from a
- * picture file.
+ * free_CDWidget
  *
+ * destroy the CD Widget and free everything currently
+ * in memory.
  */
-void coverart_set_cover_from_file ()
+static void free_CDWidget ()
 {
-	gchar *filename;
-	Track *track;
-	Cover_Item *cover;
-	GList *tracks;
-	
-  filename = fileselection_get_cover_filename ();
+  gint i;
+  g_signal_handler_disconnect (cdwidget->leftbutton, lbutton_signal_id);
+  g_signal_handler_disconnect (cdwidget->rightbutton, rbutton_signal_id);
+  g_signal_handler_disconnect (cdwidget->cdslider, slide_signal_id);
+  g_signal_handler_disconnect (cdwidget->contentpanel, contentpanel_signal_id);
+  g_signal_handler_disconnect (gtkpod_window, window_signal_id);
 
-	if (filename)
+  /* Components not freed as they are part of the glade xml file */
+  cdwidget->leftbutton = NULL;
+  cdwidget->rightbutton = NULL;
+  cdwidget->cdslider = NULL;
+  cdwidget->contentpanel = NULL;
+  cdwidget->canvasbox = NULL;
+  cdwidget->controlbox = NULL;
+
+  /* native variables rather than references so should be destroyed when freed */
+  cdwidget->first_imgindex = 0;
+  cdwidget->block_display_change = FALSE;
+
+  Cover_Item *cover;
+  for(i = 0; i < IMG_TOTAL; ++i)
   {
-  	cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
-		tracks = cover->album->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 */
-		gdk_pixbuf_unref (cover->album->albumart);
-		cover->album->albumart = NULL;
+    cover = g_ptr_array_index(cdwidget->cdcovers, i);
+    /* Nullify pointer to album reference. Will be freed below */
+    cover->album = NULL;
   }
-    
-  g_free (filename);
-  
-  set_covers (FALSE);
+
+  g_ptr_array_free (cdwidget->cdcovers, TRUE);
+
+  /* Destroying canvas should destroy the background and cvrtext */
+  gtk_widget_destroy (GTK_WIDGET(cdwidget->draw_area));
+
+  /* Remove all null tracks before using it to destory the hash table */
+  album_key_list = g_list_remove_all (album_key_list, NULL);
+  g_hash_table_foreach_remove(album_hash, (GHRFunc) gtk_true, NULL);
+  g_hash_table_destroy (album_hash);
+  g_list_free (album_key_list);
+
+  g_free (cdwidget);
+  cdwidget = NULL;
 }
 
+/**
+ * dnd_coverart_drag_drop:
+ *
+ * Used by the drag and drop of a jpg. When a drop is
+ * made, this determines whether the drop is valid
+ * then requests the data from the source widget.
+ *
+ */
 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);
+  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;
+  if (target != GDK_NONE)
+  {
+    gtk_drag_get_data (widget, drag_context, target, time);
+    return TRUE;
+  }
+
+  return FALSE;
 }
 
+/**
+ * dnd_coverart_drag_motion:
+ *
+ * Used by the drag and drop of a jpg. While the jpg is being
+ * dragged, this reports to the source widget whether it is an
+ * acceptable location to allow a drop.
+ *
+ */
 static gboolean dnd_coverart_drag_motion (GtkWidget *widget,
-				GdkDragContext *dc,
-				gint x,
-				gint y,
-				guint time,
-				gpointer user_data)
+    GdkDragContext *dc,
+    gint x,
+    gint y,
+    guint time,
+    gpointer user_data)
 {
-	GdkAtom target;
-	iTunesDB *itdb;
-	ExtraiTunesDBData *eitdb;
+  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);
+  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;
 }
 
+/**
+ * dnd_coverart_drag_data_received:
+ *
+ * Used by the drag and drop of a jpg. When the drop is performed, this
+ * acts on the receipt of the data from the source widget and applies
+ * the jpg to the track.
+ *
+ */
 static void dnd_coverart_drag_data_received(GtkWidget *widget, GdkDragContext *dc, gint x, gint y, GtkSelectionData *data, guint info,
-		guint time, gpointer user_data)
+    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 */
+  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);
+  printf ("data length = %d\n", data->length);
+  printf ("data->data = %s\n", data->data);
 #endif
-		
-	Cover_Item *cover;
-	GList *tracks;
-	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:
+
+  Cover_Item *cover;
+  GList *tracks;
+  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");
+    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:
+    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);
+      g_object_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");
+    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);			
+    /* 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;
+    image_error = g_strdup ("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 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;
-	}
-	
-	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);
-	
-	g_free (filename);
-	
-	gtkpod_statusbar_message (_("Successfully set new coverart for selected tracks"));
-	gtk_drag_finish (dc, FALSE, FALSE, time);
-	return;
+  if (!image_status || filename == NULL)
+  {
+    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;
+  }
+
+  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;
+  if (cover->album->scaled_art != NULL)
+  {
+    g_object_unref (cover->album->scaled_art);
+    cover->album->scaled_art = NULL;
+  }
+
+  redraw (FALSE);
+
+  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;
 }
-	
-	
+
+/**
+ * convert_hexstring_to_gdk_color:
+ *
+ * Convert a #FFEEFF string to a GdkColor.
+ * Returns a freshly allocated GdkColor that should be freed.
+ *
+ * @GdkColor
+ */
+static GdkColor *convert_hexstring_to_gdk_color (gchar *hexstring)
+{
+  GdkColor *colour;
+  GdkColormap *map;
+  map = gdk_colormap_get_system();
+
+  colour = g_malloc (sizeof(GdkColor));
+
+  if (! gdk_color_parse(hexstring, colour))
+    return NULL;
+
+  if (! gdk_colormap_alloc_color(map, colour, FALSE, TRUE))
+    return NULL;
+
+  return colour;
+}
+
+

Modified: gtkpod/branches/upstream/current/src/display_coverart.h
===================================================================
--- gtkpod/branches/upstream/current/src/display_coverart.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_coverart.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,14 +23,14 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display_coverart.h 1731 2007-10-21 15:07:42Z phantom_sf $
+|  $Id: display_coverart.h 1997 2008-05-31 10:15:05Z phantom_sf $
 */
 
 #ifndef __DISPLAY_COVERART_H__
 #define __DISPLAY_COVERART_H__
 
 #include <gtk/gtk.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <cairo/cairo.h>
 
 #define IMG_MAIN 4
 #define IMG_NEXT 1
@@ -48,48 +48,159 @@
 	gchar *albumname;
 	gchar *artist;
 	GdkPixbuf *albumart;
+	GdkPixbuf *scaled_art;
 } Album_Item;
 
 typedef struct {
+	/* Data */
 	Album_Item *album;
 	gdouble img_x;
 	gdouble img_y;
 	gdouble img_width;
 	gdouble img_height;
-	GnomeCanvasItem *cdcvrgrp;
-	GnomeCanvasItem *cdimage;
-	GnomeCanvasItem *cdreflection;
-	GnomeCanvasItem *highlight;
 } Cover_Item;
 
 typedef struct {
+  /* Gtk widgets */
 	GtkWidget *contentpanel;
 	GtkWidget *canvasbox;
 	GtkWidget *controlbox;
-	GnomeCanvas *canvas;
-	GnomeCanvasItem *bground;
-	GnomeCanvasText *cvrtext;
 	GtkButton *leftbutton;
 	GtkHScale *cdslider;
 	GtkButton *rightbutton;
+	
+	/* Utility data */
 	GPtrArray *cdcovers;
 	gint first_imgindex;
 	gboolean block_display_change;
+	
+	/* Drawing area related widgets */
+	GtkWidget *draw_area;	
 } CD_Widget;
 
 extern const gchar *DISPLAY_COVER_SHOW;
 
-void coverart_display_big_artwork ();
-GList *coverart_get_displayed_tracks (void);
-GdkPixbuf *coverart_get_default_track_thumb (gint default_img_size);
+/**
+ * coverart_init:
+ *
+ * Initialises the image file used if an album has no cover. 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. 
+ * 
+ * Currently called from gtkpod_init. Should not need to be called
+ * subsequent to this.
+ *
+ * @progpath: path of the gtkpod binary being loaded.
+ *  
+ */
 void coverart_init (gchar *progpath);
-void force_update_covers ();
-void coverart_select_cover (Itdb_Track *track);
-void coverart_set_images (gboolean clear_track_list);
+
+/**
+ * coverart_init_display:
+ *
+ * Initialise the boxes and canvases of the coverart_display.
+ * Called during the creation of the listviews and toolbars etc...
+ *  
+ */
+void coverart_init_display ();
+
+/**
+ * coverart_display_update:
+ *
+ * Refreshes the coverart display depending on the playlist selection. Using the
+ * clear_track_list, the refresh can be quicker is set to FALSE. However, the track
+ * list is not updated in this case. Using TRUE, the display is completely cleared and
+ * redrawn.
+ *
+ * @clear_track_list: flag indicating whether to clear the displaytracks list or not
+ *  
+ */
+void coverart_display_update (gboolean clear_track_list);
+
+/**
+ * 
+ * Function to cause a refresh on the given track.
+ * The signal will be one of:
+ * 
+ *    COVERART_REMOVE_SIGNAL - track deleted
+ *    COVERART_CREATE_SIGNAL - track created
+ *    COVERART_CHANGE_SIGNAL - track modified
+ * 
+ * If the track was in the current display of artwork then the
+ * artwork will be updated. If it was not then a refresh is unnecessary
+ * and the function will return accordingly.
+ * 
+ * @track: affected track
+ * @signal: flag indicating the type of track change that has occurred.
+ */
 void coverart_track_changed (Track *track, gint signal);
-void coverart_clear_images ();
+
+/**
+ * coverart_block_change:
+ *
+ * Select covers events can be switched off when automatic
+ * selections of tracks are taking place.
+ *
+ * @val: indicating whether to block or unblock select cover events
+ *  
+ */
 void coverart_block_change (gboolean val);
-void coverart_init_display ();
-GdkPixbuf *coverart_get_track_thumb (Track *track, Itdb_Device *device, gint default_img_size);
+
+/**
+ * coverart_set_cover_from_file:
+ *
+ * Add a cover to the displayed track by setting it from a
+ * picture file.
+ *
+ */
 void coverart_set_cover_from_file ();
+
+/**
+ * coverart_get_displayed_tracks:
+ *
+ * Get all tracks suggested by the displayed album cover.
+ * 
+ * Returns:
+ * GList containing references to all the displayed covered tracks
+ */
+GList *coverart_get_displayed_tracks (void);
+
+/**
+ * coverart_display_big_artwork:
+ * 
+ * Display a big version of the artwork in a dialog
+ * 
+ */
+void coverart_display_big_artwork ();
+
+/**
+ * coverart_select_cover
+ * 
+ * When a track / album is selected, the artwork cover
+ * is selected in the display
+ * 
+ * @track: chosen track
+ * 
+ */
+void coverart_select_cover (Itdb_Track *track);
+
+/**
+ * coverart_get_background_display_color:
+ *
+ * Used by coverart draw functions to determine the background color
+ * of the coverart display, which is selected from the preferences.
+ * 
+ */
+GdkColor *coverart_get_background_display_color ();
+
+/**
+ * coverart_get_foreground_display_color:
+ *
+ * Used by coverart draw functions to determine the foreground color
+ * of the coverart display, which is selected from the preferences. The
+ * foreground color refers to the color used by the artist and album text.
+ * 
+ */
+GdkColor *coverart_get_foreground_display_color ();
 #endif

Modified: gtkpod/branches/upstream/current/src/display_itdb.c
===================================================================
--- gtkpod/branches/upstream/current/src/display_itdb.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_itdb.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display_itdb.c 1723 2007-10-08 03:45:55Z tiffman $
+|  $Id: display_itdb.c 2148 2008-11-08 08:02:15Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -65,6 +65,8 @@
     {
 	sha1_free_eitdb (eitdb);
 	gp_itdb_pc_path_hash_destroy (eitdb);
+	g_free (eitdb->offline_filename);
+	itdb_photodb_free (eitdb->photodb);
 	g_free (eitdb);
     }
 }
@@ -105,10 +107,15 @@
     if (etrack)
     {
 	g_free (etrack->year_str);
+	g_free (etrack->pc_path_locale);
 	g_free (etrack->pc_path_utf8);
+	g_free (etrack->converted_file);
+	g_free (etrack->thumb_path_locale);
+	g_free (etrack->thumb_path_utf8);
 	g_free (etrack->hostname);
 	g_free (etrack->sha1_hash);
 	g_free (etrack->charset);
+	g_free (etrack->lyrics);
 	g_free (etrack);
     }
 }
@@ -131,6 +138,7 @@
 	etr_dup->hostname = g_strdup (etr->hostname);
 	etr_dup->sha1_hash = g_strdup (etr->sha1_hash);
 	etr_dup->charset = g_strdup (etr->charset);
+	etr_dup->lyrics = g_strdup (etr->lyrics);
 	/* clear the pc_path_hashed flag */
 	etr_dup->pc_path_hashed = FALSE;
     }
@@ -251,10 +259,11 @@
 {
     g_return_if_fail (track);
 
-    if (!track->userdata);
+    if (!track->userdata)
     {
 	ExtraTrackData *etr = g_new0 (ExtraTrackData, 1);
 	track->userdata = etr;
+	etr->lyrics=NULL;
 	track->userdata_destroy =
 	    (ItdbUserDataDestroyFunc)gp_track_extra_destroy;
 	track->userdata_duplicate =
@@ -416,7 +425,7 @@
     etr = track->userdata;
     g_return_val_if_fail (etr, FALSE);
 
-    if (track->artwork->thumbnails)
+    if (itdb_track_has_thumbnails (track))
 	changed = TRUE;
 
     itdb_track_remove_thumbnails (track);
@@ -509,6 +518,9 @@
     /* Set prefs system with name of MPL */
     mpl = itdb_playlist_mpl (new_itdb);
     set_itdb_prefs_string (new_itdb, "name", mpl->name);
+
+    /* Clean up */
+    g_free (old_pl_name);
 }    
 
 
@@ -519,7 +531,7 @@
     g_return_if_fail (pl);
 
     itdb_playlist_add (itdb, pl, pos);
-    pm_add_playlist (pl, pos);
+    pm_add_child (itdb, PM_COLUMN_PLAYLIST, pl, pos);
     data_changed (itdb);
 }
 
@@ -535,7 +547,7 @@
 
     pl = gp_playlist_new (name, spl);
     itdb_playlist_add (itdb, pl, pos);
-    pm_add_playlist (pl, pos);
+    pm_add_child (itdb, PM_COLUMN_PLAYLIST, pl, pos);
     data_changed (itdb);
     return pl;
 }
@@ -814,6 +826,7 @@
     if (!etr->pc_path_locale)    etr->pc_path_locale = g_strdup ("");
     if (!etr->thumb_path_utf8)   etr->thumb_path_utf8 = g_strdup ("");
     if (!etr->thumb_path_locale) etr->thumb_path_locale = g_strdup ("");
+    if (!etr->lyrics)            etr->lyrics = g_strdup ("");
     /* Make sure year_str is identical to year */
     g_free (etr->year_str);
     etr->year_str = g_strdup_printf ("%d", track->year);
@@ -855,7 +868,7 @@
 	/* Local database */
 	filename = g_build_filename (cfgdir, "local_0.itdb", NULL);
 	prefs_set_int ("itdb_0_type", GP_ITDB_TYPE_LOCAL);
-	prefs_set_string ("itdb_0_name", _("Local"));
+	prefs_set_string ("itdb_0_name", _("Music Library"));
 	prefs_set_string ("itdb_0_filename", filename);
 	g_free (filename);
 
@@ -906,6 +919,7 @@
     }
 
     g_free (cfgdir);
+	pm_show_all_playlists ();
 }
 
 
@@ -1095,17 +1109,7 @@
  * returned if no itdb is active. */
 iTunesDB *gp_get_selected_itdb (void)
 {
-    Playlist *pl = pm_get_selected_playlist ();
-
-    /* If playlist is selected, use the itdb of the playlist as the
-       active itdb */
-    if (pl)
-    {
-	g_return_val_if_fail (pl->itdb, NULL);
-	return pl->itdb;
-    }
-
-    return NULL;
+    return pm_get_selected_itdb ();
 }
 
 

Modified: gtkpod/branches/upstream/current/src/display_itdb.h
===================================================================
--- gtkpod/branches/upstream/current/src/display_itdb.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_itdb.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display_itdb.h 1750 2007-11-01 21:57:01Z phantom_sf $
+|  $Id: display_itdb.h 2148 2008-11-08 08:02:15Z jcsjcs $
 */
 
 #ifndef __DISPLAY_ITDB_H__
@@ -87,6 +87,8 @@
 			       original itdb                               */
   guint64 local_track_dbid; /* when using DND from local to iPod:
 			       original track                              */
+  gchar   *lyrics;          /* Lyrics information as read from file or as
+			       updated in the program                      */
 } ExtraTrackData;
 
 /* types for iTunesDB */

Modified: gtkpod/branches/upstream/current/src/display_photo.c
===================================================================
--- gtkpod/branches/upstream/current/src/display_photo.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_photo.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -86,15 +86,6 @@
 		{ "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();
@@ -150,67 +141,37 @@
 	const gchar *mp;
 	GError *error= NULL;
 
-	if (itdb == NULL)
-		return;
+	g_return_if_fail (itdb);
 
 	eitdb = itdb->userdata;
+	g_return_if_fail (eitdb);
+	g_return_if_fail (eitdb->photodb == NULL);
+
 	mp = itdb_get_mountpoint (itdb);
 	db = itdb_photodb_parse (mp, &error);
 	if (db == NULL)
 	{
+	    if (itdb_device_supports_photo (itdb->device))
+	    {
 		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;
+	    }
 	}
-
+	if (error)
+	{
+	    g_error_free (error);
+	    error = NULL;
+	}
 	/* 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
@@ -223,6 +184,8 @@
 {
 	ExtraiTunesDBData *eitdb;
 
+	g_return_if_fail (itdb);
+
 	ipod_itdb = itdb;
 #if DEBUG
 	printf ("Displaying photo window\n");
@@ -317,7 +280,7 @@
 
 		if (photo_viewport == NULL)
 		{
-			photo_xml = glade_xml_new (xml_file, "photo_panel", NULL);
+			photo_xml = gtkpod_xml_new (xml_file, "photo_panel");
 			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");
@@ -338,26 +301,26 @@
 			gtk_container_remove (GTK_CONTAINER (photowin), photo_viewport);
 			/* we don't need this any more */
 			gtk_widget_destroy (photowin);
+
+			/* 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);
 		}
 
 		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
 	{
@@ -621,6 +584,10 @@
 		gtk_widget_set_sensitive (GTK_WIDGET(photo_remove_album_menuItem), TRUE);
 		
 		selected_album = itdb_photodb_photoalbum_by_name (photodb, album_name);
+
+		g_free (album_name);
+		album_name = NULL;
+
 		if (selected_album->album_type != 0x01)
 		{
 			/* Only allow renaming of album if not the Photo Library */
@@ -676,50 +643,18 @@
  */
 static void gphoto_display_photo_preview(Artwork *artwork)
 {
-	Thumb *thumb = NULL;
-	GdkPixbuf *pixbuf, *scaled;
-	gint width, height;
-	gdouble ratio;
-	gint i;
+	GdkPixbuf *pixbuf;
 	
 	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);
+        pixbuf = itdb_artwork_get_pixbuf (device, artwork,
+                                          PHOTO_FULL_SCREEN_WIDTH, 
+                                          PHOTO_FULL_SCREEN_HEIGHT);
 	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_image_set_from_pixbuf (photo_preview_image, pixbuf);
 	gtk_misc_set_padding (GTK_MISC(photo_preview_image), 20, 20);
+	g_object_unref (pixbuf);
 }
 
 /**
@@ -750,7 +685,8 @@
  * @ selection: GtkTreeSelection
  * 
  * Returns:
- * string value representing the album name selected
+ * string value representing the album name selected. Must be
+ * g_free()ed after use.
  */
 static gchar *gphoto_get_selected_album_name(GtkTreeSelection *selection)
 {
@@ -805,6 +741,8 @@
 	GError *error= NULL;
 	Artwork *image= NULL;
 
+	g_return_if_fail (photo_filename);
+
 	/* Add the photo to the photo database and the 
 	 * default photo library album
 	 */
@@ -853,54 +791,25 @@
 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;
+		gint icon_width = 42;
+		gint icon_height = 30;
 
+		g_return_if_fail (photo);
+
 		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);
+	        pixbuf = itdb_artwork_get_pixbuf (device, photo, icon_width, icon_height);
 		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);
+		index_str = g_strdup_printf ("%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);
+		gtk_list_store_set (model, &iter, COL_THUMB_NAIL, pixbuf, COL_THUMB_FILENAME, index_str, COL_THUMB_ARTWORK, photo, -1);
+		g_object_unref (pixbuf);
 		g_free (index_str);
 }
 
@@ -1124,12 +1033,12 @@
 		return;
 	}
 	
-	gchar *new_album_name = get_user_string (
-			_("New Photo Album Name"),
-			_("Please enter a new name for the photo album"), 
-			NULL, 
-			NULL, 
-			NULL);
+	gchar *new_album_name = get_user_string (_("New Photo Album Name"),
+											 _("Please enter a new name for the photo album"), 
+											 NULL, 
+											 NULL, 
+											 NULL,
+											 GTK_STOCK_ADD);
 	if (new_album_name == NULL|| strlen (new_album_name) == 0)
 		return;
 	
@@ -1205,13 +1114,14 @@
 	PhotoAlbum *new_album;
 	GtkTreeIter iter;
 	GtkListStore *model;
+	gchar *album_name;
 
-	gchar *album_name = get_user_string (
-			_("New Photo Album"),
-			_("Please enter a name for the new photo album"), 
-			NULL, 
-			NULL, 
-			NULL);
+	album_name = get_user_string (_("New Photo Album"),
+				      _("Please enter a name for the new photo album"), 
+				      FALSE, 
+				      NULL, 
+				      NULL,
+				      GTK_STOCK_ADD);
 
 	if (album_name == NULL|| strlen (album_name) == 0)
 		return;
@@ -1428,8 +1338,6 @@
 	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));
@@ -1446,19 +1354,11 @@
 	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);
+        pixbuf = itdb_artwork_get_pixbuf (device, artwork, -1, -1);
 	g_return_if_fail (pixbuf);
 	
 	display_image_dialog (pixbuf);
+	g_object_unref (pixbuf);
 
 }
 
@@ -1667,6 +1567,8 @@
 	PhotoDB *db;
 	GList *gl_album;
 
+	g_return_if_fail (itdb);
+
 	eitdb = itdb->userdata;
 	db = eitdb->photodb;
 	if (db == NULL)

Modified: gtkpod/branches/upstream/current/src/display_photo.h
===================================================================
--- gtkpod/branches/upstream/current/src/display_photo.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_photo.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -54,8 +54,6 @@
 #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 ();

Modified: gtkpod/branches/upstream/current/src/display_playlists.c
===================================================================
--- gtkpod/branches/upstream/current/src/display_playlists.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_playlists.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display_playlists.c 1776 2007-11-12 22:38:00Z phantom_sf $
+|  $Id: display_playlists.c 2084 2008-08-03 02:59:01Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -47,6 +47,8 @@
 static GtkTreeView *playlist_treeview = NULL;
 /* pointer to the currently selected playlist */
 static Playlist *current_playlist = NULL;
+/* pointer to the currently selected itdb */
+static iTunesDB *current_itdb = NULL;
 /* flag set if selection changes to be ignored temporarily */
 static gboolean pm_selection_blocked = FALSE;
 
@@ -187,8 +189,10 @@
     GtkTreeViewDropPosition pos;
     GdkAtom target;
     guint info;
+    PM_column_type type;
     Playlist *pl_d;
     iTunesDB *itdb;
+    PhotoDB *photodb;
     ExtraiTunesDBData *eitdb;
 
     g_return_val_if_fail (widget, FALSE);
@@ -214,10 +218,13 @@
 
     if(gtk_tree_model_get_iter (model, &iter_d, path))
     {
-	gtk_tree_model_get (model, &iter_d, PM_COLUMN_PLAYLIST, &pl_d, -1);
+	gtk_tree_model_get (model, &iter_d,
+			    PM_COLUMN_TYPE, &type,
+			    PM_COLUMN_ITDB, &itdb,
+			    PM_COLUMN_PLAYLIST, &pl_d,
+			    PM_COLUMN_PHOTOS, &photodb,
+			    -1);
     }
-    g_return_val_if_fail (pl_d, FALSE);
-    itdb = pl_d->itdb;
     g_return_val_if_fail (itdb, FALSE);
     eitdb = itdb->userdata;
     g_return_val_if_fail (eitdb, FALSE);
@@ -260,41 +267,55 @@
 	return FALSE;
     }
 
-    switch (info)
+    switch (type)
     {
-    case DND_GTKPOD_PLAYLISTLIST:
-	/* need to consult drag data to decide */
-	g_object_set_data (G_OBJECT (widget), "drag_data_by_motion_path", path);
-	g_object_set_data (G_OBJECT (widget), "drag_data_by_motion_pos", (gpointer)pos);
-	gtk_drag_get_data (widget, dc, target, time);
-	return TRUE;
-    case DND_GTKPOD_TRACKLIST:
-	/* do not allow drop into currently selected playlist */
-	if (pl_d == pm_get_selected_playlist ())
+    case PM_COLUMN_PLAYLIST:
+	switch (info)
 	{
-	    if ((pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) ||
-		(pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER))
+	case DND_GTKPOD_PLAYLISTLIST:
+	    /* need to consult drag data to decide */
+	    g_object_set_data (G_OBJECT (widget), "drag_data_by_motion_path", path);
+	    g_object_set_data (G_OBJECT (widget), "drag_data_by_motion_pos", (gpointer)pos);
+	    gtk_drag_get_data (widget, dc, target, time);
+	    return TRUE;
+	case DND_GTKPOD_TRACKLIST:
+	    /* do not allow drop into currently selected playlist */
+	    if (pl_d == pm_get_selected_playlist ())
 	    {
-		gtk_tree_path_free (path);
-		gdk_drag_status (dc, 0, time);
-		return FALSE;
+		if ((pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE) ||
+		    (pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER))
+		{
+		    gtk_tree_path_free (path);
+		    gdk_drag_status (dc, 0, time);
+		    return FALSE;
+		}
 	    }
+	    /* need to consult drag data to decide */
+	    g_object_set_data (G_OBJECT (widget), "drag_data_by_motion_path", path);
+	    g_object_set_data (G_OBJECT (widget), "drag_data_by_motion_pos", (gpointer)pos);
+	    gtk_drag_get_data (widget, dc, target, time);
+	    return TRUE;
+	case DND_TEXT_PLAIN:
+	case DND_TEXT_URI_LIST:
+	    gdk_drag_status (dc, dc->suggested_action, time);
+	    gtk_tree_path_free (path);
+	    return TRUE;
+	default:
+	    g_warning ("Programming error: pm_drag_motion received unknown info type (%d)\n", info);
+	    gtk_tree_path_free (path);
+	    return FALSE;
 	}
-	/* need to consult drag data to decide */
-	g_object_set_data (G_OBJECT (widget), "drag_data_by_motion_path", path);
-	g_object_set_data (G_OBJECT (widget), "drag_data_by_motion_pos", (gpointer)pos);
-	gtk_drag_get_data (widget, dc, target, time);
-	return TRUE;
-    case DND_TEXT_PLAIN:
-    case DND_TEXT_URI_LIST:
-	gdk_drag_status (dc, dc->suggested_action, time);
-	gtk_tree_path_free (path);
-	return TRUE;
-    default:
-	g_warning ("Programming error: pm_drag_motion received unknown info type (%d)\n", info);
-	gtk_tree_path_free (path);
+	g_return_val_if_reached (FALSE);
+
+    case PM_COLUMN_PHOTOS:
+	/* We don't handle drops into the photo playlist yet */
 	return FALSE;
+    case PM_NUM_COLUMNS:
+    case PM_COLUMN_ITDB:
+    case PM_COLUMN_TYPE:
+	g_return_val_if_reached (FALSE);
     }
+    g_return_val_if_reached (FALSE);
 }
 
 
@@ -1071,7 +1092,7 @@
 	gtk_tree_model_get (model, &itdb_iter,
 			    PM_COLUMN_PLAYLIST, &pl,
 			    -1);
-	g_return_val_if_fail (pl, FALSE);
+
 	if (pl == playlist)
 	{
 	    *pl_iter = itdb_iter;
@@ -1090,7 +1111,7 @@
 	    gtk_tree_model_get (model, pl_iter,
 				PM_COLUMN_PLAYLIST, &pl,
 				-1);
-	    g_return_val_if_fail (pl, FALSE);
+
 	    if (pl == playlist)
 	    {
 		return TRUE;
@@ -1187,49 +1208,87 @@
 /* If @position = -1: append to end */
 /* If @position >=0: insert at that position (count starts with MPL as
  * 0) */
-void pm_add_playlist (Playlist *playlist, gint pos)
+void pm_add_child (iTunesDB *itdb, PM_column_type type, gpointer item, gint pos)
 {
   GtkTreeIter mpl_iter;
-  GtkTreeIter *mpl = NULL;
+  GtkTreeIter *mpli = NULL;
   GtkTreeIter iter;
   GtkTreeModel *model;
-  GtkTreeSelection *selection;
-  iTunesDB *itdb;
+/*  GtkTreeSelection *selection;*/
 
   g_return_if_fail (playlist_treeview);
-  g_return_if_fail (playlist);
+  g_return_if_fail (item);
+  g_return_if_fail (itdb);
 
   model = GTK_TREE_MODEL (gtk_tree_view_get_model (playlist_treeview));
   g_return_if_fail (model);
 
-  if (itdb_playlist_is_mpl (playlist))
-  {   /* MPLs are always added top-level */
-      mpl = NULL;
-      itdb = playlist->itdb;
+  /* Find the iter with the mpl in it */
+  if (pm_get_iter_for_itdb (itdb, &mpl_iter))
+  {
+      mpli = &mpl_iter;
   }
-  else
-  {   /* We need to find the iter with the mpl in it */
-      if (pm_get_iter_for_itdb (playlist->itdb, &mpl_iter))
-      {
-	  mpl = &mpl_iter;
+
+  switch (type)
+  {
+  case PM_COLUMN_PLAYLIST:
+      if (itdb_playlist_is_mpl ((Playlist *)item))
+      {   /* MPLs are always added top-level */
+	  mpli = NULL;
       }
       else
-      {
-	  g_warning ("Programming error: need to add mpl before adding normal playlists.\n");
+      {   /* Handle normal playlist */
+	  /* MPL must be set before calling this function */
+	  g_return_if_fail (mpli);
+	  if (pos == -1)
+	  {   /* just adding at the end will add behind the photo
+	       * item. Find out how many playlists there are and add
+	       * at the end. */
+	      GtkTreeIter pl_iter;
+	      Playlist *pl;
+	      pos = 0;
+	      	/* go down one hierarchy and try all other iters */
+	      if (gtk_tree_model_iter_children (model, &pl_iter, &mpl_iter))
+	      {
+		  do
+		  {
+		      gtk_tree_model_get (model, &pl_iter,
+					  PM_COLUMN_PLAYLIST, &pl,
+					  -1);
+		      if (pl != NULL)
+		      {
+			  ++pos;
+		      }
+		  } while (pl && gtk_tree_model_iter_next (model, &pl_iter));
+	      }
+	  }
+	  else
+	  {   /* reduce position by one because the MPL is not included in the
+		 tree model's count */
+	      --pos;
+	  }
       }
-      /* reduce position by one because the MPL is not included in the
-	 tree model's count */
-      --pos;
-      itdb = NULL;
+      break;
+  case PM_COLUMN_PHOTOS:
+      /* MPL must be set before calling this function */
+      g_return_if_fail (mpli);
+      /* always add at the end */
+      pos = -1;
+      break;
+  case PM_COLUMN_ITDB:
+  case PM_COLUMN_TYPE:
+  case PM_NUM_COLUMNS:
+      g_return_if_reached ();
   }
+  gtk_tree_store_insert (GTK_TREE_STORE (model), &iter, mpli, pos);
 
-  gtk_tree_store_insert (GTK_TREE_STORE (model), &iter, mpl, pos);
-
   gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
 		      PM_COLUMN_ITDB, itdb,
-		      PM_COLUMN_PLAYLIST, playlist,
+		      PM_COLUMN_TYPE, type,
+		      type, item,
 		      -1);
 
+#if 0
   /* If the current_playlist is "playlist", we select it. This can
      happen during a display_reset */
   if (current_playlist == playlist)
@@ -1237,17 +1296,15 @@
       selection = gtk_tree_view_get_selection (playlist_treeview);
       gtk_tree_selection_select_iter (selection, &iter);
   }
-  else if (current_playlist == NULL)
+#endif
+/*  else if (current_playlist == NULL)
   {
-      /* If it's the first playlist (no playlist selected AND playlist is
-	 the MPL, we select it, unless prefs_get_mpl_autoselect() says
-	 otherwise */
       if (itdb_playlist_is_mpl(playlist) && prefs_get_int("mpl_autoselect"))
       {
 	  selection = gtk_tree_view_get_selection (playlist_treeview);
 	  gtk_tree_selection_select_iter (selection, &iter);
       }
-  }
+  } */
 }
 
 
@@ -1269,12 +1326,12 @@
 
   ts = gtk_tree_view_get_selection (playlist_treeview);
 
-  if (itdb_playlist_is_mpl (playlist) && current_playlist &&
-      (playlist->itdb == current_playlist->itdb))
+  if (itdb_playlist_is_mpl (playlist) && (playlist->itdb == current_itdb))
   {   /* We are about to remove the entire itdb (playlist is MPL) and
        * a playlist of this itdb is selected --> clear display
        * (pm_unselect_playlist probably works as well, but the
        * unselect won't be done until later (callback)) */
+      gphoto_change_to_photo_window (FALSE);
       st_init (-1, 0);
       current_playlist = NULL;
   }
@@ -1379,14 +1436,13 @@
 static void pm_selection_changed_cb (GtkTreeSelection *selection,
 				     gpointer user_data2)
 {
-  GtkTreeModel *model;
-  GtkTreeIter  iter;
-  Playlist *new_playlist = NULL;
+	GtkTreeModel *model;
+	GtkTreeIter  iter;
 
 #if DEBUG_TIMING
-  GTimeVal time;
-  g_get_current_time (&time);
-  printf ("pm_selection_changed_cb enter: %ld.%06ld sec\n",
+	GTimeVal time;
+	g_get_current_time (&time);
+	printf ("pm_selection_changed_cb enter: %ld.%06ld sec\n",
 	  time.tv_sec % 3600, time.tv_usec);
 #endif
 
@@ -1394,77 +1450,106 @@
 	 * in playlist
 	 */
 	 coverart_block_change (TRUE);
-  
-  if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE)
-  {  /* no selection -> reset sort tabs */
-      st_init (-1, 0);
-      current_playlist = NULL;
-  }
-  else
-  {   /* handle new selection */
-      gtk_tree_model_get (model, &iter, 
-			  PM_COLUMN_PLAYLIST, &new_playlist,
-			  -1);
 
-      /* If new playlist is in an iPod itdb, set the mountpoint for
-       * the free space display to this iPod (there may be several
-       * iPods connected */
-      g_return_if_fail (new_playlist);
-      g_return_if_fail (new_playlist->itdb);
-      if (new_playlist->itdb->usertype & GP_ITDB_TYPE_IPOD)
-      {
-	  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);
-      }
+	if (gtk_tree_selection_get_selected (selection, &model, &iter) == FALSE)
+	{  /* no selection -> reset sort tabs */
+		gphoto_change_to_photo_window (FALSE);
+		st_init (-1, 0);
+		current_playlist = NULL;
+		current_itdb = NULL;
+	}
+	else
+	{
+	    Playlist *new_playlist = NULL;
+	    iTunesDB *itdb = NULL;
+	    PhotoDB *photodb = NULL;
+	    PM_column_type type=0;
+	    gchar *label_text;
+	    /* handle new selection */
+	    gtk_tree_model_get (model, &iter, 
+				PM_COLUMN_TYPE, &type,
+				PM_COLUMN_ITDB, &itdb,
+				PM_COLUMN_PLAYLIST, &new_playlist,
+				PM_COLUMN_PHOTOS, &photodb,
+				-1);
 
-      /* remove all entries from sort tab 0 */
-      /* printf ("removing entries: %x\n", current_playlist);*/
-      st_init (-1, 0);
+	    current_playlist = new_playlist;
+	    current_itdb = itdb;
 
-     current_playlist = new_playlist;
-      if (new_playlist->is_spl && new_playlist->splpref.liveupdate)
-	  itdb_spl_update (new_playlist);
-      if (new_playlist->members)
-      {
-	  GList *gl;
+	    switch (type)
+	    {
+	    case PM_COLUMN_PLAYLIST:
+		g_return_if_fail (new_playlist);
+		g_return_if_fail (itdb);
 
-	  st_enable_disable_view_sort (0, FALSE);
-	  for (gl=new_playlist->members; gl; gl=gl->next)
-	  { /* add all tracks to sort tab 0 */
-	      Track *track = gl->data;
-	      st_add_track (track, FALSE, TRUE, 0);
-	  }
-	  st_enable_disable_view_sort (0, TRUE);
-	  st_add_track (NULL, TRUE, TRUE, 0);
-      }
-      gtkpod_tracks_statusbar_update();
-  }
-  
-  /* Reallow the coverart selection update */
-  coverart_block_change (FALSE);
-  /* Set the coverart display based on the selected playlist */
-  coverart_set_images(TRUE);
+		gphoto_change_to_photo_window (FALSE);
+
+		/* If new playlist is in an iPod itdb, set the mountpoint for
+		 * the free space display to this iPod (there may be several
+		 * iPods connected */
+		label_text = g_markup_printf_escaped ("<span weight='bold' size='larger'>%s</span>",
+						      new_playlist->name);
+		gtk_label_set_markup (GTK_LABEL (gtkpod_xml_get_widget (
+						     main_window_xml, "current_playlist_label")),
+				      label_text);
+		g_free (label_text);
+
+		if (itdb->usertype & GP_ITDB_TYPE_IPOD)
+		{
+		    space_set_ipod_itdb (itdb);
+		}
+
+		/* remove all entries from sort tab 0 */
+		/* printf ("removing entries: %x\n", current_playlist);*/
+		st_init (-1, 0);
+
+		if (new_playlist->is_spl && new_playlist->splpref.liveupdate)
+		    itdb_spl_update (new_playlist);
+
+		if (new_playlist->members)
+		{
+		    GList *gl;
+
+		    st_enable_disable_view_sort (0, FALSE);
+
+		    for (gl=new_playlist->members; gl; gl=gl->next)
+		    {
+			/* add all tracks to sort tab 0 */
+			Track *track = gl->data;
+			st_add_track (track, FALSE, TRUE, 0);
+		    }
+
+		    st_enable_disable_view_sort (0, TRUE);
+		    st_add_track (NULL, TRUE, TRUE, 0);
+		}
+		gtkpod_tracks_statusbar_update();
+		break;
+	    case PM_COLUMN_PHOTOS:
+		g_return_if_fail (photodb);
+		g_return_if_fail (itdb);
+		gphoto_display_photo_window (itdb);
+		break;
+	    case PM_COLUMN_ITDB:
+	    case PM_COLUMN_TYPE:
+	    case PM_NUM_COLUMNS:
+		g_warn_if_reached ();
+	    }
+	}
+
+	/* Reallow the coverart selection update */
+	coverart_block_change (FALSE);
+	/* Set the coverart display based on the selected playlist */
+	coverart_display_update(TRUE);
 	 
-  space_data_update ();
-    
+	space_data_update ();
+
 #if DEBUG_TIMING
-  g_get_current_time (&time);
-  printf ("pm_selection_changed_cb exit:  %ld.%06ld sec\n",
-	  time.tv_sec % 3600, time.tv_usec);
+	g_get_current_time (&time);
+	printf ("pm_selection_changed_cb exit:  %ld.%06ld sec\n",
+		time.tv_sec % 3600, time.tv_usec);
 #endif 
-  /* make only suitable delete menu items available */
-  display_adjust_menus ();
+	/* make only suitable delete menu items available */
+	display_adjust_menus ();
 }
 
 /* Callback function called when the selection
@@ -1514,65 +1599,46 @@
 /* Add all playlists of @itdb at position @pos */
 void pm_add_itdb (iTunesDB *itdb, gint pos)
 {
+    GtkTreeIter mpl_iter;
     GList *gl_pl;
+    ExtraiTunesDBData *eitdb;
 
     g_return_if_fail (itdb);
+    eitdb=itdb->userdata;
+    g_return_if_fail (eitdb);
 
     for (gl_pl=itdb->playlists; gl_pl; gl_pl=gl_pl->next)
     {
-			Playlist *pl = gl_pl->data;
-			g_return_if_fail (pl);
-			if (itdb_playlist_is_mpl (pl))     pm_add_playlist (pl, pos);
-			else                               pm_add_playlist (pl, -1);
+	Playlist *pl = gl_pl->data;
+	g_return_if_fail (pl);
+	if (itdb_playlist_is_mpl (pl))
+	{
+	    pm_add_child (itdb, PM_COLUMN_PLAYLIST, pl, pos);
+	}
+	else
+	{
+	    pm_add_child (itdb, PM_COLUMN_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))
+    /* eitdb->photodb might be NULL: the itdb is added before the iPod
+     * is parsed */
+    if (itdb_device_supports_photo (itdb->device) && eitdb->photodb)
     {
-			gboolean createpl = TRUE;
-   	GtkTreeIter pl_iter;
-   	GtkTreeModel *model;
-			Playlist *pl;
+	pm_add_child (itdb, PM_COLUMN_PHOTOS, eitdb->photodb, -1);
+    }
 
-			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);
-			}
+    /* expand the itdb */
+    if (pm_get_iter_for_itdb (itdb, &mpl_iter))
+    {
+	GtkTreeModel *model;
+	GtkTreePath *mpl_path;
+	model = GTK_TREE_MODEL (gtk_tree_view_get_model (playlist_treeview));
+	g_return_if_fail (model);
+	mpl_path = gtk_tree_model_get_path (model, &mpl_iter);
+	g_return_if_fail (mpl_path);
+	gtk_tree_view_expand_row (playlist_treeview, mpl_path, TRUE);
+	gtk_tree_path_free (mpl_path);
     }
-	}
 }
 
 
@@ -1905,130 +1971,169 @@
  * @renderer: renderer to be set
  * @playlist: playlist to consider.
  */
-void pm_set_renderer_text (GtkCellRenderer *renderer,
-			   Playlist *playlist)
+void pm_set_playlist_renderer_text (GtkCellRenderer *renderer,
+				    Playlist *playlist)
 {
-    if (playlist)
-    {
-	ExtraiTunesDBData *eitdb;
+    ExtraiTunesDBData *eitdb;
 
-	g_return_if_fail (playlist->itdb);
-	eitdb = playlist->itdb->userdata;
-	g_return_if_fail (eitdb);
+    g_return_if_fail (playlist);
+    g_return_if_fail (playlist->itdb);
+    eitdb = playlist->itdb->userdata;
+    g_return_if_fail (eitdb);
 
-	if (itdb_playlist_is_mpl (playlist))
-	{   /* mark MPL */
+    if (itdb_playlist_is_mpl (playlist))
+    {   /* mark MPL */
+	g_object_set (G_OBJECT (renderer),
+		      "text", playlist->name, 
+		      "weight", PANGO_WEIGHT_BOLD,
+		      NULL);
+	if (eitdb->data_changed)
+	{
 	    g_object_set (G_OBJECT (renderer),
+			  "style", PANGO_STYLE_ITALIC,
+			  NULL);
+	}
+	else
+	{
+	    g_object_set (G_OBJECT (renderer),
+			  "style", PANGO_STYLE_NORMAL,
+			  NULL);
+	}
+    }
+    else
+    {
+	if (itdb_playlist_is_podcasts (playlist))
+	{
+	    g_object_set (G_OBJECT (renderer),
 			  "text", playlist->name, 
-			  "weight", PANGO_WEIGHT_BOLD,
+			  "weight", PANGO_WEIGHT_SEMIBOLD,
+			  "style", PANGO_STYLE_ITALIC,
 			  NULL);
-	    if (eitdb->data_changed)
-	    {
-		g_object_set (G_OBJECT (renderer),
-			      "style", PANGO_STYLE_ITALIC,
-			      NULL);
-	    }
-	    else
-	    {
-		g_object_set (G_OBJECT (renderer),
-			      "style", PANGO_STYLE_NORMAL,
-			      NULL);
-	    }
 	}
 	else
 	{
-	    if (itdb_playlist_is_podcasts (playlist))
-	    {
-		g_object_set (G_OBJECT (renderer),
-			      "text", playlist->name, 
-			      "weight", PANGO_WEIGHT_SEMIBOLD,
-			      "style", PANGO_STYLE_ITALIC,
-			      NULL);
-	    }
-	    else
-	    {
-		g_object_set (G_OBJECT (renderer),
-			      "text", playlist->name, 
-			      "weight", PANGO_WEIGHT_NORMAL,
-			      "style", PANGO_STYLE_NORMAL,
-			      NULL);
-	    }
+	    g_object_set (G_OBJECT (renderer),
+			  "text", playlist->name, 
+			  "weight", PANGO_WEIGHT_NORMAL,
+			  "style", PANGO_STYLE_NORMAL,
+			  NULL);
 	}
     }
+}
+
+/**
+ * pm_set_photodb_renderer_text
+ *
+ * Set the PhotoDB name in appropriate style.
+ *
+ * @renderer: renderer to be set
+ * @PhotoDB: photodb to consider.
+ */
+void pm_set_photodb_renderer_text (GtkCellRenderer *renderer,
+				   PhotoDB *photodb)
+{
+    g_return_if_fail (photodb);
+
+    /* bold face */
+    g_object_set (G_OBJECT (renderer),
+		  "text", _("Photos"), 
+		  "weight", PANGO_WEIGHT_BOLD,
+		  NULL);
+/* (example for italic style)
+    if (eitdb->data_changed)
+    {
+	g_object_set (G_OBJECT (renderer),
+		      "style", PANGO_STYLE_ITALIC,
+		      NULL);
+    }
     else
     {
 	g_object_set (G_OBJECT (renderer),
-		      "text", "",
+		      "style", PANGO_STYLE_NORMAL,
 		      NULL);
     }
+*/
 }
 
 
 /**
- * pm_set_renderer_pix
+ * pm_set_playlist_renderer_pix
  *
  * Set the appropriate playlist icon.
  *
  * @renderer: renderer to be set
  * @playlist: playlist to consider.
  */
-void pm_set_renderer_pix (GtkCellRenderer *renderer,
-			  Playlist *playlist)
+void pm_set_playlist_renderer_pix (GtkCellRenderer *renderer,
+				   Playlist *playlist)
 {
+    iTunesDB *itdb;
+    ExtraiTunesDBData *eitdb;
+
     const gchar *stock_id=NULL;
 
     g_return_if_fail (renderer);
+    g_return_if_fail (playlist);
+    g_return_if_fail (playlist->itdb);
 
-    if (playlist)
+    itdb = playlist->itdb;
+    g_return_if_fail (itdb->userdata);
+    eitdb = itdb->userdata;
+
+    if (playlist->is_spl)
     {
-	iTunesDB *itdb;
-	ExtraiTunesDBData *eitdb;
-
-	g_return_if_fail (playlist->itdb);
-	itdb = playlist->itdb;
-	g_return_if_fail (itdb->userdata);
-	eitdb = itdb->userdata;
-
-	if (playlist->is_spl)
+	stock_id = GTK_STOCK_PROPERTIES;
+    }
+    else if (!itdb_playlist_is_mpl (playlist))
+    {
+	stock_id = TUNES_PLAYLIST_ICON_STOCK_ID;
+    }
+    else
+    {
+	if (itdb->usertype & GP_ITDB_TYPE_LOCAL)
 	{
-	    stock_id = GTK_STOCK_PROPERTIES;
+	    stock_id = GTK_STOCK_HARDDISK;
 	}
-	else if (!itdb_playlist_is_mpl (playlist))
-	{
-		if (gphoto_is_photo_playlist (playlist))
-		{
-			stock_id = GPHOTO_PLAYLIST_ICON_STOCK_ID;
-		}
-		else
-		{
-			stock_id = TUNES_PLAYLIST_ICON_STOCK_ID;
-		}
-	}
 	else
 	{
-	    if (itdb->usertype & GP_ITDB_TYPE_LOCAL)
+	    if (eitdb->itdb_imported)
 	    {
-		stock_id = GTK_STOCK_HARDDISK;
+		stock_id = GTK_STOCK_CONNECT;
 	    }
 	    else
 	    {
-		if (eitdb->itdb_imported)
-		{
-		    stock_id = GTK_STOCK_CONNECT;
-		}
-		else
-		{
-		    stock_id = GTK_STOCK_DISCONNECT;
-		}
+		stock_id = GTK_STOCK_DISCONNECT;
 	    }
 	}
     }
+    g_object_set (G_OBJECT (renderer), "stock-id", stock_id, NULL);
+    g_object_set (G_OBJECT (renderer), "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
+}
 
-  g_object_set (G_OBJECT (renderer),
-		"stock-id", stock_id, NULL);
+/**
+ * pm_set_photodb_renderer_pix
+ *
+ * Set the appropriate photodb icon.
+ *
+ * @renderer: renderer to be set
+ * @photodb: photodb to consider.
+ */
+void pm_set_photodb_renderer_pix (GtkCellRenderer *renderer,
+				  PhotoDB *photodb)
+{
+    const gchar *stock_id=NULL;
+
+    g_return_if_fail (renderer);
+    g_return_if_fail (photodb);
+
+    stock_id = GPHOTO_PLAYLIST_ICON_STOCK_ID;
+
+    g_object_set (G_OBJECT (renderer), "stock-id", stock_id, NULL);
+    g_object_set (G_OBJECT (renderer), "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
 }
 
 
+
 /* The playlist data is stored in a separate list
    and only pointers to the corresponding playlist structure are placed
    into the model.
@@ -2041,15 +2146,31 @@
 			       gpointer           data)
 {
   Playlist *playlist = NULL;
+  PhotoDB *photodb = NULL;
+  PM_column_type type;
 
   g_return_if_fail (renderer);
   g_return_if_fail (model);
   g_return_if_fail (iter);
 
-  gtk_tree_model_get (model, iter, PM_COLUMN_PLAYLIST, &playlist, -1);
-  g_return_if_fail (playlist);
-
-  pm_set_renderer_text (renderer, playlist);
+  gtk_tree_model_get (model, iter,
+		      PM_COLUMN_TYPE, &type,
+		      PM_COLUMN_PLAYLIST, &playlist,
+		      PM_COLUMN_PHOTOS, &photodb,
+		      -1);
+  switch (type)
+  {
+  case PM_COLUMN_PLAYLIST:
+      pm_set_playlist_renderer_text (renderer, playlist);
+      break;
+  case PM_COLUMN_PHOTOS:
+      pm_set_photodb_renderer_text (renderer, photodb);
+      break;
+  case PM_COLUMN_ITDB:
+  case PM_COLUMN_TYPE:
+  case PM_NUM_COLUMNS:
+      g_return_if_reached ();
+  }
 }
 
 
@@ -2060,16 +2181,32 @@
 				   GtkTreeIter       *iter,
 				   gpointer           data)
 {
-  Playlist *playlist=NULL;
+  Playlist *playlist = NULL;
+  PhotoDB *photodb = NULL;
+  PM_column_type type;
 
   g_return_if_fail (renderer);
   g_return_if_fail (model);
   g_return_if_fail (iter);
 
-  gtk_tree_model_get (model, iter, PM_COLUMN_PLAYLIST, &playlist, -1);
-  g_return_if_fail (playlist);
-
-  pm_set_renderer_pix (renderer, playlist);
+  gtk_tree_model_get (model, iter,
+		      PM_COLUMN_TYPE, &type,
+		      PM_COLUMN_PLAYLIST, &playlist,
+		      PM_COLUMN_PHOTOS, &photodb,
+		      -1);
+  switch (type)
+  {
+  case PM_COLUMN_PLAYLIST:
+      pm_set_playlist_renderer_pix (renderer, playlist);
+      break;
+  case PM_COLUMN_PHOTOS:
+      pm_set_photodb_renderer_pix (renderer, photodb);
+      break;
+  case PM_COLUMN_ITDB:
+  case PM_COLUMN_TYPE:
+  case PM_NUM_COLUMNS:
+      g_return_if_reached ();
+  }
 }
 
 
@@ -2214,6 +2351,7 @@
 		 * an iPod */
 		eitdb = pl->itdb->userdata;
 		g_return_val_if_fail (eitdb, FALSE);
+		block_widgets ();
 		if (!eitdb->itdb_imported)
 		{
 		    gp_load_ipod (pl->itdb);
@@ -2222,6 +2360,7 @@
 		{
 		    gp_eject_ipod (pl->itdb);
 		}
+		release_widgets ();
 		return TRUE;
 	    }
 	    if (pl->itdb->usertype & GP_ITDB_TYPE_LOCAL)
@@ -2245,47 +2384,48 @@
 /* Adds the columns to our playlist_treeview */
 static void pm_add_columns (void)
 {
-  GtkTreeViewColumn *column;
-  GtkCellRenderer *renderer;
-  GtkTreeModel *model;
+	GtkTreeViewColumn *column;
+	GtkCellRenderer *renderer;
+	GtkTreeModel *model;
 
-  model = gtk_tree_view_get_model (playlist_treeview);
-  g_return_if_fail (model);
+	model = gtk_tree_view_get_model (playlist_treeview);
+	g_return_if_fail (model);
 
 
-  /* playlist column */
-  column = gtk_tree_view_column_new ();
-  gtk_tree_view_column_set_title (column, _("Playlists"));
-/* FIXME: see comments at pm_data_compare_func() */
-/*
-  gtk_tree_view_column_set_sort_column_id (column, PM_COLUMN_PLAYLIST);
-  gtk_tree_view_column_set_sort_order (column, GTK_SORT_ASCENDING);
-  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model),
+	/* playlist column */
+	column = gtk_tree_view_column_new ();
+	gtk_tree_view_column_set_title (column, _("Playlists"));
+	/* FIXME: see comments at pm_data_compare_func() */
+	/*
+	gtk_tree_view_column_set_sort_column_id (column, PM_COLUMN_PLAYLIST);
+	gtk_tree_view_column_set_sort_order (column, GTK_SORT_ASCENDING);
+	gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model),
 				   PM_COLUMN_PLAYLIST,
 				   pm_data_compare_func, column, NULL);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  g_signal_connect (G_OBJECT (column), "clicked",
-		    G_CALLBACK (pm_track_column_button_clicked),
+	gtk_tree_view_column_set_clickable(column, TRUE);
+	g_signal_connect (G_OBJECT (column), "clicked",
+			G_CALLBACK (pm_track_column_button_clicked),
 				(gpointer)PM_COLUMN_PLAYLIST);
-*/
-  gtk_tree_view_append_column (playlist_treeview, column);
+	*/
 
-  /* cell for graphic indicator */
-  renderer = gtk_cell_renderer_pixbuf_new ();
+	gtk_tree_view_append_column (playlist_treeview, column);
 
-  gtk_tree_view_column_pack_start (column, renderer, FALSE); 
-  gtk_tree_view_column_set_cell_data_func (column, renderer,
+	/* cell for graphic indicator */
+	renderer = gtk_cell_renderer_pixbuf_new ();
+
+	gtk_tree_view_column_pack_start (column, renderer, FALSE); 
+	gtk_tree_view_column_set_cell_data_func (column, renderer,
 					   pm_cell_data_func_pix,
 					   NULL, NULL);
-  /* cell for playlist name */
-  renderer = gtk_cell_renderer_text_new ();
-  g_signal_connect (G_OBJECT (renderer), "edited",
-		    G_CALLBACK (pm_cell_edited), model);
-  gtk_tree_view_column_pack_start (column, renderer, FALSE);
-  gtk_tree_view_column_set_cell_data_func (column, renderer,
+	/* cell for playlist name */
+	renderer = gtk_cell_renderer_text_new ();
+	g_signal_connect (G_OBJECT (renderer), "edited",
+			G_CALLBACK (pm_cell_edited), model);
+	gtk_tree_view_column_pack_start (column, renderer, FALSE);
+	gtk_tree_view_column_set_cell_data_func (column, renderer,
 					   pm_cell_data_func,
 					   NULL, NULL);
-  g_object_set (G_OBJECT (renderer),
+	g_object_set (G_OBJECT (renderer),
 		"editable", TRUE,
 		NULL);
 }
@@ -2294,100 +2434,100 @@
 /* Create playlist listview */
 void pm_create_treeview (void)
 {
-  GtkTreeStore *model;
-  GtkTreeSelection *selection;
-  GtkWidget *playlist_window;
-  GtkWidget *tree;
+	GtkTreeStore *model;
+	GtkTreeSelection *selection;
+	GtkWidget *playlist_window;
+	GtkWidget *tree;
 
-  playlist_window = gtkpod_xml_get_widget (main_window_xml, "playlist_window");
-  g_return_if_fail (playlist_window);
+	playlist_window = gtkpod_xml_get_widget (main_window_xml, "playlist_window");
+	g_return_if_fail (playlist_window);
 
-  /* destroy old treeview */
-  if (playlist_treeview)
-  {
-      model = GTK_TREE_STORE (gtk_tree_view_get_model(playlist_treeview));
-      g_return_if_fail (model);
-      g_object_unref (model);
-      gtk_widget_destroy (GTK_WIDGET (playlist_treeview));
-      playlist_treeview = NULL;
-  }
-  /* create new one */
-  tree = gtk_tree_view_new ();
-  gtk_widget_set_events (tree, GDK_KEY_RELEASE_MASK);
-  gtk_widget_show (tree);
-  playlist_treeview = GTK_TREE_VIEW (tree);
-  gtk_container_add (GTK_CONTAINER (playlist_window), tree);
+	/* destroy old treeview */
+	if (playlist_treeview)
+	{
+	  model = GTK_TREE_STORE (gtk_tree_view_get_model(playlist_treeview));
+	  g_return_if_fail (model);
+	  g_object_unref (model);
+	  gtk_widget_destroy (GTK_WIDGET (playlist_treeview));
+	  playlist_treeview = NULL;
+	}
+	/* create new one */
+	tree = gtk_tree_view_new ();
+	gtk_widget_set_events (tree, GDK_KEY_RELEASE_MASK);
+	gtk_widget_show (tree);
+	playlist_treeview = GTK_TREE_VIEW (tree);
+	gtk_container_add (GTK_CONTAINER (playlist_window), tree);
 
-  /* create model */
-  model =   gtk_tree_store_new (PM_NUM_COLUMNS, G_TYPE_POINTER, G_TYPE_POINTER);
+	/* create model */
+	model =   gtk_tree_store_new (PM_NUM_COLUMNS, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_POINTER, G_TYPE_POINTER);
 
-  /* set tree model */
-  gtk_tree_view_set_model (playlist_treeview, GTK_TREE_MODEL (model));
-  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (playlist_treeview), TRUE);
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (playlist_treeview),
-			       GTK_SELECTION_SINGLE);
-  selection = gtk_tree_view_get_selection (playlist_treeview);
-  g_signal_connect (G_OBJECT (selection), "changed",
-		    G_CALLBACK (pm_selection_changed), NULL);
-  pm_add_columns ();
+	/* set tree model */
+	gtk_tree_view_set_model (playlist_treeview, GTK_TREE_MODEL (model));
+	/* gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (playlist_treeview), TRUE); */
+	gtk_tree_selection_set_mode (gtk_tree_view_get_selection (playlist_treeview),
+				   GTK_SELECTION_SINGLE);
+	selection = gtk_tree_view_get_selection (playlist_treeview);
+	g_signal_connect (G_OBJECT (selection), "changed",
+			G_CALLBACK (pm_selection_changed), NULL);
+	pm_add_columns ();
 
-  gtk_drag_source_set (GTK_WIDGET (playlist_treeview),
-		       GDK_BUTTON1_MASK,
-		       pm_drag_types, TGNR (pm_drag_types),
-		       GDK_ACTION_COPY|GDK_ACTION_MOVE);
-  gtk_drag_dest_set (GTK_WIDGET (playlist_treeview),
-		     GTK_DEST_DEFAULT_HIGHLIGHT,
-		     pm_drop_types, TGNR (pm_drop_types),
-		     GDK_ACTION_COPY|GDK_ACTION_MOVE);
+	gtk_drag_source_set (GTK_WIDGET (playlist_treeview),
+			   GDK_BUTTON1_MASK,
+			   pm_drag_types, TGNR (pm_drag_types),
+			   GDK_ACTION_COPY|GDK_ACTION_MOVE);
+	gtk_drag_dest_set (GTK_WIDGET (playlist_treeview),
+			 GTK_DEST_DEFAULT_HIGHLIGHT,
+			 pm_drop_types, TGNR (pm_drop_types),
+			 GDK_ACTION_COPY|GDK_ACTION_MOVE);
 
 
-/*   gtk_tree_view_enable_model_drag_dest (playlist_treeview, */
-/* 					pm_drop_types, TGNR (pm_drop_types), */
-/* 					GDK_ACTION_COPY); */
-  /* need the gtk_drag_dest_set() with no actions ("0") so that the
-     data_received callback gets the correct info value. This is most
-     likely a bug... */
-/*   gtk_drag_dest_set_target_list (GTK_WIDGET (playlist_treeview), */
-/* 				 gtk_target_list_new (pm_drop_types, */
-/* 						      TGNR (pm_drop_types))); */
+	/*   gtk_tree_view_enable_model_drag_dest (playlist_treeview, */
+	/* 					pm_drop_types, TGNR (pm_drop_types), */
+	/* 					GDK_ACTION_COPY); */
+	/* need the gtk_drag_dest_set() with no actions ("0") so that the
+	 data_received callback gets the correct info value. This is most
+	 likely a bug... */
+	/*   gtk_drag_dest_set_target_list (GTK_WIDGET (playlist_treeview), */
+	/* 				 gtk_target_list_new (pm_drop_types, */
+	/* 						      TGNR (pm_drop_types))); */
 
-  g_signal_connect ((gpointer) playlist_treeview, "drag-begin",
-		    G_CALLBACK (pm_drag_begin),
-		    NULL);
+	g_signal_connect ((gpointer) playlist_treeview, "drag-begin",
+			G_CALLBACK (pm_drag_begin),
+			NULL);
 
-  g_signal_connect ((gpointer) playlist_treeview, "drag-data-delete",
-		    G_CALLBACK (pm_drag_data_delete),
-		    NULL);
+	g_signal_connect ((gpointer) playlist_treeview, "drag-data-delete",
+			G_CALLBACK (pm_drag_data_delete),
+			NULL);
 
-  g_signal_connect ((gpointer) playlist_treeview, "drag-data-get",
-		    G_CALLBACK (pm_drag_data_get),
-		    NULL);
+	g_signal_connect ((gpointer) playlist_treeview, "drag-data-get",
+			G_CALLBACK (pm_drag_data_get),
+			NULL);
 
-  g_signal_connect ((gpointer) playlist_treeview, "drag-data-received",
-		    G_CALLBACK (pm_drag_data_received),
-		    NULL);
+	g_signal_connect ((gpointer) playlist_treeview, "drag-data-received",
+			G_CALLBACK (pm_drag_data_received),
+			NULL);
 
-  g_signal_connect ((gpointer) playlist_treeview, "drag-drop",
-		    G_CALLBACK (pm_drag_drop),
-		    NULL);
+	g_signal_connect ((gpointer) playlist_treeview, "drag-drop",
+			G_CALLBACK (pm_drag_drop),
+			NULL);
 
-  g_signal_connect ((gpointer) playlist_treeview, "drag-end",
-		    G_CALLBACK (pm_drag_end),
-		    NULL);
+	g_signal_connect ((gpointer) playlist_treeview, "drag-end",
+			G_CALLBACK (pm_drag_end),
+			NULL);
 
-  g_signal_connect ((gpointer) playlist_treeview, "drag-leave",
-		    G_CALLBACK (pm_drag_leave),
-		    NULL);
+	g_signal_connect ((gpointer) playlist_treeview, "drag-leave",
+			G_CALLBACK (pm_drag_leave),
+			NULL);
 
-  g_signal_connect ((gpointer) playlist_treeview, "drag-motion",
-		    G_CALLBACK (pm_drag_motion),
-		    NULL);
+	g_signal_connect ((gpointer) playlist_treeview, "drag-motion",
+			G_CALLBACK (pm_drag_motion),
+			NULL);
 
-  g_signal_connect_after ((gpointer) playlist_treeview, "key_release_event",
+	g_signal_connect_after ((gpointer) playlist_treeview, "key_release_event",
 			  G_CALLBACK (on_playlist_treeview_key_release_event),
 			  NULL);
-  g_signal_connect (G_OBJECT (playlist_treeview), "button-press-event",
-		    G_CALLBACK (pm_button_press), model);
+	g_signal_connect (G_OBJECT (playlist_treeview), "button-press-event",
+			G_CALLBACK (pm_button_press), model);
 }
 
 
@@ -2420,9 +2560,42 @@
     return result;
 }
 
+iTunesDB*
+pm_get_selected_itdb (void)
+{
+/* return(current_playlist);*/
+/* we can't just return the "current_playlist" because the context
+   menus require the selection before "current_playlist" is updated */
+
+    GtkTreeSelection *ts;
+    GtkTreeIter iter;
+    GtkTreeModel *model;
+    iTunesDB *result = NULL;
+
+    g_return_val_if_fail (playlist_treeview, NULL);
+    ts = gtk_tree_view_get_selection (playlist_treeview);
+    g_return_val_if_fail (ts, NULL);
+
+    if (gtk_tree_selection_get_selected (ts, &model, &iter))
+    {
+	gtk_tree_model_get (model, &iter,
+			    PM_COLUMN_ITDB, &result, -1);
+    }
+
+    /* playlist was just changed -- wait until current_playlist is
+       updated. */
+    if (result != current_itdb)  result=NULL;
+    return result;
+}
+
 /* use with care!! */
 void
 pm_set_selected_playlist (Playlist *pl)
 {
     current_playlist = pl;
 }
+
+void pm_show_all_playlists ()
+{
+	gtk_tree_view_expand_all (playlist_treeview);
+}

Modified: gtkpod/branches/upstream/current/src/display_sorttabs.c
===================================================================
--- gtkpod/branches/upstream/current/src/display_sorttabs.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_sorttabs.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display_sorttabs.c 1750 2007-11-01 21:57:01Z phantom_sf $
+|  $Id: display_sorttabs.c 2030 2008-07-05 10:00:06Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -43,6 +43,9 @@
 #include <string.h>
 #include <stdlib.h>
 
+#define ST_AUTOSELECT(i) TRUE
+/* #define ST_AUTOSELECT(i) (prefs_get_int_index("st_autoselect", (i))) */
+
 /* array with pointers to the sort tabs */
 static SortTab *sorttab[SORT_TAB_MAX];
 /* pointer to paned elements holding the sort tabs */
@@ -266,12 +269,15 @@
 static void st_set_string_compare_func (guint inst, guint page_num)
 {
     gchar *buf;
-    buf = g_strdup_printf ("sort_ign_field_%d", ST_to_T (page_num));
-    if (prefs_get_int (buf))
-	sorttab[inst]->string_compare_func = compare_string_fuzzy;
-    else
-	sorttab[inst]->string_compare_func = compare_string;
-    g_free (buf);
+    if (page_num != ST_CAT_SPECIAL)
+    {
+	buf = g_strdup_printf ("sort_ign_field_%d", ST_to_T (page_num));
+	if (prefs_get_int (buf))
+	    sorttab[inst]->string_compare_func = compare_string_fuzzy;
+	else
+	    sorttab[inst]->string_compare_func = compare_string;
+	g_free (buf);
+    }
 }
 
 
@@ -1241,7 +1247,7 @@
 		if (!valid) next = NULL;
 	    }
 	    /* don't select master entry 'All' until requested to do so */
-	    if (next && next->master && !prefs_get_int_index("st_autoselect", inst))
+	    if (next && next->master && !ST_AUTOSELECT (inst))
 		next = NULL;
 	}
     }
@@ -1474,8 +1480,8 @@
       case ST_CAT_SPECIAL:
 	  st_track_changed_special (track, removed, inst);
 	  break;
-      case ST_CAT_NUM:
-	  break;
+      default:
+	  g_return_if_reached();
       }
   }
 }
@@ -1610,7 +1616,7 @@
 	    {
 		/* no last selection -- check if we should select "All" */
 		/* only select "All" when currently adding the first track */
-		if (first && prefs_get_int_index("st_autoselect", inst))
+		if (first && ST_AUTOSELECT (inst))
 		{
 		    select_entry = master_entry;
 		}
@@ -1633,7 +1639,7 @@
        selected (including "select_entry", which is to be selected" and
        prefs_get_int_index("st_autoselect", index) allows us to select "All" */
     if (final && !st->current_entry && !select_entry &&
-	!st->unselected && prefs_get_int_index("st_autoselect", inst))
+	!st->unselected && ST_AUTOSELECT (inst))
     { /* auto-select entry "All" */
 	select_entry = g_list_nth_data (st->entries, 0);
     }
@@ -1706,8 +1712,8 @@
       case ST_CAT_SPECIAL:
 	  st_add_track_special (track, final, display, inst);
 	  break;
-      case ST_CAT_NUM:
-	  break;
+      default:
+	  g_return_if_reached();
       }
   }
 }
@@ -1759,8 +1765,8 @@
 	case ST_CAT_SPECIAL:
 	    st_remove_track_special (track, inst);
 	    break;
-	case ST_CAT_NUM:
-	    break;
+        default:
+	    g_return_if_reached();
 	}
     }
 }
@@ -1824,8 +1830,8 @@
       case ST_CAT_SPECIAL:
 	  sp_remove_all_members (inst);
 	  break;
-      case ST_CAT_NUM:
-	  break;
+      default:
+	g_return_if_reached();
       }
       if (new_category != -1)
       {
@@ -1956,8 +1962,9 @@
 		}
 		break;
 	    case ST_CAT_SPECIAL:
-	    case ST_CAT_NUM:
 		break;
+	    default:
+	        g_return_if_reached();
 	    }
 	}
     }
@@ -1976,7 +1983,7 @@
 	 * displaytracks list in coverart recreated.
 	 * ie. easy to sort ascending and descending but difficult to return to unsorted state
 	 */
-	coverart_set_images (order == SORT_NONE);
+	coverart_display_update (order == SORT_NONE);
 }
 
 gint st_get_sorttab_page_number (int inst)
@@ -2652,29 +2659,35 @@
     /* sanity check */
     g_return_if_fail (st_paned[0] == NULL);
 
-    for (i=0; i<PANED_NUM_ST; ++i)
+    for (i = 0; i < PANED_NUM_ST; ++i)
     {
-	GtkWidget *paned;
+        GtkWidget *paned;
 
-	paned = gtk_hpaned_new ();
-	gtk_widget_show (paned);
- 	if (i==0)
-	{
-	    GtkWidget *parent;
-	    GtkWidget *dummy;
-	    parent = gtkpod_xml_get_widget (main_window_xml, "paned1");
-	    dummy = gtkpod_xml_get_widget (main_window_xml, "paned1_dummy");
-	    g_return_if_fail (parent);
-	    g_return_if_fail (dummy);
-	    gtk_widget_destroy (dummy);
-	    gtk_paned_pack1 (GTK_PANED (parent), paned, TRUE, TRUE);
-	}
-	else
-	{
-	    gtk_paned_pack2 (st_paned[i-1], paned, TRUE, TRUE);
-	}
-	st_paned[i] = GTK_PANED (paned);
+        paned = gtk_hpaned_new ();
+        gtk_widget_show (paned);
+        
+        if (!i)
+        {
+            GtkWidget *parent;
+            GtkWidget *dummy;
+            parent = gtkpod_xml_get_widget (main_window_xml, "paned1");
+            dummy = gtkpod_xml_get_widget (main_window_xml, "paned1_dummy");
+            g_return_if_fail (parent);
+            g_return_if_fail (dummy);
+            gtk_widget_destroy (dummy);
+            
+            g_object_set_data (G_OBJECT (paned), "paned_id", "st_0");
+            gtk_paned_pack2 (GTK_PANED (parent), paned, TRUE, TRUE);
+            st_update_paned_position ();
+        }
+        else
+        {
+            gtk_paned_pack2 (st_paned[i-1], paned, TRUE, TRUE);
+        }
+        
+        st_paned[i] = GTK_PANED (paned);
     }
+    
     /* set position of visible paned to decent values if not already
        set */
     if (prefs_get_int_index("paned_pos_", PANED_NUM_GLADE) == -1)
@@ -2780,7 +2793,7 @@
       GladeXML *special_xml;
       gchar *buf;
 
-      special_xml = glade_xml_new (xml_file, "special_sorttab", NULL);
+      special_xml = gtkpod_xml_new (xml_file, "special_sorttab");
       special = gtkpod_xml_get_widget (special_xml, "special_sorttab");
      
       viewport = gtkpod_xml_get_widget (special_xml, "special_viewport");
@@ -2996,9 +3009,8 @@
   case ST_CAT_SPECIAL:
       st0_label0 = gtk_label_new (_("Special"));
       break;
-  case ST_CAT_NUM: /* should not happen... */
+  default: /* should not happen... */
       g_return_if_reached ();
-      break;
   }
   gtk_widget_show (st0_label0);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (st0_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (st0_notebook), st_cat), st0_label0);
@@ -3228,11 +3240,36 @@
     }
 }
 
+/*
+	Set the correct locations of the filter tabs and track list
+	when filter_tabs_top is changed
+*/
+void st_update_paned_position ()
+{
+	GtkPaned *paned = GTK_PANED (gtkpod_xml_get_widget (main_window_xml, "paned1"));
+	GtkWidget *top = gtk_paned_get_child1 (paned);
+	GtkWidget *bottom = gtk_paned_get_child2 (paned);
+	gboolean top_is_st_paned = g_object_get_data (G_OBJECT (top), "paned_id") != NULL;
+	gboolean st_top = prefs_get_int ("filter_tabs_top");
+	
+	if ((top_is_st_paned && !st_top) || (!top_is_st_paned && st_top))
+	{
+		/* Filter tabs are not at the correct location - swap pane children */
+		/* We use g_object_ref so the widgets are not auto-destroyed */
+		g_object_ref (top);
+		g_object_ref (bottom);
+		
+		gtk_container_remove (GTK_CONTAINER (paned), top);
+		gtk_container_remove (GTK_CONTAINER (paned), bottom);
+		
+		gtk_paned_pack1 (paned, bottom, TRUE, TRUE);
+		gtk_paned_pack2 (paned, top, TRUE, TRUE);
+		
+		g_object_unref (top);
+		g_object_unref (bottom);
+	}
+}
 
-
-
-
-
 /* ---------------------------------------------------------------- */
 /*                                                                  */
 /*                Section for calendar display                      */
@@ -3241,12 +3278,6 @@
 
 /* Strings for 'Category-Combo' */
 
-const gchar *cat_strings[] = {
-    N_("Last Played"),
-    N_("Last Modified"),
-    N_("Added"),
-    NULL };
-
 /* enum to access cat_strings */
 enum {
     CAT_STRING_PLAYED = 0,
@@ -3413,34 +3444,31 @@
  * combo */
 static T_item cal_get_category (GtkWidget *cal)
 {
-    const gchar *str;
     GtkWidget *w;
     T_item item;
     gint i = -1;
 
     w = gtkpod_xml_get_widget (cal_xml, "cat_combo");
-    str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (w)->entry));
-    /* Check which string is selected in the combo */
-    if (str)
-	for (i=0; cat_strings[i]; ++i)
-	    if (strcmp (gettext (cat_strings[i]), str) == 0)  break;
+    i = gtk_combo_box_get_active (GTK_COMBO_BOX (w));
+
     switch (i)
     {
     case CAT_STRING_PLAYED:
-	item = T_TIME_PLAYED;
-	break;
+		item = T_TIME_PLAYED;
+		break;
     case CAT_STRING_MODIFIED:
-	item = T_TIME_MODIFIED;
-	break;
+		item = T_TIME_MODIFIED;
+		break;
     case CAT_STRING_ADDED:
-	item = T_TIME_ADDED;
-	break;
+		item = T_TIME_ADDED;
+		break;
     default:
-	fprintf (stderr, "Programming error: cal_get_category () -- item not found.\n");
-	/* set to something reasonable at least */
-	item = T_TIME_PLAYED;
+		fprintf (stderr, "Programming error: cal_get_category () -- item not found.\n");
+		/* set to something reasonable at least */
+		item = T_TIME_PLAYED;
     }
-    return item;
+
+	return item;
 }
 
 
@@ -3603,8 +3631,7 @@
     SortTab *st;
     GtkWidget *w;
     GtkWidget *cal;
-    gchar *str = NULL;
-    static GList *catlist = NULL;
+    int index = -1;
     gint defx, defy;
     TimeInfo *ti;
 
@@ -3616,7 +3643,7 @@
     /* Sanity */
     if (!st) return;
 
-    cal_xml = glade_xml_new (xml_file, "calendar_window", NULL);
+    cal_xml = gtkpod_xml_new (xml_file, "calendar_window");
 
     glade_xml_signal_autoconnect (cal_xml);
 
@@ -3634,41 +3661,38 @@
     gtk_spin_button_set_value (GTK_SPIN_BUTTON (w), inst+1);
 
     /* Set Category-Combo */
-    if (!catlist)
-    {   /* create list */
-	const gchar **bp = cat_strings;
-	while (*bp)   catlist = g_list_append (catlist, gettext (*bp++));
-    }
-    w = gtkpod_xml_get_widget (cal_xml, "cat_combo");
-    gtk_combo_set_popdown_strings (GTK_COMBO (w), catlist);
+	w = gtkpod_xml_get_widget (cal_xml, "cat_combo");
+	
     switch (item)
     {
     case T_TIME_PLAYED:
-	str = gettext (cat_strings[CAT_STRING_PLAYED]);
-	break;
+		index = CAT_STRING_PLAYED;
+		break;
     case T_TIME_MODIFIED:
-	str = gettext (cat_strings[CAT_STRING_MODIFIED]);
-	break;
+		index = CAT_STRING_MODIFIED;
+		break;
     case T_TIME_ADDED:
-	str = gettext (cat_strings[CAT_STRING_ADDED]);
-	break;
+		index = CAT_STRING_ADDED;
+		break;
     default:
-	fprintf (stderr, "Programming error: cal_open_calendar() -- item not found\n");
-	break;
+		fprintf (stderr, "Programming error: cal_open_calendar() -- item not found\n");
+		break;
     }
-    gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (w)->entry), str);
+	
+    gtk_combo_box_set_active (GTK_COMBO_BOX (w), index);
 
     /* Make sure we use the current contents of the entry */
     sp_store_sp_entries (inst);
     /* set calendar */
     ti = sp_update_date_interval_from_string (inst, item, TRUE);
-    /* set the calendar if we have a valid TimeInfo */
+    
+	/* set the calendar if we have a valid TimeInfo */
     if (ti)
     {
-	if (!ti->valid)
-	{   /* set to reasonable default */
-	    ti->lower = 0;
-	    ti->upper = 0;
+		if (!ti->valid)
+		{   /* set to reasonable default */
+			ti->lower = 0;
+			ti->upper = 0;
 	}
 
 	/* Lower Margin */

Modified: gtkpod/branches/upstream/current/src/display_spl.c
===================================================================
--- gtkpod/branches/upstream/current/src/display_spl.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_spl.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -22,7 +22,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display_spl.c 1798 2007-11-17 16:12:06Z jcsjcs $
+|  $Id: display_spl.c 1872 2007-12-29 18:35:12Z Sikon $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -233,6 +233,13 @@
     spl_ET_STRING,
 };
 
+enum matchmode
+{
+	spl_MATCH_ANY = 0,
+	spl_MATCH_ALL,
+	spl_MATCH_IGNORE
+};
+
 static const gchar *entry_get_string (gchar *str, Itdb_SPLRule *splr,
 				      enum entrytype et);
 
@@ -336,62 +343,6 @@
 
 }
 
-
-/* Callbacks */
-static void spl_all_radio_toggled (GtkToggleButton *togglebutton,
-				   GtkWidget *spl_window)
-{
-    Playlist *spl;
-
-    g_return_if_fail (spl_window);
-    spl =  g_object_get_data (G_OBJECT (spl_window), "spl_work");
-    g_return_if_fail (spl);
-    if (gtk_toggle_button_get_active (togglebutton))
-    {
-	GtkWidget *frame = gtkpod_xml_get_widget (spl_window_xml, "spl_rules_frame");
-	g_return_if_fail (frame);
-	gtk_widget_set_sensitive (frame, TRUE);
-	spl->splpref.checkrules = TRUE;
-	spl->splrules.match_operator = ITDB_SPLMATCH_AND;
-    }
-}
-
-static void spl_any_radio_toggled (GtkToggleButton *togglebutton,
-				   GtkWidget *spl_window)
-{
-    Playlist *spl;
-
-    g_return_if_fail (spl_window);
-    spl =  g_object_get_data (G_OBJECT (spl_window), "spl_work");
-    g_return_if_fail (spl);
-    if (gtk_toggle_button_get_active (togglebutton))
-    {
-	GtkWidget *frame = gtkpod_xml_get_widget (spl_window_xml, "spl_rules_frame");
-	g_return_if_fail (frame);
-	gtk_widget_set_sensitive (frame, TRUE);
-	spl->splpref.checkrules = TRUE;
-	spl->splrules.match_operator = ITDB_SPLMATCH_OR;
-    }
-}
-
-static void spl_none_radio_toggled (GtkToggleButton *togglebutton,
-				    GtkWidget *spl_window)
-{
-    Playlist *spl;
-    GtkWidget *frame;
-
-    g_return_if_fail (spl_window);
-    spl =  g_object_get_data (G_OBJECT (spl_window), "spl_work");
-    g_return_if_fail (spl);
-    frame = gtkpod_xml_get_widget (spl_window_xml, "spl_rules_frame");
-    g_return_if_fail (frame);
-    if (gtk_toggle_button_get_active (togglebutton))
-    {
-	gtk_widget_set_sensitive (frame, FALSE);
-	spl->splpref.checkrules = FALSE;
-    }
-}
-
 static void spl_matchcheckedonly_toggled (GtkToggleButton *togglebutton,
 					  GtkWidget *spl_window)
 {
@@ -1608,7 +1559,7 @@
     g_return_if_fail (spl->is_spl);
     g_return_if_fail (itdb != NULL);
 
-    spl_window_xml = glade_xml_new (xml_file, "spl_window", NULL);
+    spl_window_xml = gtkpod_xml_new (xml_file, "spl_window");
     spl_window = gtkpod_xml_get_widget (spl_window_xml, "spl_window");
     
     g_return_if_fail (spl_window != NULL);
@@ -1621,69 +1572,50 @@
     g_object_set_data (G_OBJECT (spl_window), "spl_work", spl_dup);
     g_object_set_data (G_OBJECT (spl_window), "spl_pos",  GINT_TO_POINTER(pos));
     g_object_set_data (G_OBJECT (spl_window), "spl_itdb", itdb);
-    /* Set checkboxes and connect signal handlers */
+
+	/* Set checkboxes and connect signal handlers */
     if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_name_entry")))
     {
-	if (spl_dup->name)
-	    gtk_entry_set_text (GTK_ENTRY (w), spl_dup->name);	
+		if (spl_dup->name)
+			gtk_entry_set_text (GTK_ENTRY (w), spl_dup->name);	
     }
 
-    if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_all_radio")))
-    {
-	g_signal_connect (w, "toggled",
-			  G_CALLBACK (spl_all_radio_toggled),
-			  spl_window);
-	gtk_toggle_button_set_active (
-	    GTK_TOGGLE_BUTTON (w),
-	    (spl_dup->splrules.match_operator == ITDB_SPLMATCH_AND));
-    }
-    if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_any_radio")))
-    {
-	g_signal_connect (w, "toggled",
-			  G_CALLBACK (spl_any_radio_toggled),
-			  spl_window);
-	gtk_toggle_button_set_active (
-	    GTK_TOGGLE_BUTTON (w),
-	    (spl_dup->splrules.match_operator == ITDB_SPLMATCH_OR));
-    }
-    if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_none_radio")))
-    {
-	g_signal_connect (w, "toggled",
-			  G_CALLBACK (spl_none_radio_toggled),
-			  spl_window);
-	gtk_toggle_button_set_active (
-	    GTK_TOGGLE_BUTTON (w), !spl_dup->splpref.checkrules);
-    }
-
     if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_matchcheckedonly_button")))
     {
-	gtk_toggle_button_set_active (
-	    GTK_TOGGLE_BUTTON (w), spl_dup->splpref.matchcheckedonly);
-	g_signal_connect (w, "toggled",
-			  G_CALLBACK (spl_matchcheckedonly_toggled),
-			  spl_window);
+		gtk_toggle_button_set_active (
+			GTK_TOGGLE_BUTTON (w), spl_dup->splpref.matchcheckedonly);
+		g_signal_connect (w, "toggled",
+				  G_CALLBACK (spl_matchcheckedonly_toggled),
+				  spl_window);
     }
 
     if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_liveupdate_button")))
     {
-	gtk_toggle_button_set_active (
-	    GTK_TOGGLE_BUTTON (w), spl_dup->splpref.liveupdate);
-	g_signal_connect (w, "toggled",
-			  G_CALLBACK (spl_liveupdate_toggled),
-			  spl_window);
+		gtk_toggle_button_set_active (
+			GTK_TOGGLE_BUTTON (w), spl_dup->splpref.liveupdate);
+		g_signal_connect (w, "toggled",
+				  G_CALLBACK (spl_liveupdate_toggled),
+				  spl_window);
     }
 
     /* Signals for Cancel, OK, Delete */
     if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_cancel_button")))
     {
-	g_signal_connect (w, "clicked",
-		      G_CALLBACK (spl_cancel), spl_window);
+		g_signal_connect (w, "clicked",
+				  G_CALLBACK (spl_cancel), spl_window);
     }
-    if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_ok_button")))
+
+	if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_ok_button")))
     {
-	g_signal_connect (w, "clicked",
-		      G_CALLBACK (spl_ok), spl_window);
+		g_signal_connect (w, "clicked",
+				  G_CALLBACK (spl_ok), spl_window);
     }
+	
+	if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_match_rules")))
+    {
+		gtk_combo_box_set_active (GTK_COMBO_BOX (w), spl_MATCH_ALL);
+    }
+	
     g_signal_connect (spl_window, "delete_event",
 		      G_CALLBACK (spl_delete_event), spl_window);
 
@@ -1697,6 +1629,7 @@
     if ((defx != 0) && (defy != 0))
 	gtk_window_set_default_size (GTK_WINDOW (spl_window), defx, defy);
 
+	glade_xml_signal_autoconnect (spl_window_xml);
     gtk_widget_show (spl_window);
 
     block_widgets ();
@@ -1720,3 +1653,37 @@
 
     spl_edit_all (itdb, spl, pos);
 }
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void spl_match_rules_changed (GtkComboBox *sender, gpointer e)
+{
+    Playlist *spl;
+	GtkWidget *spl_window = gtkpod_xml_get_widget (spl_window_xml, "spl_window");
+	GtkWidget *frame = gtkpod_xml_get_widget (spl_window_xml, "spl_rules_frame");
+
+    g_return_if_fail (spl_window);
+	g_return_if_fail (frame);
+    spl =  g_object_get_data (G_OBJECT (spl_window), "spl_work");
+    g_return_if_fail (spl);
+	
+	switch (gtk_combo_box_get_active (sender))
+	{
+	case spl_MATCH_ANY:
+		gtk_widget_set_sensitive (frame, TRUE);
+		spl->splpref.checkrules = TRUE;
+		spl->splrules.match_operator = ITDB_SPLMATCH_OR;
+		break;
+	case spl_MATCH_ALL:
+		gtk_widget_set_sensitive (frame, TRUE);
+		spl->splpref.checkrules = TRUE;
+		spl->splrules.match_operator = ITDB_SPLMATCH_AND;
+		break;
+	default:
+		gtk_widget_set_sensitive (frame, FALSE);
+		spl->splpref.checkrules = FALSE;
+		break;
+    }
+}
+

Modified: gtkpod/branches/upstream/current/src/display_tracks.c
===================================================================
--- gtkpod/branches/upstream/current/src/display_tracks.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/display_tracks.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display_tracks.c 1815 2007-12-12 15:36:40Z jcsjcs $
+|  $Id: display_tracks.c 2216 2009-01-17 05:47:46Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -41,6 +41,7 @@
 #include <unistd.h>
 
 #include "prefs.h"
+#include "details.h"
 #include "display_private.h"
 #include "display_itdb.h"
 #include "itdb.h"
@@ -49,6 +50,7 @@
 #include "misc_track.h"
 #include "file.h"
 #include "context_menus.h"
+#include "rb_cell_renderer_rating.h"
 
 /* pointer to the treeview for the track display */
 static GtkTreeView *track_treeview = NULL;
@@ -80,23 +82,132 @@
 
 /* prefs strings */
 const gchar *TM_PREFS_SEARCH_COLUMN = "tm_prefs_search_column";
+const gchar *KEY_DISPLAY_SEARCH_ENTRY ="display_search_entry";
 
+/* Convenience functions */
+static gboolean filter_tracks (GtkTreeModel *model, GtkTreeIter *iter, gpointer entry)
+{
+    Track *tr;
+	gboolean result = FALSE;
+	const gchar *text = gtk_entry_get_text (GTK_ENTRY (entry));
+	int i;
 
+	gtk_tree_model_get(model, iter, READOUT_COL, &tr, -1);
+
+	if (tr)
+	{
+	    if (text[0] == 0x0)   return TRUE;
+	    for (i = 0; i < TM_NUM_COLUMNS; i++)
+	    {
+		gint visible = prefs_get_int_index("col_visible", i);
+		gchar *data;
+		
+		if (!visible)
+			continue;
+		
+		data = track_get_text (tr, TM_to_T (i));
+		
+		if (data && utf8_strcasestr (data, text))
+		{
+			g_free (data);
+			result = TRUE;
+			break;
+		}
+
+		g_free (data);
+	    }
+	}
+
+	return result;
+}
+
+static GtkListStore *get_model_as_store (GtkTreeModel *model)
+{
+	if (!GTK_IS_TREE_MODEL_FILTER (model))
+		return GTK_LIST_STORE (model);
+	else
+		return GTK_LIST_STORE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (model)));
+}
+
+static void convert_iter (GtkTreeModel *model, GtkTreeIter *from, GtkTreeIter *to)
+{
+    if (!GTK_IS_TREE_MODEL_FILTER (model))
+        *to = *from;
+    else
+        gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (model), to, from);
+}
+
+/*static void update_model_view (GtkTreeModel *model)
+{
+    if (GTK_IS_TREE_MODEL_FILTER (model))
+        gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+}*/
+
+static GtkTreeModelFilter *get_filter (GtkTreeView *tree)
+{
+	GtkTreeModel *model = gtk_tree_view_get_model (tree);
+	
+	if (GTK_IS_TREE_MODEL_FILTER (model))
+		return GTK_TREE_MODEL_FILTER (model);
+	else
+	{
+		GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (gtk_tree_model_filter_new (model, NULL));
+		GtkWidget *search_entry = gtkpod_xml_get_widget (main_window_xml, "search_entry");
+		
+		gtk_tree_model_filter_set_visible_func (filter, filter_tracks, search_entry, NULL);
+		gtk_tree_model_filter_refilter (filter);
+		gtk_tree_view_set_model (tree, GTK_TREE_MODEL (filter));
+		
+		return filter;
+	}
+}
+
+G_MODULE_EXPORT void on_search_entry_changed (GtkEditable *editable, gpointer user_data)
+{
+	gtk_tree_model_filter_refilter (get_filter (track_treeview));
+}
+
+G_MODULE_EXPORT void on_searchbar_down_button_clicked (GtkWidget *widget, gpointer data)
+{
+	GtkWidget *upbutton = gtkpod_xml_get_widget (main_window_xml, "searchbar_up_button");
+	GtkWidget *searchbar = gtkpod_xml_get_widget (main_window_xml, "searchbar_hpanel");
+	g_return_if_fail (upbutton);
+	g_return_if_fail (searchbar);
+	
+	prefs_set_int (KEY_DISPLAY_SEARCH_ENTRY, FALSE);
+		
+	gtk_widget_hide_all (searchbar);
+	gtk_widget_show (upbutton);
+	gtk_widget_set_sensitive (upbutton, TRUE);
+}
+
+G_MODULE_EXPORT void on_searchbar_up_button_clicked (GtkWidget *widget, gpointer data)
+{
+	GtkWidget *searchbar = gtkpod_xml_get_widget (main_window_xml, "searchbar_hpanel");
+	g_return_if_fail (searchbar);
+		
+	prefs_set_int (KEY_DISPLAY_SEARCH_ENTRY, TRUE);
+			
+	gtk_widget_show_all (searchbar);
+	gtk_widget_hide (widget);
+}
+
 /* ---------------------------------------------------------------- */
 /* Section for track display                                        */
 /* DND -- Drag And Drop                                             */
 /* ---------------------------------------------------------------- */
 
-
 /* Move the paths listed in @data before or after (according to @pos)
    @path. Used for DND */
 static gboolean tm_move_pathlist (gchar *data,
 				  GtkTreePath *path,
 				  GtkTreeViewDropPosition pos)
 {
+    GtkTreeIter temp;
     GtkTreeIter to_iter;
     GtkTreeIter *from_iter;
     GtkTreeModel *model;
+    GtkListStore *store;
     GList *iterlist = NULL;
     GList *link;
     gchar **paths, **pathp;
@@ -106,53 +217,59 @@
 
     model = gtk_tree_view_get_model (track_treeview);
     g_return_val_if_fail (model, FALSE);
+    store = get_model_as_store (model);
+    g_return_val_if_fail (store, FALSE);
 
-    g_return_val_if_fail (gtk_tree_model_get_iter (model, &to_iter, path),
-			  FALSE);
+    g_return_val_if_fail (gtk_tree_model_get_iter (model, &temp, path), FALSE);
+    convert_iter (model, &temp, &to_iter);
 
     /* split the path list into individual strings */
     paths = g_strsplit (data, "\n", -1);
     pathp = paths;
+    
     /* Convert the list of paths into a list of iters */
     while (*pathp)
     {
-	from_iter = g_malloc (sizeof (GtkTreeIter));
-	if ((strlen (*pathp) > 0) &&
-	    gtk_tree_model_get_iter_from_string (model, from_iter, *pathp))
-	{
-	    iterlist = g_list_append (iterlist, from_iter);
-	}
-	++pathp;
+        if ((strlen (*pathp) > 0) && gtk_tree_model_get_iter_from_string (model, &temp, *pathp))
+        {
+            from_iter = g_new (GtkTreeIter, 1);
+            convert_iter (model, &temp, from_iter);
+            iterlist = g_list_append (iterlist, from_iter);
+        }
+        
+        ++pathp;
     }
+    
     g_strfreev (paths);
+    
     /* Move the iters in iterlist before or after @to_iter */
     switch (pos)
     {
     case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
     case GTK_TREE_VIEW_DROP_AFTER:
-	for (link = g_list_last (iterlist); link; link = link->prev)
-	{
-	    from_iter = (GtkTreeIter *)link->data;
-	    gtk_list_store_move_after (GTK_LIST_STORE (model),
-				       from_iter, &to_iter);
-	}
-	break;
+    for (link = g_list_last (iterlist); link; link = link->prev)
+    {
+        from_iter = (GtkTreeIter *)link->data;
+        gtk_list_store_move_after (store, from_iter, &to_iter);
+    }
+    break;
     case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
     case GTK_TREE_VIEW_DROP_BEFORE:
-	for (link = g_list_first (iterlist); link; link = link->next)
-	{
-	    from_iter = (GtkTreeIter *)link->data;
-	    gtk_list_store_move_before (GTK_LIST_STORE (model),
-					from_iter, &to_iter);
-	}
-	break;
+    for (link = g_list_first (iterlist); link; link = link->next)
+    {
+        from_iter = (GtkTreeIter *)link->data;
+        gtk_list_store_move_before (store,
+                    from_iter, &to_iter);
     }
+    break;
+    }
 
     /* free iterlist */
     for (link = iterlist; link; link = link->next)
 	g_free (link->data);
     g_list_free (iterlist);
 
+/*    update_model_view (model); -- not needed */
     tm_rows_reordered ();
     return TRUE;
 }
@@ -420,7 +537,7 @@
     {   /* drag is within the same widget */
 	gint column;
 	GtkSortType order;
-	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
+	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
 	g_return_val_if_fail (model, FALSE);
 	if(gtk_tree_sortable_get_sort_column_id (
 	       GTK_TREE_SORTABLE (model), &column, &order))
@@ -626,15 +743,19 @@
     GtkTreeIter iter;
     GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
 
-    g_return_if_fail (model != NULL);
+    g_return_if_fail (model);
 
     if (into_iter)
-	iter = *into_iter;
+    {
+        convert_iter (model, into_iter, &iter);
+    }
     else
-	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-
-    gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-			READOUT_COL, track, -1);
+    {
+        gtk_list_store_append (get_model_as_store (model), &iter);
+    }
+    
+    gtk_list_store_set (get_model_as_store (model), &iter, READOUT_COL, track, -1);
+/*    update_model_view (model); -- not needed */
 }
 
 
@@ -647,44 +768,71 @@
 				GtkTreeIter *iter,
 				gpointer data)
 {
-  Track *track;
+    Track *track;
 
-  gtk_tree_model_get (model, iter, READOUT_COL, &track, -1);
-  if(track == (Track *)data)
-  {
-      GtkTreeSelection *selection = gtk_tree_view_get_selection
-	  (track_treeview);
-/*       printf("unselect...\n"); */
-      gtk_tree_selection_unselect_iter (selection, iter);
-/*       printf("...unselect done\n"); */
-      gtk_list_store_remove (GTK_LIST_STORE (model), iter);
-      return TRUE;
-  }
-  return FALSE;
+    gtk_tree_model_get (model, iter, READOUT_COL, &track, -1);
+
+    if(track == (Track *)data)
+    {
+        GtkTreeIter temp;
+
+        GtkTreeSelection *selection = gtk_tree_view_get_selection
+        (track_treeview);
+        /*       printf("unselect...\n"); */
+        gtk_tree_selection_unselect_iter (selection, iter);
+        /*       printf("...unselect done\n"); */
+
+        convert_iter (model, iter, &temp);
+        gtk_list_store_remove (get_model_as_store (model), &temp);
+/*        update_model_view (model); -- not needed */
+        return TRUE;
+    }
+    return FALSE;
 }
 
 
 /* Remove track from the display model */
 void tm_remove_track (Track *track)
 {
-  GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
-  if (model != NULL)
-    gtk_tree_model_foreach (model, tm_delete_track, track);
+    GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
+
+    if (model)
+    {
+        gtk_tree_model_foreach (model, tm_delete_track, track);
+/*        update_model_view (model); -- not needed */
+    }
 }
 
 
 /* Remove all tracks from the display model */
 void tm_remove_all_tracks ()
 {
-  GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
-  GtkTreeIter iter;
+    GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
+    GtkTreeModel *realmodel;
+    GtkTreeIter iter;
+    GtkWidget *search_entry = gtkpod_xml_get_widget (main_window_xml, "search_entry");
 
-  while (gtk_tree_model_get_iter_first (model, &iter))
-  {
-      gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-  }
-  tm_store_col_order ();
-  tm_update_default_sizes ();
+    /* remove all tracks, including tracks filtered out */
+    if (GTK_IS_TREE_MODEL_FILTER (model))
+    {
+	realmodel = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(model));
+    }
+    else
+    {
+	realmodel = model;
+    }
+
+    while (gtk_tree_model_get_iter_first (realmodel, &iter))
+    {
+        gtk_list_store_remove (get_model_as_store (realmodel), &iter);
+    }
+
+    /* reset filter text -- if many tracks are added with the filter
+     * activated, a lot of time is needed */
+    gtk_entry_set_text (GTK_ENTRY (search_entry), "");
+
+    tm_store_col_order ();
+    tm_update_default_sizes ();
 }
 
 /* find out at which position column @tm_item is displayed */
@@ -782,6 +930,37 @@
 #endif
 
 
+static void tm_rating_edited (RBCellRendererRating *renderer,
+							  const gchar *path_string,
+							  double rating)
+{
+	GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
+	GtkTreeIter iter;
+    Track *track;
+	GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
+		
+	g_return_if_fail (model);
+	g_return_if_fail (path);
+	g_return_if_fail (gtk_tree_model_get_iter (model, &iter, path));
+	
+	gtk_tree_path_free (path);
+	gtk_tree_model_get(model, &iter, READOUT_COL, &track, -1);
+	
+	if ((int) rating * ITDB_RATING_STEP != track->rating)
+	{
+		track->rating = (int) rating * ITDB_RATING_STEP;		
+		track->time_modified = time (NULL);
+		pm_track_changed (track);
+		data_changed (track->itdb);
+
+		if (prefs_get_int("id3_write"))
+		{
+			write_tags_to_file (track);
+			gp_duplicate_remove (NULL, NULL);
+		}
+	}
+}
+
 /* Called when editable cell is being edited. Stores new data to the
    track list. ID3 tags in the corresponding files are updated as
    well, if activated in the pref settings */
@@ -801,8 +980,8 @@
 
   column = (TM_item) g_object_get_data(G_OBJECT(renderer), "column");
   multi_edit = prefs_get_int("multi_edit");
-  if (column == TM_COLUMN_TITLE)
-      multi_edit &= prefs_get_int("multi_edit_title");
+/*  if (column == TM_COLUMN_TITLE)
+      multi_edit &= prefs_get_int("multi_edit_title"); */
   selection = gtk_tree_view_get_selection(track_treeview);
   row_list = gtk_tree_selection_get_selected_rows(selection, &model);
 
@@ -821,7 +1000,7 @@
   {
      Track *track;
      ExtraTrackData *etr;
-     gboolean changed;
+     gboolean changed = FALSE;
      GtkTreeIter iter;
      gchar *str;
 
@@ -917,6 +1096,7 @@
      case TM_COLUMN_IPOD_PATH:
      case TM_COLUMN_COMPILATION:
      case TM_COLUMN_THUMB_PATH:
+     case TM_COLUMN_LYRICS:
      case TM_NUM_COLUMNS:
 	 /* These are not editable text fields */
 	 break;
@@ -961,112 +1141,121 @@
 			       GtkTreeIter       *iter,
 			       gpointer           data)
 {
-  Track *track;
-  ExtraTrackData *etr;
-  iTunesDB *itdb;
-  TM_item column;
-  gchar *text;
+	Track *track;
+	ExtraTrackData *etr;
+	iTunesDB *itdb;
+	TM_item column;
+	gchar *text;
 
-  column = (TM_item)g_object_get_data (G_OBJECT (renderer), "column");
+	column = (TM_item)g_object_get_data (G_OBJECT (renderer), "column");
 
-  g_return_if_fail ((column >= 0) && (column < TM_NUM_COLUMNS));
+	g_return_if_fail ((column >= 0) && (column < TM_NUM_COLUMNS));
 
-  gtk_tree_model_get (model, iter, READOUT_COL, &track, -1);
-  g_return_if_fail (track);
-  etr = track->userdata;
-  g_return_if_fail (etr);
-  itdb = track->itdb;
-  g_return_if_fail (itdb);
+	gtk_tree_model_get (model, iter, READOUT_COL, &track, -1);
+	g_return_if_fail (track);
+	etr = track->userdata;
+	g_return_if_fail (etr);
+	itdb = track->itdb;
+	g_return_if_fail (itdb);
 
-  text = track_get_text (track, TM_to_T (column));
+	text = track_get_text (track, TM_to_T (column));
 
-  switch (column)
-  {
-  case TM_COLUMN_TITLE:
-  case TM_COLUMN_ARTIST:
-  case TM_COLUMN_ALBUM:
-  case TM_COLUMN_GENRE:
-  case TM_COLUMN_COMPOSER:
-  case TM_COLUMN_COMMENT:
-  case TM_COLUMN_FILETYPE:
-  case TM_COLUMN_GROUPING:
-  case TM_COLUMN_CATEGORY:
-  case TM_COLUMN_DESCRIPTION:
-  case TM_COLUMN_PODCASTURL:
-  case TM_COLUMN_PODCASTRSS:
-  case TM_COLUMN_SUBTITLE:
-  case TM_COLUMN_TIME_PLAYED:
-  case TM_COLUMN_TIME_MODIFIED:
-  case TM_COLUMN_TIME_ADDED:
-  case TM_COLUMN_TIME_RELEASED:
-  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:
-      g_object_set (G_OBJECT (renderer),
-		    "text", text,
-		    "editable", TRUE,
-		    "xalign", 0.0, NULL);
-      break;
-  case TM_COLUMN_MEDIA_TYPE:
-      g_object_set (G_OBJECT (renderer),
-		    "text", text,
-		    "editable", FALSE,
-		    "xalign", 0.0, NULL);
-      break;
-  case TM_COLUMN_TRACK_NR:
-  case TM_COLUMN_CD_NR:
-  case TM_COLUMN_BITRATE:
-  case TM_COLUMN_SAMPLERATE:
-  case TM_COLUMN_BPM:
-  case TM_COLUMN_PLAYCOUNT:
-  case TM_COLUMN_YEAR:
-  case TM_COLUMN_RATING:
-  case TM_COLUMN_VOLUME:
-  case TM_COLUMN_SOUNDCHECK:
-  case TM_COLUMN_TRACKLEN:
-  case TM_COLUMN_SEASON_NR:
-  case TM_COLUMN_EPISODE_NR:
-      g_object_set (G_OBJECT (renderer),
-		    "text", text,
-		    "editable", TRUE,
-		    "xalign", 1.0, NULL);
-      break;
-  case TM_COLUMN_IPOD_ID:
-  case TM_COLUMN_SIZE:
-      g_object_set (G_OBJECT (renderer),
-		    "text", text,
-		    "editable", FALSE,
-		    "xalign", 1.0, NULL);
-      break;
-  case TM_COLUMN_PC_PATH:
-  case TM_COLUMN_IPOD_PATH:
-  case TM_COLUMN_THUMB_PATH:
-      g_object_set (G_OBJECT (renderer),
-		    "text", text,
-		    "editable", FALSE,
-		    "xalign", 0.0, NULL);
-      break;
-  case TM_COLUMN_TRANSFERRED:
-      g_object_set (G_OBJECT (renderer),
-		    "active", track->transferred,
-		    "activatable", FALSE, NULL);
-      break;
-  case TM_COLUMN_COMPILATION:
-      g_object_set (G_OBJECT (renderer),
-		    "active", track->compilation,
-		    "activatable", TRUE, NULL);
-      break;
-  case TM_NUM_COLUMNS:
-      break;
-  }
-  g_free (text);
+	switch (column)
+	{
+	case TM_COLUMN_RATING:
+		g_object_set (G_OBJECT (renderer),
+					  "rating", (double)(track->rating / ITDB_RATING_STEP),
+					  NULL);
+		break;
+	case TM_COLUMN_TITLE:
+	case TM_COLUMN_ARTIST:
+	case TM_COLUMN_ALBUM:
+	case TM_COLUMN_GENRE:
+	case TM_COLUMN_COMPOSER:
+	case TM_COLUMN_COMMENT:
+	case TM_COLUMN_FILETYPE:
+	case TM_COLUMN_GROUPING:
+	case TM_COLUMN_CATEGORY:
+	case TM_COLUMN_DESCRIPTION:
+	case TM_COLUMN_PODCASTURL:
+	case TM_COLUMN_PODCASTRSS:
+	case TM_COLUMN_SUBTITLE:
+	case TM_COLUMN_TIME_PLAYED:
+	case TM_COLUMN_TIME_MODIFIED:
+	case TM_COLUMN_TIME_ADDED:
+	case TM_COLUMN_TIME_RELEASED:
+	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:
+	  g_object_set (G_OBJECT (renderer),
+			"text", text,
+			"editable", TRUE,
+			"xalign", 0.0, NULL);
+	  break;
+	case TM_COLUMN_MEDIA_TYPE:
+	  g_object_set (G_OBJECT (renderer),
+			"text", text,
+			"editable", FALSE,
+			"xalign", 0.0, NULL);
+	  break;
+	case TM_COLUMN_TRACK_NR:
+	case TM_COLUMN_CD_NR:
+	case TM_COLUMN_BITRATE:
+	case TM_COLUMN_SAMPLERATE:
+	case TM_COLUMN_BPM:
+	case TM_COLUMN_PLAYCOUNT:
+	case TM_COLUMN_YEAR:
+	case TM_COLUMN_VOLUME:
+	case TM_COLUMN_SOUNDCHECK:
+	case TM_COLUMN_TRACKLEN:
+	case TM_COLUMN_SEASON_NR:
+	case TM_COLUMN_EPISODE_NR:
+	  g_object_set (G_OBJECT (renderer),
+			"text", text,
+			"editable", TRUE,
+			"xalign", 1.0, NULL);
+	  break;
+	case TM_COLUMN_IPOD_ID:
+	case TM_COLUMN_SIZE:
+	  g_object_set (G_OBJECT (renderer),
+			"text", text,
+			"editable", FALSE,
+			"xalign", 1.0, NULL);
+	  break;
+	case TM_COLUMN_PC_PATH:
+	case TM_COLUMN_IPOD_PATH:
+	case TM_COLUMN_THUMB_PATH:
+	  g_object_set (G_OBJECT (renderer),
+			"text", text,
+			"editable", FALSE,
+			"xalign", 0.0, NULL);
+	  break;
+	case TM_COLUMN_LYRICS:
+	  g_object_set (G_OBJECT (renderer),
+			"active", track->lyrics_flag,
+			"activatable", TRUE, NULL);
+	  break;
+	case TM_COLUMN_TRANSFERRED:
+	  g_object_set (G_OBJECT (renderer),
+			"active", track->transferred,
+			"activatable", FALSE, NULL);
+	  break;
+	case TM_COLUMN_COMPILATION:
+	  g_object_set (G_OBJECT (renderer),
+			"active", track->compilation,
+			"activatable", TRUE, NULL);
+	  break;
+	case TM_NUM_COLUMNS:
+	  break;
+	}
+	g_free (text);
 }
 
 
@@ -1118,6 +1307,7 @@
   gint sel_rows_num;
   GList *row_list, *row_node, *first;
   gboolean active;
+  GList *selected_tracks = NULL;
 
   column = (TM_item) g_object_get_data(G_OBJECT(renderer), "column");
   multi_edit = prefs_get_int("multi_edit");
@@ -1164,6 +1354,10 @@
 	 if (!active) track->compilation = 1;
 	 else        track->compilation = 0;
         break;
+     case TM_COLUMN_LYRICS:
+	 /* collect all selected tracks -- then call "edit details" */
+	 selected_tracks = g_list_append (selected_tracks, track);
+	 break;
      case TM_COLUMN_ARTIST:
      case TM_COLUMN_ALBUM:
      case TM_COLUMN_GENRE:
@@ -1211,7 +1405,7 @@
      case TM_COLUMN_SORT_COMPOSER:
      case TM_COLUMN_SORT_TVSHOW:
      case TM_NUM_COLUMNS:
-	 /* these are not toggle buttons */
+	 /* these are not toggle buttons or are non-editable */
 	 break;
      }
 /*      printf ("  changed: %d\n", changed); */
@@ -1232,6 +1426,14 @@
      while (widgets_blocked && gtk_events_pending ())  gtk_main_iteration ();
   }
 
+  if ((column == TM_COLUMN_LYRICS) && (selected_tracks != NULL))
+  {
+      /* set displayed page to the lyrics page */
+      prefs_set_int (DETAILS_WINDOW_NOTEBOOK_PAGE, 3);
+      details_edit (selected_tracks);
+      g_list_free (selected_tracks);
+  }
+
   if (multi_edit && (sel_rows_num > 1)) release_widgets ();
 
   g_list_foreach(row_list, (GFunc) gtk_tree_path_free, NULL);
@@ -1252,7 +1454,7 @@
     gint result = 0;
     GtkTreeModel *tm = NULL;
 
-    tm = gtk_tree_view_get_model (GTK_TREE_VIEW(track_treeview));
+    tm = gtk_tree_view_get_model (track_treeview);
     if (tm)
     {
 	result = gtk_tree_model_iter_n_children (tm, NULL);
@@ -1421,6 +1623,7 @@
 {
     Track *tr = NULL;
     GList *l = *((GList**)data);
+    
     gtk_tree_model_get(tm, i, READOUT_COL, &tr, -1);
     g_return_if_fail (tr);
     l = g_list_append(l, tr);
@@ -1633,6 +1836,9 @@
   case TM_COLUMN_MEDIA_TYPE:
       cmp = track1->mediatype - track2->mediatype;
       break;
+  case  TM_COLUMN_LYRICS:
+      cmp = track1->lyrics_flag - track2->lyrics_flag;
+      break;
   case TM_NUM_COLUMNS:
       break;
   }
@@ -1714,6 +1920,7 @@
   case TM_COLUMN_MEDIA_TYPE:
   case TM_COLUMN_SEASON_NR:
   case TM_COLUMN_EPISODE_NR:
+  case TM_COLUMN_LYRICS:
   case TM_NUM_COLUMNS:
       break;
   }
@@ -1792,6 +1999,11 @@
     {
 	GtkTreeModel *model= gtk_tree_view_get_model (track_treeview);
 
+	if (GTK_IS_TREE_MODEL_FILTER (model))
+	{
+	    model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(model));
+	}
+
 	prefs_set_int("tm_sort", SORT_NONE);
 	if (!BROKEN_GTK_TREE_SORT)
 	{
@@ -1873,6 +2085,7 @@
     case TM_COLUMN_MEDIA_TYPE:
     case TM_COLUMN_SEASON_NR:
     case TM_COLUMN_EPISODE_NR:
+    case TM_COLUMN_LYRICS:
     case TM_NUM_COLUMNS:
 	gtk_tree_view_set_enable_search (GTK_TREE_VIEW (track_treeview), FALSE);
 	break;
@@ -1967,6 +2180,12 @@
     if (track_treeview)
     {
 	GtkTreeModel *model= gtk_tree_view_get_model (track_treeview);
+
+	if (GTK_IS_TREE_MODEL_FILTER (model))
+	{
+	    model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(model));
+	}
+
 	if (order != SORT_NONE)
 	{
 	    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
@@ -1996,166 +2215,179 @@
 /* Adds the columns to our track_treeview */
 static GtkTreeViewColumn *tm_add_column (TM_item tm_item, gint pos)
 {
-  GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
-  GtkTreeViewColumn *col = NULL;
-  const gchar *text;
-  GtkCellRenderer *renderer = NULL;  /* default */
-  GtkTooltips *tt;
+	GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
+	GtkTreeViewColumn *col = NULL;
+	const gchar *text;
+	GtkCellRenderer *renderer = NULL;  /* default */
+	GtkTooltips *tt;
 
-  g_return_val_if_fail (gtkpod_window, NULL);
-  tt = g_object_get_data (G_OBJECT (gtkpod_window), "main_tooltips");
-  g_return_val_if_fail (tt, NULL);
+	g_return_val_if_fail (gtkpod_window, NULL);
+	tt = g_object_get_data (G_OBJECT (gtkpod_window), "main_tooltips");
+	g_return_val_if_fail (tt, NULL);
 
-  g_return_val_if_fail (tm_item >= 0, NULL);
-  g_return_val_if_fail (tm_item < TM_NUM_COLUMNS, NULL);
+	g_return_val_if_fail (tm_item >= 0, NULL);
+	g_return_val_if_fail (tm_item < TM_NUM_COLUMNS, NULL);
 
-  text = gettext (get_tm_string (tm_item));
+	text = gettext (get_tm_string (tm_item));
 
-  g_return_val_if_fail (text, NULL);
+	g_return_val_if_fail (text, NULL);
 
-  col = gtk_tree_view_column_new ();
+	col = gtk_tree_view_column_new ();
 
-  switch (tm_item)
-  {
-  case TM_COLUMN_TITLE:
-      /* Add additional toggle box for 'checked' property */
-      renderer = gtk_cell_renderer_toggle_new ();
-      g_object_set_data (G_OBJECT (renderer), "column",
+	switch (tm_item)
+	{
+	case TM_COLUMN_TITLE:
+	  /* Add additional toggle box for 'checked' property */
+	  renderer = gtk_cell_renderer_toggle_new ();
+	  g_object_set_data (G_OBJECT (renderer), "column",
 			 (gint *)tm_item);
-      g_signal_connect (G_OBJECT (renderer), "toggled",
+	  g_signal_connect (G_OBJECT (renderer), "toggled",
 			G_CALLBACK (tm_cell_toggled), model);
-      gtk_tree_view_column_pack_start (col, renderer, FALSE);
-      gtk_tree_view_column_set_cell_data_func (col, renderer,
-					       tm_cell_data_func_toggle,
-					       NULL, NULL);
-      renderer = NULL;
-      break;
-  case TM_COLUMN_ARTIST:
-  case TM_COLUMN_ALBUM:
-  case TM_COLUMN_GENRE:
-  case TM_COLUMN_COMPOSER:
-  case TM_COLUMN_COMMENT:
-  case TM_COLUMN_FILETYPE:
-  case TM_COLUMN_GROUPING:
-  case TM_COLUMN_BITRATE:
-  case TM_COLUMN_SAMPLERATE:
-  case TM_COLUMN_BPM:
-  case TM_COLUMN_CATEGORY:
-  case TM_COLUMN_DESCRIPTION:
-  case TM_COLUMN_PODCASTURL:
-  case TM_COLUMN_PODCASTRSS:
-  case TM_COLUMN_SUBTITLE:
-  case TM_COLUMN_PC_PATH:
-  case TM_COLUMN_IPOD_PATH:
-  case TM_COLUMN_THUMB_PATH:
-  case TM_COLUMN_SIZE:
-  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:
-      break;
-  /* for some column names we want to use shorter alternatives to
-     get_tm_string() */
-  case TM_COLUMN_RATING:
-      text = _("Rtng");
-      break;
-  case TM_COLUMN_TRACK_NR:
-      text = _("#");
-      break;
-  case TM_COLUMN_CD_NR:
-      text = _("CD");
-      break;
-  case TM_COLUMN_IPOD_ID:
-      text = _("ID");
-      break;
-  case TM_COLUMN_TRANSFERRED:
-      text = _("Trnsfrd");
-      renderer = gtk_cell_renderer_toggle_new ();
-      break;
-  case TM_COLUMN_COMPILATION:
-      text = _("Cmpl");
-      renderer = gtk_cell_renderer_toggle_new ();
-      g_signal_connect (G_OBJECT (renderer), "toggled",
+	  gtk_tree_view_column_pack_start (col, renderer, FALSE);
+	  gtk_tree_view_column_set_cell_data_func (col, renderer,
+						   tm_cell_data_func_toggle,
+						   NULL, NULL);
+	  renderer = NULL;
+	  break;
+	case TM_COLUMN_ARTIST:
+	case TM_COLUMN_ALBUM:
+	case TM_COLUMN_GENRE:
+	case TM_COLUMN_COMPOSER:
+	case TM_COLUMN_COMMENT:
+	case TM_COLUMN_FILETYPE:
+	case TM_COLUMN_GROUPING:
+	case TM_COLUMN_BITRATE:
+	case TM_COLUMN_SAMPLERATE:
+	case TM_COLUMN_BPM:
+	case TM_COLUMN_CATEGORY:
+	case TM_COLUMN_DESCRIPTION:
+	case TM_COLUMN_PODCASTURL:
+	case TM_COLUMN_PODCASTRSS:
+	case TM_COLUMN_SUBTITLE:
+	case TM_COLUMN_PC_PATH:
+	case TM_COLUMN_IPOD_PATH:
+	case TM_COLUMN_THUMB_PATH:
+	case TM_COLUMN_SIZE:
+	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:
+	  break;
+	/* for some column names we want to use shorter alternatives to
+	 get_tm_string() */
+	case TM_COLUMN_RATING:
+	  text = _("Rtng");
+	  break;
+	case TM_COLUMN_TRACK_NR:
+	  text = _("#");
+	  break;
+	case TM_COLUMN_CD_NR:
+	  text = _("CD");
+	  break;
+	case TM_COLUMN_IPOD_ID:
+	  text = _("ID");
+	  break;
+	case TM_COLUMN_TRANSFERRED:
+	  text = _("Trnsfrd");
+	  renderer = gtk_cell_renderer_toggle_new ();
+	  break;
+	case TM_COLUMN_LYRICS:
+	  renderer = gtk_cell_renderer_toggle_new ();
+	  g_signal_connect (G_OBJECT (renderer), "toggled",
 			G_CALLBACK (tm_cell_toggled), model);
-      break;
-  case TM_COLUMN_TRACKLEN:
-      text = _("Time");
-      break;
-  case TM_COLUMN_PLAYCOUNT:
-      text = _("Plycnt");
-      break;
-  case TM_COLUMN_TIME_PLAYED:
-      text = _("Played");
-      break;
-  case TM_COLUMN_TIME_MODIFIED:
-      text = _("Modified");
-      break;
-  case TM_COLUMN_TIME_ADDED:
-      text = _("Added");
-      break;
-  case TM_COLUMN_TIME_RELEASED:
-      text = _("Released");
-      break;
-  case TM_COLUMN_YEAR:
-      text = _("Year");
-      break;
-  case TM_COLUMN_VOLUME:
-      text = _("Vol.");
-      break;
-  case TM_COLUMN_SOUNDCHECK:
-      text = _("Sndchk.");
-      break;
-  case TM_NUM_COLUMNS:
-      g_return_val_if_reached (NULL);
-      break;
-  }
+	  break;
+	case TM_COLUMN_COMPILATION:
+	  text = _("Cmpl");
+	  renderer = gtk_cell_renderer_toggle_new ();
+	  g_signal_connect (G_OBJECT (renderer), "toggled",
+			G_CALLBACK (tm_cell_toggled), model);
+	  break;
+	case TM_COLUMN_TRACKLEN:
+	  text = _("Time");
+	  break;
+	case TM_COLUMN_PLAYCOUNT:
+	  text = _("Plycnt");
+	  break;
+	case TM_COLUMN_TIME_PLAYED:
+	  text = _("Played");
+	  break;
+	case TM_COLUMN_TIME_MODIFIED:
+	  text = _("Modified");
+	  break;
+	case TM_COLUMN_TIME_ADDED:
+	  text = _("Added");
+	  break;
+	case TM_COLUMN_TIME_RELEASED:
+	  text = _("Released");
+	  break;
+	case TM_COLUMN_YEAR:
+	  text = _("Year");
+	  break;
+	case TM_COLUMN_VOLUME:
+	  text = _("Vol.");
+	  break;
+	case TM_COLUMN_SOUNDCHECK:
+	  text = _("Sndchk.");
+	  break;
+	case TM_NUM_COLUMNS:
+	  g_return_val_if_reached (NULL);
+	  break;
+	}
 
-  if (!renderer)
-  {   /* text renderer -- editable/not editable is done in
-	 tm_cell_data_func() */
-      renderer = gtk_cell_renderer_text_new ();
-      g_signal_connect (G_OBJECT (renderer), "edited",
-			G_CALLBACK (tm_cell_edited), model);
-  }
+	if (!renderer)
+	{
+		if (tm_item == TM_COLUMN_RATING)
+		{
+			renderer = rb_cell_renderer_rating_new ();
+			g_signal_connect (G_OBJECT (renderer), "rated",
+							  G_CALLBACK (tm_rating_edited), NULL);
+		}
+		else
+		{
+			/* text renderer -- editable/not editable is done in
+			   tm_cell_data_func() */
+			renderer = gtk_cell_renderer_text_new ();
+			g_signal_connect (G_OBJECT (renderer), "edited",
+							  G_CALLBACK (tm_cell_edited), model);
+		}
+	}
 
-  g_object_set_data (G_OBJECT (renderer), "column",
-		     (gint *)tm_item);
+	g_object_set_data (G_OBJECT (renderer), "column",
+			 (gint *)tm_item);
 
-  gtk_tree_view_column_set_title (col, text);
-  gtk_tree_view_column_pack_start (col, renderer, FALSE);
-  gtk_tree_view_column_set_cell_data_func (col, renderer,
+	gtk_tree_view_column_set_title (col, text);
+	gtk_tree_view_column_pack_start (col, renderer, FALSE);
+	gtk_tree_view_column_set_cell_data_func (col, renderer,
 					   tm_cell_data_func, NULL, NULL);
-  gtk_tree_view_column_set_sort_column_id (col, tm_item);
-  gtk_tree_view_column_set_resizable (col, TRUE);
-/*     gtk_tree_view_column_set_clickable(column, TRUE); */
-  gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
-  gtk_tree_view_column_set_fixed_width (col,
-					prefs_get_int_index("tm_col_width", tm_item));
-  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model), tm_item,
+	gtk_tree_view_column_set_sort_column_id (col, tm_item);
+	gtk_tree_view_column_set_resizable (col, TRUE);
+	gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED);
+	gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model), tm_item,
 				   tm_data_compare_func, NULL, NULL);
-  gtk_tree_view_column_set_reorderable (col, TRUE);
-  gtk_tree_view_insert_column (track_treeview, col, pos);
-  tm_columns[tm_item] = col;
-
-  if (pos != -1)
-  {
-      gtk_tree_view_column_set_visible (col,
+	gtk_tree_view_column_set_reorderable (col, TRUE);
+	
+	gtk_tree_view_insert_column (track_treeview, col, pos);
+	tm_columns[tm_item] = col;
+	
+	if (pos != -1)
+	{
+	  gtk_tree_view_column_set_visible (col,
 					prefs_get_int_index("col_visible", tm_item));
-  }
-  if (get_tm_tooltip (tm_item))
-      gtk_tooltips_set_tip (tt, col->button, 
-			    gettext (get_tm_tooltip (tm_item)),
-			    NULL);
-  return col;
+	}
+	if (get_tm_tooltip (tm_item))
+	  gtk_tooltips_set_tip (tt, col->button, 
+				gettext (get_tm_tooltip (tm_item)),
+				NULL);
+	return col;
 }
 
 
@@ -2164,11 +2396,12 @@
 {
     gint i;
 
-    for (i=0; i<TM_NUM_COLUMNS; ++i)
+    for (i = 0 ; i < TM_NUM_COLUMNS; ++i)
     {
-	tm_add_column (prefs_get_int_index("col_order", i), -1);
+        tm_add_column (prefs_get_int_index("col_order", i), -1);
     }
-    tm_show_preferred_columns();
+    
+    tm_show_preferred_columns ();
 }
 
 static void tm_select_current_position (gint x, gint y)
@@ -2229,7 +2462,7 @@
 	col_id = tm_lookup_col_id (column);
 	if (col_id != -1)  tm_set_search_column (col_id);
     }
-    info_update_track_view_selected ();
+    info_update_track_view ();
     
     /* update the coverart display */
     GList *selected = display_get_selection (prefs_get_int("sort_tab_num"));
@@ -2245,131 +2478,184 @@
 /* Create tracks treeview */
 void tm_create_treeview (void)
 {
-  GtkTreeModel *model = NULL;
-  GtkWidget *track_window = gtkpod_xml_get_widget (main_window_xml, "track_window");
-  GtkTreeSelection *select;
-  gint col;
-  GtkWidget *stv = gtk_tree_view_new ();
+    GtkTreeModel *model = NULL;
+    GtkWidget *track_window = gtkpod_xml_get_widget (main_window_xml, "track_window");
+    GtkTreeSelection *select;
+    gint col;
+    GtkWidget *stv = gtk_tree_view_new ();
 
-  /* create tree view */
-  if (track_treeview)
-  {   /* delete old tree view */
+    /* create tree view */
+    if (track_treeview)
+    {   /* delete old tree view */
       model = gtk_tree_view_get_model (track_treeview);
       /* FIXME: how to delete model? */
       gtk_widget_destroy (GTK_WIDGET (track_treeview));
-  }
-  track_treeview = GTK_TREE_VIEW (stv);
-  gtk_widget_show (stv);
-  gtk_container_add (GTK_CONTAINER (track_window), stv);
-  /* create model (we only need one column for the model -- only a
-   * pointer to the track has to be stored) */
-  model = GTK_TREE_MODEL (
+    }
+    track_treeview = GTK_TREE_VIEW (stv);
+    gtk_widget_show (stv);
+    gtk_container_add (GTK_CONTAINER (track_window), stv);
+    /* create model (we only need one column for the model -- only a
+    * pointer to the track has to be stored) */
+    model = GTK_TREE_MODEL (
       gtk_list_store_new (1, G_TYPE_POINTER));
-  gtk_tree_view_set_model (track_treeview, GTK_TREE_MODEL (model));
-  gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (track_treeview), TRUE);
-  gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (track_treeview), 
-				       tm_search_equal_func,
-				       NULL,
-				       NULL);
-  select = gtk_tree_view_get_selection (track_treeview);
-  gtk_tree_selection_set_mode (select,
-			       GTK_SELECTION_MULTIPLE);
-  g_signal_connect (G_OBJECT (select) , "changed",
-		    G_CALLBACK (tm_selection_changed_event),
-		    NULL);
-  tm_add_columns ();
+    gtk_tree_view_set_model (track_treeview, GTK_TREE_MODEL (model));
+    gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (track_treeview), TRUE);
+    gtk_tree_view_set_search_equal_func (GTK_TREE_VIEW (track_treeview), 
+                       tm_search_equal_func,
+                       NULL,
+                       NULL);
+    select = gtk_tree_view_get_selection (track_treeview);
+    gtk_tree_selection_set_mode (select,
+                   GTK_SELECTION_MULTIPLE);
+    g_signal_connect (G_OBJECT (select) , "changed",
+            G_CALLBACK (tm_selection_changed_event),
+            NULL);
 
-/*   gtk_drag_source_set (GTK_WIDGET (track_treeview), GDK_BUTTON1_MASK, */
-/* 		       tm_drag_types, TGNR (tm_drag_types), */
-/* 		       GDK_ACTION_COPY|GDK_ACTION_MOVE); */
-/*   gtk_tree_view_enable_model_drag_dest(track_treeview, tm_drop_types, */
-/* 				       TGNR (tm_drop_types), */
-/* 				       GDK_ACTION_COPY|GDK_ACTION_MOVE); */
-/*   /\* need the gtk_drag_dest_set() with no actions ("0") so that the */
-/*      data_received callback gets the correct info value. This is most */
-/*      likely a bug... *\/ */
-/*   gtk_drag_dest_set_target_list (GTK_WIDGET (track_treeview), */
-/* 				 gtk_target_list_new (tm_drop_types, */
-/* 						      TGNR (tm_drop_types))); */
+    tm_add_columns ();
 
+    /*   gtk_drag_source_set (GTK_WIDGET (track_treeview), GDK_BUTTON1_MASK, */
+    /* 		       tm_drag_types, TGNR (tm_drag_types), */
+    /* 		       GDK_ACTION_COPY|GDK_ACTION_MOVE); */
+    /*   gtk_tree_view_enable_model_drag_dest(track_treeview, tm_drop_types, */
+    /* 				       TGNR (tm_drop_types), */
+    /* 				       GDK_ACTION_COPY|GDK_ACTION_MOVE); */
+    /*   /\* need the gtk_drag_dest_set() with no actions ("0") so that the */
+    /*      data_received callback gets the correct info value. This is most */
+    /*      likely a bug... *\/ */
+    /*   gtk_drag_dest_set_target_list (GTK_WIDGET (track_treeview), */
+    /* 				 gtk_target_list_new (tm_drop_types, */
+    /* 						      TGNR (tm_drop_types))); */
 
-  gtk_drag_source_set (GTK_WIDGET (track_treeview),
-		       GDK_BUTTON1_MASK,
-		       tm_drag_types, TGNR (tm_drag_types),
-		       GDK_ACTION_COPY|GDK_ACTION_MOVE);
-  gtk_drag_dest_set (GTK_WIDGET (track_treeview),
-		     0,
-		     tm_drop_types, TGNR (tm_drop_types),
-		     GDK_ACTION_COPY|GDK_ACTION_MOVE);
 
+    gtk_drag_source_set (GTK_WIDGET (track_treeview),
+               GDK_BUTTON1_MASK,
+               tm_drag_types, TGNR (tm_drag_types),
+               GDK_ACTION_COPY|GDK_ACTION_MOVE);
+    gtk_drag_dest_set (GTK_WIDGET (track_treeview),
+             0,
+             tm_drop_types, TGNR (tm_drop_types),
+             GDK_ACTION_COPY|GDK_ACTION_MOVE);
 
-  g_signal_connect ((gpointer) track_treeview, "drag-begin",
-		    G_CALLBACK (tm_drag_begin),
-		    NULL);
 
-  g_signal_connect ((gpointer) track_treeview, "drag-data-delete",
-		    G_CALLBACK (tm_drag_data_delete),
-		    NULL);
+    g_signal_connect ((gpointer) track_treeview, "drag-begin",
+            G_CALLBACK (tm_drag_begin),
+            NULL);
 
-  g_signal_connect ((gpointer) track_treeview, "drag-data-get",
-		    G_CALLBACK (tm_drag_data_get),
-		    NULL);
+    g_signal_connect ((gpointer) track_treeview, "drag-data-delete",
+            G_CALLBACK (tm_drag_data_delete),
+            NULL);
 
-  g_signal_connect ((gpointer) track_treeview, "drag-data-received",
-		    G_CALLBACK (tm_drag_data_received),
-		    NULL);
+    g_signal_connect ((gpointer) track_treeview, "drag-data-get",
+            G_CALLBACK (tm_drag_data_get),
+            NULL);
 
-  g_signal_connect ((gpointer) track_treeview, "drag-drop",
-		    G_CALLBACK (tm_drag_drop),
-		    NULL);
+    g_signal_connect ((gpointer) track_treeview, "drag-data-received",
+            G_CALLBACK (tm_drag_data_received),
+            NULL);
 
-  g_signal_connect ((gpointer) track_treeview, "drag-end",
-		    G_CALLBACK (tm_drag_end),
-		    NULL);
+    g_signal_connect ((gpointer) track_treeview, "drag-drop",
+            G_CALLBACK (tm_drag_drop),
+            NULL);
 
-  g_signal_connect ((gpointer) track_treeview, "drag-leave",
-		    G_CALLBACK (tm_drag_leave),
-		    NULL);
+    g_signal_connect ((gpointer) track_treeview, "drag-end",
+            G_CALLBACK (tm_drag_end),
+            NULL);
 
-  g_signal_connect ((gpointer) track_treeview, "drag-motion",
-		    G_CALLBACK (tm_drag_motion),
-		    NULL);
+    g_signal_connect ((gpointer) track_treeview, "drag-leave",
+            G_CALLBACK (tm_drag_leave),
+            NULL);
 
-  g_signal_connect_after ((gpointer) stv, "key_release_event",
-			  G_CALLBACK (on_track_treeview_key_release_event),
-			  NULL);
-  g_signal_connect ((gpointer) track_treeview, "button-press-event",
-		    G_CALLBACK (tm_button_press_event),
-		    NULL);
-  g_signal_connect (G_OBJECT (model), "sort-column-changed",
-		    G_CALLBACK (tm_sort_column_changed),
-		    (gpointer)0);
+    g_signal_connect ((gpointer) track_treeview, "drag-motion",
+            G_CALLBACK (tm_drag_motion),
+            NULL);
 
-  /* set correct column for typeahead */
-  if (prefs_get_int_value (TM_PREFS_SEARCH_COLUMN, &col))
-  {
+    g_signal_connect_after ((gpointer) stv, "key_release_event",
+              G_CALLBACK (on_track_treeview_key_release_event),
+              NULL);
+    g_signal_connect ((gpointer) track_treeview, "button-press-event",
+            G_CALLBACK (tm_button_press_event),
+            NULL);
+    g_signal_connect (G_OBJECT (model), "sort-column-changed",
+            G_CALLBACK (tm_sort_column_changed),
+            (gpointer)0);
+
+    /* set correct column for typeahead */
+    if (prefs_get_int_value (TM_PREFS_SEARCH_COLUMN, &col))
+    {
       tm_set_search_column (col);
-  }
-  else
-  {   /* reasonable default */
+    }
+    else
+    {   /* reasonable default */
       tm_set_search_column (TM_COLUMN_TITLE);
-  }
+    }
 }
 
 
 void
-tm_show_preferred_columns(void)
+tm_show_preferred_columns (void)
 {
-    GtkTreeViewColumn *tvc = NULL;
-    gboolean visible;
     gint i;
+    gboolean horizontal_scrollbar = prefs_get_int ("horizontal_scrollbar");
+    GtkScrolledWindow *scroller = GTK_SCROLLED_WINDOW (gtkpod_xml_get_widget (main_window_xml,
+                                                                              "track_window"));
+    
+    if (horizontal_scrollbar)
+        gtk_scrolled_window_set_policy (scroller, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+    else
+        gtk_scrolled_window_set_policy (scroller, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
-    for (i=0; i<TM_NUM_COLUMNS; ++i)
+    for (i = 0; i < TM_NUM_COLUMNS; ++i)
     {
-	tvc = gtk_tree_view_get_column (track_treeview, i);
-	visible = prefs_get_int_index("col_visible", 
-      prefs_get_int_index("col_order", i));
-	gtk_tree_view_column_set_visible (tvc, visible);
+	TM_item tm_item = prefs_get_int_index ("col_order", i);
+	GtkTreeViewColumn *tvc = gtk_tree_view_get_column (track_treeview, i);
+	gboolean visible = prefs_get_int_index ("col_visible", tm_item);
+	gint col_width;
+
+        gtk_tree_view_column_set_visible (tvc, visible);
+
+	col_width = prefs_get_int_index ("tm_col_width", tm_item);
+
+	if (col_width == 0)
+	    col_width = 80;
+
+        if (horizontal_scrollbar)
+        {
+	    gtk_tree_view_column_set_fixed_width (tvc, col_width);
+            gtk_tree_view_column_set_min_width (tvc, -1);
+            gtk_tree_view_column_set_expand (tvc, FALSE);
+        }
+        else
+        {
+            switch (tm_item)
+            {
+            case TM_COLUMN_TITLE:
+            case TM_COLUMN_ARTIST:
+            case TM_COLUMN_ALBUM:
+            case TM_COLUMN_GENRE:
+            case TM_COLUMN_COMPOSER:
+            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_PC_PATH:
+            case TM_COLUMN_IPOD_PATH:
+            case TM_COLUMN_THUMB_PATH:
+            case TM_COLUMN_TV_SHOW:
+            case TM_COLUMN_TV_EPISODE:
+            case TM_COLUMN_TV_NETWORK:
+            case TM_COLUMN_ALBUMARTIST:
+                gtk_tree_view_column_set_min_width (tvc, 0);
+                gtk_tree_view_column_set_expand (tvc, TRUE);
+                break;
+            default:
+                gtk_tree_view_column_set_min_width (tvc, 80);
+                gtk_tree_view_column_set_fixed_width (tvc, col_width);
+                gtk_tree_view_column_set_expand (tvc, FALSE);
+                break;
+            }
+        }
     }
 }
 
@@ -2379,23 +2665,23 @@
    column widths of track model */
 void tm_update_default_sizes (void)
 {
-    gint i;
+    TM_item tm_item;
     GtkTreeViewColumn *col;
     gint col_width;
 
     /* column widths */
-    for (i=0; i<TM_NUM_COLUMNS; ++i)
+    for (tm_item=0; tm_item<TM_NUM_COLUMNS; ++tm_item)
     {
-	col = tm_columns [i];
+	col = tm_columns [tm_item];
 	if (col)
 	{
-    col_width = gtk_tree_view_column_get_width (col);
+	    col_width = gtk_tree_view_column_get_width (col);
     
-    if (col_width > 0)
-	    prefs_set_int_index ("tm_col_width", i, col_width);
-    else
-      prefs_set_int_index ("tm_col_width", i, 80);
-   
+	    if (col_width > 0)
+	    {   /* columns not displayed seem to be 0 pixels wide --
+		   only change the visible columns */
+		prefs_set_int_index ("tm_col_width", tm_item, col_width);
+	    }
 	}
     }
 }
@@ -2445,6 +2731,12 @@
 	    {
 		/* Re-enable sorting */
 		GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
+
+		if (GTK_IS_TREE_MODEL_FILTER (model))
+		{
+		    model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(model));
+		}
+
 		if (BROKEN_GTK_TREE_SORT)
 		{
 		    gtk_tree_sortable_set_sort_func (
@@ -2470,6 +2762,12 @@
 	    {
 		/* Disable sorting */
 		GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
+
+		if (GTK_IS_TREE_MODEL_FILTER (model))
+		{
+		    model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(model));
+		}
+
 		if (BROKEN_GTK_TREE_SORT)
 		{
 		    gtk_tree_sortable_set_sort_func (
@@ -2512,11 +2810,11 @@
     case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE:
     case GTK_TREE_VIEW_DROP_INTO_OR_AFTER:
     case GTK_TREE_VIEW_DROP_AFTER:
-	gtk_list_store_insert_after (GTK_LIST_STORE (model),
+	gtk_list_store_insert_after (get_model_as_store (model),
 				     &new_iter, asf->to_iter);
 	break;
     case GTK_TREE_VIEW_DROP_BEFORE:
-	gtk_list_store_insert_before (GTK_LIST_STORE (model),
+	gtk_list_store_insert_before (get_model_as_store (model),
 				      &new_iter, asf->to_iter);
 	break;
     }
@@ -2579,15 +2877,19 @@
     /* initialize add-track-struct */
     if (path)
     {   /* add where specified (@path/@pos) */
-	GtkTreeIter to_iter;
-	struct asf_data asf;
-	if (!gtk_tree_model_get_iter (model, &to_iter, path))
-	    g_return_val_if_reached (FALSE);
-	asf.to_iter = &to_iter;
-	asf.pos = pos;
-	add_text_plain_to_playlist (current_playlist->itdb,
-				    current_playlist, use_data, 0,
-				    tm_addtrackfunc, &asf);
+        GtkTreeIter to_iter;
+        GtkTreeIter temp;
+            
+        struct asf_data asf;
+        if (!gtk_tree_model_get_iter (model, &to_iter, path))
+            g_return_val_if_reached (FALSE);
+            
+        convert_iter (model, &to_iter, &temp);
+        asf.to_iter = &temp;
+        asf.pos = pos;
+        add_text_plain_to_playlist (current_playlist->itdb,
+                        current_playlist, use_data, 0,
+                        tm_addtrackfunc, &asf);
     }
     else
     {   /* add to the end */
@@ -2595,6 +2897,8 @@
 				    current_playlist, use_data, 0,
 				    NULL, NULL);
     }
+    
+/*    update_model_view (model); -- not needed */
     tm_rows_reordered ();
     C_FREE (buf);
     return TRUE;

Modified: gtkpod/branches/upstream/current/src/fetchcover.c
===================================================================
--- gtkpod/branches/upstream/current/src/fetchcover.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/fetchcover.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 	| 
 	|  This product is not supported/written/published by Apple!
 	|
-	|  $Id: fetchcover.c 1822 2007-12-12 16:31:26Z dforsi $
+	|  $Id: fetchcover.c 2024 2008-06-29 13:01:17Z jcsjcs $
 	*/
 	
 #ifdef HAVE_CONFIG_H
@@ -350,54 +350,41 @@
 		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);
+				"Do you want to overwrite the existing file, possibly associating\n" \
+				"other music files in the same directory with this cover art file,\n" \
+				"to save the file with a unique file name, or to 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));
+		result = gtkpod_confirmation_hig (fetch_cover->parent_window,
+									      GTK_MESSAGE_WARNING,
+									      _("Cover art file already exists"),
+									      message,
+									      _("Overwrite"),
+									      _("Rename"),
+									      _("Abort"),
+									      NULL);
 		g_free (message);
 				
 		switch (result)
 		{
-			case GTK_RESPONSE_REJECT:
-				/* Cancel has been clicked so no save */
-				gtk_widget_destroy (dialog);
+			case GTK_RESPONSE_APPLY:
+				/* Abort has been clicked so no save */
 				return NULL;
-			case GTK_RESPONSE_YES:
-				/*** Yes clicked so overwrite the file is okay. Leave final_filename intact
+			case GTK_RESPONSE_OK:
+				/*** Overwrite 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:
+			case GTK_RESPONSE_CANCEL:
 				/* 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);
@@ -408,11 +395,12 @@
 				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);
+					gchar *intext= NULL;
+					intext = g_strdup_printf ("%d.jpg", i);
 					newfilename = g_strconcat (basename, intext, NULL);
 					
 					g_free (filepath);
+					g_free (intext);
 					
 					filepath = g_build_filename(fetch_cover->dir, newfilename, NULL);
 				}
@@ -424,11 +412,9 @@
 				newfilename = NULL;
 				basename = NULL;
 				g_strfreev(splitarr);
-				gtk_widget_destroy (dialog);
 				
 				return filepath;
 			default:
-				gtk_widget_destroy (dialog);
 				return NULL;
 		}	
 	}
@@ -449,7 +435,7 @@
 		g_string_free (fcover->url, TRUE);
 		
 	if (fcover->image)
-		gdk_pixbuf_unref (fcover->image);
+		g_object_unref (fcover->image);
 			
 	if (fcover->dir)
 		g_free (fcover->dir);

Modified: gtkpod/branches/upstream/current/src/fetchcover.h
===================================================================
--- gtkpod/branches/upstream/current/src/fetchcover.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/fetchcover.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: fetchcover.h 1755 2007-11-05 01:16:19Z phantom_sf $
+|  $Id: fetchcover.h 1884 2007-12-30 22:31:07Z phantom_sf $
 */
 
 #ifndef __FETCHCOVER_H__
@@ -31,7 +31,6 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
-#include <libgnomecanvas/libgnomecanvas.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include "display.h"

Modified: gtkpod/branches/upstream/current/src/file.c
===================================================================
--- gtkpod/branches/upstream/current/src/file.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/file.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: file.c 1824 2007-12-13 10:51:04Z dforsi $
+|  $Id: file.c 2185 2008-12-31 22:30:36Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -37,6 +37,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <glib.h>
+#include <glib/gstdio.h>
 
 
 #include "charset.h"
@@ -823,10 +825,10 @@
 	case T_SORT_TVSHOW:
 	case T_YEAR:
 	case T_TRACK_NR:
-	case T_SIZE:
 	case T_TRACKLEN:
 	case T_STARTTIME:
 	case T_STOPTIME:
+	case T_SIZE:
 	case T_BITRATE:
 	case T_SAMPLERATE:
 	case T_BPM:
@@ -840,6 +842,7 @@
 	case T_SEASON_NR:
 	case T_EPISODE_NR:
 	case T_GROUPING:
+	case T_LYRICS:
 	    changed |= track_copy_item (from, to, item);
 	    break;
 	case T_CATEGORY:
@@ -871,6 +874,13 @@
 	changed = TRUE;
     }
 
+    if (from->chapterdata)
+    {
+	itdb_chapterdata_free (to->chapterdata);
+	to->chapterdata = itdb_chapterdata_duplicate (from->chapterdata);
+	changed = TRUE; /* FIXME: probably should actually compare chapters for changes */
+    }
+
     itdb_artwork_free (to->artwork);
     to->artwork = itdb_artwork_duplicate (from->artwork);
     if ((to->artwork_size != from->artwork_size) ||
@@ -905,6 +915,12 @@
 	to->gapless_track_flag = from->gapless_track_flag;
     }
 
+    if (eto->mtime != efrom->mtime)
+    {
+	changed = TRUE;
+	eto->mtime = efrom->mtime;
+    }
+
     return changed;
 }
 
@@ -1010,8 +1026,127 @@
     return success;
 }
 
+/* ensure that a cache directory is available for video thumbnail generation.
+ * largely copied from conversion_setup_cachedir, only slightly simplified
+ * and modified to return the path to the caller for convenience.
+ */
+static gchar* video_thumbnail_setup_cache() 
+{
+	gchar *cachedir = NULL;
+	gchar *cfgdir = prefs_get_cfgdir();
 
+	if (!cfgdir)
+        return NULL;
+    
+    cachedir = g_build_filename (cfgdir, "video_thumbnail_cache", NULL);
+    g_free (cfgdir);
 
+    if (!g_file_test (cachedir, G_FILE_TEST_IS_DIR) && (g_mkdir (cachedir, 0777) == -1))
+    {
+        gtkpod_warning (_("Could not create '%s'"), cachedir);
+	g_free (cachedir);
+	cachedir = NULL;
+    }
+
+    return cachedir;
+}
+
+/*
+ * automatically generate a thumbnail for video input files using
+ * an external program (the totem thumbnailer by default).
+ * @input is the path of the video file to be thumbnailed.
+ * Returns a path to a temporary file containing the thumbnail.  The
+ * temporary file is stored in a dedicated cache directory.
+ */
+static gchar* create_video_thumbnail (gchar* input)
+{
+	GString *cmd = NULL;
+	GError *err = NULL;
+	int fd, retval, forkstatus;
+	gchar *thumbnailer = NULL, *tmp_fn = NULL, *tmp = NULL, *p = NULL;
+	/* find (and set up if necessary) the thumbnail cache dir */
+    gchar *tdir = video_thumbnail_setup_cache();
+
+	if (!tdir)
+	{
+		return NULL;
+	}
+    
+	/* safely generate a temporary file.  we don't actually need the fd
+	 * so we close it on succesful generation */
+	tmp_fn = g_build_filename (tdir, "thumb.XXXXXX", NULL);
+	g_free(tdir);
+	tdir = NULL;
+
+	if ((fd = g_mkstemp(tmp_fn)) == -1 || close(fd))
+	{
+		gtkpod_warning (_("Error creating thumbnail file"));
+		g_free (tmp_fn);
+		return NULL;
+	}
+    
+	/* get the string containing the (template) command for thumbnailing */
+	thumbnailer = prefs_get_string("video_thumbnailer_prog");
+	/* copy it into cmd, expanding any format characters */
+	cmd = g_string_new("");
+	p = thumbnailer;
+    
+	while (*p)
+    {
+		if (*p == '%') 
+		{
+			++p;
+            
+			switch (*p)
+            {
+			/* %f: input file */
+			case 'f':
+				tmp = g_shell_quote(input);
+				break;
+			/* %o: temporary output file */
+			case 'o':
+				tmp = g_shell_quote(tmp_fn);
+				break;
+			case '%':
+				cmd = g_string_append_c (cmd, '%');
+				break;
+			default:
+				gtkpod_warning (_("Unknown token '%%%c' in template '%s'"),
+			                    *p, thumbnailer);
+				break;
+			}
+            
+			if (tmp)
+			{
+				cmd = g_string_append (cmd, tmp);
+				g_free (tmp);
+				tmp = NULL;
+			}
+		}
+		else
+		{
+			cmd = g_string_append_c (cmd, *p);
+		}
+        
+		++p;
+	}
+	/* run the thumbnailing program */
+	forkstatus = g_spawn_command_line_sync(cmd->str, NULL, NULL, &retval, &err);
+    
+	if(!forkstatus)
+	{
+		gtkpod_warning (_("Unable to start video thumbnail generator\n(command line was: '%s')"), cmd->str);
+	} 
+	else if(retval)
+	{
+		gtkpod_warning (_("Thumbnail generator returned status %d"), retval);
+	}
+    
+	g_string_free(cmd, TRUE);
+	/* thumbnail is in tmp_fn */
+	return tmp_fn;
+}
+
 /* look for a picture specified by coverart_template  */
 static void add_coverart (Track *tr)
 {
@@ -1020,14 +1155,18 @@
     gchar **templates, **tplp;
     gchar *dirname;
     gchar *filename_local = NULL;
+    FileType type;
+    gint vid_thumbnailer;
 
     g_return_if_fail (tr);
     etr = tr->userdata;
     g_return_if_fail (etr);
 
     dirname = g_path_get_dirname (etr->pc_path_utf8);
+    type = determine_file_type(etr->pc_path_utf8);
 
     full_template = prefs_get_string("coverart_template");
+    vid_thumbnailer = prefs_get_int("video_thumbnailer");
 
     templates = g_strsplit (full_template, ";", 0);
     tplp = templates;
@@ -1039,7 +1178,10 @@
 	{
 	    if (strchr (*tplp, '.') != NULL)
 	    {   /* if template has an extension, try if it is valid */
-		filename_utf8 = g_build_filename (dirname, fname, NULL);
+		if (fname[0] == '/')  /* allow absolute paths in template */
+		    filename_utf8 = g_build_filename ("", fname, NULL);
+		else
+		    filename_utf8 = g_build_filename (dirname, fname, NULL);
 		filename_local = charset_from_utf8 (filename_utf8);
 		g_free (filename_utf8);
 		if (!g_file_test (filename_local, G_FILE_TEST_EXISTS))
@@ -1054,7 +1196,11 @@
 		while (*extp && !filename_local)
 		{
 		    gchar *ffname = g_strconcat (fname, *extp, NULL);
-		    filename_utf8 = g_build_filename (dirname, ffname, NULL);
+		    if (ffname[0] == '/')  /* allow absolute paths in template */
+			filename_utf8 = g_build_filename ("", ffname, NULL);
+		    else
+			filename_utf8 = g_build_filename (dirname, ffname,
+			    NULL);
 		    g_free (ffname);
 		    filename_local = charset_from_utf8 (filename_utf8);
 		    g_free (filename_utf8);
@@ -1071,7 +1217,11 @@
 		    gchar *upper_ext = g_ascii_strup (*extp, -1);
 		    gchar *ffname = g_strconcat (fname, upper_ext, NULL);
 		    g_free (upper_ext);
-		    filename_utf8 = g_build_filename (dirname, ffname, NULL);
+		    if (ffname[0] == '/')  /* allow absolute paths in template */
+			filename_utf8 = g_build_filename ("", ffname, NULL);
+		    else
+			filename_utf8 = g_build_filename (dirname, ffname,
+			    NULL);
 		    g_free (ffname);
 		    filename_local = charset_from_utf8 (filename_utf8);
 		    g_free (filename_utf8);
@@ -1092,9 +1242,27 @@
     {
 	gp_track_set_thumbnails (tr, filename_local);
     }
+    else if(vid_thumbnailer)
+    {
+        /* if a template match was not made, and we're dealing with a video 
+         * file, generate an arbitrary thumbnail if appropriate */
+        switch(type)
+        {
+            case FILE_TYPE_M4V:
+            case FILE_TYPE_MP4:
+            case FILE_TYPE_MOV:
+            case FILE_TYPE_MPG:
+                filename_local = create_video_thumbnail (etr->pc_path_utf8);
+                gp_track_set_thumbnails (tr, filename_local);
+                break;
+            default:
+                break;
+        }
+    }
 
     g_strfreev (templates);
-    g_free(full_template);
+    g_free (full_template);
+    g_free (dirname);
 }
 
 
@@ -1233,6 +1401,7 @@
 	/* set path file information */
 	enti->pc_path_utf8 = charset_to_utf8 (name);
 	enti->pc_path_locale = g_strdup (name);
+	enti->lyrics=NULL;
 	/* set length of file */
 	stat (name, &filestat);
 	nti->size = filestat.st_size; /* get the filesize in bytes */
@@ -1249,7 +1418,7 @@
 	if (prefs_get_int("coverart_file"))
 	{
 	    /* APIC data takes precedence */
-	    if (!nti->artwork || !nti->artwork->thumbnails)
+	    if (! itdb_track_has_thumbnails (nti))
 		add_coverart (nti);
 	}
 
@@ -1653,7 +1822,6 @@
 
     trackpath = get_file_name_from_source (track, SOURCE_PREFER_LOCAL);
 
-    
     if (!(oetr->pc_path_locale && *oetr->pc_path_locale))
     { /* no path available */
 	if (trackpath)
@@ -2410,3 +2578,168 @@
     return result;
 }
 
+/* Get lyrics from file */
+gboolean read_lyrics_from_file (Track *track, gchar **lyrics)
+{
+    gchar *path;
+    gchar *buf;
+    gboolean result = FALSE;
+    ExtraTrackData *etr;
+
+    g_return_val_if_fail (track, FALSE);
+    etr = track->userdata;
+    g_return_val_if_fail (etr,FALSE);
+    path = get_file_name_from_source (track, SOURCE_PREFER_IPOD);
+    if (path)
+    {
+        switch (determine_file_type (path))
+        {
+        case FILE_TYPE_MP3:
+            result = id3_lyrics_read (path, lyrics);
+            break;
+        case FILE_TYPE_M4A:
+        case FILE_TYPE_M4P:
+        case FILE_TYPE_M4B:
+        case FILE_TYPE_M4V:
+        case FILE_TYPE_MP4:
+            result = TRUE;
+            *lyrics=g_strdup(
+                "File format unsupported now.");
+            break;
+        case FILE_TYPE_MOV:
+        case FILE_TYPE_MPG:
+        case FILE_TYPE_WAV: /* FIXME */
+        case FILE_TYPE_OGG: /* FIXME */
+        case FILE_TYPE_FLAC: /* FIXME */
+        case FILE_TYPE_UNKNOWN:
+            result = TRUE;
+            *lyrics=g_strdup(
+                "Lyrics not supported for this file format.");
+            break;
+        case FILE_TYPE_M3U:
+        case FILE_TYPE_PLS:
+        case FILE_TYPE_IMAGE:
+        case FILE_TYPE_DIRECTORY:
+            break;
+        }
+        g_free (path);
+    }
+    else
+    {
+        buf = get_track_info (track, FALSE);
+        gtkpod_warning (
+            _("Lyrics not found, file not available (%s).\n\n"),
+            buf);
+        g_free (buf);
+    }
+    if (result)
+    {
+	if (!*lyrics) *lyrics=g_strdup("");
+	if (etr->lyrics) g_free(etr->lyrics);
+	etr->lyrics=g_strdup(*lyrics);
+    }
+    return result;
+}
+
+/* Write lyrics to file */
+gboolean write_lyrics_to_file (Track *track)
+{
+    gchar *path=NULL;
+    gchar *buf;
+    Track *oldtrack;
+    gboolean result = FALSE;
+    gboolean warned = FALSE;
+    ExtraTrackData *etr;
+    iTunesDB *itdb;
+
+    g_return_val_if_fail (track, FALSE);
+    etr = track->userdata;
+    g_return_val_if_fail (etr,FALSE);
+    itdb = track->itdb;
+    g_return_val_if_fail (itdb, FALSE);
+    path = get_file_name_from_source (track, SOURCE_IPOD);
+    if (!path)
+    {
+	if (prefs_get_int("id3_write"))
+	{
+	    path = get_file_name_from_source (track, SOURCE_LOCAL);
+	}
+	else
+	{
+	    buf = get_track_info (track, FALSE);
+	    gtkpod_warning (
+			_("iPod File not available and ID3 saving disabled in options, cannot save lyrics to: %s.\n\n"),
+			buf);
+	    g_free (buf);
+	    warned=TRUE;
+	}
+    }
+    if (path!=NULL)
+    {
+        switch (determine_file_type (path))
+        {
+        case FILE_TYPE_MP3:
+            result = id3_lyrics_save (path, etr->lyrics);
+            break;
+        case FILE_TYPE_M4A:
+        case FILE_TYPE_M4P:
+        case FILE_TYPE_M4B:
+        case FILE_TYPE_M4V:
+        case FILE_TYPE_MP4:
+            result = TRUE;
+            break;
+        case FILE_TYPE_MOV:
+        case FILE_TYPE_MPG:
+        case FILE_TYPE_WAV: /* FIXME */
+        case FILE_TYPE_OGG: /* FIXME */
+        case FILE_TYPE_FLAC: /* FIXME */
+        case FILE_TYPE_UNKNOWN:
+            result = TRUE;
+            break;
+        case FILE_TYPE_M3U:
+        case FILE_TYPE_PLS:
+        case FILE_TYPE_IMAGE:
+        case FILE_TYPE_DIRECTORY:
+            break;
+        }
+        g_free (path);
+    }
+    else
+    {
+	if (!warned) {
+	    buf = get_track_info (track, FALSE);
+	    gtkpod_warning (
+		_("Lyrics not written, file name not available (%s).\n\n"),
+		buf);
+	    g_free (buf);
+	}
+    }
+
+    if (!result || !etr->lyrics || (strlen(etr->lyrics)==0))
+    {
+	track->lyrics_flag=0x00;
+    }
+    else
+    {
+	track->lyrics_flag=0x01;
+    }
+    if (!etr->lyrics)
+    {
+	etr->lyrics = g_strdup ("");
+    }
+
+    if (result)
+    {
+	/* remove track from sha1 hash and reinsert it (hash value has changed!) */
+	sha1_track_remove (track);
+	C_FREE (etr->sha1_hash);  /* need to remove the old value manually! */
+	oldtrack = sha1_track_exists_insert (itdb, track);
+	if (oldtrack)
+	{ /* track exists, remove the old track and register the new version */
+	    sha1_track_remove (oldtrack);
+	    gp_duplicate_remove (track, oldtrack);
+	    sha1_track_exists_insert (itdb, track);
+	}
+    }
+    return result;
+}

Modified: gtkpod/branches/upstream/current/src/file.h
===================================================================
--- gtkpod/branches/upstream/current/src/file.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/file.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-05-06 20:20:31 jcs>
+/* Time-stamp: <2008-11-08 18:11:02 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: file.h 1065 2007-05-06 14:16:17Z jcsjcs $
+|  $Id: file.h 2149 2008-11-08 09:38:35Z jcsjcs $
 */
 
 #ifndef __FILE_H__
@@ -124,6 +124,8 @@
 GList *export_trackglist_when_necessary (iTunesDB *itdb_s,
 					 iTunesDB *itdb_d,
 					 GList *tracks);
+gboolean read_lyrics_from_file (Track *track, gchar **lyrics);
+gboolean write_lyrics_to_file (Track *track);
 /* needed to adapt the prefs structure */
 extern const gchar *EXPORT_FILES_SPECIAL_CHARSET;
 extern const gchar *EXPORT_FILES_CHECK_EXISTING;

Modified: gtkpod/branches/upstream/current/src/file_convert.c
===================================================================
--- gtkpod/branches/upstream/current/src/file_convert.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/file_convert.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -25,7 +25,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: file_convert.c 1813 2007-12-11 12:34:20Z jcsjcs $
+|  $Id: file_convert.c 2218 2009-01-17 10:54:46Z jcsjcs $
 */
 
 
@@ -38,6 +38,7 @@
 #include "info.h"
 #include "misc.h"
 #include "misc_track.h"
+#include "mp3file.h"
 #include "prefs.h"
 #include <errno.h>
 #include <glib/gstdio.h>
@@ -160,6 +161,16 @@
 static void transfer_reset (Conversion *conv, iTunesDB *itdb);
 static void transfer_reschedule (Conversion *conv, iTunesDB *itdb);
 
+struct GaplessData
+{
+    guint32 pregap;       /* number of pregap samples */
+    guint64 samplecount;  /* number of actual music samples */
+    guint32 postgap;      /* number of postgap samples */
+    guint32 gapless_data; /* number of bytes from the first sync frame
+			   * to the 8th to last frame */
+    guint16 gapless_track_flag;
+};
+
 struct _Conversion
 {
     GMutex *mutex;          /* shared lock                              */
@@ -216,7 +227,7 @@
     gchar *fname_root;      /* filename root of converted file          */
     gchar *fname_extension; /* filename extension of converted file     */
     GPid  pid;              /* PID of child doing the conversion        */
-    gint  stderr;           /* stderr of child doing the conversion     */
+    gint  child_stderr;     /* stderr of child doing the conversion     */
     Track *track;           /* for reference, don't access inside threads! */
     iTunesDB *itdb;         /* for reference, don't access inside threads! */
     gint  threadnum;        /* number of thread working on this track   */
@@ -230,6 +241,7 @@
     gchar *genre;
     gchar *year;
     gchar *comment;
+    struct GaplessData gapless;   /* only used for MP3 */
     /* needed for transfering */
     gchar *dest_filename;
     gchar *mountpoint;
@@ -294,7 +306,7 @@
     conversion->dirsize = CONV_DIRSIZE_INVALID;
 
     /* setup log window */
-    log_xml = glade_xml_new (xml_file, "conversion_log", NULL);
+    log_xml = gtkpod_xml_new (xml_file, "conversion_log");
     conversion->log_window = gtkpod_xml_get_widget (log_xml, "conversion_log");
     gtk_window_set_default_size (GTK_WINDOW (conversion->log_window),
 				 prefs_get_int (FILE_CONVERT_LOG_SIZE_X),
@@ -490,7 +502,7 @@
     GtkWidget *mi;
     /* show display log if it was previously hidden and should be
        shown again */
-    mi = gtkpod_xml_get_widget (main_window_xml, "conversion_log");
+    mi = gtkpod_xml_get_widget (main_window_xml, "view_conversion_log");
     if (prefs_get_int (FILE_CONVERT_DISPLAY_LOG))
     {
 	if (conv->log_window_hidden && !conv->log_window_shown)
@@ -554,19 +566,28 @@
     glthread = conv->threads;
     for (glpage=conv->pages; glpage; glpage=glpage->next)
     {
+	GtkNotebook *notebook = GTK_NOTEBOOK (conv->notebook);
 	GtkWidget *child = glpage->data;
+	const gchar *current_label;
 	g_return_if_fail (child);
 
+	current_label = gtk_notebook_get_tab_label_text (notebook, child);
+
 	/* in the beginning we may have more pages than thread entries */
 	if (glthread && glthread->data)
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("active"));
+	    if (!current_label || strcmp (current_label, _("active")) != 0)
+	    {   /* only change the label if it has changed --
+		   otherwise our tooltips will be switched off */
+		gtk_notebook_set_tab_label_text (notebook, child, _("active"));
+	    }
 	}
 	else
 	{
-	    gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (conv->notebook),
-					     child, _("inactive"));
+	    if (!current_label || strcmp (current_label, _("inactive")) != 0)
+	    {
+		gtk_notebook_set_tab_label_text (notebook, child, _("inactive"));
+	    }
 	}
 
 	if (glthread)
@@ -1034,19 +1055,26 @@
     ConvTrack *ctr;
     gchar *conversion_cmd = NULL;
     const gchar *typestr = NULL;
-    gboolean convert=FALSE, must_convert = FALSE;
+    gboolean convert = FALSE, must_convert = FALSE;
     gboolean result = TRUE;
 
+    debug ("entering conversion_add_track\n");
+
     g_return_val_if_fail (conv, FALSE);
     g_return_val_if_fail (track, FALSE);
     g_return_val_if_fail (track->itdb, FALSE);
     etr = track->userdata;
     g_return_val_if_fail (etr, FALSE);
 
-    if ((track->itdb->usertype & GP_ITDB_TYPE_LOCAL) ||
-	(track->transferred))
-    {   /* no conversion or transfer needed */
-	return TRUE;
+    debug ("considering '%s' to conversion/transfer list\n", etr->pc_path_locale);
+
+    if ((track->itdb->usertype & GP_ITDB_TYPE_LOCAL) || (track->transferred))
+    {
+      debug ("adding aborted: lcl:%d, trsfrd:%d\n",
+	     track->itdb->usertype & GP_ITDB_TYPE_LOCAL,
+	     track->transferred);
+		/* no conversion or transfer needed */
+		return TRUE;
     }
 
     /* Create ConvTrack structure */
@@ -1067,33 +1095,33 @@
 
     if (!etr->pc_path_locale || (strlen (etr->pc_path_locale) == 0))
     {
-	gchar *buf = get_track_info (track, FALSE);
-	gtkpod_warning (_("Original filename not available for '%s.'\n"), buf);
-	g_free (buf);
+		gchar *buf = get_track_info (track, FALSE);
+		gtkpod_warning (_("Original filename not available for '%s.'\n"), buf);
+		g_free (buf);
 
-	etr->conversion_status = FILE_CONVERT_FAILED;
-	/* add to failed list */
-	g_mutex_lock (conv->mutex);
-	conv->failed = g_list_prepend (conv->failed, ctr);
-	g_mutex_unlock (conv->mutex);
-	debug ("added track to failed %p\n", track);
-	return FALSE;
+		etr->conversion_status = FILE_CONVERT_FAILED;
+		/* add to failed list */
+		g_mutex_lock (conv->mutex);
+		conv->failed = g_list_prepend (conv->failed, ctr);
+		g_mutex_unlock (conv->mutex);
+		debug ("added track to failed %p\n", track);
+		return FALSE;
     }
 
     if (!g_file_test (etr->pc_path_locale, G_FILE_TEST_IS_REGULAR))
     {
-	gchar *buf = get_track_info (track, FALSE);
-	gtkpod_warning (_("Filename '%s' is no longer valid for '%s'.\n"),
-			etr->pc_path_utf8, buf);
-	g_free (buf);
+		gchar *buf = get_track_info (track, FALSE);
+		gtkpod_warning (_("Filename '%s' is no longer valid for '%s'.\n"),
+				etr->pc_path_utf8, buf);
+		g_free (buf);
 
-	etr->conversion_status = FILE_CONVERT_FAILED;
-	/* add to failed list */
-	g_mutex_lock (conv->mutex);
-	conv->failed = g_list_prepend (conv->failed, ctr);
-	g_mutex_unlock (conv->mutex);
-	debug ("added track to failed %p\n", track);
-	return FALSE;
+		etr->conversion_status = FILE_CONVERT_FAILED;
+		/* add to failed list */
+		g_mutex_lock (conv->mutex);
+		conv->failed = g_list_prepend (conv->failed, ctr);
+		g_mutex_unlock (conv->mutex);
+		debug ("added track to failed %p\n", track);
+		return FALSE;
     }	
 
     /* Find the correct script for conversion */
@@ -1119,28 +1147,28 @@
 	    debug ("added track to finished %p\n", track);
             return TRUE;
         case FILE_TYPE_M4A:
-	    convert = prefs_get_int ("convert_m4a");
             conversion_cmd = prefs_get_string ("path_conv_m4a");
+			convert = conversion_cmd && conversion_cmd[0] && prefs_get_int ("convert_m4a");
             break;
         case FILE_TYPE_WAV:
-	    convert = prefs_get_int ("convert_wav");
             conversion_cmd = prefs_get_string ("path_conv_wav");
+			convert = conversion_cmd && conversion_cmd[0] && prefs_get_int ("convert_wav");
             break;
         case FILE_TYPE_MP3:
-	    convert = prefs_get_int ("convert_mp3");
             conversion_cmd = prefs_get_string ("path_conv_mp3");
+			convert = conversion_cmd && conversion_cmd[0] && prefs_get_int ("convert_mp3");
             break;
         case FILE_TYPE_OGG:
-	    convert = prefs_get_int ("convert_ogg");
-	    conversion_cmd = prefs_get_string ("path_conv_ogg");
-	    must_convert = TRUE;
-	    typestr = _("Ogg Vorbis");
+			conversion_cmd = prefs_get_string ("path_conv_ogg");
+			convert = conversion_cmd && conversion_cmd[0] && prefs_get_int ("convert_ogg");
+			must_convert = TRUE;
+			typestr = _("Ogg Vorbis");
             break;
         case FILE_TYPE_FLAC:
-	    convert = prefs_get_int ("convert_flac");
-	    conversion_cmd = prefs_get_string ("path_conv_flac");
-	    must_convert = TRUE;
-	    typestr = _("FLAC");
+			conversion_cmd = prefs_get_string ("path_conv_flac");
+			convert = conversion_cmd && conversion_cmd[0] && prefs_get_int ("convert_flac");
+			must_convert = TRUE;
+			typestr = _("FLAC");
             break;
     }
 
@@ -1492,9 +1520,11 @@
 
 	    if (ctr->valid)
 	    {
-		GList *trackgl;
+		GList *trackgl, *tracks;
+
 		g_return_val_if_fail (ctr->track, TRUE);
-		GList *tracks = gp_itdb_find_same_tracks_in_itdbs (ctr->track);
+
+		tracks = gp_itdb_find_same_tracks_in_itdbs (ctr->track);
 		for (trackgl=tracks; trackgl; trackgl=trackgl->next)
 		{
 		    ExtraTrackData *etr;
@@ -1521,6 +1551,11 @@
 			etr->converted_file = g_strdup (ctr->converted_file);
 			etr->conversion_status = FILE_CONVERT_CONVERTED;
 			tr->size = ctr->converted_size;
+			tr->pregap = ctr->gapless.pregap;
+			tr->samplecount = ctr->gapless.samplecount;
+			tr->postgap = ctr->gapless.postgap;
+			tr->gapless_data = ctr->gapless.gapless_data;
+			tr->gapless_track_flag = ctr->gapless.gapless_track_flag;
 			pm_track_changed (tr);
 			data_changed (tr->itdb);
 		    }
@@ -2302,13 +2337,14 @@
 				  argv,         /* command line   */
 				  NULL,         /* envp           */
 				  G_SPAWN_SEARCH_PATH |
-				  G_SPAWN_DO_NOT_REAP_CHILD,
+				  G_SPAWN_DO_NOT_REAP_CHILD |
+				  G_SPAWN_STDOUT_TO_DEV_NULL,
 				  pgid_setup,   /* setup func     */
 				  NULL,         /* user data      */
 				  &ctr->pid,    /* child's PID    */
 				  NULL,         /* child's stdin  */
 				  NULL,         /* child's stdout */
-				  &ctr->stderr, /* child's stderr */
+				  &ctr->child_stderr, /* child's stderr */
 				  &error);
 
 	    child_pid = ctr->pid;
@@ -2334,7 +2370,7 @@
 		gint status;
 
 		/* set up i/o channel to main thread */
-		ctr->gio_channel = g_io_channel_unix_new (ctr->stderr);
+		ctr->gio_channel = g_io_channel_unix_new (ctr->child_stderr);
 		g_io_channel_set_flags (ctr->gio_channel,
 					G_IO_FLAG_NONBLOCK, NULL);
 		g_io_channel_set_close_on_unref (ctr->gio_channel, TRUE);
@@ -2402,6 +2438,51 @@
 	}
     }
 
+    /* Fill in additional info (currently only gapless info for MP3s */
+    if (result == TRUE)
+    {
+	Track *track;
+	gboolean retval;
+
+	switch (determine_file_type (ctr->converted_file))
+	{
+        case FILE_TYPE_UNKNOWN:
+        case FILE_TYPE_M4P:
+        case FILE_TYPE_M4B:
+        case FILE_TYPE_M4V:
+        case FILE_TYPE_MP4:
+        case FILE_TYPE_MOV:
+        case FILE_TYPE_MPG:
+        case FILE_TYPE_M3U:
+        case FILE_TYPE_PLS:
+        case FILE_TYPE_IMAGE:
+        case FILE_TYPE_DIRECTORY:
+        case FILE_TYPE_M4A:
+        case FILE_TYPE_WAV:
+        case FILE_TYPE_OGG:
+        case FILE_TYPE_FLAC:
+            break;
+        case FILE_TYPE_MP3:
+	    g_mutex_unlock (conv->mutex);
+
+	    track = gp_track_new ();
+	    retval = mp3_read_gapless (ctr->converted_file, track);
+
+	    g_mutex_lock (conv->mutex);
+
+	    if (ctr->valid && (retval == TRUE))
+	    {
+		ctr->gapless.pregap = track->pregap;
+		ctr->gapless.samplecount = track->samplecount;
+		ctr->gapless.postgap = track->postgap;
+		ctr->gapless.gapless_data = track->gapless_data;
+		ctr->gapless.gapless_track_flag = track->gapless_track_flag;
+	    }
+	    itdb_track_free (track);
+            break;
+	}
+    }
+
     g_mutex_unlock (conv->mutex);
 
     return result;
@@ -3027,8 +3108,6 @@
 	return result;
     }
 
-    g_mutex_unlock (conv->mutex);
-
     copy_success = itdb_cp (source_file, dest_file, &error);
 
     g_mutex_lock (conv->mutex);

Modified: gtkpod/branches/upstream/current/src/file_export.c
===================================================================
--- gtkpod/branches/upstream/current/src/file_export.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/file_export.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,5 +1,4 @@
-/* Time-stamp: <2007-02-24 13:22:58 jcs>
-|
+/*
 |  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -25,7 +24,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: file_export.c 1824 2007-12-13 10:51:04Z dforsi $
+|  $Id: file_export.c 2208 2009-01-13 13:17:43Z jcsjcs $
 */
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -73,9 +72,8 @@
 const gchar *EXPORT_FILES_PATH="export_files_path";
 const gchar *EXPORT_FILES_TPL="export_files_template";
 /* Default prefs settings */
-const gchar *EXPORT_FILES_TPL_DFLT="%o;%a - %t.mp3;%t.wav";
+const gchar *EXPORT_FILES_TPL_DFLT="%o;%a - %t.m4a;%a - %t.mp3;%t.wav";
 
-
 /**
  * READ_WRITE_BLOCKSIZE - how many bytes we read per fread/fwrite call
  */
@@ -591,10 +589,10 @@
 	GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
 	NULL);
 
-    export_files_xml = glade_xml_new (xml_file, "export_files_options", NULL);
+    export_files_xml = gtkpod_xml_new (xml_file, "export_files_options");
     win = gtkpod_xml_get_widget (export_files_xml, "export_files_options");
-    options = gtkpod_xml_get_widget (export_files_xml, "options_frame");
-    message_box = gtkpod_xml_get_widget (export_files_xml, "message_box");
+    options = gtkpod_xml_get_widget (export_files_xml, "ef_options_frame");
+    message_box = gtkpod_xml_get_widget (export_files_xml, "ef_message_box");
 
     /* Information needed to clean up later */
     fcd = g_malloc0 (sizeof (struct fcd));
@@ -619,9 +617,9 @@
     {
 	GList *gl;
 	GtkWidget *label = gtkpod_xml_get_widget (export_files_xml,
-						 "message");
+						 "ef_message");
 	GtkWidget *tv = gtkpod_xml_get_widget (export_files_xml,
-					      "textview");
+					      "ef_textview");
 	GtkTextBuffer *tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW(tv));
 	if (message)  gtk_label_set_text (GTK_LABEL (label), message);
 	else          gtk_widget_hide (label);
@@ -1091,10 +1089,10 @@
 	NULL);
     GladeXML *export_playlist_xml;
     
-    export_playlist_xml = glade_xml_new (xml_file, "export_playlist_file_options", NULL);
+    export_playlist_xml = gtkpod_xml_new (xml_file, "export_playlist_file_options");
     win = gtkpod_xml_get_widget (export_playlist_xml, "export_playlist_file_options");
 
-    options = gtkpod_xml_get_widget (export_playlist_xml, "options_frame");
+    options = gtkpod_xml_get_widget (export_playlist_xml, "ep_options_frame");
 
     fcd->win_xml = export_playlist_xml;
 

Modified: gtkpod/branches/upstream/current/src/file_itunesdb.c
===================================================================
--- gtkpod/branches/upstream/current/src/file_itunesdb.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/file_itunesdb.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: file_itunesdb.c 1824 2007-12-13 10:51:04Z dforsi $
+|  $Id: file_itunesdb.c 2221 2009-01-18 05:30:42Z tmzullinger $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -54,6 +54,9 @@
 #define debug(s) printf(__FILE__":" TO_STR(__LINE__) ":" s)
 #define debugx(s,...) printf(__FILE__":" TO_STR(__LINE__) ":" s,__VA_ARGS__)
 
+#define WRITE_EXTENDED_INFO TRUE
+/* #define WRITE_EXTENDED_INFO prefs_get_int("write_extended_info") */
+
 /*------------------------------------------------------------------*\
  *                                                                  *
  *      Handle Import of iTunesDB                                   *
@@ -78,6 +81,7 @@
     guint64 local_itdb_id;
     guint64 local_track_dbid;
     gboolean transferred;
+    gchar *lyrics;
 };
 
 typedef struct {
@@ -144,6 +148,8 @@
   }
   if (sei) /* found info for this id! */
   {
+      etr->lyrics=NULL;
+      sei->lyrics=NULL;
       if (sei->pc_path_locale && !etr->pc_path_locale)
       {
 	  etr->pc_path_locale = g_strdup (sei->pc_path_locale);
@@ -229,12 +235,22 @@
     struct track_extended_info *sei = NULL;
     FILE *fp;
 
+    g_return_val_if_fail (itunes, FALSE);
 
+    if (!name)
+    {   /* name can be NULL if it does not exist on the iPod */
+	return FALSE;
+    }
+
     fp = fopen (name, "r");
+
     if (!fp)
     {
+	/* Ideally, we'd only warn when we know we've written the extended info
+	 * previously...
 	gtkpod_warning (_("Could not open \"%s\" for reading extended info.\n"),
 			name);
+	*/
 	return FALSE;
     }
     sha1 = sha1_hash_on_filename (itunes, FALSE);
@@ -297,6 +313,7 @@
 	    {
 		if (sei->ipod_id != 0)
 		{ /* normal extended information */
+		    sei->lyrics=NULL;
 		    if (hash_matched)
 		    {
 			if (!extendedinfohash)
@@ -337,6 +354,7 @@
 	    {
 		sei = g_malloc0 (sizeof (struct track_extended_info));
 		sei->ipod_id = atoi (arg);
+		sei->lyrics=NULL;
 	    }
 	}
 	else if (g_ascii_strcasecmp (line, "version") == 0)
@@ -410,7 +428,7 @@
 			  const gchar *mp, const gchar *name_off,
 			  const gchar *name_loc)
 {
-    gchar *cfgdir = prefs_get_cfgdir ();
+    gchar *cfgdir;
     GList *gl;
     Playlist *pod_pl;
     ExtraiTunesDBData *eitdb;
@@ -423,6 +441,8 @@
     g_return_val_if_fail (!(type & GP_ITDB_TYPE_LOCAL) || name_loc, NULL);
     g_return_val_if_fail (!(type & GP_ITDB_TYPE_IPOD) || 
 			  (mp && name_off), NULL);
+
+    cfgdir = prefs_get_cfgdir ();
     g_return_val_if_fail (cfgdir, NULL);
 
     if (old_itdb)
@@ -450,7 +470,7 @@
 
 	if (g_file_test (name_db, G_FILE_TEST_EXISTS))
 	{
-	    if (prefs_get_int("write_extended_info"))
+	    if (WRITE_EXTENDED_INFO)
 	    {
 		if (!read_extended_info (name_ext, name_db))
 		{
@@ -499,7 +519,6 @@
 	}
 	g_free (name_ext);
 	g_free (name_db);
-	g_free (cfgdir);
     }
     else
     { /* GP_ITDB_TYPE_IPOD _and_ iPod is connected */
@@ -554,6 +573,7 @@
 	g_free (name_db);
 	g_free (itunes_dir);
     }
+    g_free (cfgdir);
 
     if (!itdb)
     {
@@ -602,7 +622,7 @@
 	{   /* if has_artwork is not set (0x00), or it has been
 	       (potentially wrongly) set to 0x02 by gtkpod V0.99 or
 	       smaller, determine the correct(?) value */
-	    if (track->artwork->thumbnails)
+	    if (itdb_track_has_thumbnails (track))
 		track->has_artwork = 0x01;
 	    else
 		track->has_artwork = 0x02;
@@ -612,7 +632,7 @@
 	if (track->mediatype == 0)
 	    track->mediatype = 0x00000001;
 	/* restore deleted thumbnails */
-	if ((track->artwork->thumbnails == NULL) &&
+	if ((!itdb_track_has_thumbnails (track)) &&
 	    (strlen (etr->thumb_path_locale) != 0))
 	{
 	    /* !! gp_track_set_thumbnails() writes on
@@ -802,9 +822,13 @@
 				   mountpoint,
 				   old_eitdb->offline_filename,
 				   NULL);
+	if (new_itdb)
+	    gphoto_load_photodb (new_itdb);
     }
     else
+    {
 	g_return_val_if_reached (NULL);
+    }
 
     if (new_itdb)
     {
@@ -862,25 +886,24 @@
     itunesdb = itdb_get_itunesdb_path (mountpoint);
     if (!itunesdb)
     {
-	gchar *str = g_strdup_printf (_("Could not find iPod directory structure at '%s'.\nIf you are sure that the iPod is properly mounted at '%s', gtkpod can create the directory structure for you.\n\nDo you want to create the directory structure now?\n"), mountpoint, mountpoint);
-	GtkWidget *dialog = gtk_message_dialog_new (
-	    GTK_WINDOW (gtkpod_window),
-	    GTK_DIALOG_DESTROY_WITH_PARENT,
-	    GTK_MESSAGE_WARNING,
-	    GTK_BUTTONS_YES_NO,
-	    str);
-	gint result = gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-	g_free (str);
+		gchar *str = g_strdup_printf (_("Could not find iPod directory structure at '%s'.\n\nIf you are sure that the iPod is properly mounted at '%s', it may not be initialized for use. In this case, gtkpod can initialize it for you.\n\nDo you want to create the directory structure now?"), mountpoint, mountpoint);
+		
+		gint result = gtkpod_confirmation_simple (GTK_WINDOW (gtkpod_window),
+												  GTK_MESSAGE_WARNING,
+												  _("iPod directory structure not found"),
+												  str,
+												  _("Create directory structure"));
+			
+		g_free (str);
 
-	if (result == GTK_RESPONSE_YES)
-	{
-	    ok_to_load = gp_ipod_init (itdb);
-	}
-	else
-	{
-	    ok_to_load = FALSE;
-	}
+		if (result == GTK_RESPONSE_OK)
+		{
+			ok_to_load = gp_ipod_init (itdb);
+		}
+		else
+		{
+			ok_to_load = FALSE;
+		}
     }
     g_free (itunesdb);
     g_free (mountpoint);
@@ -987,8 +1010,6 @@
 	}
     }
     
-    /* All successfully loaded so try loading the photo database */
-    gphoto_load_photodb (new_itdb);
     return new_itdb;
 }
 
@@ -1343,7 +1364,7 @@
     GladeXML *dialog_xml;
     GtkWidget *dialog, *widget;
 
-    dialog_xml = glade_xml_new (xml_file, "file_transfer_information_dialog", NULL);
+    dialog_xml = gtkpod_xml_new (xml_file, "file_transfer_information_dialog");
     glade_xml_signal_autoconnect (dialog_xml);
 
     dialog = gtkpod_xml_get_widget (dialog_xml, "file_transfer_information_dialog");
@@ -1605,6 +1626,7 @@
 	g_return_if_fail (tr && tr->userdata);
 
 	etr = tr->userdata;
+	etr->lyrics=NULL;
 
 	buf = get_track_info (tr, FALSE);
 
@@ -1849,21 +1871,24 @@
       }
       if (g_file_test (tunes, G_FILE_TEST_EXISTS))
       {
-	  gchar *str = g_strdup_printf (_("You did not import the existing iTunesDB ('%s'). This is most likely incorrect and will result in the loss of the existing database.\n\nPress '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"), tunes);
-	  GtkWidget *dialog = gtk_message_dialog_new (
-	      GTK_WINDOW (gtkpod_window),
-	      GTK_DIALOG_DESTROY_WITH_PARENT,
-	      GTK_MESSAGE_WARNING,
-	      GTK_BUTTONS_OK_CANCEL,
-	      str);
-	  gint result = gtk_dialog_run (GTK_DIALOG (dialog));
-	  gtk_widget_destroy (dialog);
-	  g_free (str);
-	  if (result == GTK_RESPONSE_CANCEL)
-	  {
-	      g_free (cfgdir);
-	      return FALSE;
-	  }
+		  gchar *str = g_strdup_printf (_("You did not import the existing iTunesDB ('%s'). This is most likely incorrect and will result in the loss of the existing database.\n\nIf you skip storing, you can import the existing database before calling this function again.\n"), tunes);
+
+		  gint result = gtkpod_confirmation_hig (GTK_WINDOW (gtkpod_window),
+											     GTK_MESSAGE_WARNING,
+											     _("Existing iTunes database not imported"),
+											     str,
+											     _("Proceed anyway"),
+												 _("Skip storing"),
+												 NULL,
+												 NULL);
+			
+		  g_free (str);
+		  
+		  if (result == GTK_RESPONSE_CANCEL)
+		  {
+			  g_free (cfgdir);
+			  return FALSE;
+		  }
       }
   }
 
@@ -1965,7 +1990,7 @@
 	      }
 	  }
       }
-      if (success && cfgdir)
+      if (success)
       {   /* copy to cfgdir */
 	  GError *error = NULL;
 	  if (!itdb_cp (itdb->filename, eitdb->offline_filename, &error))
@@ -2043,7 +2068,7 @@
    */
   if (success &&  
 		  (itdb->usertype & GP_ITDB_TYPE_IPOD) &&
-		  gphoto_ipod_supports_photos (itdb) &&
+		  itdb_device_supports_photo (itdb->device) &&
 		  eitdb->photodb != NULL &&
 		  eitdb->photo_data_changed == TRUE)
   {
@@ -2138,9 +2163,19 @@
     eitdb = itdb->userdata;
     g_return_if_fail (eitdb);
 
-    eitdb->data_changed = TRUE;
-    pm_itdb_name_changed (itdb);
-    space_data_update ();
+    if ((itdb->usertype & GP_ITDB_TYPE_IPOD) && !eitdb->itdb_imported)
+    {   /* don't do anything for non-imported iPod
+	   repositories. Marking them as "changed" allows the empty
+	   repository to be saved back to the iPod, overwriting data
+	   there */
+	return;
+    }
+    else
+    {
+	eitdb->data_changed = TRUE;
+	pm_itdb_name_changed (itdb);
+	space_data_update ();
+    }
 }
 
 

Modified: gtkpod/branches/upstream/current/src/fileselection.c
===================================================================
--- gtkpod/branches/upstream/current/src/fileselection.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/fileselection.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,5 +1,4 @@
-/* Time-stamp: <2007-06-25 00:56:37 jcs>
-|
+/*
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net>
 |  Part of the gtkpod project.
 |
@@ -23,7 +22,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: fileselection.c 1588 2007-06-24 16:02:51Z jcsjcs $
+|  $Id: fileselection.c 2059 2008-07-20 12:49:55Z jcsjcs $
 */
 
 /***********************************************************************
@@ -55,32 +54,62 @@
 #include "fileselection.h"
 #include "display_coverart.h"
 
-/* 
- * Data global to this module only
- */
 
-static Playlist *db_active_pl = NULL;    /* playlist for dirbrowser */
-
-static void error_dialog (const gchar *str)
+/* Open a modal file selection dialog with multiple selction enabled */
+GSList* fileselection_get_files(const gchar *title)
 {
-    GtkWidget *dialog;
+    GtkWidget* fc;  /* The file chooser dialog */
+    gint response;  /* The response of the filechooser */
+    gchar *last_dir, *new_dir;
+    GSList * files = NULL;
 
-    g_return_if_fail (str);
+    fc = gtk_file_chooser_dialog_new (title,
+				      NULL,
+				      GTK_FILE_CHOOSER_ACTION_OPEN,
+				      GTK_STOCK_CANCEL,
+				      GTK_RESPONSE_CANCEL,
+				      GTK_STOCK_OPEN,
+				      GTK_RESPONSE_ACCEPT,
+				      NULL);
 
-    dialog = gtk_message_dialog_new (GTK_WINDOW (gtkpod_window),
-				     GTK_DIALOG_DESTROY_WITH_PARENT,
-				     GTK_MESSAGE_WARNING,
-				     GTK_BUTTONS_OK,
-				     str);
-    gtk_dialog_run (GTK_DIALOG (dialog));
-    gtk_widget_destroy (dialog);
+    /* allow multiple selection of files */
+    gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (fc), TRUE);
+
+    /* set same directory as last time */
+    last_dir = prefs_get_string ("last_dir_browsed");
+    if (last_dir)
+    {
+	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc),
+					     last_dir);
+	g_free (last_dir);
+    }
+
+    /* Run the dialog */
+    response = gtk_dialog_run (GTK_DIALOG(fc));
+
+    /* Handle the response */
+    switch (response)
+    {
+    case GTK_RESPONSE_ACCEPT:
+	new_dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (fc));
+	prefs_set_string ("last_dir_browsed", new_dir);
+	g_free (new_dir);
+	files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (fc));
+	break;
+    case GTK_RESPONSE_CANCEL:
+	break;
+    default:	/* Fall through */
+	break;
+    }
+    gtk_widget_destroy (fc);
+
+    return files;
 }
 
 
-/* OK button */
-static void add_files_ok(GtkFileChooser* filechooser, Playlist *playlist)
+
+static void fileselection_add_files (GSList* names, Playlist *playlist)
 {
-    GSList* names;   /* List of selected names */
     GSList* gsl;     /* Current node in list */
     gboolean result = TRUE;  /* Result of file adding */
 	
@@ -89,17 +118,6 @@
 	
     block_widgets ();
 
-    names = gtk_file_chooser_get_filenames (filechooser);
-
-    if (names)
-    {
-	gchar *dirname = gtk_file_chooser_get_current_folder (filechooser);
-	prefs_set_string ("last_dir_browsed", dirname);
-	g_free (dirname);
-    }
-
-    block_widgets ();
-
     /* Get the filenames and add them */
     for (gsl=names; gsl; gsl=gsl->next)
     {
@@ -108,13 +126,8 @@
 					playlist,
 					prefs_get_int ("add_recursively"),
 					NULL, NULL);
-	g_free (gsl->data);
     }
-    g_slist_free (names);
-    names = NULL;
 
-    release_widgets ();
-
     /* clear log of non-updated tracks */
     display_non_updated ((void *)-1, NULL);
   
@@ -139,7 +152,7 @@
 /* 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 create_add_files_callback (void)
+G_MODULE_EXPORT void create_add_files_callback (void)
 {
     Playlist *pl;
 
@@ -152,16 +165,15 @@
 /* Open a modal file selection dialog for adding individual files */
 void create_add_files_dialog (Playlist *pl)
 {
-    GtkWidget* fc;  /* The file chooser dialog */
-    gint response;  /* The response of the filechooser */
-    gchar *last_dir, *str;
+    gchar *str;
+    GSList *names;
     iTunesDB *itdb;
     ExtraiTunesDBData *eitdb;
     Playlist *mpl;
 
     if (!pl)
     {
-	error_dialog (_("Please select a playlist or repository before adding tracks."));
+	gtkpod_warning_simple (_("Please select a playlist or repository before adding tracks."));
 	return;
     }
 
@@ -172,7 +184,7 @@
 
     if (!eitdb->itdb_imported)
     {
-	error_dialog (_("Please load the iPod before adding tracks."));
+	gtkpod_warning_simple (_("Please load the iPod before adding tracks."));
 	return;
     }
 
@@ -188,66 +200,29 @@
     {
 	str = g_strdup_printf (_("Add files to '%s/%s'"), mpl->name, pl->name);
     }
-    /* Create the file chooser */
-    fc = gtk_file_chooser_dialog_new (str,
-				      NULL,
-				      GTK_FILE_CHOOSER_ACTION_OPEN,
-				      GTK_STOCK_CANCEL,
-				      GTK_RESPONSE_CANCEL,
-				      GTK_STOCK_OPEN,
-				      GTK_RESPONSE_ACCEPT,
-				      NULL);
+
+    names = fileselection_get_files(str);
     g_free (str);
 
-    /* allow multiple selection of files */
-    gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (fc), TRUE);
+    if (!names)
+	return;
 
-    /* set same directory as last time */
-    last_dir = prefs_get_string ("last_dir_browsed");
-    if (last_dir)
-    {
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc),
-					     last_dir);
-	g_free (last_dir);
-    }
+    fileselection_add_files (names, pl);
 
-    /* Run the dialog */
-    response = gtk_dialog_run (GTK_DIALOG(fc));
-
-    /* Handle the response */
-    switch (response)
-    {
-    case GTK_RESPONSE_ACCEPT:
-	add_files_ok (GTK_FILE_CHOOSER (fc), pl);
-	break;
-    case GTK_RESPONSE_CANCEL:
-	break;
-    default:	/* Fall through */
-	break;
-    }
-    gtk_widget_destroy (fc);
+    g_slist_foreach (names, (GFunc)g_free, NULL);
+    g_slist_free (names);
 }
 
 
 /* OK Button */
-static void add_playlists_ok (GtkFileChooser* filechooser, iTunesDB *itdb)
+static void fileselection_add_playlists (GSList* names, iTunesDB *itdb)
 {
-    GSList* names;  /* List of selected names */
     GSList* gsl;
 	
     /* Get the names of the playlist(s) and add them */
 	
     g_return_if_fail (itdb);
 	
-    names = gtk_file_chooser_get_filenames(filechooser);
-
-    if (names)
-    {
-	gchar *dirname = gtk_file_chooser_get_current_folder (filechooser);
-	prefs_set_string ("last_dir_browsed", dirname);
-	g_free (dirname);
-    }
-
     block_widgets ();
 
     for (gsl=names; gsl; gsl=gsl->next)
@@ -255,10 +230,7 @@
 	add_playlist_by_filename (itdb,
 				  gsl->data, NULL, 
 				  -1, NULL, NULL);
-	g_free (gsl->data);
     }
-    g_slist_free (names);
-    names = NULL;
 
     release_widgets ();
 
@@ -281,7 +253,7 @@
 /* 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 create_add_playlists_callback (void)
+G_MODULE_EXPORT void create_add_playlists_callback (void)
 {
     iTunesDB *itdb;
 
@@ -294,15 +266,14 @@
 /* Open a modal file selection dialog for adding playlist files */
 void create_add_playlists_dialog (iTunesDB *itdb)
 {
-    GtkWidget* fc ; /* The file chooser dialog */
-    gint response;  /* The response of the filechooser */
-    gchar *last_dir, *str;
+    gchar *str;
+    GSList *names;
     ExtraiTunesDBData *eitdb;
     Playlist *mpl;
 
     if (!itdb)
     {
-	error_dialog (_("Please select a playlist or repository before adding tracks."));
+	gtkpod_warning_simple (_("Please select a playlist or repository before adding tracks."));
 	return;
     }
 
@@ -311,7 +282,7 @@
 
     if (!eitdb->itdb_imported)
     {
-	error_dialog (_("Please load the iPod before adding tracks."));
+	gtkpod_warning_simple (_("Please load the iPod before adding tracks."));
 	return;
     }
 
@@ -321,49 +292,19 @@
     /* Create window title */
     str = g_strdup_printf (_("Add playlist files to '%s'"), mpl->name);
 
-    /* Create the file chooser */
-    fc = gtk_file_chooser_dialog_new (str,
-				      NULL, 
-				      GTK_FILE_CHOOSER_ACTION_OPEN,
-				      GTK_STOCK_CANCEL,
-				      GTK_RESPONSE_CANCEL,
-				      GTK_STOCK_OPEN,
-				      GTK_RESPONSE_ACCEPT,
-				      NULL);
+    names = fileselection_get_files(str);
     g_free (str);
-	
-    /* allow multiple selection of files */
-    gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (fc), TRUE);
 
-    /* set same directory as last time */
-    last_dir = prefs_get_string ("last_dir_browsed");
-    if (last_dir)
-    {
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (fc),
-					     last_dir);
-	g_free (last_dir);
-    }
+    if (!names)
+	return;
 
-    /* Run the dialog */
-    response = gtk_dialog_run (GTK_DIALOG(fc));
-	
-    /* Handle the response */
-    switch (response)
-    {
-    case GTK_RESPONSE_ACCEPT:
-	add_playlists_ok(GTK_FILE_CHOOSER (fc), itdb);
-	break;
-    case GTK_RESPONSE_CANCEL:
-	break;
-    default:	/* Fall through */
-	break;
-    }	
-    gtk_widget_destroy(fc);
+    fileselection_add_playlists (names, itdb);
+    
+    g_slist_foreach (names, (GFunc)g_free, NULL);
+    g_slist_free (names);
 }
 
 
-
-
 /* 
  * Add Cover Art
  */
@@ -447,6 +388,7 @@
     GtkWidget* fc;  /* The file chooser dialog */
     gint response;  /* The response of the filechooser */
     gchar *new_file = NULL; /* The chosen file */
+    gchar *new_dir; /* The new dir to remember */
 
     g_return_val_if_fail (title, NULL);
 
@@ -486,6 +428,9 @@
     switch (response)
     {
     case GTK_RESPONSE_ACCEPT:
+	new_dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (fc));
+	prefs_set_string ("last_dir_browsed", new_dir);
+	g_free (new_dir);
 	new_file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fc));
 	break;
     case GTK_RESPONSE_CANCEL:
@@ -603,159 +548,41 @@
 
 
 
-
-
-/*
-|  Changed by Jorg Schuler <jcsjcs at users.sourceforge.net> to compile
-|  "standalone" with the gtkpod project 2002/11/24
-|  (http://gtkpod.sourceforge.net)
-|  Modified for UTF8 string handling under GKT2 (Jan 2003).
-|
-|  last version before moving over to fileselection.c:
-|  dirbrowser.c,v 1.30 2005/04/29 04:01:17 jcsjcs Exp
-*/
-
-/*  XMMS - Cross-platform multimedia player
- *  Copyright (C) 1998-2002  Peter Alm, Mikael Alm, Olle Hallnas,
- *                           Thomas Nilsson and 4Front Technologies
- *  Copyright (C) 1999-2002  Haavard Kvaalen
- *
- *  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.
- */
-
-
-/* XPM */
-static char *db_folder[] =
+/* Callback after directories to add have been selected */
+static void add_selected_dirs (GSList *names, Playlist *db_active_pl)
 {
-	"16 16 16 1",
-	" 	c None",
-	".	c #f4f7e4",
-	"X	c #dee4b5",
-	"o	c #e1e7b9",
-	"O	c #c6cba4",
-	"+	c #dce2b8",
-	"@	c #e9e9ec",
-	"#	c #d3d8ae",
-	"$	c #d8daca",
-	"%	c #b2b2b5",
-	"&	c #767862",
-	"*	c #e3e6c3",
-	"=	c #1b1b1a",
-	"-	c #939684",
-	";	c #555555",
-	":	c #000000",
-	"                ",
-	"                ",
-	"  ::::          ",
-	" :.@@O:         ",
-	":-&&&&&:::::    ",
-	":.@@@@@*$O#O=   ",
-	":@*+XXXX+##O:   ",
-	":.*#oooXXXXX:   ",
-	":@+XoXXXXXX#:   ",
-	":@*ooXXXXXX#:   ",
-	":@**XXXXXXX#:   ",
-	":@*XXXXXXXX%:   ",
-	":$.*OOOOOO%-:   ",
-	" ;:::::::::::   ",
-	"                ",
-	"                "};
+    gboolean result=TRUE;
 
-/* Icon by Jakub Steiner <jimmac at ximian.com> */
-
-/* XPM */
-static char *db_ofolder[] =
-{
-	"16 16 16 1",
-	" 	c None",
-	".	c #a9ad93",
-	"X	c #60634d",
-	"o	c #dee4b5",
-	"O	c #9ca085",
-	"+	c #0c0d04",
-	"@	c #2f2f31",
-	"#	c #3b3d2c",
-	"$	c #c8cda2",
-	"%	c #e6e6e9",
-	"&	c #b3b5a5",
-	"*	c #80826d",
-	"=	c #292a1c",
-	"-	c #fefef6",
-	";	c #8f937b",
-	":	c #000000",
-	"                ",
-	"                ",
-	"  ::::          ",
-	" :-%%&:         ",
-	":-;;;OX:::::    ",
-	":-;;;;O;O;&.:   ",
-	":-*X##@@@@@=#:  ",
-	":%*+-%%ooooooO: ",
-	":%X;%ooooooo.*: ",
-	":.+-%oooooooO:  ",
-	":*O-oooooooo*:  ",
-	":O-oooooooo.:   ",
-	":*-%$$$$$$OX:   ",
-	" :::::::::::    ",
-	"                ",
-	"                "};
-
-#define NODE_SPACING 4
-
-static GdkPixmap *db_folder_pixmap = NULL, *db_ofolder_pixmap;
-static GdkBitmap *db_folder_mask, *db_ofolder_mask;
-static GtkWidget *dirbrowser = NULL;
-
-static GtkWidget *xmms_create_dir_browser(const gchar *title,
-					  const gchar *current_path,
-					  GtkSelectionMode mode,
-					  void (*handler) (gchar *));
-
-struct dirnode
-{
-    unsigned int scanned : 1;
-    char *path;
-    char *dir;
-};
-
-
-/* ------------------------------------------------------------ *
- * functions added for gtkpod                                   *
- * ------------------------------------------------------------ */
-
-/* Callback after one directory has been added */
-static void add_dir_selected (gchar *dir)
-{
+    g_return_if_fail (names);
     g_return_if_fail (db_active_pl);
 
-    if (dir)
+    if (names)
     {
-	add_directory_by_name (db_active_pl->itdb, dir, db_active_pl,
-			       prefs_get_int ("add_recursively"),
-			       NULL, NULL);
-	prefs_set_string ("last_dir_browsed", dir);
-	gtkpod_tracks_statusbar_update ();
-    }
-    else
-    {
+        GSList* currentnode;
+        for (currentnode=names; currentnode; currentnode=currentnode->next)
+        {
+            result &= add_directory_by_name (db_active_pl->itdb,
+					     currentnode->data,
+					     db_active_pl,
+					     prefs_get_int ("add_recursively"),
+					     NULL, NULL);
+            g_free (currentnode->data);
+            gtkpod_tracks_statusbar_update ();
+        }
+        g_slist_free (names);
+        names = NULL;
+
 	/* clear log of non-updated tracks */
 	display_non_updated ((void *)-1, NULL);
 	/* display log of updated tracks */
 	display_updated (NULL, NULL);
 	/* display log of detected duplicates */
 	gp_duplicate_remove (NULL, NULL);
+
+	if (result == TRUE) 
+	    gtkpod_statusbar_message (_("Successfully added files"));
+	else 
+	    gtkpod_statusbar_message (_("Some files were not added successfully"));
     }
 }
 
@@ -763,400 +590,47 @@
 /* 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 dirbrowser_create_callback (void)
+G_MODULE_EXPORT void dirbrowser_create_callback (void)
 {
-    Playlist *pl;
-
-    pl = pm_get_selected_playlist ();
-
-    dirbrowser_create (pl);
-}
-
-
-
-
-
-void dirbrowser_create (Playlist *pl)
-{
-    gchar *cur_dir, *str;
-    iTunesDB *itdb;
-    ExtraiTunesDBData *eitdb;
-    Playlist *mpl;
-
-    /* we only allow one modal dirbrowser */
-    g_return_if_fail (dirbrowser==NULL);
-
-
-    if (!pl)
+    GSList* names=NULL;  /* List of selected items */
+    Playlist *pl = pm_get_selected_playlist ();
+    GtkWidget *dialog;
+	
+    if(!pl) 
     {
-	error_dialog (_("Please select a playlist or repository before adding tracks."));
+        gtkpod_warning_simple (_("Please select a playlist or repository before adding tracks."));
 	return;
     }
 
-    itdb = pl->itdb;
-    g_return_if_fail (itdb);
-    eitdb = itdb->userdata;
-    g_return_if_fail (eitdb);
+    dialog = gtk_file_chooser_dialog_new (
+	_("Add Folder"),
+	GTK_WINDOW (gtkpod_window),
+	GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+	GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+	GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
+	NULL);
 
-    if (!eitdb->itdb_imported)
-    {
-	error_dialog (_("Please load the iPod before adding tracks."));
-	return;
-    }
+    /* Allow multiple selection of directories. */
+    gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER(dialog), TRUE);
 
-    /* FIXME: I don't like global variables */
-    db_active_pl = pl;
-
-    mpl = itdb_playlist_mpl (itdb);
-    g_return_if_fail (mpl);
-
-    /* Create window title */
-    if (mpl == pl)
+    /* Set same directory as the last browsed directory. */
+    gchar *last_dir = prefs_get_string ("last_dir_browsed");
+    if (last_dir)
     {
-	str = g_strdup_printf (_("Add directories to '%s'"), mpl->name);
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
+					     last_dir);
+        g_free (last_dir);
     }
-    else
-    {
-	str = g_strdup_printf (_("Add directories to '%s/%s'"), mpl->name, pl->name);
-    }
 
-    cur_dir = prefs_get_string ("last_dir_browsed");
-    dirbrowser = xmms_create_dir_browser (str,
-					  cur_dir,
-					  GTK_SELECTION_MULTIPLE,
-					  add_dir_selected);
-    g_free (cur_dir);
-    g_free (str);
-    gtk_window_set_modal (GTK_WINDOW (dirbrowser), TRUE);
-    gtk_widget_show (dirbrowser);
-}
+    if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+	names = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (dialog));
 
-/* called when dirbrowser gets destroyed with the window-close button */
-static void dirbrowser_destroyed (GtkWidget *w, gpointer userdata)
-{
-    g_return_if_fail (dirbrowser);
-
-    dirbrowser = NULL;
-}
-
-
-/* called when the file selector is closed */
-static void add_dir_close (GtkWidget *w1, GtkWidget *w2)
-{
-    gint x,y;
-
-    g_return_if_fail (dirbrowser);
-
-    gtk_window_get_size (GTK_WINDOW (dirbrowser), &x, &y);
-    /* store size for next time */
-    prefs_set_int("size_dirbr.x", x);
-    prefs_set_int("size_dirbr.y", y);
-    gtk_widget_destroy(dirbrowser);
-    /* dirbrowser = NULL; -- will be done by the dirbrowser_destroy()
-       as part of the callback */
-}
-
-
-/* ------------------------------------------------------------ *
- * end of added functions                                       *
- * ------------------------------------------------------------ */
-
-static gboolean check_for_subdir(char *path)
-{
-	DIR *dir;
-	struct dirent *dirent;
-	struct stat statbuf;
-	char *npath;
-
-	if ((dir = opendir(path)) != NULL)
-	{
-		while ((dirent = readdir(dir)) != NULL)
-		{
-			if (dirent->d_name[0] == '.')
-				continue;
-
-			npath = g_strconcat(path, dirent->d_name, NULL);
-			if (stat(npath, &statbuf) != -1 &&
-			    S_ISDIR(statbuf.st_mode))
-			{
-				g_free(npath);
-				closedir(dir);
-				return TRUE;
-			}
-			g_free(npath);
-		}
-		closedir(dir);
-	}
-	return FALSE;
-}
-
-static void destroy_cb(gpointer data)
-{
-	struct dirnode *node = data;
-
-	g_free(node->path);
-	g_free(node->dir);
-	g_free(node);
-}
-
-static void add_dir(GtkCTree *tree, GtkCTreeNode *pnode, char* parent, char *dir)
-{
-	struct stat statbuf;
-	char *path;
-	gchar *dir_utf8;
-
-	/* Don't show hidden dirs, nor . and .. */
-	if (dir[0] == '.')
-		return;
-
-	path = g_strconcat(parent, dir, NULL);
-	if (stat(path, &statbuf) != -1 && S_ISDIR(statbuf.st_mode))
-	{
-		gboolean has_subdir;
-		char *text = "";
-		GtkCTreeNode *node;
-		struct dirnode *dirnode = g_malloc0(sizeof (struct dirnode));
-		dirnode->path = g_strconcat(path, "/", NULL);
-		dirnode->dir = g_strdup (dir);
- 		has_subdir = check_for_subdir(dirnode->path);
-		dir_utf8 = charset_to_utf8 (dir);
-		node = gtk_ctree_insert_node(tree, pnode, NULL, &dir_utf8,
-					     NODE_SPACING, db_folder_pixmap,
-					     db_folder_mask, db_ofolder_pixmap,
-					     db_ofolder_mask, !has_subdir, FALSE);
-		g_free (dir_utf8);
-		gtk_ctree_node_set_row_data_full(tree, node, dirnode,
-						 destroy_cb);
-		if (has_subdir)
-			gtk_ctree_insert_node(tree, node, NULL, &text,
-					      NODE_SPACING, NULL, NULL,
-					      NULL, NULL, FALSE, FALSE);
-	}
-	g_free(path);
-}
-
-static void expand_cb(GtkWidget *widget, GtkCTreeNode *parent_node)
-{
-	struct dirent *dirent;
-	GtkCTree *tree = GTK_CTREE(widget);
-	struct dirnode *parent_dirnode;
-
-	parent_dirnode = gtk_ctree_node_get_row_data(tree, parent_node);
-	if (!parent_dirnode->scanned)
-	{
-		DIR *dir;
-
-		gtk_clist_freeze(GTK_CLIST(widget));
-		gtk_ctree_remove_node(tree,
-				      GTK_CTREE_ROW(parent_node)->children);
-		if ((dir = opendir(parent_dirnode->path)) != NULL)
-		{
-			while ((dirent = readdir(dir)) != NULL)
-			{
-				add_dir(tree, parent_node,
-					parent_dirnode->path, dirent->d_name);
-			}
-			closedir(dir);
-			gtk_ctree_sort_node(tree, parent_node);
-		}
-		gtk_clist_thaw(GTK_CLIST(widget));
-		parent_dirnode->scanned = TRUE;
-	}
-}
-
-static void select_row_cb(GtkWidget *widget, int row, int column, GdkEventButton *bevent, gpointer data)
-{
-	struct dirnode *dirnode;
-	GtkCTreeNode *node;
-	void (*handler) (char *);
-
-	if (bevent && (bevent->type == GDK_2BUTTON_PRESS))
-	{
-		node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
-		dirnode = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
-		handler = gtk_object_get_user_data(GTK_OBJECT(widget));
-		if (handler)
-			handler(dirnode->path);
-		if (handler) handler(NULL); /* call once with "NULL" to
-					       indicate "end" */
-	}
-}
-
-static void show_cb(GtkWidget *widget, gpointer data)
-{
-	GtkCTree *tree = GTK_CTREE(data);
-	GtkCTreeNode *node = gtk_object_get_data(GTK_OBJECT(tree),
-						 "selected_node");
-
-	if (node)
-		gtk_ctree_node_moveto(tree, node, -1, 0.6, 0);
-}
-
-static void ok_clicked(GtkWidget *widget, GtkWidget *tree)
-{
-	GtkCTreeNode *node;
-	struct dirnode *dirnode;
-	GList *list_node;
-	GtkWidget *window;
-	void (*handler) (char *) = NULL;
-
-	window = gtk_object_get_user_data(GTK_OBJECT(widget));
-	list_node = GTK_CLIST(tree)->selection;
-	while (list_node)
-	{
-		node = list_node->data;
-		dirnode = gtk_ctree_node_get_row_data(GTK_CTREE(tree), node);
-		handler = gtk_object_get_user_data(GTK_OBJECT(tree));
-		if (handler)
-			handler(dirnode->path);
-		list_node = g_list_next(list_node);
-	}
-	if (handler) handler(NULL); /* call once with "NULL" to
-				       indicate "end" */
-	gtk_widget_hide(window);
-	add_dir_close (widget, tree);
-}
-
-static GtkWidget *xmms_create_dir_browser (const char *title,
-					   const char *current_path,
-					   GtkSelectionMode mode,
-					   void (*handler) (char *))
-{
-    GtkWidget *window, *scroll_win, *tree, *vbox, *bbox, *ok, *cancel, *sep;
-    char *root_text = "/", *text = "";
-    GtkCTreeNode *root_node, *node, *selected_node = NULL;
-    GtkCTree *ctree;
-    struct dirnode *dirnode;
-    gint x,y;
-
-    window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    x = prefs_get_int("size_dirbr.x");
-    y = prefs_get_int("size_dirbr.y");
-    gtk_window_set_default_size(GTK_WINDOW(window), x, y);
-    gtk_window_set_title(GTK_WINDOW(window), title);
-    gtk_container_border_width(GTK_CONTAINER(window), 10);
-
-    vbox = gtk_vbox_new(FALSE, 10);
-    gtk_container_add(GTK_CONTAINER(window), vbox);
-
-    scroll_win = gtk_scrolled_window_new(NULL, NULL);
-    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_win),
-				   GTK_POLICY_AUTOMATIC,
-				   GTK_POLICY_AUTOMATIC);
-    gtk_box_pack_start(GTK_BOX(vbox), scroll_win, TRUE, TRUE, 0);
-    gtk_widget_show(scroll_win);
-
-    gtk_widget_realize(window);
-    if (!db_folder_pixmap)
+    if (names)
     {
-	db_folder_pixmap = gdk_pixmap_create_from_xpm_d(window->window,
-							&db_folder_mask,
-							NULL, db_folder);
-	db_ofolder_pixmap = gdk_pixmap_create_from_xpm_d(window->window,
-							 &db_ofolder_mask,
-							 NULL, db_ofolder);
+	add_selected_dirs (names, pl);
+        prefs_set_string ("last_dir_browsed",
+			  gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
     }
 
-    tree = gtk_ctree_new(1, 0);
-    ctree = GTK_CTREE(tree);
-    gtk_clist_set_column_auto_resize(GTK_CLIST(tree), 0, TRUE);
-    gtk_clist_set_selection_mode(GTK_CLIST(tree), mode);
-    gtk_ctree_set_line_style(ctree, GTK_CTREE_LINES_DOTTED);
-    gtk_signal_connect(GTK_OBJECT(tree), "tree_expand",
-		       GTK_SIGNAL_FUNC(expand_cb), NULL);
-    gtk_signal_connect(GTK_OBJECT(tree), "select_row",
-		       GTK_SIGNAL_FUNC(select_row_cb), NULL);
-    gtk_signal_connect(GTK_OBJECT(window), "show",
-		       GTK_SIGNAL_FUNC(show_cb), tree);
-    gtk_container_add(GTK_CONTAINER(scroll_win), tree);
-    gtk_object_set_user_data(GTK_OBJECT(tree), handler);
-
-    root_node = gtk_ctree_insert_node(ctree, NULL, NULL,
-				      &root_text, NODE_SPACING,
-				      db_folder_pixmap, db_folder_mask,
-				      db_ofolder_pixmap, db_ofolder_mask,
-				      FALSE, FALSE);
-    dirnode = g_malloc0(sizeof (struct dirnode));
-    dirnode->path = g_strdup("/");
-    gtk_ctree_node_set_row_data_full(ctree, root_node,
-				     dirnode, destroy_cb);
-    node = gtk_ctree_insert_node(ctree, root_node, NULL,
-				 &text, 4, NULL, NULL, NULL,
-				 NULL, TRUE, TRUE);
-    gtk_ctree_expand(ctree, root_node);
-    gtk_widget_show(tree);
-
-    sep = gtk_hseparator_new();
-    gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
-    gtk_widget_show(sep);
-
-    bbox = gtk_hbutton_box_new();
-    gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
-    gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
-
-    ok = gtk_button_new_with_label(_("Ok"));
-    gtk_object_set_user_data(GTK_OBJECT(ok), window);
-    GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
-    gtk_window_set_default(GTK_WINDOW(window), ok);
-    gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
-    gtk_signal_connect(GTK_OBJECT(ok), "clicked",
-		       GTK_SIGNAL_FUNC(ok_clicked), tree);
-    gtk_widget_show(ok);
-
-    cancel = gtk_button_new_with_label(_("Cancel"));
-    GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
-    gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
-    gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked",
-			      GTK_SIGNAL_FUNC(add_dir_close),
-			      GTK_OBJECT(window));
-    gtk_widget_show(cancel);
-
-    gtk_signal_connect(GTK_OBJECT(window), "destroy",
-		       GTK_SIGNAL_FUNC(dirbrowser_destroyed),
-		       NULL);
-
-    gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-    gtk_widget_show(bbox);
-    gtk_widget_show(vbox);
-
-    if (current_path && *current_path)
-    {
-	char **dir;
-	int i;
-
-	dir = g_strsplit(current_path, "/", 0);
-	node = root_node;
-	for (i = 0; dir[i] != NULL; i++)
-	{
-	    if (dir[i][0] == '\0')
-		continue;
-
-	    for (node = GTK_CTREE_ROW(node)->children; node != NULL;
-		 node = GTK_CTREE_ROW(node)->sibling)
-	    {
-		struct dirnode *dn;
-		dn = gtk_ctree_node_get_row_data(GTK_CTREE(tree), node);
-		if (!strcmp(dir[i], dn->dir))
-		    break;
-	    }
-	    if (!node)
-		break;
-	    if (!GTK_CTREE_ROW(node)->is_leaf && dir[i+1] && *dir[i+1])
-		gtk_ctree_expand(ctree, node);
-	    else
-	    {
-		selected_node = node;
-		break;
-	    }
-	}
-	g_strfreev(dir);
-    }
-
-    if (!selected_node)
-	selected_node = root_node;
-
-    gtk_ctree_select(ctree, selected_node);
-    gtk_object_set_data(GTK_OBJECT(tree), "selected_node", selected_node);
-
-    return window;
+    gtk_widget_destroy (dialog);
 }

Modified: gtkpod/branches/upstream/current/src/fileselection.h
===================================================================
--- gtkpod/branches/upstream/current/src/fileselection.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/fileselection.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: fileselection.h 1588 2007-06-24 16:02:51Z jcsjcs $
+|  $Id: fileselection.h 2059 2008-07-20 12:49:55Z jcsjcs $
 */
 
 /***************************************************************************
@@ -51,6 +51,7 @@
 				    const gchar *fallback,
 				    const gchar *title,
 				    const gchar *additional_text);
+GSList* fileselection_get_files(const gchar *title);
 
 /* dirbrowser */
 void dirbrowser_create (Playlist *pl);

Modified: gtkpod/branches/upstream/current/src/flacfile.c
===================================================================
--- gtkpod/branches/upstream/current/src/flacfile.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/flacfile.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: flacfile.c 1671 2007-08-06 14:46:46Z jcsjcs $
+|  $Id: flacfile.c 1964 2008-04-19 09:26:28Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -107,9 +107,37 @@
                     if (g_ascii_strncasecmp("YEAR=", tag, 5) == 0) {
                         track->year = atoi (tag + 5);
                     }
+                    if (g_ascii_strncasecmp("DATE=", tag, 5) == 0) {
+			/* The date field is supposed to be of the
+			   format YYYY-MM-DD */
+                        track->year = atoi (tag + 5);
+                    }
+                    /* track_nr/tracks tag handling */
                     if (g_ascii_strncasecmp("TRACKNUMBER=", tag, 12) == 0) {
-                        track->track_nr = atoi (tag + 12);
+                        gchar* string;
+                        gchar* string2;
+                        string = tag + 12;
+			string2 = strchr(string,'/');
+			if (string2)
+			{
+			    track->tracks = atoi (string2 + 1);
+			    *string2 = '\0';
+			}
+			track->track_nr = atoi (string);
                     }
+                    /* cd_nr/cds tag handling */
+                    if (g_ascii_strncasecmp("DISCNUMBER=", tag, 11) == 0) {
+                        gchar* string;
+                        gchar* string2;
+                        string = tag + 11;
+			string2 = strchr(string,'/');
+			if (string2)
+			{
+			    track->cds = atoi (string2 + 1);
+			    *string2 = '\0';
+			}
+			track->cd_nr = atoi (string);
+                    }
                     if (g_ascii_strncasecmp("COMPOSER=", tag, 9) == 0) {
                         track->composer = charset_to_utf8 (tag + 9);
                     }
@@ -119,7 +147,7 @@
                     if (g_ascii_strncasecmp("TRACKS=", tag, 7) == 0) {
                         track->tracks = atoi (tag  + 7);
                     }
-                    if (g_ascii_strncasecmp("CNDR=", tag, 5) == 0) {
+                    if (g_ascii_strncasecmp("CDNR=", tag, 5) == 0) {
                         track->cd_nr = atoi (tag + 5);
                     }
                     if (g_ascii_strncasecmp("CDS=", tag, 4) == 0) {

Added: gtkpod/branches/upstream/current/src/help.c
===================================================================
--- gtkpod/branches/upstream/current/src/help.c	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/help.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,239 @@
+/*
+|  Copyright (C) 2007 Matvey Kozhev <sikon 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!
+*/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include "help.h"
+#include "misc.h"
+
+/*------------------------------------------------------------------*\
+ *                                                                  *
+ *             About Window                                         *
+ *                                                                  *
+\*------------------------------------------------------------------*/
+
+/* 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 */
+G_MODULE_EXPORT void open_about_window ()
+{
+	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 };
+
+	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
+	};
+
+	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 *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);
+	
+#ifdef LIBGPOD_VERSION
+	gchar *version = g_strdup_printf (_("(using libgpod %s)"), LIBGPOD_VERSION);
+	gchar *description = g_strdup_printf ("%s\n%s", _("Cross-platform multilingual interface to Apple's iPod™"),
+											version);
+										  
+	g_free (version);
+#else
+	gchar *description = _("Cross-platform multilingual interface to Apple's iPod™");
+#endif
+
+	gtk_show_about_dialog(GTK_WINDOW(gtkpod_window),
+		"name", "gtkpod",
+		"version", VERSION,
+		"logo", icon,
+		"comments", description,
+		"copyright", copyright,
+		"website", "http://gtkpod.org",
+		"license", license,
+		"authors", authors,
+		"translator_credits", translator_credits,
+		NULL);
+
+	g_free (translator_credits);
+										 
+#ifdef LIBGPOD_VERSION
+	g_free (description);
+#endif
+
+	if(icon)
+		g_object_unref(icon);
+}
+
+
+/* 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 */
+G_MODULE_EXPORT void open_help_contents ()
+{
+	gtkpod_open_help_context("gtkpod");
+}
+
+/* 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 */
+G_MODULE_EXPORT void open_help_online ()
+{
+	gtkpod_open_in_browser("http://www.gtkpod.org/contact.html");
+}
+
+/* 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 */
+G_MODULE_EXPORT void open_help_reportbug ()
+{
+	gtkpod_open_in_browser("http://sourceforge.net/tracker/?group_id=67873&atid=519273");
+}
+
+void gtkpod_open_in_browser (const gchar *url)
+{
+	const gchar *xdg_open_argv[]   = { "xdg-open", url, NULL };
+	const gchar *gnome_open_argv[] = { "gnome-open", url, NULL };
+	const gchar *kfmclient_argv[]  = { "kfmclient", "exec", url, NULL };
+	
+	if(g_spawn_async(NULL, (gchar **)xdg_open_argv, NULL, G_SPAWN_SEARCH_PATH,
+					 NULL, NULL, NULL, NULL))
+	{
+		return;
+	}
+	
+	if(g_spawn_async(NULL, (gchar **)gnome_open_argv, NULL, G_SPAWN_SEARCH_PATH,
+					 NULL, NULL, NULL, NULL))
+	{
+		return;
+	}
+	
+	g_spawn_async(NULL, (gchar **)kfmclient_argv, NULL, G_SPAWN_SEARCH_PATH,
+					 NULL, NULL, NULL, NULL);
+}
+
+void gtkpod_open_help_context (const gchar *context)
+{
+	const gchar *docdir =
+		PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "doc" G_DIR_SEPARATOR_S;
+	
+	gchar *filename = g_strdup_printf("%sgtkpod.xml#%s", docdir, context);
+	const gchar *yelp_open_argv[] = { "yelp", filename, NULL };
+	
+	if(g_spawn_async(NULL, (gchar **)yelp_open_argv, NULL, G_SPAWN_SEARCH_PATH,
+					 NULL, NULL, NULL, NULL))
+	{
+		g_free(filename);
+		return;
+	}
+	
+	g_free(filename);
+	filename = g_strdup_printf("%s%s.html", docdir, context);
+	gtkpod_open_in_browser(filename);
+	g_free(filename);
+}

Added: gtkpod/branches/upstream/current/src/help.h
===================================================================
--- gtkpod/branches/upstream/current/src/help.h	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/help.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,40 @@
+/*
+|  Copyright (C) 2007 Matvey Kozhev <sikon 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 __HELP_H__
+#define __HELP_H__
+
+/* glade callbacks */
+void open_about_window ();
+void open_help_contents ();
+void open_help_reportbug ();
+void open_help_online ();
+
+/* helper functions */
+void gtkpod_open_in_browser (const gchar *url);
+void gtkpod_open_help_context (const gchar *context);
+
+#endif

Modified: gtkpod/branches/upstream/current/src/info.c
===================================================================
--- gtkpod/branches/upstream/current/src/info.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/info.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: info.c 1550 2007-06-17 14:14:38Z jcsjcs $
+|  $Id: info.c 1894 2008-01-01 19:26:37Z Sikon $
 */
 
 /* This file provides functions for the info window as well as for the
@@ -63,14 +63,80 @@
 static gdouble space_ipod_free = 0; /* thread save access through mutex */
 static gdouble space_ipod_used = 0; /* thread save access through mutex */
 
+static GList *callbacks_info_update = NULL;
+static GList *callbacks_info_update_track_view = NULL;
+static GList *callbacks_info_update_playlist_view = NULL;
+static GList *callbacks_info_update_totals_view = NULL;
 
-static gdouble get_ipod_free_space(void);
 #if 0
 static gdouble get_ipod_used_space(void);
 #endif
 
+/* callback management */
+static void register_callback (GList **list, info_update_callback cb)
+{
+	if(*list && g_list_index (*list, cb) != -1)
+		return;
+	
+	*list = g_list_append (*list, cb);
+}
+
+static void unregister_callback (GList **list, info_update_callback cb)
+{
+	if(*list)
+		*list = g_list_remove (*list, cb);
+}
+
+static void callback_call_all (GList *list)
+{
+	for(; list; list = list->next)
+	{
+		((info_update_callback) list->data) ();
+	}
+}
+
+void register_info_update (info_update_callback cb)
+{
+	register_callback (&callbacks_info_update, cb);
+}
+
+void register_info_update_track_view (info_update_callback cb)
+{
+	register_callback (&callbacks_info_update_track_view, cb);
+}
+
+void register_info_update_playlist_view (info_update_callback cb)
+{
+	register_callback (&callbacks_info_update_playlist_view, cb);
+}
+
+void register_info_update_totals_view (info_update_callback cb)
+{
+	register_callback (&callbacks_info_update_totals_view, cb);
+}
+
+void unregister_info_update (info_update_callback cb)
+{
+	unregister_callback (&callbacks_info_update, cb);
+}
+
+void unregister_info_update_track_view (info_update_callback cb)
+{
+	unregister_callback (&callbacks_info_update_track_view, cb);
+}
+
+void unregister_info_update_playlist_view (info_update_callback cb)
+{
+	unregister_callback (&callbacks_info_update_playlist_view, cb);
+}
+
+void unregister_info_update_totals_view (info_update_callback cb)
+{
+	unregister_callback (&callbacks_info_update_totals_view, cb);
+}
+
 /* fill in tracks, playtime and filesize from track list @tl */
-static void fill_in_info (GList *tl, guint32 *tracks,
+void fill_in_info (GList *tl, guint32 *tracks,
 			  guint32 *playtime, gdouble *filesize)
 {
     GList *gl;
@@ -153,67 +219,11 @@
     }
 }
 
-
-
-/* open info window */
-void info_open_window (void)
-{
-    if (info_window)
-    {   /* info window already open -- raise to the top */
-	gdk_window_raise (info_window->window);
-	return;
-    }
-    
-    info_xml = glade_xml_new (xml_file, "gtkpod_info", NULL);
-    glade_xml_signal_autoconnect (info_xml);
-    info_window = gtkpod_xml_get_widget (info_xml, "gtkpod_info");
-    
-    if (info_window)
-    {
-	gint defx, defy;
-	defx = prefs_get_int("size_info.x");
-  defy = prefs_get_int("size_info.y");
-	gtk_window_set_default_size (GTK_WINDOW (info_window), defx, defy);
-	prefs_set_int("info_window", TRUE); /* notify prefs */
-	info_update ();
-	gtk_widget_show (info_window);
-	/* set the menu item for the info window correctly */
-	display_set_info_window_menu ();
-    }
-}
-
-/* close info window */
-void info_close_window (void)
-{
-    GtkWidget *win;
-
-    if (!info_window) return; /* not open */
-
-    info_update_default_sizes ();
-    win = info_window;
-    info_window = NULL;
-    gtk_widget_destroy (win);
-     prefs_set_int("info_window", FALSE); /* notify prefs */
-    /* set the menu item for the info window correctly */
-    display_set_info_window_menu ();
-}
-
-/* save current window size */
-void info_update_default_sizes (void)
-{
-    if (info_window)
-    {
-	gint defx, defy;
-	gtk_window_get_size (GTK_WINDOW (info_window), &defx, &defy);
-	prefs_set_int("size_info.x", defx);
-	prefs_set_int("size_info.y", defy);
-    }
-}
-
 /* update all sections of info window */
 void info_update (void)
 {
-    if (!info_window) return; /* not open */
+	callback_call_all (callbacks_info_update);
+	
     info_update_track_view ();
     info_update_playlist_view ();
     info_update_totals_view ();
@@ -225,7 +235,7 @@
     gdouble  filesize;        /* in bytes */
     GList *displayed;
 
-    g_return_if_fail (info_window);
+    if (!info_window) return; /* not open */
     displayed = display_get_selected_members (prefs_get_int("sort_tab_num")-1);
     fill_in_info (displayed, &tracks, &playtime, &filesize);
     fill_label_uint ("tracks_displayed", tracks);
@@ -233,7 +243,7 @@
     fill_label_size ("filesize_displayed", filesize);
 }
 
-void info_update_track_view_selected (void)
+static void info_update_track_view_selected (void)
 {
     guint32 tracks, playtime; /* playtime in secs */
     gdouble  filesize;        /* in bytes */
@@ -251,7 +261,9 @@
 /* update track view section */
 void info_update_track_view (void)
 {
-    if (!info_window) return; /* not open */
+	callback_call_all (callbacks_info_update_track_view);
+
+	if (!info_window) return; /* not open */
     info_update_track_view_displayed ();
     info_update_track_view_selected ();
 }
@@ -259,7 +271,9 @@
 /* update playlist view section */
 void info_update_playlist_view (void)
 {
-    guint32 tracks, playtime; /* playtime in secs */
+	callback_call_all (callbacks_info_update_playlist_view);
+
+	guint32 tracks, playtime; /* playtime in secs */
     gdouble  filesize;        /* in bytes */
     GList   *tl;
 
@@ -273,7 +287,7 @@
 
 
 /* Get the local itdb */
-static iTunesDB *get_itdb_local (void)
+iTunesDB *get_itdb_local (void)
 {
     struct itdbs_head *itdbs_head;
     GList *gl;
@@ -296,7 +310,7 @@
 /* Get the iPod itdb */
 /* FIXME: This function must be expanded if support for several iPods
    is implemented */
-static iTunesDB *get_itdb_ipod (void)
+iTunesDB *get_itdb_ipod (void)
 {
     struct itdbs_head *itdbs_head;
     GList *gl;
@@ -315,7 +329,43 @@
     return NULL;
 }
 
+/* update "free space" section of totals view */
+static void info_update_totals_view_space (void)
+{
+    gdouble nt_filesize, del_filesize;
+    guint32 nt_tracks, del_tracks;
+    iTunesDB *itdb;
 
+    if (!info_window) return;
+    itdb = get_itdb_ipod ();
+    if (itdb)
+    {
+	gp_info_nontransferred_tracks (itdb, &nt_filesize, &nt_tracks);
+	fill_label_uint ("non_transferred_tracks", nt_tracks);
+	fill_label_size ("non_transferred_filesize", nt_filesize);
+	gp_info_deleted_tracks (itdb, &del_filesize, &del_tracks);
+	fill_label_uint ("deleted_tracks", del_tracks);
+	fill_label_size ("deleted_filesize", del_filesize);
+	if (!get_offline (itdb))
+	{
+	    if (ipod_connected ())
+	    {
+		gdouble free_space = get_ipod_free_space()
+		    + del_filesize - nt_filesize;
+		fill_label_size ("free_space", free_space);
+	    }
+	    else
+	    {
+		fill_label_string ("free_space", _("n/c"));
+	    }
+	}
+	else
+	{
+	    fill_label_string ("free_space", _("offline"));
+	}
+    }
+}
+
 /* update "totals" view section */
 void info_update_totals_view (void)
 {
@@ -324,7 +374,9 @@
     Playlist *pl;
     iTunesDB *itdb;
 
-    if (!info_window) return; /* not open */
+	callback_call_all (callbacks_info_update_totals_view);
+
+	if (!info_window) return; /* not open */
     
     itdb = get_itdb_ipod ();
     if (itdb)
@@ -353,44 +405,6 @@
     info_update_totals_view_space ();
 }
 
-/* update "free space" section of totals view */
-void info_update_totals_view_space (void)
-{
-    gdouble nt_filesize, del_filesize;
-    guint32 nt_tracks, del_tracks;
-    iTunesDB *itdb;
-
-    if (!info_window) return;
-    itdb = get_itdb_ipod ();
-    if (itdb)
-    {
-	gp_info_nontransferred_tracks (itdb, &nt_filesize, &nt_tracks);
-	fill_label_uint ("non_transferred_tracks", nt_tracks);
-	fill_label_size ("non_transferred_filesize", nt_filesize);
-	gp_info_deleted_tracks (itdb, &del_filesize, &del_tracks);
-	fill_label_uint ("deleted_tracks", del_tracks);
-	fill_label_size ("deleted_filesize", del_filesize);
-	if (!get_offline (itdb))
-	{
-	    if (ipod_connected ())
-	    {
-		gdouble free_space = get_ipod_free_space()
-		    + del_filesize - nt_filesize;
-		fill_label_size ("free_space", free_space);
-	    }
-	    else
-	    {
-		fill_label_string ("free_space", _("n/c"));
-	    }
-	}
-	else
-	{
-	    fill_label_string ("free_space", _("offline"));
-	}
-    }
-}
-
-
 /*------------------------------------------------------------------*\
  *                                                                  *
  *                   Functions for Statusbar                        *
@@ -749,7 +763,7 @@
 
 
 /* in Bytes */
-static gdouble get_ipod_free_space(void)
+gdouble get_ipod_free_space(void)
 {
     gdouble result;
     g_mutex_lock (space_mutex);

Modified: gtkpod/branches/upstream/current/src/info.h
===================================================================
--- gtkpod/branches/upstream/current/src/info.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/info.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: info.h 1065 2007-05-06 14:16:17Z jcsjcs $
+|  $Id: info.h 1894 2008-01-01 19:26:37Z Sikon $
 */
 
 #ifndef __INFO_H__
@@ -36,16 +36,30 @@
 #include <glib.h>
 #include "itdb.h"
 
+/* callbacks */
+typedef void (*info_update_callback) ();
+
+void register_info_update (info_update_callback cb);
+void register_info_update_track_view (info_update_callback cb);
+void register_info_update_playlist_view (info_update_callback cb);
+void register_info_update_totals_view (info_update_callback cb);
+
+void unregister_info_update (info_update_callback cb);
+void unregister_info_update_track_view (info_update_callback cb);
+void unregister_info_update_playlist_view (info_update_callback cb);
+void unregister_info_update_totals_view (info_update_callback cb);
+
+/* generic functions */
+void fill_in_info (GList *tl, guint32 *tracks, guint32 *playtime, gdouble *filesize);
+iTunesDB *get_itdb_ipod (void);
+iTunesDB *get_itdb_local (void);
+gdouble get_ipod_free_space(void);
+
 /* info window */
-void info_open_window (void);
-void info_close_window (void);
-void info_update_default_sizes (void);
 void info_update (void);
 void info_update_track_view (void);
-void info_update_track_view_selected (void);
 void info_update_playlist_view (void);
 void info_update_totals_view (void);
-void info_update_totals_view_space (void);
 
 /* statusbar stuff */
 #define STATUSBAR_TIMEOUT 4200

Added: gtkpod/branches/upstream/current/src/infodlg.c
===================================================================
--- gtkpod/branches/upstream/current/src/infodlg.c	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/infodlg.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,316 @@
+/*
+|  Copyright (C) 2007 Matvey Kozhev <sikon 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!
+*/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include "infodlg.h"
+#include "misc.h"
+#include "info.h"
+#include "prefs.h"
+#include "misc_track.h"
+
+enum info_dialog_columns
+{
+	C_DESCRIPTION = 0,
+	C_TOTAL_IPOD,
+	C_TOTAL_LOCAL,
+	C_SELECTED_PLAYLIST,
+	C_DISPLAYED_TRACKS,
+	C_SELECTED_TRACKS,
+	C_COUNT
+};
+
+static const gchar *column_headers[] =
+{
+	"",
+	N_("Total\n(iPod)"),
+	N_("Total\n(local)"),
+	N_("Selected\nPlaylist"),
+	N_("Displayed\nTracks"),
+	N_("Selected\nTracks"),
+	NULL
+};
+
+enum info_dialog_rows
+{
+	R_NUMBER_OF_TRACKS,
+	R_PLAY_TIME,
+	R_FILE_SIZE,
+	R_NUMBER_OF_PLAYLISTS,
+	R_DELETED_TRACKS,
+	R_FILE_SIZE_DELETED,
+	R_NON_TRANSFERRED_TRACKS,
+	R_FILE_SIZE_NON_TRANSFERRED,
+	R_EFFECTIVE_FREE_SPACE,
+	R_COUNT
+};
+
+static const gchar *row_headers[] =
+{
+	N_("Number of tracks"),
+	N_("Play time"),
+	N_("File size"),
+	N_("Number of playlists"),
+	N_("Deleted tracks"),
+	N_("File size (deleted)"),
+	N_("Non-transferred tracks"),
+	N_("File size (non-transferred)"),
+	N_("Effective free space"),
+	NULL
+};
+
+static GladeXML *info_xml = NULL;
+static GtkWidget *info_dialog = NULL;
+static GtkTreeView *tree = NULL;
+static GtkListStore *store = NULL;
+
+static void info_dialog_set_text (gint row, gint column, const gchar *text)
+{
+	GtkTreeIter iter;
+	
+	gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (store), &iter, NULL, row);
+	gtk_list_store_set (store, &iter, column, text, -1);
+}
+
+static void info_dialog_set_uint (gint row, gint column, guint32 value)
+{
+	gchar buf[10];
+	sprintf (buf, "%u", value);
+	info_dialog_set_text (row, column, buf);
+}
+
+static void info_dialog_set_time (gint row, gint column, guint32 secs)
+{
+	gchar *str = g_strdup_printf ("%u:%02u:%02u",
+				      secs / 3600,
+				      (secs % 3600) / 60,
+				      secs % 60);
+
+	info_dialog_set_text (row, column, str);
+	g_free (str);
+}
+
+static void info_dialog_set_size (gint row, gint column, gdouble size)
+{
+	gchar *str = get_filesize_as_string (size);
+	info_dialog_set_text (row, column, str);
+	g_free (str);
+}
+
+static void update_view_generic (gint column, GList *list)
+{
+    guint32 tracks, playtime; /* playtime in secs */
+    gdouble  filesize;        /* in bytes */
+
+    g_return_if_fail (info_dialog);
+    fill_in_info (list, &tracks, &playtime, &filesize);
+    info_dialog_set_uint (R_NUMBER_OF_TRACKS, column, tracks);
+    info_dialog_set_time (R_PLAY_TIME, column, playtime);
+    info_dialog_set_size (R_FILE_SIZE, column, filesize);
+}
+
+static void on_info_dialog_update_track_view ()
+{
+	update_view_generic (C_DISPLAYED_TRACKS,
+						 display_get_selected_members (prefs_get_int ("sort_tab_num") - 1));
+
+	update_view_generic (C_SELECTED_TRACKS,
+						 display_get_selection (prefs_get_int("sort_tab_num")));
+}
+
+static void on_info_dialog_update_playlist_view ()
+{
+	update_view_generic (C_SELECTED_PLAYLIST,
+						 display_get_selected_members (-1));
+
+}
+
+static void on_info_dialog_update_totals_view ()
+{
+    Playlist *pl;
+    iTunesDB *itdb;
+    gdouble nt_filesize, del_filesize;
+    guint32 nt_tracks, del_tracks;
+	
+	itdb = get_itdb_ipod ();
+	
+	if (itdb)
+	{
+		pl = itdb_playlist_mpl (itdb);
+		g_return_if_fail (pl);
+		update_view_generic (C_TOTAL_IPOD, pl->members);
+		
+		info_dialog_set_uint (R_NUMBER_OF_PLAYLISTS,
+							  C_TOTAL_IPOD,
+							  itdb_playlists_number (itdb) - 1);
+		
+		gp_info_nontransferred_tracks (itdb, &nt_filesize, &nt_tracks);
+		gp_info_deleted_tracks (itdb, &del_filesize, &del_tracks);
+		
+		info_dialog_set_uint (R_NON_TRANSFERRED_TRACKS, C_TOTAL_IPOD, nt_tracks);
+		info_dialog_set_size (R_FILE_SIZE_NON_TRANSFERRED, C_TOTAL_IPOD, nt_filesize);
+		info_dialog_set_uint (R_DELETED_TRACKS, C_TOTAL_IPOD, del_tracks);
+		info_dialog_set_size (R_FILE_SIZE_DELETED, C_TOTAL_IPOD, del_filesize);
+
+		if (!get_offline (itdb))
+		{
+			if (ipod_connected ())
+			{
+				gdouble free_space = get_ipod_free_space() + del_filesize - nt_filesize;
+				info_dialog_set_size (R_EFFECTIVE_FREE_SPACE, C_TOTAL_IPOD, free_space);
+			}
+			else
+				info_dialog_set_text (R_EFFECTIVE_FREE_SPACE, C_TOTAL_IPOD, _("n/c"));
+		}
+		else
+			info_dialog_set_text (R_EFFECTIVE_FREE_SPACE, C_TOTAL_IPOD, _("offline"));
+	}
+	
+	itdb = get_itdb_local ();
+	
+	if (itdb)
+	{
+		pl = itdb_playlist_mpl (itdb);
+		g_return_if_fail (pl);
+		update_view_generic (C_TOTAL_LOCAL, pl->members);
+		
+		info_dialog_set_uint (R_NUMBER_OF_PLAYLISTS,
+							  C_TOTAL_LOCAL,
+							  itdb_playlists_number (itdb) - 1);
+	}
+}
+
+static void setup_info_dialog ()
+{
+	gint i;
+	gint defx = prefs_get_int("size_info.x");
+	gint defy = prefs_get_int("size_info.y");
+	
+	gtk_window_set_default_size (GTK_WINDOW (info_dialog), defx, defy);
+
+	tree = GTK_TREE_VIEW (gtkpod_xml_get_widget (info_xml, "info_tree"));
+	store = gtk_list_store_new (C_COUNT,
+								G_TYPE_STRING,
+								G_TYPE_STRING,
+								G_TYPE_STRING,
+								G_TYPE_STRING,
+								G_TYPE_STRING,
+								G_TYPE_STRING);
+	
+	for (i = 0; column_headers[i]; i++)
+	{
+		const gchar *hdr = column_headers[i][0] ? _(column_headers[i]) : column_headers[i];
+		GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+
+		g_object_set (renderer,
+					  "editable",
+					  i > 0,
+					  "foreground",
+					  i % 2 ? "#000000" : "#000000",
+					  NULL);
+		
+		gtk_tree_view_insert_column_with_attributes (tree,
+													 -1,
+													 hdr,
+													 renderer,
+													 "markup",
+													 i,
+													 NULL);
+	}
+	
+	for (i = 0; row_headers[i]; i++)
+	{
+		GtkTreeIter iter;
+		gchar *text = g_strdup_printf ("<b>%s</b>", _(row_headers[i]));
+		
+		gtk_list_store_append (store, &iter);
+		gtk_list_store_set (store, &iter, C_DESCRIPTION, text, -1);
+		g_free (text);
+	}
+	
+	gtk_tree_view_set_model (tree, GTK_TREE_MODEL (store));
+	g_object_unref (store);
+
+	register_info_update_track_view (on_info_dialog_update_track_view);
+	register_info_update_playlist_view (on_info_dialog_update_playlist_view);
+	register_info_update_totals_view (on_info_dialog_update_totals_view);
+	info_update ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void open_info_dialog ()
+{
+	if(info_dialog)
+	{
+		gtk_window_present(GTK_WINDOW(info_dialog));
+		return;
+	}
+
+	info_xml = gtkpod_xml_new (xml_file, "info_dialog");
+	info_dialog = gtkpod_xml_get_widget (info_xml, "info_dialog");
+	
+	setup_info_dialog();
+	
+	glade_xml_signal_autoconnect (info_xml);
+	prefs_set_int("info_window", TRUE);
+	gtk_widget_show(info_dialog);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void close_info_dialog ()
+{
+	unregister_info_update_track_view (on_info_dialog_update_track_view);
+	unregister_info_update_playlist_view (on_info_dialog_update_playlist_view);
+	unregister_info_update_totals_view (on_info_dialog_update_totals_view);
+	info_dialog_update_default_sizes ();
+
+	prefs_set_int("info_window", FALSE);
+    display_set_info_window_menu ();
+	gtk_widget_destroy(info_dialog);
+	g_object_unref(info_xml);
+	
+	info_dialog = NULL;
+	info_xml = NULL;
+}
+
+void info_dialog_update_default_sizes ()
+{
+    if (info_dialog)
+    {
+		gint defx, defy;
+		gtk_window_get_size (GTK_WINDOW (info_dialog), &defx, &defy);
+		prefs_set_int("size_info.x", defx);
+		prefs_set_int("size_info.y", defy);
+    }
+}

Added: gtkpod/branches/upstream/current/src/infodlg.h
===================================================================
--- gtkpod/branches/upstream/current/src/infodlg.h	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/infodlg.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,34 @@
+/*
+|  Copyright (C) 2007 Matvey Kozhev <sikon 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 __INFODLG_H__
+#define __INFODLG_H__
+
+void open_info_dialog ();
+void close_info_dialog ();
+void info_dialog_update_default_sizes ();
+
+#endif

Modified: gtkpod/branches/upstream/current/src/ipod_init.c
===================================================================
--- gtkpod/branches/upstream/current/src/ipod_init.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/ipod_init.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-06-19 22:52:52 jcs>
+/* Time-stamp: <2008-09-30 23:36:02 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: ipod_init.c 1564 2007-06-19 13:54:47Z jcsjcs $
+|  $Id: ipod_init.c 2124 2008-09-30 14:40:29Z jcsjcs $
 */
 
 /* This file provides functions to initialize a new iPod */
@@ -48,9 +48,11 @@
 const gchar *SELECT_OR_ENTER_YOUR_MODEL=N_("Select or enter your model");
 
 /* string constants for window widgets used more than once */
-static const gchar *MOUNTPOINT_ENTRY="mountpoint_entry";
-static const gchar *MOUNTPOINT_BUTTON="mountpoint_button";
-static const gchar *MODEL_COMBO="model_combo";
+static const gchar *IID_MOUNTPOINT_ENTRY="iid_mountpoint_entry";
+static const gchar *IID_MOUNTPOINT_BUTTON="iid_mountpoint_button";
+static const gchar *IID_MODEL_COMBO="iid_model_combo";
+static const gchar *SIMD_MODEL_COMBO="simd_model_combo";
+static const gchar *SIMD_LABEL="simd_label";
 
 /* Columns for the model_combo tree model */
 enum
@@ -73,7 +75,7 @@
     g_return_if_fail (ii);
 
     old_dir = gtk_entry_get_text (
-	GTK_ENTRY (GET_WIDGET (MOUNTPOINT_ENTRY)));
+	GTK_ENTRY (GET_WIDGET (IID_MOUNTPOINT_ENTRY)));
 
     new_dir = fileselection_get_file_or_dir (
 	_("Select mountpoint"),
@@ -82,7 +84,7 @@
 
     if (new_dir)
     {
-	gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (MOUNTPOINT_ENTRY)),
+	gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (IID_MOUNTPOINT_ENTRY)),
 			    new_dir);
 	g_free (new_dir);
     }
@@ -253,7 +255,8 @@
     /* Create window */
     ii = g_new0 (IpodInit, 1);
     ii->itdb = itdb;
-    ii->xml = glade_xml_new (xml_file, "ipod_init_dialog", NULL);
+    ii->xml = gtkpod_xml_new (xml_file, "ipod_init_dialog");
+
     ii->window = gtkpod_xml_get_widget (ii->xml,
 					"ipod_init_dialog");
     g_return_val_if_fail (ii->window, FALSE);
@@ -262,17 +265,17 @@
     mountpoint = get_itdb_prefs_string (itdb, KEY_MOUNTPOINT);
     if (mountpoint)
     {
-	gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (MOUNTPOINT_ENTRY)),
+	gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (IID_MOUNTPOINT_ENTRY)),
 			    mountpoint);
     }
 
     /* Signal handlers */
-    g_signal_connect (GET_WIDGET (MOUNTPOINT_BUTTON), "clicked",
+    g_signal_connect (GET_WIDGET (IID_MOUNTPOINT_BUTTON), "clicked",
 		      G_CALLBACK (mountpoint_button_clicked), ii);
 
 
     /* Setup model number combo */
-    cb = GTK_COMBO_BOX (GET_WIDGET (MODEL_COMBO));
+    cb = GTK_COMBO_BOX (GET_WIDGET (IID_MODEL_COMBO));
     gp_init_model_number_combo (cb);
 
     /* If available set current model number, otherwise indicate that
@@ -307,7 +310,7 @@
     case GTK_RESPONSE_OK:
 	new_mount = g_strdup (
 	    gtk_entry_get_text (
-		GTK_ENTRY (GET_WIDGET (MOUNTPOINT_ENTRY))));
+		GTK_ENTRY (GET_WIDGET (IID_MOUNTPOINT_ENTRY))));
 	/* remove trailing '/' in case it's present. */
 	if (mountpoint && (strlen (mountpoint) > 0))
 	{
@@ -339,7 +342,7 @@
 	    new_mount = NULL;
 	}
 	model = gtk_combo_box_get_active_text (
-	    GTK_COMBO_BOX (GET_WIDGET (MODEL_COMBO)));
+	    GTK_COMBO_BOX (GET_WIDGET (IID_MODEL_COMBO)));
 	if ((strcmp (model, gettext(SELECT_OR_ENTER_YOUR_MODEL)) == 0) ||
 	    (strlen (model) == 0))
 	{   /* User didn't choose a model */
@@ -412,7 +415,7 @@
     g_return_if_fail (itdb);
 
     /* Create window */
-    xml = glade_xml_new (xml_file, "set_ipod_model_dialog", NULL);
+    xml = gtkpod_xml_new (xml_file, "set_ipod_model_dialog");
     window = GET_WIDGET ("set_ipod_model_dialog");
     g_return_if_fail (window);
 
@@ -420,11 +423,11 @@
     mountpoint = get_itdb_prefs_string (itdb, KEY_MOUNTPOINT);
     g_return_if_fail (mountpoint);
     g_snprintf (buf, PATH_MAX, _("<b>Please select your iPod model at </b><i>%s</i>"), mountpoint);
-    gtk_label_set_markup (GTK_LABEL (GET_WIDGET ("label")), buf);
+    gtk_label_set_markup (GTK_LABEL (GET_WIDGET (SIMD_LABEL)), buf);
     g_free (mountpoint);
 
     /* Setup model number combo */
-    cb = GTK_COMBO_BOX (GET_WIDGET (MODEL_COMBO));
+    cb = GTK_COMBO_BOX (GET_WIDGET (SIMD_MODEL_COMBO));
     gp_init_model_number_combo (cb);
 
     /* If available set current model number, otherwise indicate that
@@ -457,7 +460,7 @@
     {
     case GTK_RESPONSE_OK:
 	model = gtk_combo_box_get_active_text (
-	    GTK_COMBO_BOX (GET_WIDGET (MODEL_COMBO)));
+	    GTK_COMBO_BOX (GET_WIDGET (SIMD_MODEL_COMBO)));
 	if (!model)
 	{
 	    gtkpod_warning (_("Could not determine the model you selected -- this could be a bug or incompatibilty in the GTK+ or glade library.\n\n"));

Modified: gtkpod/branches/upstream/current/src/misc.c
===================================================================
--- gtkpod/branches/upstream/current/src/misc.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/misc.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: misc.c 1822 2007-12-12 16:31:26Z dforsi $
+|  $Id: misc.c 2079 2008-08-02 10:50:09Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -57,135 +57,65 @@
 
 /*------------------------------------------------------------------*\
  *                                                                  *
- *             About Window                                         *
+ *             Miscellaneous                                        *
  *                                                                  *
 \*------------------------------------------------------------------*/
 
-/* 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 ()
+/* Copied g_utf8_strcasestr from GtkSourceView */
+gchar *utf8_strcasestr (const gchar *haystack, const gchar *needle)
 {
-	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 };
+	gsize needle_len;
+	gsize haystack_len;
+	gchar *ret = NULL;
+	gchar *p;
+	gchar *casefold;
+	gchar *caseless_haystack;
+	gint i;
 
-	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
-	};
+	g_return_val_if_fail (haystack != NULL, NULL);
+	g_return_val_if_fail (needle != NULL, NULL);
 
-	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."
-	);
+	casefold = g_utf8_casefold (haystack, -1);
+	caseless_haystack = g_utf8_normalize (casefold, -1, G_NORMALIZE_ALL);
+	g_free (casefold);
 
-	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);
+	needle_len = g_utf8_strlen (needle, -1);
+	haystack_len = g_utf8_strlen (caseless_haystack, -1);
 
-	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);
+	if (needle_len == 0)
+	{
+		ret = (gchar *)haystack;
+		goto finally_1;
+	}
 
-	g_free(translator_credits);
+	if (haystack_len < needle_len)
+	{
+		ret = NULL;
+		goto finally_1;
+	}
 
-	if(icon)
-		g_object_unref(icon);
-}
+	p = (gchar*)caseless_haystack;
+	needle_len = strlen (needle);
+	i = 0;
 
+	while (*p)
+	{
+		if ((strncmp (p, needle, needle_len) == 0))
+		{
+			ret = g_utf8_offset_to_pointer (haystack, i);
+			goto finally_1;
+		}
 
-/*------------------------------------------------------------------*\
- *                                                                  *
- *             Miscellaneous                                        *
- *                                                                  *
-\*------------------------------------------------------------------*/
+		p = g_utf8_next_char (p);
+		i++;
+	}
 
+finally_1:
+	g_free (caseless_haystack);
 
+	return ret;
+}
+
 /* Calculate the time in ms passed since @old_time. @old_time is
    updated with the current time if @update is TRUE*/
 float get_ms_since (GTimeVal *old_time, gboolean update)
@@ -1348,22 +1278,43 @@
 
 
 /**
+ * Wrapper for glade_xml_new() for cygwin compatibility issues
+ *
+ **/
+GladeXML *gtkpod_xml_new (const gchar *xml_file, const gchar *name)
+{
+    GladeXML *xml;
+	
+#ifdef ENABLE_NLS
+	xml = glade_xml_new (xml_file, name, GETTEXT_PACKAGE);
+#else
+	xml = glade_xml_new (xml_file, name, NULL);
+#endif
+
+    if (!xml)
+		fprintf (stderr, "*** Programming error: Cannot create glade XML: '%s'\n",
+				 name);
+
+    return xml;
+}
+
+
+/**
  * Wrapper for gtkpod_xml_get_widget() giving out a warning if widget
  * could not be found.
  *
  **/
 GtkWidget *gtkpod_xml_get_widget (GladeXML *xml, const gchar *name)
 {
-    GtkWidget *w=glade_xml_get_widget (xml, name);
+    GtkWidget *w = glade_xml_get_widget (xml, name);
 
     if (!w)
-	fprintf (stderr, "*** Programming error: Widget not found: '%s'\n",
-		 name);
+		fprintf (stderr, "*** Programming error: Widget not found: '%s'\n",
+				 name);
 
     return w;
 }
 
-
 /* ------------------------------------------------------------
  *
  *        Helper functions for pref keys
@@ -1739,12 +1690,14 @@
 	GError *error = NULL;
 	gchar *path = g_build_filename (dir, "gtkpod.prefs", NULL);
 	temp_prefs = temp_prefs_load (path, &error);
+	g_free (path);
 	if (temp_prefs)
 	{
 	    gchar *subkey;
 	    subkey = get_itdb_prefs_key (index, "");
 	    /* rename 'itdb_*' to 'itdb_<index>_*' */
 	    temp_prefs_rename_subkey (temp_prefs, "itdb_", subkey);
+	    g_free (subkey);
 	    /* merge with real prefs */
 	    temp_prefs_apply (temp_prefs);
 	    /* destroy temp prefs */
@@ -1850,7 +1803,7 @@
     /* Initialisation of libxml */
     LIBXML_TEST_VERSION;
 
-    main_window_xml = glade_xml_new (xml_file, "gtkpod", NULL);
+    main_window_xml = gtkpod_xml_new (xml_file, "gtkpod");
 
     glade_xml_signal_autoconnect (main_window_xml);
   

Modified: gtkpod/branches/upstream/current/src/misc.h
===================================================================
--- gtkpod/branches/upstream/current/src/misc.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/misc.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: misc.h 1814 2007-12-11 12:53:22Z jcsjcs $
+|  $Id: misc.h 1908 2008-01-03 14:38:30Z Sikon $
 */
 
 #ifndef __MISC_H__
@@ -75,27 +75,10 @@
 
 /* Some symbols not necessarily defined */
 
-/* Introduced in 2.6 */
-#ifndef GTK_STOCK_DISCONNECT
-#define GTK_STOCK_DISCONNECT GTK_STOCK_GOTO_TOP
-#define GTK_STOCK_CONNECT GTK_STOCK_GOTO_BOTTOM
-#endif
-#ifndef GTK_STOCK_EDIT
-#define GTK_STOCK_EDIT NULL
-#endif
-#ifndef G_IS_DIR_SEPARATOR
-#define G_IS_DIR_SEPARATOR(c) (c == G_DIR_SEPARATOR)
-#endif
-/* SEMIBOLD was introduced with version 2.8 */
-#ifndef PANGO_WEIGHT_SEMIBOLD
-#define PANGO_WEIGHT_SEMIBOLD 600
-#endif
+gchar *utf8_strcasestr (const gchar *haystack, const gchar *needle);
 
-
-
-
 gchar *get_user_string (gchar *title, gchar *message, gchar *dflt,
-			gchar *opt_msg, gboolean *opt_state);
+			gchar *opt_msg, gboolean *opt_state, const gchar *accept_button);
 Playlist *add_new_pl_user_name (iTunesDB *itdb, gchar *dflt, gint32 pos);
 void add_new_pl_or_spl_user_name (iTunesDB *itdb, gchar *dflt, gint32 pos);
 void create_add_files_fileselector (void);
@@ -105,7 +88,6 @@
 			       G_CONST_RETURN gchar *rel_dir);
 float get_ms_since (GTimeVal *old_time, gboolean update);
 gint get_sort_tab_number (gchar *text);
-void open_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[]);
@@ -143,6 +125,11 @@
 void delete_track_ok (struct DeleteData *dd);
 
 void gtkpod_warning (const gchar *format, ...);
+void gtkpod_warning_simple (const gchar *format, ...);
+void gtkpod_warning_hig (GtkWindow *parent,
+						 GtkMessageType icon,
+						 const gchar *primary_text,
+						 const gchar *secondary_text);
 
 gchar *time_time_to_string (time_t t);
 gchar *time_fromtime_to_string (time_t t);
@@ -239,6 +226,7 @@
 
 gchar *which (const gchar *exe);
 
+GladeXML *gtkpod_xml_new (const gchar *xml_file, const gchar *name);
 GtkWidget *gtkpod_xml_get_widget (GladeXML *xml, const gchar *name);
 
 gchar *get_itdb_prefs_key (gint index, const gchar *subkey);

Modified: gtkpod/branches/upstream/current/src/misc_confirm.c
===================================================================
--- gtkpod/branches/upstream/current/src/misc_confirm.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/misc_confirm.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: misc_confirm.c 1822 2007-12-12 16:31:26Z dforsi $
+|  $Id: misc_confirm.c 2209 2009-01-13 13:45:55Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -82,7 +82,41 @@
     g_free (text);
 }
 
+void gtkpod_warning_simple (const gchar *format, ...)
+{
+    va_list arg;
+    gchar *text;
 
+    va_start (arg, format);
+    text = g_strdup_vprintf (format, arg);
+    va_end (arg);
+	
+	gtkpod_warning_hig (GTK_WINDOW (gtkpod_window), GTK_MESSAGE_WARNING, _("Warning"), text);
+	g_free (text);
+}
+
+void gtkpod_warning_hig (GtkWindow *parent,
+						 GtkMessageType icon,
+						 const gchar *primary_text,
+						 const gchar *secondary_text)
+{
+	GtkWidget *dialog =	gtk_message_dialog_new(parent,
+						       GTK_DIALOG_MODAL,
+						       icon,
+						       GTK_BUTTONS_OK,
+						       "%s",
+						       primary_text);
+	
+	gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG(dialog),
+						    "%s",
+						    secondary_text);
+	
+	gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
+
+}
+
+
 /*------------------------------------------------------------------*\
  *                                                                  *
  *             Delete Tracks                                         *
@@ -826,33 +860,38 @@
  *
  * return value: TRUE if it's OK to quit.
  */
-static gboolean
-ok_to_close_gtkpod (void)
+static gboolean ok_to_close_gtkpod (void)
 {
-    gint result = GTK_RESPONSE_YES;
+    gint result = GTK_RESPONSE_OK;
 
     if (!files_are_saved ())
     {
-	GtkWidget *dialog = gtk_message_dialog_new (
-	    GTK_WINDOW (gtkpod_window),
-	    GTK_DIALOG_DESTROY_WITH_PARENT,
-	    GTK_MESSAGE_WARNING,
-	    GTK_BUTTONS_YES_NO,
-	    _("Data has been changed and not been saved.\nOK to exit gtkpod?"));
-	result = gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
+		const gchar *str = _("Data has been changed and not been saved. If you quit gtkpod, all unsaved changes will be lost.\n\nDo you want to save your changes first?");
+		
+		result = gtkpod_confirmation_hig(GTK_WINDOW (gtkpod_window),
+											GTK_MESSAGE_WARNING,
+											_("Save changes before quiting?"),
+											str,
+											GTK_STOCK_SAVE,
+											GTK_STOCK_CANCEL,
+											_("Quit without saving"),
+											NULL);
     }
 
-    if (result == GTK_RESPONSE_YES)
-    {
+	/* User pressed Cancel */
+    if (result == GTK_RESPONSE_CANCEL)
+		return FALSE;
+	
+	/* User pressed Save */
+	if (result == GTK_RESPONSE_OK)
+		handle_export ();
+	
 	return TRUE;
-    }
-    return FALSE;
 }
 
 
 /* callback for gtkpod window's close button */
-gboolean
+G_MODULE_EXPORT gboolean
 on_gtkpod_delete_event                 (GtkWidget       *widget,
 					GdkEvent        *event,
 					gpointer         user_data)
@@ -862,7 +901,9 @@
 	if (ok_to_close_gtkpod ())
 	{
 	    gtkpod_shutdown ();
-	    return FALSE;
+	    /* returning FALSE to continue calling other handlers
+	       causes tons of errors. */
+	    return TRUE;
 	}
     }
     return TRUE; /* don't quit -- would cause numerous error messages */
@@ -870,7 +911,7 @@
 
 
 /* callback for quit menu entry */
-void
+G_MODULE_EXPORT void
 on_quit1_activate                      (GtkMenuItem     *menuitem,
 					gpointer         user_data)
 {

Modified: gtkpod/branches/upstream/current/src/misc_conversion.c
===================================================================
--- gtkpod/branches/upstream/current/src/misc_conversion.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/misc_conversion.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: misc_conversion.c 1655 2007-07-27 02:22:31Z tiffman $
+|  $Id: misc_conversion.c 2148 2008-11-08 08:02:15Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -111,6 +111,7 @@
     N_("Sort Composer"),
     N_("Sort TV Show"),
     N_("Gapless Track Flag"),
+    N_("Lyrics"),
     NULL };
 
 /* Tooltips for prefs window */
@@ -171,6 +172,7 @@
     N_("Used for sorting on the iPod"),
     N_("Used for sorting on the iPod"),
     N_("Used for sorting on the iPod"),
+    NULL,
     NULL
  };
 
@@ -230,6 +232,7 @@
     case TM_COLUMN_SORT_ALBUMARTIST: return T_SORT_ALBUMARTIST;
     case TM_COLUMN_SORT_COMPOSER: return T_SORT_COMPOSER;
     case TM_COLUMN_SORT_TVSHOW:   return T_SORT_TVSHOW;
+    case TM_COLUMN_LYRICS:        return T_LYRICS;
     case TM_NUM_COLUMNS:          g_return_val_if_reached (-1);
     }
     return -1;
@@ -296,10 +299,9 @@
     case ST_CAT_COMPOSER:    return T_COMPOSER;
     case ST_CAT_TITLE:       return T_TITLE;
     case ST_CAT_YEAR:        return T_YEAR;
-    case ST_CAT_SPECIAL:
-    case ST_CAT_NUM:         g_return_val_if_reached (-1);
+    case ST_CAT_SPECIAL:     g_return_val_if_reached (-1);
+    default:                 g_return_val_if_reached (-1);
     }
-    return -1;
 }
 
 

Modified: gtkpod/branches/upstream/current/src/misc_input.c
===================================================================
--- gtkpod/branches/upstream/current/src/misc_input.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/misc_input.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: misc_input.c 1588 2007-06-24 16:02:51Z jcsjcs $
+|  $Id: misc_input.c 1951 2008-03-17 22:48:27Z phantom_sf $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -38,7 +38,7 @@
 #include "misc.h"
 #include "misc_track.h"
 #include "prefs.h"
-#include "prefs_window.h"
+#include "sort_window.h"
 
 
 #define DEBUG_MISC 0
@@ -76,49 +76,32 @@
    return value: the string entered by the user or NULL if the dialog
    was cancelled. */
 gchar *get_user_string (gchar *title, gchar *message, gchar *dflt,
-			gchar *opt_msg, gboolean *opt_state)
+			gchar *opt_msg, gboolean *opt_state, const gchar *accept_button)
 {
-
-    GtkWidget *dialog, *image, *label=NULL;
-    GtkWidget *entry, *checkb=NULL, *hbox;
+	GladeXML *xml = gtkpod_xml_new (xml_file, "input_box");
+    GtkWidget *dialog = gtkpod_xml_get_widget (xml, "input_box");
+	GtkWidget *label = gtkpod_xml_get_widget (xml, "input_box_label");
+    GtkWidget *entry = gtkpod_xml_get_widget (xml, "input_box_entry");
+	GtkWidget *checkb = gtkpod_xml_get_widget (xml, "input_box_checkbox");
     gint response;
     gchar *result = NULL;
+	gchar *temp;
 
-    /* create the dialog window */
-    dialog = gtk_dialog_new_with_buttons (
-	title,
-	GTK_WINDOW (gtkpod_window),
-	GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-	GTK_STOCK_OK, GTK_RESPONSE_OK,
-	GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-	NULL);
-    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+    gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+								GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+								accept_button ? accept_button : GTK_STOCK_OK, GTK_RESPONSE_OK,
+								NULL);
 
-    /* emulate gtk_message_dialog_new */
-    image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
-				    GTK_ICON_SIZE_DIALOG);
-    gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
-
-    if (message)
-    {
-	label = gtk_label_new (message);
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_label_set_selectable (GTK_LABEL (label), TRUE);
-	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_label_set_selectable (GTK_LABEL (label), TRUE);
-    }
-    /* hbox to put the image+label in */
-    hbox = gtk_hbox_new (FALSE, 6);
-    gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
-    if (label) gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
-    /* Create entry */
-    entry = gtk_entry_new ();
+    temp = g_markup_printf_escaped ("<span weight='bold' size='larger'>%s</span>\n\n%s", title, message);
+	gtk_label_set_markup (GTK_LABEL (label), temp);
+	g_free (temp);
+	
     if (dflt)
     {
-	gtk_entry_set_text (GTK_ENTRY (entry), dflt);
-	gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
+		gtk_entry_set_text (GTK_ENTRY (entry), dflt);
+		gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
     }
+
     /* Pressing enter should activate the default response (default
        response set above */
     gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
@@ -126,36 +109,26 @@
     /* create option checkbox */
     if (opt_msg && opt_state)
     {
-	checkb = gtk_check_button_new_with_mnemonic (opt_msg);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkb),
-				      *opt_state);
+		gtk_widget_show (checkb);
+		gtk_button_set_label (GTK_BUTTON (checkb), opt_msg);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkb), *opt_state);
     }
 
-    /* add to vbox */
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			hbox, FALSE, FALSE, 2);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			entry, FALSE, FALSE, 2);
-    if (checkb)
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-			    checkb, FALSE, FALSE, 2);
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
 
-    /* Start the dialogue */
-    gtk_widget_show_all (dialog);
-    response = gtk_dialog_run (GTK_DIALOG (dialog));
-
     if (response == GTK_RESPONSE_OK)
     {
-	result = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
-	/* get state of checkbox */
-	if (checkb)
-	{
-	    *opt_state = gtk_toggle_button_get_active (
-		GTK_TOGGLE_BUTTON (checkb));
-	}
+		result = gtk_editable_get_chars (GTK_EDITABLE (entry), 0, -1);
+		
+		/* get state of checkbox only if opt_msg was non NULL */
+		if (opt_msg && checkb)
+		{
+			*opt_state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkb));
+		}
     }
 
     gtk_widget_destroy (dialog);
+	g_object_unref (xml);
     return result;
 }
 
@@ -309,13 +282,12 @@
 	{ /* only block widgets, if they are not already blocked */
 	    for (l = bws; l; l = l->next)
 	    {
-		bw = (struct blocked_widget *)l->data;
-		/* remember the state the widget was in before */
-		bw->sensitive = GTK_WIDGET_SENSITIVE (bw->widget);
-		gtk_widget_set_sensitive (bw->widget, FALSE);
+			bw = (struct blocked_widget *)l->data;
+			/* remember the state the widget was in before */
+			bw->sensitive = GTK_WIDGET_SENSITIVE (bw->widget);
+			gtk_widget_set_sensitive (bw->widget, FALSE);
 	    }
 	    sort_window_block ();
-	    prefs_window_block ();
 	    widgets_blocked = TRUE;
 	}
 	break;
@@ -326,14 +298,14 @@
 	    --count;
 	    if (count == 0)
 	    {
-		for (l = bws; l; l = l->next)
-		{
-		    bw = (struct blocked_widget *)l->data;
-		    gtk_widget_set_sensitive (bw->widget, bw->sensitive);
-		}
-		sort_window_release ();
-		prefs_window_release ();
-		widgets_blocked = FALSE;
+			for (l = bws; l; l = l->next)
+			{
+				bw = (struct blocked_widget *)l->data;
+				gtk_widget_set_sensitive (bw->widget, bw->sensitive);
+			}
+			
+			sort_window_release ();
+			widgets_blocked = FALSE;
 	    }
 	}
 	break;

Modified: gtkpod/branches/upstream/current/src/misc_playlist.c
===================================================================
--- gtkpod/branches/upstream/current/src/misc_playlist.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/misc_playlist.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: misc_playlist.c 1595 2007-06-26 13:43:54Z dforsi $
+|  $Id: misc_playlist.c 1970 2008-05-11 06:07:12Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -57,16 +57,26 @@
 Playlist *add_new_pl_user_name (iTunesDB *itdb,
 				gchar *dflt, gint32 position)
 {
+    ExtraiTunesDBData *eitdb;
     Playlist *result = NULL;
     gchar *name;
 
     g_return_val_if_fail (itdb, NULL);
 
+    eitdb = itdb->userdata;
+    g_return_val_if_fail (eitdb, NULL);
+
+    if (!eitdb->itdb_imported)
+    {
+	gtkpod_warning_simple(_("Please load the iPod before adding playlists."));
+	return NULL;
+    }
+
     name = get_user_string (
 	_("New Playlist"),
 	_("Please enter a name for the new playlist"),
 	dflt? dflt:_("New Playlist"),
-	NULL, NULL);
+	NULL, NULL, GTK_STOCK_ADD);
     if (name)
     {
 	result = gp_playlist_add_new (itdb, name, FALSE, position);
@@ -84,16 +94,26 @@
 void add_new_pl_or_spl_user_name (iTunesDB *itdb,
 				  gchar *dflt, gint32 position)
 {
+    ExtraiTunesDBData *eitdb;
     gboolean is_spl = FALSE;
     gchar *name;
 
     g_return_if_fail (itdb);
 
+    eitdb = itdb->userdata;
+    g_return_if_fail (eitdb);
+
+    if (!eitdb->itdb_imported)
+    {
+	gtkpod_warning_simple(_("Please load the iPod before adding playlists."));
+	return;
+    }
+
     name = get_user_string (
 	_("New Playlist"),
 	_("Please enter a name for the new playlist"),
 	dflt? dflt:_("New Playlist"),
-	_("Smart Playlist"), &is_spl);
+	_("Smart Playlist"), &is_spl, GTK_STOCK_ADD);
 
     if (name)
     {
@@ -110,7 +130,7 @@
 }
 
 /* callback */
-void
+G_MODULE_EXPORT void
 on_smart_playlist_activate             (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
@@ -428,7 +448,7 @@
 	_("New Playlist"),
 	_("Please enter a name for the new playlist"),
 	_("New Playlist"),
-	NULL, NULL);
+	NULL, NULL, GTK_STOCK_ADD);
     if (name)
 	return generate_playlist_with_name (itdb, tracks, name, FALSE);
     return NULL;
@@ -1008,23 +1028,26 @@
        a mistake and we should tell him about it */
     if (!eitdb->itdb_imported)
     {
-	gchar *itunesdb_filename = itdb_get_itunesdb_path (mountpoint);
-	if (itunesdb_filename)
-	{
-	    GtkWidget *dialog = gtk_message_dialog_new (
-		GTK_WINDOW (gtkpod_window),
-		GTK_DIALOG_DESTROY_WITH_PARENT,
-		GTK_MESSAGE_WARNING,
-		GTK_BUTTONS_OK_CANCEL,
-		_("You did not import the existing iTunesDB. This is most likely incorrect and will result in the loss of the existing database.\n\nPress '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"));
-	    gint result = gtk_dialog_run (GTK_DIALOG (dialog));
-	    gtk_widget_destroy (dialog);
-	    g_free (itunesdb_filename);
-	    if (result == GTK_RESPONSE_CANCEL)
-	    {
-		return;
-	    }
-	}
+		gchar *itunesdb_filename = itdb_get_itunesdb_path (mountpoint);
+
+		if (itunesdb_filename)
+		{
+			const gchar *str = _("You did not import the existing iTunesDB. This is most likely incorrect and will result in the loss of the existing database.\n\nIf you abort the operation, you can import the existing database before calling this function again.\n");
+
+			gint result = gtkpod_confirmation_hig (GTK_WINDOW (gtkpod_window),
+												   GTK_MESSAGE_WARNING,
+												   _("Existing iTunes database not imported"),
+												   str,
+												   _("Proceed anyway"),
+												   _("Abort operation"),
+												   NULL,
+												   NULL);
+
+			if (result == GTK_RESPONSE_CANCEL)
+			{
+				return;
+			}
+		}
     }
 
     gtkpod_statusbar_timeout (30*STATUSBAR_TIMEOUT);

Modified: gtkpod/branches/upstream/current/src/misc_track.c
===================================================================
--- gtkpod/branches/upstream/current/src/misc_track.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/misc_track.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: misc_track.c 1686 2007-08-25 03:20:11Z jcsjcs $
+|  $Id: misc_track.c 2149 2008-11-08 09:38:35Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -882,6 +882,9 @@
     case T_SORT_TVSHOW:
 	result = &track->sort_tvshow;
 	break;
+    case T_LYRICS:
+	result = &etr->lyrics;
+	break;
     case T_ALL:
     case T_IPOD_ID:
     case T_TRACK_NR:
@@ -989,6 +992,7 @@
     case T_SORT_ALBUMARTIST:
     case T_SORT_COMPOSER:
     case T_SORT_TVSHOW:
+    case T_LYRICS:
 	fritem = track_get_item (frtrack, item);
 	toitem_ptr = track_get_item_pointer (totrack, item);
 	g_return_val_if_fail (fritem, FALSE);
@@ -1007,6 +1011,10 @@
 		changed = TRUE;
 	    }
 	}
+	else if ((changed) && (item == T_LYRICS))
+	{
+	    write_lyrics_to_file (totrack);
+	}
 	/* handle items that have two entries */
 	if (item == T_PC_PATH)
 	{
@@ -1345,7 +1353,7 @@
 	{   /* no path set */
 	    g_free (text);
 	    text = NULL;
-	    if (track->artwork && track->artwork->thumbnails)
+	    if (itdb_track_has_thumbnails (track))
 	    {   /* artwork is set */
 		text = g_strdup (_("Embedded or filename was lost"));
 	    }
@@ -1418,6 +1426,9 @@
     case T_ITEM_NUM:
     case T_GAPLESS_TRACK_FLAG:
 	break;
+    case T_LYRICS:
+	read_lyrics_from_file (track, &text);
+	break;
     }
     return text;
 }
@@ -1501,6 +1512,15 @@
 	    changed = TRUE;
         }
         break;
+    case T_LYRICS:
+        if ((etr->lyrics == NULL) ||
+	    (strcmp(etr->lyrics,new_text) != 0))
+	{
+	    g_free(etr->lyrics);
+	    etr->lyrics=g_strdup(new_text);
+	    changed = TRUE;
+	}
+        break;
     case T_TRACK_NR:
         nr = atoi (new_text);
         if ((nr >= 0) && (nr != track->track_nr))

Modified: gtkpod/branches/upstream/current/src/mp3file.c
===================================================================
--- gtkpod/branches/upstream/current/src/mp3file.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/mp3file.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-12-11 21:31:57 jcs>
+/* Time-stamp: <2009-01-11 17:52:48 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 1813 2007-12-11 12:34:20Z jcsjcs $
+|  $Id: mp3file.c 2204 2009-01-11 10:13:15Z jcsjcs $
 */
 
 
@@ -88,6 +88,7 @@
     gchar *lyrics;        /* does not appear to be the full lyrics --
 			     only used to set the flag 'lyrics_flag'
 			     of the Track structure */
+    gchar *albumartist;         /* Album artist  */
 };
 
 
@@ -220,7 +221,7 @@
 } MP3Header;
 
 typedef struct {
-    gchar *filename;
+    const gchar *filename;
     FILE *file;
     off_t datasize;
     gint header_isvalid;
@@ -234,11 +235,11 @@
 } MP3Info;
 
 /* This is for xmms code */
-static guint get_track_time(gchar *path);
+static guint get_track_time(const gchar *path);
 
 
 /* This is for soundcheck code */
-gboolean mp3_read_lame_tag (gchar *path, LameTag *lt);
+gboolean mp3_read_lame_tag (const gchar *path, LameTag *lt);
 
 /* ------------------------------------------------------------
 
@@ -992,7 +993,7 @@
 	return 0;
 }
 
-static guint get_track_time (gchar *path)
+static guint get_track_time (const gchar *path)
 {
     guint result = 0;
 
@@ -1259,8 +1260,9 @@
     /* Use the specified text encoding */
     field = id3_frame_field (frame, 0);
     id3_field_settextencoding(field, encoding);
-   
-    if (strcmp (frame_name, ID3_FRAME_COMMENT) == 0)
+
+    if ((strcmp (frame_name, ID3_FRAME_COMMENT) == 0) ||
+        (strcmp (frame_name, "USLT") == 0))
     {
 	field = id3_frame_field (frame, 3);
 	field->type = ID3_FIELD_TYPE_STRINGFULL;
@@ -1275,6 +1277,9 @@
     /* maybe could be optimized see
        http://www.mars.org/mailman/public/mad-dev/2002-October/000739.html
     */
+/* don't handle the genre frame differently any more */
+#define USE_GENRE_IDS 0
+#if USE_GENRE_IDS
     if (strcmp (frame_name, ID3_FRAME_GENRE) == 0)
     {
 	id3_ucs4_t *tmp_ucs4 = id3_utf8_ucs4duplicate ((id3_utf8_t *)data);
@@ -1282,7 +1287,7 @@
 	if (index != -1)
 	{
 	    /* valid genre -- simply store the genre number */
-	    gchar *tmp = g_strdup_printf("%d", index);
+	    gchar *tmp = g_strdup_printf("(%d)", index);
 	    ucs4 = id3_latin1_ucs4duplicate (tmp);
 	    g_free (tmp);
 	}
@@ -1309,6 +1314,7 @@
     }
     else
     {
+#endif
 	if (encoding == ID3_FIELD_TEXTENCODING_ISO_8859_1)
 	{
 	    /* we read 'ISO_8859_1' to stand for 'any locale charset'
@@ -1323,9 +1329,11 @@
 	       worry about charsets */
 	    ucs4 = id3_utf8_ucs4duplicate ((id3_utf8_t *)data);
 	}
+#if USE_GENRE_IDS
     }
+#endif
 
-    if (strcmp (frame_name, ID3_FRAME_COMMENT) == 0)
+    if ((strcmp (frame_name, ID3_FRAME_COMMENT) == 0) || (strcmp (frame_name, "USLT") == 0))
 	res = id3_field_setfullstring (field, ucs4);
     else
 	res = id3_field_setstrings (field, 1, &ucs4);
@@ -1429,6 +1437,97 @@
     return TRUE;
 }
 
+
+/* Do some checks on the genre string -- ideally this should
+ * be done within the id3tag library, I think */
+static void handle_genre_variations (gchar **genrep)
+{
+/* http://www.id3.org/id3v2.3.0#head-42b02d20fb8bf48e38ec5415e34909945dd849dc */
+
+/* The 'Content type', which previously was stored as a one byte
+ * numeric value only, is now a numeric string. You may use one or
+ * several of the types as ID3v1.1 did or, since the category list
+ * would be impossible to maintain with accurate and up to date
+ * categories, define your own.
+
+ * References to the ID3v1 genres can be made by, as first byte, enter
+ * "(" followed by a number from the genres list (appendix A) and
+ * ended with a ")" character. This is optionally followed by a
+ * refinement, e.g. "(21)" or "(4)Eurodisco". Several references can
+ * be made in the same frame, e.g. "(51)(39)". If the refinement
+ * should begin with a "(" character it should be replaced with "((",
+ * e.g. "((I can figure out any genre)" or "(55)((I think...)". The
+ * following new content types is defined in ID3v2 and is implemented
+ * in the same way as the numeric content types, e.g. "(RX)".
+ */
+
+    /* If a "refinement" exists, we will forget about the ID's. */
+    /* If only an ID is given, we will translate that ID into a string */
+    gchar *genre, *oldgenre, *utf8_genre=NULL;
+    const gchar *newgenre = NULL;
+    g_return_if_fail (genrep);
+
+    genre = *genrep;
+    oldgenre = *genrep;
+    if (genre == NULL) return;
+
+    while (*genre)
+    {
+	if (genre[0] == '(')
+	{
+	    if (genre[1] == '(')
+	    {
+		/* starting with "((" */
+		newgenre = &genre[1];
+		break;
+	    }
+	    if (isdigit (genre[1]))
+	    {   /* possibly a genre ID */
+		int num, genreid;
+		num = sscanf (genre, "(%d)", &genreid);
+		if (num != 1)
+		{   /* invalid ID -> give up */
+		    newgenre = &genre[0];
+		    break;
+		}
+		genre = strchr (&genre[1], ')');
+		g_return_if_fail (genre);
+		++genre;
+		if (!newgenre)
+		{   /* retrieve genre string from ID -- we only
+		     * convert the first ID */
+		    id3_ucs4_t const *ucs4_genre = id3_genre_index (genreid);
+		    if (ucs4_genre == NULL)
+		    {
+			break;
+		    }
+		    utf8_genre = id3_ucs4_utf8duplicate (ucs4_genre);
+		    newgenre = utf8_genre;
+		}
+	    }
+	    else
+	    {
+		newgenre = &genre[0];
+		break;
+	    }
+	}
+	else
+	{
+	    newgenre = &genre[0];
+	    break;
+	}
+    }
+    if (newgenre && (newgenre != oldgenre))
+    {
+	*genrep = g_strdup (newgenre);
+	g_free (oldgenre);
+    }
+    g_free (utf8_genre);
+}
+
+
+
+
 /***
  * Reads id3v1.x / id3v2 tag and load data into the Id3tag structure.
  * If a tag entry exists (ex: title), we allocate memory, else value
@@ -1459,11 +1558,13 @@
     if ((id3tag = id3_file_tag(id3file)))
     {
 	tag->title = id3_get_string (id3tag, ID3_FRAME_TITLE);
-	tag->artist = id3_get_string (id3tag, ID3_FRAME_GROUP);
+	tag->artist = id3_get_string (id3tag, ID3_FRAME_ARTIST);
 	if (!tag->artist || !*tag->artist)
 	{
 	    g_free (tag->artist);
-	    tag->artist = id3_get_string (id3tag, ID3_FRAME_ARTIST);
+	    tag->artist = id3_get_string (id3tag, ID3_FRAME_GROUP);
+	} else {
+	    tag->albumartist = id3_get_string (id3tag, ID3_FRAME_GROUP);
 	}
 	tag->album = id3_get_string (id3tag, ID3_FRAME_ALBUM);
 	tag->year = id3_get_string (id3tag, ID3_FRAME_YEAR);
@@ -1517,6 +1618,10 @@
 	    tag->cdnostring = g_strdup_printf ("%.2d", atoi (string));
 	    g_free(string);
 	}
+
+	/* Do some checks on the genre string -- ideally this should
+	 * be done within the id3tag library, I think */
+	handle_genre_variations (&tag->genre);
     }
 
     id3_file_close (id3file);
@@ -1572,9 +1677,9 @@
 {
 #if 0
     struct id3_frame *frame;
+    union id3_field *field;
 
     frame = id3_tag_findframe (id3tag, id, 0);
-	union id3_field *field;
 	frame->flags = 0;
 	field = id3_frame_field (frame, 0);
 	    if (field)
@@ -1595,7 +1700,7 @@
  * Write the ID3 tags to the file.
  * @returns: TRUE on success, else FALSE.
  */
-gboolean mp3_write_file_info (gchar *filename, Track *track)
+gboolean mp3_write_file_info (const gchar *filename, Track *track)
 {
     struct id3_tag* id3tag;
     struct id3_file* id3file;
@@ -1614,7 +1719,6 @@
     if ((id3tag = id3_file_tag(id3file)))
     {
 	char *string1;
-
 	enum id3_field_textencoding encoding;
 
 	/* use the same coding as before... */
@@ -1637,6 +1741,7 @@
 
 	id3_set_string (id3tag, ID3_FRAME_TITLE, track->title, encoding);
 	id3_set_string (id3tag, ID3_FRAME_ARTIST, track->artist, encoding);
+	id3_set_string (id3tag, ID3_FRAME_GROUP, track->albumartist, encoding);
 	id3_set_string (id3tag, ID3_FRAME_ALBUM, track->album, encoding);
 	id3_set_string (id3tag, ID3_FRAME_GENRE, track->genre, encoding);
 	id3_set_string (id3tag, ID3_FRAME_COMMENT, track->comment, encoding);
@@ -1912,14 +2017,16 @@
  * TODO: Check CRC.
  */
 
-gboolean mp3_get_track_lame_replaygain (gchar *path, GainData *gd)
+gboolean mp3_get_track_lame_replaygain (const gchar *path, GainData *gd)
 {
+	unsigned char ubuf[2];
+	int gain_adjust = 0;
+	LameTag lt;
+
 	g_return_val_if_fail (path, FALSE);
 
-	LameTag lt;
 	if (!mp3_read_lame_tag (path, &lt))
 	    goto rg_fail;
-	int gain_adjust = 0;
 
 	g_return_val_if_fail (gd, FALSE);
 
@@ -1963,7 +2070,6 @@
 				version[0], version[1], version[2], version[3], version[4]); */
 	}
 
-	unsigned char ubuf[2];
 	/* radio gain */
 	memcpy(ubuf,&lt.radio_replay_gain,2);
 	read_lame_replaygain (ubuf, gd, gain_adjust);
@@ -1988,7 +2094,7 @@
  * The function only modifies the gains if they have not previously been set.
  */
 
-gboolean mp3_get_track_ape_replaygain(gchar *path, GainData *gd)
+gboolean mp3_get_track_ape_replaygain(const gchar *path, GainData *gd)
 {
 	/* The Ape Tag is located a t the end of the file. Or at least that
 	 * seems where it can most likely be found. Either it is at the very end
@@ -2167,7 +2273,7 @@
  *
  * Returns TRUE if the soundcheck field could be set.
  */
-gboolean mp3_read_soundcheck (gchar *path, Track *track)
+gboolean mp3_read_soundcheck (const gchar *path, Track *track)
 {
     GainData gd;
 
@@ -2226,21 +2332,24 @@
  * @path: location of the file
  * @lt: pointer to structure to be filled
  */
-gboolean mp3_read_lame_tag (gchar *path, LameTag *lt)
+gboolean mp3_read_lame_tag (const gchar *path, LameTag *lt)
 {
+    MP3Info *mp3i = NULL;
+    MP3Header h;
+    int flags;
+    int toskip = 0;
+    FILE *file;
     unsigned char ubuf[LAME_TAG_SIZE];
     int sideinfo;
-
     unsigned char full_info_tag[INFO_TAG_CRC_SIZE];
 
     g_return_val_if_fail (path, FALSE);
 
     /* Attempt to open the file */
-    FILE *file = fopen (path, "r");
+    file = fopen (path, "r");
     if (!file)
 	goto lt_fail;
 
-    MP3Info *mp3i = NULL;
     mp3i = g_malloc0 (sizeof (MP3Info));
     mp3i->filename = path;
     mp3i->file = file;
@@ -2253,7 +2362,6 @@
 	goto lt_fail;
     fseek(mp3i->file, -INFO_TAG_CRC_SIZE, SEEK_CUR);
 
-    MP3Header h;
     if (!get_header (mp3i->file, &h))
 	goto lt_fail;
 
@@ -2282,22 +2390,20 @@
 	goto lt_fail;
 
     /* Determine the offset of the LAME tag based on contents of the Xing header */
-    int flags;
     fread (&flags, 4, 1, mp3i->file);
-    int toskip = 0;
-    if (flags | 0x1)
+    if (flags & FRAMES_FLAG)
     {				/* frames field is set */
 	toskip += 4;
     }
-    if (flags | 0x2)
+    if (flags & BYTES_FLAG)
     {				/* bytes field is set */
 	toskip += 4;
     }
-    if (flags | 0x4)
+    if (flags & TOC_FLAG)
     {				/* TOC field is set */
 	toskip += 100;
     }
-    if (flags | 0x8)
+    if (flags & VBR_SCALE_FLAG)
     {				/* quality field is set */
 	toskip += 4;
     }
@@ -2346,11 +2452,13 @@
     lt->calculated_info_tag_crc = crc_compute(full_info_tag, INFO_TAG_CRC_SIZE, 0x0000);
 
     fclose(file);
+    g_free (mp3i);
     return (lt->calculated_info_tag_crc == lt->info_tag_crc);
 
   lt_fail:
     if (file)
 	fclose(file);
+    g_free (mp3i);
     return FALSE;
 
 }
@@ -2368,6 +2476,13 @@
 gboolean mp3_get_track_gapless (MP3Info *mp3i, GaplessData *gd)
 {
     int i;
+    int xing_header_offset;
+    int mysamplesperframe;
+    int totaldatasize;
+    int lastframes[8];
+    int totalframes;
+    int finaleight;
+    int l;
 
     g_return_val_if_fail (mp3i, FALSE);
     g_return_val_if_fail (gd, FALSE);
@@ -2375,27 +2490,26 @@
     /* use get_first_header() to seek to the first mp3 header */
     get_first_header (mp3i, 0);
 
-    int xing_header_offset = ftell (mp3i->file);
+    xing_header_offset = ftell (mp3i->file);
 
     get_header(mp3i->file, &(mp3i->header));
 
-    int mysamplesperframe = samplesperframe[mp3i->header.version & 1][3 - mp3i->header.layer];
+    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 (&(mp3i->header));
+    totaldatasize = frame_length (&(mp3i->header));
 
-    /* keeps track of the last 8 frame sizes */
-    int lastframes[8];
+    /* lastframes keeps track of the last 8 frame sizes */
 
     /* counts number of music frames */
-    int totalframes = 0;
+    totalframes = 0;
 
     /* quickly parse the file, reading only frame headers */
-    int l = 0;
+    l = 0;
     while ((l = get_header (mp3i->file, &(mp3i->header))) != 0)
     {
 	lastframes[totalframes%8] = l;
@@ -2406,7 +2520,7 @@
 	    goto gp_fail;
     }
 
-    int finaleight = 0;
+    finaleight = 0;
     for (i = 0; i < 8; i++)
     {
 	finaleight += lastframes[i];
@@ -2451,7 +2565,7 @@
  * FALSE otherwise.
  */
 
-gboolean mp3_read_gapless (gchar *path, Track *track) {
+gboolean mp3_read_gapless (const gchar *path, Track *track) {
     MP3Info *mp3i=NULL;
     FILE *file;
 
@@ -2462,6 +2576,8 @@
 
     etr = track->userdata;
 
+    g_return_val_if_fail (etr, FALSE);
+
     memset (&gd, 0, sizeof (GaplessData));
 
 
@@ -2484,6 +2600,7 @@
 	} else {
 	    /* insert non-LAME methods of finding pregap and postgap */
 	    fclose(file);
+	    g_free (mp3i);
 	    return FALSE;
 	}
 	    
@@ -2493,21 +2610,36 @@
 
 	if ((gd.pregap) && (gd.samplecount) && (gd.postgap) && (gd.gapless_data))
 	{
-	    if ((track->pregap != lt.delay) ||
+	    if ((track->pregap != gd.pregap) ||
 		(track->samplecount != gd.samplecount) ||
-		(track->postgap != lt.padding) ||
+		(track->postgap != gd.postgap) ||
 		(track->gapless_data != gd.gapless_data) ||
 		(track->gapless_track_flag == FALSE))
 	    {
 		etr->tchanged = TRUE;
-		track->pregap = lt.delay;
+		track->pregap = gd.pregap;
 		track->samplecount = gd.samplecount;
-		track->postgap = lt.padding;
+		track->postgap = gd.postgap;
 		track->gapless_data = gd.gapless_data;
 		track->gapless_track_flag = TRUE;
 	    }
 	}
+	else
+	{   /* remove gapless data which doesn't seem to be valid any
+	     * more */
+	    if (track->gapless_track_flag == TRUE)
+	    {
+		etr->tchanged = TRUE;
+	    }
+	    track->pregap = 0;
+	    track->samplecount = 0;
+	    track->postgap = 0;
+	    track->gapless_data = 0;
+	    track->gapless_track_flag = FALSE;
+	}
+	    
 	fclose(file);
+	g_free (mp3i);
 	return TRUE;
     }
     return FALSE;
@@ -2538,6 +2670,11 @@
 	    track->artist = filetag.artist;
 	}
 
+	if (filetag.albumartist)
+	{
+	    track->albumartist = filetag.albumartist;
+	}
+
 	if (filetag.title)
 	{
 	    track->title = filetag.title;
@@ -2708,7 +2845,7 @@
 
 /* Return a Track structure with all information read from the mp3
    file filled in */
-Track *mp3_get_file_info (gchar *name)
+Track *mp3_get_file_info (const gchar *name)
 {
     Track *track = NULL;
     MP3Info *mp3i=NULL;
@@ -2774,3 +2911,92 @@
     }
     return track;
 }
+/*
+ *
+ * @returns: TRUE on success, else FALSE.
+ */
+gboolean id3_lyrics_read (const gchar *filename,gchar **lyrics)
+{
+    struct id3_file *id3file;
+    struct id3_tag *id3tag;
+
+    g_return_val_if_fail (filename, FALSE);
+    g_return_val_if_fail (lyrics, FALSE);
+
+    if (!(id3file = id3_file_open (filename, ID3_FILE_MODE_READONLY)))
+    {
+	gchar *fbuf = charset_to_utf8 (filename);
+	g_print(_("ERROR while opening file: '%s' (%s).\n"),
+		fbuf, g_strerror(errno));
+	g_free (fbuf);
+	return FALSE;
+    }
+
+    if ((id3tag = id3_file_tag(id3file)))
+    {
+	*lyrics = id3_get_string (id3tag, "USLT");
+    }
+
+    id3_file_close (id3file);
+    return TRUE;
+}
+
+gboolean id3_lyrics_save (const gchar *filename,const gchar *lyrics)
+{
+    struct id3_file *id3file;
+    struct id3_tag *id3tag;
+
+    g_return_val_if_fail (filename, FALSE);
+
+
+    id3file = id3_file_open (filename, ID3_FILE_MODE_READWRITE);
+    if (!id3file)
+    {
+	gchar *fbuf = charset_to_utf8 (filename);
+	g_print(_("ERROR while opening file: '%s' (%s).\n"),
+		fbuf, g_strerror(errno));
+	g_free (fbuf);
+	return FALSE;
+    }
+
+    if ((id3tag = id3_file_tag(id3file)))
+    {
+	enum id3_field_textencoding encoding;
+
+	/* actually the iPod only understands UTF8 lyrics, but for
+	   consistency's sake we'll do the same as for the other tags
+	*/
+	/* use the same coding as before... */
+	encoding = get_encoding (id3tag);
+	/* ...unless it's ISO_8859_1 and prefs say we should use
+	   unicode (i.e. ID3v2.4) */
+	if (prefs_get_int("id3_write_id3v24") &&
+	    (encoding == ID3_FIELD_TEXTENCODING_ISO_8859_1))
+	    encoding = ID3_FIELD_TEXTENCODING_UTF_8;
+
+	/* always render id3v1 to prevent dj studio from crashing */
+	id3_tag_options(id3tag, ID3_TAG_OPTION_ID3V1, ~0);
+
+        /* turn off frame compression and crc information to let
+	   itunes read tags see
+	   http://www.mars.org/mailman/public/mad-dev/2002-October/000742.html
+	*/
+	id3_tag_options(id3tag, ID3_TAG_OPTION_COMPRESSION, 0);
+	id3_tag_options(id3tag, ID3_TAG_OPTION_CRC, 0);
+
+	id3_set_string (id3tag, "USLT", lyrics, encoding);
+    }
+
+    if (id3_file_update(id3file) != 0)
+    {
+	gchar *fbuf = charset_to_utf8 (filename);
+	g_print(_("ERROR while writing tag to file: '%s' (%s).\n"),
+		fbuf, g_strerror(errno));
+	g_free (fbuf);
+	return FALSE;
+    }
+
+    id3_file_close (id3file);
+
+    return TRUE;
+}

Modified: gtkpod/branches/upstream/current/src/mp3file.h
===================================================================
--- gtkpod/branches/upstream/current/src/mp3file.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/mp3file.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-07-14 15:55:29 jcs>
+/* Time-stamp: <2008-08-17 10:58:51 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 1646 2007-07-14 06:58:44Z jcsjcs $
+|  $Id: mp3file.h 2148 2008-11-08 08:02:15Z jcsjcs $
 */
 
 #ifndef MP3FILEH_INCLUDED
@@ -32,10 +32,12 @@
 
 #include "itdb.h"
 
-gboolean mp3_write_file_info (gchar *filename, Track *track);
-Track *mp3_get_file_info (gchar *name);
-gboolean mp3_read_soundcheck (gchar *path, Track *track);
-gboolean mp3_read_gapless (gchar *path, Track *track);
+gboolean mp3_write_file_info (const gchar *filename, Track *track);
+Track *mp3_get_file_info (const gchar *name);
+gboolean mp3_read_soundcheck (const gchar *path, Track *track);
+gboolean mp3_read_gapless (const gchar *path, Track *track);
 
 gboolean id3_read_tags (const gchar *name, Track *track);
+gboolean id3_lyrics_read (const gchar *filename,gchar **lyrics);
+gboolean id3_lyrics_save (const gchar *filename,const gchar *lyrics);
 #endif

Modified: gtkpod/branches/upstream/current/src/mp4file.c
===================================================================
--- gtkpod/branches/upstream/current/src/mp4file.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/mp4file.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-06-23 02:49:08 jcs>
+/* Time-stamp: <2008-09-07 11:16:18 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: mp4file.c 1740 2007-10-27 02:48:08Z jcsjcs $
+|  $Id: mp4file.c 2206 2009-01-11 13:00:36Z jcsjcs $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -137,7 +137,11 @@
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mp4.h"
+#ifdef HAVE_LIBMP4V2_2
+#include <mp4v2/mp4v2.h>
+#else
+#include <mp4.h>
+#endif
 
 #ifndef FREEFORM_ACCEPTS_EXTRA_ARG
 /* Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataFreeForm. For C++ sources it defaults
@@ -283,6 +287,53 @@
 	{
 	    trackId = MP4FindTrackId(mp4File, track_cur, NULL, 0);
 	    trackType = MP4GetTrackType(mp4File, trackId);
+	    if (trackType && (strcmp(trackType, "text") == 0))
+	    {
+		u_int32_t m_max_frame_size;
+		m_max_frame_size = MP4GetTrackMaxSampleSize(mp4File, trackId) + 4;
+		MP4SampleId samples = MP4GetTrackNumberOfSamples(mp4File, trackId);
+		MP4SampleId i;
+		Itdb_Chapterdata *chapterdata = itdb_chapterdata_new();
+		for (i=1; i<=samples; i++)
+		{
+		    u_int8_t *m_buffer;
+		    m_buffer = (u_int8_t *) malloc(m_max_frame_size * sizeof(u_int8_t));
+		    u_int32_t m_this_frame_size = m_max_frame_size;
+		    u_int8_t *buffer;
+		    buffer = m_buffer;
+		    gchar *title;
+		    if (!MP4ReadSample(mp4File, trackId, i, &buffer, &m_this_frame_size, NULL, NULL, NULL, NULL))
+		    {
+			/* chapter title couldn't be read; probably using
+			 * an older version of libmp4v2.  We'll just make
+			 * our own titles, since the ipod doesn't display
+			 * them anyway
+			 */
+			free (m_buffer);
+			m_buffer = (u_int8_t *) malloc(12 * sizeof(u_int8_t));
+			sprintf(m_buffer, "Chapter %03i", i);
+			m_buffer[11] = '\0';
+			title = g_strdup(m_buffer);
+		    }
+		    else
+		    {
+			int titlelength = (buffer[0] << 8) + buffer[1];
+			gchar *newtitle = (gchar *) malloc((titlelength+1) * sizeof(gchar));
+			newtitle = g_strndup (&buffer[2], titlelength);
+			newtitle[titlelength] = '\0';
+			title = g_strdup (newtitle);
+			free (newtitle);
+		    }
+
+		    MP4Timestamp sampletime = MP4GetSampleTime(mp4File, trackId, i);
+		    u_int64_t convertedsampletime = MP4ConvertFromTrackTimestamp(mp4File,
+			    trackId, sampletime, MP4_MILLISECONDS_TIME_SCALE);
+		    itdb_chapterdata_add_chapter(chapterdata, convertedsampletime, title);
+		}
+		track->chapterdata = itdb_chapterdata_duplicate (chapterdata);
+
+		itdb_chapterdata_free(chapterdata);
+	    }
 	    if (trackType &&
 		(audio_or_video_found == FALSE) &&
 		((strcmp(trackType, MP4_AUDIO_TRACK_TYPE) == 0) ||
@@ -328,7 +379,31 @@
 			track->artist = charset_to_utf8 (value);
 			g_free(value);
 		    }
+#if MP4_ALBUMARTIST_EXISTS
+		    if (!track->artist || !*track->artist)
+		    {
+			g_free (track->artist);
+			track->artist = NULL;
+			if (MP4GetMetadataAlbumArtist(mp4File, &value) && value != NULL)
+			{
+			    track->artist = charset_to_utf8 (value);
+			}
+		    }
+		    else
+		    {
+			if (MP4GetMetadataAlbumArtist(mp4File, &value) && value != NULL)
+			{
+			    track->albumartist = charset_to_utf8 (value);
+			}
+		    }
+#else
+#warning "Album Artist field not supported with this version of libmp4v2. Album Artist support requires at least V1.6.0"
+#endif
+#if HAVE_LIBMP4V2_2
+		    if (MP4GetMetadataComposer(mp4File, &value) && value != NULL)
+#else
 		    if (MP4GetMetadataWriter(mp4File, &value) && value != NULL)
+#endif
 		    {
 			track->composer = charset_to_utf8 (value);
 			g_free(value);
@@ -338,7 +413,11 @@
 			track->comment = charset_to_utf8 (value);
 			g_free(value);
 		    }
+#if HAVE_LIBMP4V2_2
+		    if (MP4GetMetadataReleaseDate(mp4File, &value) && value != NULL)
+#else
 		    if (MP4GetMetadataYear(mp4File, &value) && value != NULL)
+#endif
 		    {
 			track->year = atoi (value);
 			g_free(value);
@@ -368,10 +447,18 @@
 			track->genre = charset_to_utf8 (value);
 			g_free(value);
 		    }
+#if HAVE_LIBMP4V2_2
+		    if (MP4GetMetadataBPM (mp4File, &numvalue))
+#else
 		    if (MP4GetMetadataTempo (mp4File, &numvalue))
+#endif
 		    {
 			track->BPM = numvalue;
 		    }
+		    if (MP4HaveAtom (mp4File, "moov.udta.meta.ilst.\251lyr"))
+		    {
+			track->lyrics_flag = 0x01;
+		    }
 		}
 		mp4_scan_soundcheck (mp4File, track);
 		audio_or_video_found = TRUE;
@@ -441,7 +528,7 @@
 	     * you have to delete all meta data before modifying
 	     * it. Therefore we have to read it first to avoid data
 	     * loss. (Bug present in mpeg4ip-1.0RC1.) */
-/*	    gchar *m_name = NULL, *m_artist = NULL;
+/*	    gchar *m_name = NULL, *m_artist = NULL, *m_albumartist = NULL;
 	    gchar *m_writer = NULL, *m_comment = NULL;
 	    gchar *m_year = NULL;
 	    gchar *m_album = NULL, *m_genre = NULL;*/
@@ -454,15 +541,29 @@
 						      &m_track, &m_tracks);
 	    gboolean has_disk = MP4GetMetadataDisk (mp4File,
 	    &m_disk, &m_disks);*/
+#if HAVE_LIBMP4V2_2
+	    gboolean has_tempo = MP4GetMetadataBPM (mp4File,
+						      &m_tempo);
+#else
 	    gboolean has_tempo = MP4GetMetadataTempo (mp4File,
 						      &m_tempo);
+#endif
 	    gboolean has_compilation = MP4GetMetadataCompilation (mp4File,
 								  &m_cpl);
 /*	    MP4GetMetadataName (mp4File, &m_name);
 	    MP4GetMetadataArtist (mp4File, &m_artist);
+	    MP4GetMetadataAlbumArtist (mp4File, &m_albumartist);
+#if HAVE_LIBMP4V2_2
+	    MP4GetMetadataComposer (mp4File, &m_writer);
+#else
 	    MP4GetMetadataWriter (mp4File, &m_writer);
+#endif
 	    MP4GetMetadataComment (mp4File, &m_comment);
+#if HAVE_LIBMP4V2_2
+	    MP4GetMetadataReleaseDate (mp4File, &m_year);
+#else
 	    MP4GetMetadataYear (mp4File, &m_year);
+#endif
 	    MP4GetMetadataAlbum (mp4File, &m_album);
 	    MP4GetMetadataGenre (mp4File, &m_genre);*/
 	    MP4GetMetadataTool (mp4File, &m_tool);
@@ -477,8 +578,17 @@
 	    MP4SetMetadataArtist (mp4File, value);
 	    g_free (value);
 
+#if MP4_ALBUMARTIST_EXISTS
+	    value = charset_from_utf8 (track->albumartist);
+	    MP4SetMetadataAlbumArtist (mp4File, value);
+	    g_free (value);
+#endif
 	    value = charset_from_utf8 (track->composer);
+#if HAVE_LIBMP4V2_2
+	    MP4SetMetadataComposer (mp4File, value);
+#else
 	    MP4SetMetadataWriter (mp4File, value);
+#endif
 	    g_free (value);
 
 	    value = charset_from_utf8 (track->comment);
@@ -486,7 +596,11 @@
 	    g_free (value);
 
 	    value = g_strdup_printf ("%d", track->year);
+#if HAVE_LIBMP4V2_2
+	    MP4SetMetadataReleaseDate (mp4File, value);
+#else
 	    MP4SetMetadataYear (mp4File, value);
+#endif
 	    g_free (value);
 
 	    value = charset_from_utf8 (track->album);
@@ -497,7 +611,11 @@
 
 	    MP4SetMetadataDisk (mp4File, track->cd_nr, track->cds);
 
+#if HAVE_LIBMP4V2_2
+	    MP4SetMetadataBPM (mp4File, track->BPM);
+#else
 	    MP4SetMetadataTempo (mp4File, track->BPM);
+#endif
 
 	    value = charset_from_utf8 (track->grouping);
 	    MP4SetMetadataGrouping (mp4File, value);
@@ -508,12 +626,17 @@
 	    g_free (value);
 
 #if MP4V2_HAS_METADATA_BUG
+#if HAVE_LIBMP4V2_2
+	    if (has_tempo) MP4SetMetadataBPM (mp4File, m_tempo);
+#else
 	    if (has_tempo) MP4SetMetadataTempo (mp4File, m_tempo);
+#endif
 	    if (has_compilation) MP4SetMetadataCompilation (mp4File, m_cpl);
 	    if (m_tool)     MP4SetMetadataTool (mp4File, m_tool);
 	    if (m_covert)   MP4SetMetadataCoverArt (mp4File, m_covert, m_size);
 /*	    g_free (m_name);
 	    g_free (m_artist);
+	    g_free (m_albumartist);
 	    g_free (m_writer);
 	    g_free (m_comment);
 	    g_free (m_year);

Modified: gtkpod/branches/upstream/current/src/prefs.c
===================================================================
--- gtkpod/branches/upstream/current/src/prefs.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/prefs.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: prefs.c 1776 2007-11-12 22:38:00Z phantom_sf $
+|  $Id: prefs.c 2216 2009-01-17 05:47:46Z jcsjcs $
 */
 
 /* -------------------------------------------------------------------
@@ -183,7 +183,9 @@
     prefs_set_string ("path_play_now", "xmms %s");
     prefs_set_string ("path_play_enqueue", "xmms -e %s");
     prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/");
-
+    prefs_set_string ("coverart_display_bg_color", "#000000");
+    prefs_set_string ("coverart_display_fg_color", "#FFFFFF");
+    
     str = g_build_filename (SCRIPTDIR, "convert-ogg2mp3.sh", NULL);
     prefs_set_string ("path_conv_ogg", str);
     g_free (str);
@@ -225,32 +227,34 @@
     /* Set colum preferences */
     for (i = 0; i < TM_NUM_COLUMNS; i++)
     {
-	prefs_set_int_index("tm_col_width", i, 80);
-	prefs_set_int_index("col_visible", i, FALSE);
 	prefs_set_int_index("col_order", i, i);
     }
-		
-    for (i = 0; i < TM_NUM_TAGS_PREFS; i++)
-	prefs_set_int_index("tag_autoset", i, FALSE);
-		
-    prefs_set_int_index("tag_autoset", TM_COLUMN_TITLE, TRUE);
-    
+
     prefs_set_int_index("col_visible", TM_COLUMN_ARTIST, TRUE);
     prefs_set_int_index("col_visible", TM_COLUMN_ALBUM, TRUE);
     prefs_set_int_index("col_visible", TM_COLUMN_TITLE, TRUE);
-    prefs_set_int_index("col_visible", TM_COLUMN_GENRE, TRUE);
-    prefs_set_int_index("col_visible", TM_COLUMN_PLAYCOUNT, TRUE);
+    prefs_set_int_index("col_visible", TM_COLUMN_TRACKLEN, TRUE);
     prefs_set_int_index("col_visible", TM_COLUMN_RATING, TRUE);
 
+    for (i = 0; i < TM_NUM_TAGS_PREFS; i++)
+    {
+	prefs_set_int_index("tag_autoset", i, FALSE);
+    }
+
+    prefs_set_int_index("tag_autoset", TM_COLUMN_TITLE, TRUE);
+    
+    prefs_set_int("horizontal_scrollbar", TRUE);
+    prefs_set_int("filter_tabs_top", FALSE);
+
     /* Set pane positions--Let gtk worry about position */
     for (i = 0; i < PANED_NUM; i++)
 	prefs_set_int_index("paned_pos_", i, -1);
-	
+
     prefs_set_int("mpl_autoselect", TRUE);
-	
+
     /* Set window sizes */
-    prefs_set_int("size_gtkpod.x", 600);
-    prefs_set_int("size_gtkpod.y", 500);
+    prefs_set_int("size_gtkpod.x", 780);
+    prefs_set_int("size_gtkpod.y", 580);
     prefs_set_int("size_cal.x", 500);
     prefs_set_int("size_cal.y", 300);
     prefs_set_int("size_conf_sw.x", 300);
@@ -280,6 +284,7 @@
     prefs_set_int("coverart_apic", TRUE);
     prefs_set_int("coverart_file", TRUE);
     prefs_set_string("coverart_template", "%A;folder.jpg");
+    prefs_set_string("video_thumbnailer_prog", "totem-video-thumbnailer %f %o");
     prefs_set_int("mserv_use", FALSE);
     prefs_set_string("mserv_username", "");
     prefs_set_int("startup_messages", TRUE);
@@ -296,7 +301,6 @@
     prefs_set_int("display_toolbar", TRUE);
     prefs_set_int("toolbar_style", GTK_TOOLBAR_BOTH);
     prefs_set_int("sha1", TRUE);
-    prefs_set_string("export_template", "%o;%a - %t.mp3;%t.wav");
     prefs_set_int("file_dialog_details_expanded", FALSE);
 
     /* Set last browsed directory */
@@ -317,6 +321,9 @@
     prefs_set_int("pm_sort", SORT_NONE);
     prefs_set_int("tm_sortcol", TM_COLUMN_TITLE);
     prefs_set_int("tm_sort", SORT_NONE);
+	
+	/* New conversion preferences */
+	prefs_set_int("conversion_target_format", TARGET_FORMAT_MP3);
 }
 
 /* Initialize default variable-length list entries */
@@ -360,8 +367,6 @@
   locale_fprintf(fp, _("  --hash <file>:print gtkpod hash for file\n"));
   locale_fprintf(fp, _("  -m path:      define the mountpoint of your iPod\n"));
   locale_fprintf(fp, _("  --mountpoint: same as '-m'.\n"));
-  locale_fprintf(fp, _("  -a:           import database automatically after start.\n"));
-  locale_fprintf(fp, _("  --auto:       same as '-a'.\n"));
 }
 
 /* Parse commandline based options */
@@ -558,16 +563,17 @@
     {
 	if ((g_mkdir(folder, 0777)) == -1)
 	{
-	    printf(_("Couldn't create ~/.gtkpod\n"));
+	    printf(_("Couldn't create '%s'\n"), folder);
+	    g_free (folder);
 	    return NULL;
 	}
     }
-	
     return folder;
 }
 
 
 /* get @key and @value from a string like "key=value" */
+/* you must g_free (*key) and (*value) after use */
 static gboolean read_prefs_get_key_value (const gchar *buf,
 					  gchar **key, gchar **value)
 {
@@ -781,7 +787,7 @@
 
 	do
 	{
-	    gchar *line;
+	    gchar *line = NULL;
 
 	    status = g_io_channel_read_line (gio, &line, NULL, NULL, error);
 	    if (status == G_IO_STATUS_NORMAL)
@@ -790,9 +796,11 @@
 		if (read_prefs_get_key_value (line, &key, &value))
 		{
 		    temp_prefs_set_string (temp_prefs, key, value);
+		    g_free (key);
+		    g_free (value);
 		}
-		g_free (line);
 	    }
+	    g_free (line);
 	} while (status == G_IO_STATUS_NORMAL);
 
 	g_io_channel_unref (gio);
@@ -838,7 +846,6 @@
 static void cleanup_keys()
 {
     gchar *buf;
-    gchar *sp = NULL;
     gint int_buf;
     gint i;
     gint x, y, p;  /* Window position */
@@ -1040,6 +1047,9 @@
     prefs_set_string("size_file_dialog_details.y", NULL);
     prefs_set_string("autoimport", NULL);
     prefs_set_string("auto_import", NULL);
+    prefs_set_string("conversion_enable", NULL);
+    prefs_set_string("export_template", NULL);
+    prefs_set_string("filename_format", NULL);
 
     /* sp_created_cond renamed to sp_added_cond */
     for (i = 0; i < SORT_TAB_MAX; i++)
@@ -1146,50 +1156,6 @@
 	prefs_set_string("sm_sort_", NULL);
     }
 
-    /* filename_format renamed to export_template */
-    if (prefs_get_string_value("filename_format", &buf))
-    {
-	prefs_set_string("export_template", buf);
-	g_free(buf);
-	prefs_set_string("filename_format", NULL);
-    }
-
-    /* This string was a wrong autoconvert--just ignore it */
-    buf = prefs_get_string("export_template");
-    
-    if (buf && strcmp(buf, "%a - %a/%T - %T.mp3") == 0)
-	prefs_set_string("export_template", NULL);
-
-    g_free (buf);
-
-    /* We changed the meaning of the %x in export_template */
-    if (version < 0.72)
-    {
-	/* changed the meaning of the %x in export_template */
-	if (sp) while (*sp)
-	{
-	    if (sp[0] == '%')
-	    {
-		switch (sp[1]) {
-		case 'A':
-		    sp[1] = 'a';
-		    break;
-		case 'd':
-		    sp[1] = 'A';
-		    break;
-		case 'n':
-		    sp[1] = 't';
-		    break;
-		case 't':
-		    sp[1] = 'T';
-		    break;
-		default:
-		    break;
-		}
-	    }
-	}
-    }
-
     /* For versions < 0.91, remove all itdb keys */
     if (version < 0.91)
 	prefs_flush_subkey("itdb_");
@@ -1300,6 +1266,22 @@
     return temp_prefs;	
 }
 
+static void copy_key_to_temp_prefs (gpointer key, gpointer value, gpointer user_data)
+{
+    temp_prefs_set_string ((TempPrefs *)user_data, key, value);
+}
+
+void temp_prefs_copy_prefs (TempPrefs *temp_prefs)
+{
+    g_return_if_fail (prefs_table);
+    g_return_if_fail (temp_prefs);
+    g_return_if_fail (temp_prefs->tree);
+
+	lock_prefs_table ();
+    g_hash_table_foreach (prefs_table, copy_key_to_temp_prefs, temp_prefs);
+	unlock_prefs_table ();
+}
+
 /* Delete temp prefs */
 void temp_prefs_destroy (TempPrefs *temp_prefs)
 {
@@ -2319,6 +2301,9 @@
 		
 	string_iter++;
     }
+
+    g_free (text_buffer);
+    g_strfreev (string_array);
     
     return list;
 }

Modified: gtkpod/branches/upstream/current/src/prefs.h
===================================================================
--- gtkpod/branches/upstream/current/src/prefs.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/prefs.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: prefs.h 1596 2007-06-26 14:33:01Z dforsi $
+|  $Id: prefs.h 1905 2008-01-03 10:04:29Z Sikon $
 */
 
 #ifndef __PREFS_H__
@@ -35,7 +35,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include "prefs_window.h"
+#include "sort_window.h"
 #include "display.h"
 
 
@@ -58,6 +58,11 @@
 extern const gchar *KEY_DISPLAY_COVERART;
 
 /* New prefs backend. Will replace the stuff above */
+enum conv_target_format
+{
+	TARGET_FORMAT_MP3 = 0,
+	TARGET_FORMAT_AAC,
+};
 
 /* 
  * Wrapper data types for temp preferences
@@ -141,6 +146,7 @@
  * Temp prefs functions
  */
 TempPrefs *temp_prefs_create (void);
+void temp_prefs_copy_prefs (TempPrefs *temp_prefs);
 TempPrefs *temp_prefs_load (const gchar *filename, GError **error);
 gboolean temp_prefs_save (TempPrefs *temp_prefs,
 			  const gchar *filename,

Deleted: gtkpod/branches/upstream/current/src/prefs_window.c
===================================================================
--- gtkpod/branches/upstream/current/src/prefs_window.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/prefs_window.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,2407 +0,0 @@
-/*
-|  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
-|  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs 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: prefs_window.c 1776 2007-11-12 22:38:00Z phantom_sf $
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include "charset.h"
-#include "display_itdb.h"
-#include "info.h"
-#include "fileselection.h"
-#include "sha1.h"
-/*#include "md5.h"*/
-#include "misc.h"
-#include "misc_track.h"
-#include "prefs.h"
-#include "prefs_window.h"
-#include "repository.h"
-
-
-GladeXML *prefs_window_xml;
-GladeXML *sort_window_xml;
-
-static GtkWidget *prefs_window = NULL;
-static GtkWidget *sort_window = NULL;
-
-/* New prefs temp handling */
-static TempPrefs *temp_prefs;
-static TempLists *temp_lists;
-static TempPrefs *sort_temp_prefs;
-static TempLists *sort_temp_lists;
-
-/* keeps the check buttons for "Select Entry 'All' in Sorttab %d" */
-static GtkWidget *autoselect_widget[SORT_TAB_MAX];
-
-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_sort_tab_num (gint num);
-
-/* Some declarations */
-static void standard_toggle_toggled (GtkToggleButton *togglebutton,
-				     const gchar *key);
-
-static void on_convert_toggle_toggled (GtkToggleButton *togglebutton,
-				     gpointer not_used);
-
-static const gchar *convert_names[] =
-{
-    "convert_ogg",
-    "convert_flac",
-    "convert_m4a",
-    "convert_mp3",
-    "convert_wav",
-    NULL
-};
-
-/* Definition of path button names.
-   path_fileselector_titles[] specifies the title for the file
-   chooser. path_type[] specifies whether to browse for dirs or for
-   files.
-*/
-static const gchar *path_button_names[] =
-{
-    "play_now_path_button",
-    "play_enqueue_path_button",
-    "mp3gain_path_button",
-    "aacgain_path_button",
-    "mserv_music_root_button",
-    "mserv_trackinfo_root_button",
-    "path_conv_ogg_button",
-    "path_conv_flac_button",
-    "path_conv_m4a_button",
-    "path_conv_mp3_button",
-    "path_conv_wav_button",
-    NULL
-};
-static const gchar *path_key_names[] =
-{
-    "path_play_now",
-    "path_play_enqueue",
-    "path_mp3gain",
-    "aacgain_path",
-    "path_mserv_music_root",
-    "path_mserv_trackinfo_root",
-    "path_conv_ogg",
-    "path_conv_flac",
-    "path_conv_m4a",
-    "path_conv_mp3",
-    "path_conv_wav",
-    NULL
-};
-const gchar *path_entry_names[] =
-{
-    "play_now_path_entry",
-    "play_enqueue_path_entry",
-    "mp3gain_path_entry",
-    "aacgain_path_entry",
-    "mserv_music_root_entry",
-    "mserv_trackinfo_root_entry",
-    "path_conv_ogg_entry",
-    "path_conv_flac_entry",
-    "path_conv_m4a_entry",
-    "path_conv_mp3_entry",
-    "path_conv_wav_entry",
-    NULL
-};
-static const gchar *path_fileselector_titles[] =
-{
-    N_("Please select command for 'Play Now'"),
-    N_("Please select command for 'Enqueue'"),
-    N_("Please select the mp3gain executable"),
-    N_("Please select the aacgain executable"),
-    N_("Select the mserv music root directory"),
-    N_("Select the mserv trackinfo root directory"),
-    N_("Select the ogg/vorbis converter command"),
-    N_("Select the flac converter command"),
-    N_("Select the m4a converter command."),
-    N_("Select the mp3 converter command."),
-    N_("Select the wav converter command."),
-    NULL
-};
-static const GtkFileChooserAction path_type[] =
-{
-    GTK_FILE_CHOOSER_ACTION_OPEN,  /* select file */
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, /* select folder */
-    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_OPEN,
-    -1
-};
-
-static void on_cfg_st_autoselect_toggled (GtkToggleButton *togglebutton,
-					  gpointer         user_data)
-{
-    prefs_window_set_st_autoselect (
-	GPOINTER_TO_UINT(user_data),
-	gtk_toggle_button_get_active(togglebutton));
-}
-
-static void on_cfg_autosettags_toggled (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    prefs_window_set_autosettags (
-	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)
-{
-    gint i = GPOINTER_TO_INT (user_data);
-    gchar *oldpath, *newpath;
-    gchar *fallback = NULL;
-    gchar *text = NULL;
-
-    g_return_if_fail (temp_prefs);
-
-    oldpath = temp_prefs_get_string (temp_prefs, path_key_names[i]);
-    if (!oldpath)
-    {
-	oldpath = prefs_get_string (path_key_names[i]);
-    }
-
-    /* initialize fallback path with something reasonable */
-    if ((strcmp (path_key_names[i], "path_conv_ogg") == 0) ||
-	(strcmp (path_key_names[i], "path_conv_flac") == 0))
-    {
-	fallback = g_strdup (SCRIPTDIR);
-	text = g_markup_printf_escaped (_("<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>"), SCRIPTDIR);
-    }
-
-    switch (path_type[i])
-    {
-    case GTK_FILE_CHOOSER_ACTION_OPEN:
-	/* script */
-	newpath = fileselection_select_script (
-	    oldpath,
-	    fallback,
-	    _(path_fileselector_titles[i]),
-	    text);
-	break;
-    case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
-	/* directory */
-	newpath = fileselection_get_file_or_dir (
-	    _(path_fileselector_titles[i]),
-	    oldpath,
-	    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-	break;
-    default:
-	g_return_if_reached ();
-    }
-    g_free (oldpath);
-    g_free (fallback);
-    g_free (text);
-
-    if (newpath)
-    {
-	GtkWidget *w = gtkpod_xml_get_widget (prefs_window_xml,
-					      path_entry_names[i]);
-	if (w)
-	{
-	    gchar *newpath_utf8 = g_filename_to_utf8 (newpath, -1, NULL, NULL, NULL);
-	    gtk_entry_set_text(GTK_ENTRY(w), newpath_utf8);
-	    g_free (newpath_utf8);
-	}
-	g_free (newpath);
-    }
-}
-
-
-static void on_path_entry_changed (GtkEditable     *editable,
-				   gpointer         user_data)
-{
-    gint i = GPOINTER_TO_INT (user_data);
-    gchar *buf = gtk_editable_get_chars(editable, 0, -1);
-
-    temp_prefs_set_string (temp_prefs, path_key_names[i], buf);
-    g_free (buf);
-}
-
-/* turn the prefs window insensitive (if it's open) */
-void prefs_window_block (void)
-{
-    if (prefs_window)
-	gtk_widget_set_sensitive (prefs_window, FALSE);
-}
-
-/* turn the prefs window sensitive (if it's open) */
-void prefs_window_release (void)
-{
-    if (prefs_window)
-	gtk_widget_set_sensitive (prefs_window, TRUE);
-}
-
-
-/* make the tooltips visible or hide it depending on the value set in
- * the prefs (tooltips_prefs) */
-void prefs_window_show_hide_tooltips (void)
-{
-    GtkTooltips *tt;
-    GtkTooltipsData *tooltipsdata;
-
-    if (!prefs_window)   return; /* we may get called even when window
-				    is not open */
-    tooltipsdata = gtk_tooltips_data_get (gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_extended"));
-    g_return_if_fail (tooltipsdata);
-    tt = tooltipsdata->tooltips;
-    g_return_if_fail (tt);
-    if (prefs_get_int("display_tooltips_prefs")) gtk_tooltips_enable (tt);
-    else                                     gtk_tooltips_disable (tt);
-}
-
-static void convert_table_set_children_initial_sensitivity (GtkTable *table)
-{
-    GList *list_item;
-    GtkTableChild *child;
-
-    list_item = table->children;
-    while (list_item) {
-        child = (GtkTableChild*)list_item->data;
-        gtk_widget_set_sensitive (child->widget, 
-                                     GTK_IS_TOGGLE_BUTTON (child->widget));
-        list_item = g_list_next (list_item);
-    }
-}
-
-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)
-{
-    gchar *str1, *str2;
-    gint result;
-
-    gtk_tree_model_get (model, a, TRACK_COLUMNS_TEXT, &str1, -1);
-    gtk_tree_model_get (model, b, TRACK_COLUMNS_TEXT, &str2, -1);
-
-    result = g_utf8_collate (str1, str2);
-
-    g_free (str1);
-    g_free (str2);
-
-    return result;
-}
-
-
-static GtkWidget *visible_cols_get_treeview (TrackColumnsType type)
-{
-    GtkWidget *w=NULL;
-
-    switch (type)
-    {
-    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);
-    }
-
-    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)
-    {
-	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);
-    }
-    /* 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);
-}
-
-
-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;
-
-    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)
-    {
-	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))
-	{
-	    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);
-    }
-    g_list_free (selected_refs);
-}
-
-
-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
- * allocate a static cfg struct for temporary variables
- *
- * If the window is already open, it is raised to the front and @page
- * is selected (unless it's -1).
- *
- * @page: -1 for 'last page'.
- */
-void
-prefs_window_create (gint page)
-{
-    gint i;
-    gint defx, defy;
-    GtkWidget *w = NULL;
-    GtkTooltips *tt;
-    GtkTooltipsData *tooltipsdata;
-    GtkToolbarStyle toolbar_style;
-    gchar *buf = NULL;
-    /* List of standard toggle widget names */
-    const gchar *toggle_widget_names[] = {
-	"sync_confirm_dirs_toggle",
-	"sync_delete_tracks_toggle",
-	"sync_show_summary_toggle",
-	"file_convert_display_log_button",
-	"file_convert_background_transfer_button",
-	NULL
-    };
-    /* ... and corresponding keys */
-    const gchar *toggle_key_names[] = {
-	KEY_SYNC_CONFIRM_DIRS,
-	KEY_SYNC_DELETE_TRACKS,
-	KEY_SYNC_SHOW_SUMMARY,
-	FILE_CONVERT_DISPLAY_LOG,
-	FILE_CONVERT_BACKGROUND_TRANSFER,
-	NULL
-    };
-
-    if (prefs_window)
-    {   /* prefs window already open -- raise to the top */
-	gdk_window_raise (prefs_window->window);
-	if (page != -1)
-	{
-	    g_return_if_fail (prefs_window_xml);
-	    if ((w = gtkpod_xml_get_widget (prefs_window_xml, "notebook")))
-	    {
-		gtk_notebook_set_current_page (GTK_NOTEBOOK (w), page);
-	    }
-	}
-	return;
-    }
-		
-    /* Initialize temp prefs structures */
-    temp_prefs = temp_prefs_create();
-    temp_lists = temp_lists_create();
-
-    prefs_window_xml = glade_xml_new (xml_file, "prefs_window", NULL);
-    glade_xml_signal_autoconnect (prefs_window_xml);
-
-    prefs_window = gtkpod_xml_get_widget(prefs_window_xml,"prefs_window");
-
-    g_return_if_fail (prefs_window);
-		
-    tooltipsdata = gtk_tooltips_data_get (gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_extended"));
-    g_return_if_fail (tooltipsdata);
-    tt = tooltipsdata->tooltips;
-    g_return_if_fail (tt);
-
-    defx = prefs_get_int("size_prefs.x");
-    defy = prefs_get_int("size_prefs.y");
-    if (defx == 0)
-	defx = 500;
-    if (defy == 0)
-	defy = 600;
-
-    gtk_window_set_default_size (GTK_WINDOW (prefs_window), defx, defy);
-
-    /* Code to add subscriptions list box */
-
-    /* Set up standard toggles */
-    for (i=0; toggle_widget_names[i]; ++i)
-    {
-	w = gtkpod_xml_get_widget (prefs_window_xml,
-				   toggle_widget_names[i]);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
-				      prefs_get_int (toggle_key_names[i]));
-	g_signal_connect (w, "toggled",
-			  G_CALLBACK (standard_toggle_toggled),
-			  (gpointer)toggle_key_names[i]);
-    }
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "sync_confirm_delete_toggle");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int (KEY_SYNC_CONFIRM_DELETE));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "sync_confirm_delete_toggle2");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int (KEY_SYNC_CONFIRM_DELETE));
-
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "charset_combo");
-    charset_init_combo (GTK_COMBO (w));
-    
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_sha1tracks");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("sha1"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_update_existing");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("update_existing"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_show_duplicates");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("show_duplicates"));
-    if (!prefs_get_int("sha1")) gtk_widget_set_sensitive (w, FALSE);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_show_updated");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("show_updated"));
-    if (!prefs_get_int("update_existing")) gtk_widget_set_sensitive (w, FALSE);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_show_non_updated");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("show_non_updated"));
-    if (!prefs_get_int("update_existing")) gtk_widget_set_sensitive (w, FALSE);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_display_toolbar");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("display_toolbar"));
-
-    toolbar_style = prefs_get_int("toolbar_style");
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_icons");
-    if (toolbar_style == GTK_TOOLBAR_ICONS)
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
-    if (!prefs_get_int("display_toolbar")) gtk_widget_set_sensitive (w, FALSE);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_text");
-    if (toolbar_style == GTK_TOOLBAR_TEXT)
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
-    if (!prefs_get_int("display_toolbar")) gtk_widget_set_sensitive (w, FALSE);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_both");
-    if (toolbar_style == GTK_TOOLBAR_BOTH)
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
-    if (!prefs_get_int("display_toolbar")) gtk_widget_set_sensitive (w, FALSE);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_display_tooltips_main");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("display_tooltips_main"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_display_tooltips_prefs");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("display_tooltips_prefs"));
-		
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_multi_edit");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("multi_edit"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_not_played_track");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("not_played_track"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_misc_track_nr");
-    gtk_spin_button_set_range (GTK_SPIN_BUTTON (w), 0, 0xffffffff);
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON (w),
-			       prefs_get_int("misc_track_nr"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_multi_edit_title");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("multi_edit_title"));
-    gtk_widget_set_sensitive (w, prefs_get_int("multi_edit"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_update_charset");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("update_charset"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_id3_write");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("id3_write"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_id3_write_id3v24");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("id3_write_id3v24"));
-    if (!prefs_get_int("id3_write")) gtk_widget_set_sensitive (w, FALSE);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_charset");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("write_charset"));
-    if (!prefs_get_int("id3_write")) gtk_widget_set_sensitive (w, FALSE);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_add_recursively");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("add_recursively"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_delete_track_from_playlist");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("delete_track"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_delete_track_from_ipod");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("delete_ipod"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_track_local_file_deletion");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("delete_local_file"));
-
-    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 */
-    int x = prefs_get_int("lastfm_active");
-    GtkWidget *u = gtkpod_xml_get_widget (prefs_window_xml, "lastfm_username");
-    GtkWidget *p = gtkpod_xml_get_widget (prefs_window_xml, "lastfm_password");
-    w = gtkpod_xml_get_widget (prefs_window_xml, "lastfm_active");
-
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), x);
-    gtk_entry_set_text(GTK_ENTRY(u), prefs_get_string("lastfm_username"));
-    gtk_entry_set_text(GTK_ENTRY(p), prefs_get_string("lastfm_password"));
-    gtk_widget_set_sensitive (u, x);
-    gtk_widget_set_sensitive (p, x);
-# else
-    w = gtkpod_xml_get_widget (prefs_window_xml, "labelfm");
-    gtk_widget_hide(w);
-    w = gtkpod_xml_get_widget (prefs_window_xml, "scrolledwindowfm");
-    gtk_widget_hide(w);
-#endif
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "autoselect_hbox");
-    for (i=0; i<SORT_TAB_MAX; ++i)
-    {
-	GtkWidget *as;
-	gint padding;
-	    
-	buf = g_strdup_printf ("%d", i+1);
-	as = gtk_check_button_new_with_mnemonic (buf);
-	autoselect_widget[i] = as;
-	gtk_widget_show (as);
-	if (i==0) padding = 0;
-	else      padding = 5;
-	gtk_box_pack_start (GTK_BOX (w), as, FALSE, FALSE, padding);
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(as),
-				     prefs_get_int_index("st_autoselect", i));
-	g_signal_connect ((gpointer)as,
-			  "toggled",
-			  G_CALLBACK (on_cfg_st_autoselect_toggled),
-			  GUINT_TO_POINTER(i));
-	g_free (buf);
-    }
-    /* connect signals for path entrys and selectors */
-    for (i=0; path_button_names[i]; ++i)
-    {
-	gchar *path;
-	/* "" is not a valid button name -> skip */
-	if (strlen (path_button_names[i]) == 0) continue;
-	/* Otherwise connect handler */
-	w = gtkpod_xml_get_widget (prefs_window_xml, path_button_names[i]);
-	g_signal_connect ((gpointer)w,
-			  "clicked",
-			  G_CALLBACK (on_path_button_pressed),
-			  GUINT_TO_POINTER(i));
-
-	w = gtkpod_xml_get_widget (prefs_window_xml, path_entry_names[i]);
-
-	path = prefs_get_string (path_key_names[i]);
-	if (path)
-	{
-	    gtk_entry_set_text(GTK_ENTRY(w), path);
-	    g_free (path);
-	}
-	g_signal_connect ((gpointer)w,
-			  "changed",
-			  G_CALLBACK (on_path_entry_changed),
-			  GUINT_TO_POINTER(i));
-    }
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_mpl_autoselect");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("mpl_autoselect"));
-
-    for (i=0; i<TM_NUM_TAGS_PREFS; ++i)
-    {
-	buf = g_strdup_printf ("tag_autoset%d", i);
-	if((w = gtkpod_xml_get_widget (prefs_window_xml, buf)))
-	{
-	    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-					 prefs_get_int_index("tag_autoset", i));
-	    /* glade makes a "GTK_OBJECT (i)" which segfaults
-	       because "i" is not a GTK object. So we have to set up
-	       the signal handlers ourselves */
-	    g_signal_connect ((gpointer)w,
-			      "toggled",
-			      G_CALLBACK (on_cfg_autosettags_toggled),
-			      GUINT_TO_POINTER(i));
-	}
-	g_free (buf);
-    }
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "readtags");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("readtags"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("parsetags"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags_overwrite");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("parsetags_overwrite"));
-    gtk_widget_set_sensitive (w, prefs_get_int("parsetags"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags_template");
-    gtk_widget_set_sensitive (w, prefs_get_int("parsetags"));
-    buf = prefs_get_string("parsetags_template");
-    if (buf)
-    {
-	gtk_entry_set_text(GTK_ENTRY(w), buf);
-	g_free(buf);
-    }
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "coverart_apic");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("coverart_apic"));
-
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "coverart_file");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("coverart_file"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "coverart_template");
-    buf = prefs_get_string("coverart_template");
-    if (buf)
-    {
-	gtk_entry_set_text(GTK_ENTRY(w), buf);
-	g_free(buf);
-    }
-    gtk_widget_set_sensitive (w, prefs_get_int("coverart_file"));
-
-    setup_visible_cols (tt);
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_extended");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("write_extended_info"));
-
-
-    if ((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_sort_tab_num_sb")))
-    {
-	gtk_spin_button_set_range (GTK_SPIN_BUTTON (w),
-				   0, SORT_TAB_MAX);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (w),
-				   prefs_get_int("sort_tab_num"));
-	prefs_window_set_sort_tab_num (prefs_get_int("sort_tab_num"));
-    }
-    if ((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_group_compilations")))
-    {
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				     prefs_get_int("group_compilations"));
-    }
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_startup_messages");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("startup_messages"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_mserv_use");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("mserv_use"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_mserv_report_probs");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 prefs_get_int("mserv_report_probs"));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "mserv_username_entry");
-    buf = prefs_get_string("mserv_username");
-    if (buf)
-    {
-	gtk_entry_set_text(GTK_ENTRY(w), buf);
-	g_free(buf);
-    }
-    w = gtkpod_xml_get_widget (prefs_window_xml, "notebook");
-    if (page == -1)
-    {
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (w),
-				       prefs_get_int("last_prefs_page"));
-    }
-    else
-    {
-	gtk_notebook_set_current_page (GTK_NOTEBOOK (w), page);
-    }
-    
-    w = gtkpod_xml_get_widget (prefs_window_xml, "exclude_file_mask_entry");
-    buf = prefs_get_string("exclude_file_mask");
-    if (buf)
-    {
-	gtk_entry_set_text(GTK_ENTRY(w), buf);
-	g_free(buf);
-    }
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "convert_table");
-    convert_table_set_children_initial_sensitivity (GTK_TABLE (w));
-    for (i=0; convert_names[i]; ++i)
-    {
-         w = gtkpod_xml_get_widget (prefs_window_xml, convert_names[i]);
-         g_signal_connect ((gpointer)w,
-			      "toggled",
-			      G_CALLBACK (on_convert_toggle_toggled),
-			      NULL);
-         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(w), prefs_get_int (convert_names[i]) );
-
-    }
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "file_convert_max_threads_num_spinbutton");
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON(w),
-			       prefs_get_int (FILE_CONVERT_MAX_THREADS_NUM));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "file_convert_maxdirsize_spinbutton");
-    gtk_spin_button_set_value (GTK_SPIN_BUTTON(w),
-			       prefs_get_double (FILE_CONVERT_MAXDIRSIZE));
-
-    w = gtkpod_xml_get_widget (prefs_window_xml, "file_convert_cachedir_entry");
-    buf = prefs_get_string (FILE_CONVERT_CACHEDIR);
-    if (buf)
-	gtk_entry_set_text (GTK_ENTRY(w), buf);
-    g_free (buf);
-
-
-    prefs_window_show_hide_tooltips ();
-    gtk_widget_show(prefs_window);
-
-
-
-}
-
-
-/**
- * save_gtkpod_prefs_window
- * UI has requested preferences update(by clicking ok on the prefs window)
- * Frees the tmpcfg variable
- */
-static void
-prefs_window_set(void)
-{
-   if (temp_prefs)
-   {
-     /* Update the display if we changed the number of sort tabs */
-     if (temp_prefs_get_int_value(temp_prefs, "sort_tab_num", NULL))
-      st_show_visible();
-
-     /* Set up/free sha1 hash table if changed */
-     if (temp_prefs_get_int_value(temp_prefs, "sha1", NULL))
-	 setup_sha1();
-   }
-  
-   /* Need this in case user reordered column order (we don't
-    * catch the reorder signal) */
-   tm_store_col_order ();
-
-   tm_show_preferred_columns();
-   st_show_visible();
-   display_show_hide_tooltips();
-   display_show_hide_toolbar();
-
-   /* update file_conversion data */
-   file_convert_prefs_changed ();
-}
-
-/* save current window size */
-void prefs_window_update_default_sizes (void)
-{
-    if (prefs_window)
-    {
-	gint defx, defy;
-	gtk_window_get_size (GTK_WINDOW (prefs_window), &defx, &defy);
-	prefs_set_int("size_prefs.x", defx);
-	prefs_set_int("size_prefs.y", defy);
-    }
-}
-
-
-/**
- * cancel_gtk_prefs_window
- * UI has requested preference changes be ignored -- write back the
- * original values
- * Frees the tmpcfg and origcfg variable
- */
-void
-prefs_window_cancel(void)
-{
-    /* "save" (i.e. reset) original configs */
-    prefs_window_set ();
-
-    /* save current window size */
-    prefs_window_update_default_sizes ();
-
-    /* close the window */
-    if(prefs_window)
-	gtk_widget_destroy(prefs_window);
-    prefs_window = NULL;
-}
-
-/* when window is deleted, we keep the currently applied prefs and
-   save the notebook page */
-void prefs_window_delete(void)
-{
-    gint defx, defy;
-    GtkWidget *nb;
-	
-    /* Delete temp prefs structures */
-    temp_prefs_destroy(temp_prefs);
-    temp_prefs = NULL;
-    temp_lists_destroy(temp_lists);
-    temp_lists = NULL;
-
-    /* save current notebook page */
-    nb = gtkpod_xml_get_widget (prefs_window_xml, "notebook");
-    prefs_set_int("last_prefs_page", gtk_notebook_get_current_page (
-		  GTK_NOTEBOOK (nb)));
-
-    /* save current window size */
-    gtk_window_get_size (GTK_WINDOW (prefs_window), &defx, &defy);
-    prefs_set_int("size_prefs.x", defx);
-    prefs_set_int("size_prefs.y", defy);
-
-    /* close the window */
-    if(prefs_window)
-	gtk_widget_destroy(prefs_window);
-    prefs_window = NULL;
-}
-
-/* apply the current settings and close the window */
-/* Frees the tmpcfg and origcfg variable */
-void
-prefs_window_ok (void)
-{
-    prefs_window_apply ();
-
-    /* close the window */
-    if(prefs_window)
-	gtk_widget_destroy(prefs_window);
-    prefs_window = NULL;
-}
-
-
-/* apply the current settings, don't close the window */
-void
-prefs_window_apply (void)
-{
-    gint defx, defy;
-    GtkWidget *nb;
-
-    /* Commit temp prefs to prefs table */
-    temp_prefs_apply(temp_prefs);
-    temp_lists_apply(temp_lists);
-  
-    /* save current settings */
-    prefs_window_set ();
-
-    /* save current notebook page */
-    nb = gtkpod_xml_get_widget (prefs_window_xml, "notebook");
-    prefs_set_int("last_prefs_page", gtk_notebook_get_current_page (
-		  GTK_NOTEBOOK (nb)));
-
-    /* save current window size */
-    gtk_window_get_size (GTK_WINDOW (prefs_window), &defx, &defy);
-    prefs_set_int("size_prefs.x", defx);
-    prefs_set_int("size_prefs.y", defy);
-}
-
-
-
-/* -----------------------------------------------------------------
-
-   Callbacks
-
-   ----------------------------------------------------------------- */
-
-
-void
-on_sorting_clicked                     (GtkButton       *button,
-					gpointer         user_data)
-{
-    sort_window_create ();
-}
-
-
-void
-on_edit_repository_clicked           (GtkButton       *button,
-				      gpointer         user_data)
-{
-    iTunesDB *itdb = gp_get_selected_itdb();
-
-    if (itdb)
-    {
-	repository_edit (itdb, NULL);
-    }
-    else
-    {
-	message_sb_no_itdb_selected ();
-    }
-}
-
-void
-on_calendar_contact_notes_options_clicked (GtkButton       *button,
-					   gpointer         user_data)
-{
-    iTunesDB *itdb = gp_get_ipod_itdb();
-
-    /* no iPod itdb selected -> try to use the first iPod itdb */
-    if (!itdb)
-    {
-	struct itdbs_head *itdbs_head;
-
-	g_return_if_fail (gtkpod_window);
-	itdbs_head = g_object_get_data (G_OBJECT (gtkpod_window),
-					"itdbs_head");
-	if (itdbs_head)
-	{
-	    GList *gl;
-	    for (gl=itdbs_head->itdbs; gl; gl=gl->next)
-	    {
-		iTunesDB *itdbgl = gl->data;
-		g_return_if_fail (itdbgl);
-		if (itdbgl->usertype & GP_ITDB_TYPE_IPOD)
-		    break;
-	    }
-	    if (gl)
-	    {
-		itdb = gl->data;
-	    }
-	}
-    }
-
-    if (itdb)
-    {
-	repository_edit (itdb, NULL);
-    }
-    else
-    {
-	message_sb_no_ipod_itdb_selected ();
-    }
-}
-
-
-gboolean
-on_prefs_window_delete_event           (GtkWidget       *widget,
-					GdkEvent        *event,
-					gpointer         user_data)
-{
-  prefs_window_delete ();
-  gtkpod_statusbar_message(_("Preferences not updated"));
-  return FALSE;
-}
-
-
-void
-on_prefs_ok_clicked                    (GtkButton       *button,
-					gpointer         user_data)
-{
-    prefs_window_ok();
-}
-
-
-void
-on_prefs_cancel_clicked                (GtkButton       *button,
-					gpointer         user_data)
-{
-    prefs_window_cancel();
-    gtkpod_statusbar_message(_("Preferences not updated"));
-}
-
-
-void
-on_prefs_apply_clicked                 (GtkButton       *button,
-					gpointer         user_data)
-{
-    prefs_window_apply ();
-    gtkpod_statusbar_message(_("Preferences applied"));
-}
-
-
-void on_file_convert_max_threads_num_spinbutton_value_changed (
-    GtkSpinButton *spinbutton,
-    gpointer       user_data)
-{
-    temp_prefs_set_int (temp_prefs, FILE_CONVERT_MAX_THREADS_NUM,
-			gtk_spin_button_get_value_as_int (spinbutton));
-}
-
-void on_file_convert_maxdirsize_spinbutton_value_changed (
-    GtkSpinButton *spinbutton,
-    gpointer       user_data)
-{
-    temp_prefs_set_double (temp_prefs, FILE_CONVERT_MAXDIRSIZE,
-			   gtk_spin_button_get_value (spinbutton));
-}
-
-
-void
-on_cfg_sha1tracks_toggled                (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    gboolean val = gtk_toggle_button_get_active(togglebutton);
-    GtkWidget *w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_show_duplicates");
-
-    temp_prefs_set_int(temp_prefs, "sha1", val);
-    if(w)	gtk_widget_set_sensitive (w, val);
-}
-
-void
-on_cfg_update_existing_toggled         (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    gboolean val = gtk_toggle_button_get_active (togglebutton);
-    GtkWidget *w;
-
-    temp_prefs_set_int(temp_prefs, "update_existing", val);
-
-    if((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_show_updated")))
-	gtk_widget_set_sensitive (w, val);
-    if((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_show_non_updated")))
-	gtk_widget_set_sensitive (w, val);
-}
-
-void
-on_cfg_id3_write_toggled                (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    gboolean val = gtk_toggle_button_get_active (togglebutton);
-    GtkWidget *w;
-
-    temp_prefs_set_int(temp_prefs, "id3_write", val);
-    if((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_id3_write_id3v24")))
-	gtk_widget_set_sensitive (w, val);
-    if((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_write_charset")))
-	gtk_widget_set_sensitive (w, val);
-}
-
-
-void
-on_cfg_id3_write_id3v24_toggled            (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs,"id3_write_id3v24",
-                       gtk_toggle_button_get_active (togglebutton));
-}
-
-
-void
-on_cfg_write_extended_info_toggled     (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "write_extended_info",
-		       gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_cfg_delete_track_from_playlist_toggled (GtkToggleButton *togglebutton,
-					   gpointer         user_data)
-{
-	temp_prefs_set_int(temp_prefs, "delete_file",
-                     gtk_toggle_button_get_active(togglebutton));
-}
-
-
-void
-on_cfg_delete_track_from_ipod_toggled  (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-	temp_prefs_set_int(temp_prefs, "delete_ipod", 
-                     gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_cfg_track_local_file_deletion_toggled (GtkToggleButton *togglebutton,
-					  gpointer         user_data)
-{
-	temp_prefs_set_int(temp_prefs, "delete_local_file",
-                     gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_cfg_track_database_deletion_toggled (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-	temp_prefs_set_int(temp_prefs, "delete_database",
-                     gtk_toggle_button_get_active(togglebutton));
-}
-
-static void standard_toggle_toggled (GtkToggleButton *togglebutton,
-				     const gchar *key)
-{
-    g_return_if_fail (key);
-
-    temp_prefs_set_int (temp_prefs, key, 
-			gtk_toggle_button_get_active (togglebutton));
-}
-
-static void on_convert_toggle_toggled (GtkToggleButton *togglebutton,
-				     gpointer not_used)
-{
-    GtkTable *parent;
-    GList *list_item;
-    GtkTableChild *child;
-    guint16 row = 0;
-    gboolean active;
-
-    parent = (GtkTable*)gtk_widget_get_parent (GTK_WIDGET (togglebutton));    
-    g_return_if_fail (GTK_IS_TABLE (parent));
-
-    /* Find row of togglebutton */
-    list_item = parent->children;
-    while (list_item) {
-        child = (GtkTableChild*)list_item->data;
-        if (child->widget == (GtkWidget*)togglebutton) {
-            row = child->top_attach;
-            break;
-        }
-        list_item = g_list_next (list_item);
-    }
-
-    active = gtk_toggle_button_get_active (togglebutton);
-
-    temp_prefs_set_int (temp_prefs, gtk_widget_get_name (GTK_WIDGET (togglebutton)), 
-			active);
-
-    /* set sensitivity of all widgets on togglebuttons row, except togglebutton */
-    list_item = parent->children;
-    while (list_item) {
-        child = (GtkTableChild*)list_item->data;
-        if (child->top_attach == row && child->widget != (GtkWidget*)togglebutton) 
-            gtk_widget_set_sensitive (child->widget, active);
-        list_item = g_list_next (list_item);
-    }
-}
-
-
-void
-on_sync_confirm_delete_toggled     (GtkToggleButton *togglebutton,
-				    gpointer         user_data)
-{
-    GtkToggleButton *w;
-    gboolean active = gtk_toggle_button_get_active(togglebutton);
-
-    temp_prefs_set_int(temp_prefs, KEY_SYNC_CONFIRM_DELETE, active);
-		       
-
-    w = GTK_TOGGLE_BUTTON(
-	gtkpod_xml_get_widget (prefs_window_xml,
-			       "sync_confirm_delete_toggle"));
-    if (w != togglebutton)
-	gtk_toggle_button_set_active(w, active);
-
-    w = GTK_TOGGLE_BUTTON(
-	gtkpod_xml_get_widget (prefs_window_xml,
-			       "sync_confirm_delete_toggle2"));
-    if (w != togglebutton)
-	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,
-					gpointer         user_data)
-{
-    gchar *descr, *charset;
-
-    descr = gtk_editable_get_chars (editable, 0, -1);
-    charset = charset_from_description (descr);
-    temp_prefs_set_string(temp_prefs, "charset", charset);
-    g_free (descr);
-    g_free (charset);
-}
-
-void prefs_window_set_st_autoselect (guint32 inst, gboolean autoselect)
-{
-    if ((inst >= 0) && (inst < SORT_TAB_MAX))
-    {
-      temp_prefs_set_int_index(temp_prefs, "st_autoselect", inst, 
-                               autoselect);
-    }
-}
-
-void
-on_cfg_mpl_autoselect_toggled          (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "mpl_autoselect", 
-		       gtk_toggle_button_get_active(togglebutton));
-}
-
-void prefs_window_set_autosettags (gint category, gboolean autoset)
-{
-    if (category < TM_NUM_TAGS_PREFS)
-			temp_prefs_set_int_index(temp_prefs, "tag_autoset", category, autoset);
-}
-
-void
-on_readtags_toggled                    (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "readtags",
-		       gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_parsetags_toggled                   (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    gboolean val = gtk_toggle_button_get_active(togglebutton);
-    GtkWidget *w;
-
-    temp_prefs_set_int(temp_prefs, "parsetags", val);
-    w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags_overwrite");
-    gtk_widget_set_sensitive (w, val);
-    w = gtkpod_xml_get_widget (prefs_window_xml, "parsetags_template");
-    gtk_widget_set_sensitive (w, val);
-}
-
-void
-on_parsetags_overwrite_toggled         (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "parsetags_overwrite",
-		       gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_parsetags_template_changed             (GtkEditable     *editable,
-					   gpointer         user_data)
-{
-    temp_prefs_set_string(temp_prefs, "parsetags_template",
-			  gtk_editable_get_chars (editable,0, -1));
-}
-
-void
-on_coverart_file_toggled                   (GtkToggleButton *togglebutton,
-					    gpointer         user_data)
-{
-    gboolean val = gtk_toggle_button_get_active(togglebutton);
-    GtkWidget *w;
-
-    temp_prefs_set_int(temp_prefs, "coverart_file", val);
-    w = gtkpod_xml_get_widget (prefs_window_xml, "coverart_template");
-    gtk_widget_set_sensitive (w, val);
-}
-
-void
-on_coverart_apic_toggled                   (GtkToggleButton *togglebutton,
-					    gpointer         user_data)
-{
-    gboolean val = gtk_toggle_button_get_active(togglebutton);
-    GtkWidget *w;
-
-    temp_prefs_set_int(temp_prefs, "coverart_apic", val);
-    w = gtkpod_xml_get_widget (prefs_window_xml, "coverart_template");
-    gtk_widget_set_sensitive (w, val);
-}
-
-void
-on_coverart_template_changed             (GtkEditable     *editable,
-					gpointer         user_data)
-{
-    temp_prefs_set_string(temp_prefs, "coverart_template",
-			  gtk_editable_get_chars (editable,0, -1));
-}
-
-void
-on_cfg_show_duplicates_toggled         (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-	temp_prefs_set_int(temp_prefs, "show_duplicates", 
-                     gtk_toggle_button_get_active (togglebutton));
-
-}
-
-
-void
-on_cfg_show_updated_toggled            (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "show_updated",
-                       gtk_toggle_button_get_active (togglebutton));
-}
-
-
-void
-on_cfg_show_non_updated_toggled        (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "show_non_updated", 
-                       gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_cfg_display_tooltips_main_toggled   (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "display_tooltips_main",
-		       gtk_toggle_button_get_active  (togglebutton));
-}
-
-void
-on_cfg_display_tooltips_prefs_toggled  (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "display_tooltips_prefs",
-		       gtk_toggle_button_get_active  (togglebutton));
-}
-
-void
-on_cfg_display_toolbar_toggled         (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    gboolean val = gtk_toggle_button_get_active (togglebutton);
-    GtkWidget *w1 = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_icons");
-    GtkWidget *w2 = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_text");
-    GtkWidget *w3 = gtkpod_xml_get_widget (prefs_window_xml, "cfg_toolbar_style_both");
-
-    temp_prefs_set_int(temp_prefs, "display_toolbar", val);
-
-    if (w1) gtk_widget_set_sensitive (w1, val);
-    if (w2) gtk_widget_set_sensitive (w2, val);
-    if (w3) gtk_widget_set_sensitive (w3, val);
-}
-
-void
-on_cfg_multi_edit_toggled              (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    gboolean val = gtk_toggle_button_get_active (togglebutton);
-    GtkWidget *w = gtkpod_xml_get_widget  (prefs_window_xml, "cfg_multi_edit_title");
-
-    temp_prefs_set_int(temp_prefs, "multi_edit", val);
-    gtk_widget_set_sensitive (w, val);
-}
-
-
-void
-on_cfg_multi_edit_title_toggled        (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "multi_edit_title",
-		       gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_cfg_update_charset_toggled          (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "update_charset",
-		       gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_cfg_write_charset_toggled           (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "write_charset",
-		       gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_cfg_add_recursively_toggled         (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "add_recursively",
-		       gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_cfg_not_played_track_toggled         (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "not_played_track",
-		       gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_cfg_misc_track_nr_value_changed      (GtkSpinButton   *spinbutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "misc_track_nr",
-		       gtk_spin_button_get_value  (spinbutton));
-}
-
-static void prefs_window_set_sort_tab_num (gint num)
-{
-    gint i;
-
-    temp_prefs_set_int(temp_prefs, "sort_tab_num", num);
-    for (i=0; i<SORT_TAB_MAX; ++i)
-    {   /* make all checkboxes with i<num sensitive, the others
-	   insensitive */
-	gtk_widget_set_sensitive (autoselect_widget[i], i<num);
-    }
-}
-
-void
-on_cfg_sort_tab_num_sb_value_changed   (GtkSpinButton   *spinbutton,
-					gpointer         user_data)
-{
-    prefs_window_set_sort_tab_num (
-	gtk_spin_button_get_value (spinbutton));
-}
-
-void
-on_cfg_group_compilations_toggled      (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "group_compilations",
-		       gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_cfg_toolbar_style_both_toggled      (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active (togglebutton))
-    {
-	temp_prefs_set_int(temp_prefs, "toolbar_style",  
-			   GTK_TOOLBAR_BOTH);
-    }
-}
-
-
-void
-on_cfg_toolbar_style_text_toggled      (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active (togglebutton))
-    {
-	temp_prefs_set_int(temp_prefs, "toolbar_style",
-			   GTK_TOOLBAR_TEXT);
-    }
-}
-
-
-void
-on_cfg_toolbar_style_icons_toggled      (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active (togglebutton))
-    {
-	temp_prefs_set_int(temp_prefs, "toolbar_style",
-			   GTK_TOOLBAR_ICONS);
-    }
-}
-
-void prefs_window_set_toolbar_style (GtkToolbarStyle style)
-{
-}
-
-void
-on_cfg_startup_messages                (GtkToggleButton *togglebutton,
-                                        gpointer         user_data)
-{
-	temp_prefs_set_int(temp_prefs, "startup_messages",
-			   gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_mserv_from_file_playlist_menu_activate
-                                        (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-    gp_do_selected_playlist (mserv_from_file_tracks);
-}
-
-
-void
-on_mserv_use_toggled                   (GtkToggleButton *togglebutton,
-                                        gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "mserv_use",
-		       gtk_toggle_button_get_active(togglebutton));
-}
-
-void
-on_mserv_report_probs_toggled          (GtkToggleButton *togglebutton,
-                                        gpointer         user_data)
-{
-    temp_prefs_set_int(temp_prefs, "mserv_report_probs", 
-                       gtk_toggle_button_get_active (togglebutton));
-}
-
-void
-on_mserv_username_entry_changed              (GtkEditable     *editable,
-					      gpointer         user_data)
-{
-    gchar *val = gtk_editable_get_chars (editable,0, -1);
-
-    if (!val) return;
-    temp_prefs_set_string(temp_prefs, "mserv_username", val);
-    g_free(val);
-}
-
-/* last.fm callbacks */
-void
-on_lastfm_active_toggled              (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-#if 0
-    int x = gtk_toggle_button_get_active(togglebutton);
-    GtkWidget *u = gtkpod_xml_get_widget  (prefs_window_xml, "lastfm_username");
-    GtkWidget *p = gtkpod_xml_get_widget  (prefs_window_xml, "lastfm_password");
-    temp_prefs_set_int(temp_prefs, "lastfm_active", x);
-
-    gtk_widget_set_sensitive (u, x);
-    gtk_widget_set_sensitive (p, x);
-#endif
-}
-
-void
-on_lastfm_username_entry_changed          (GtkEditable     *editable,
-					gpointer         user_data)
-{
-#if 0
-    gchar *uname;
-    uname = gtk_editable_get_chars (editable, 0, -1);
-    temp_prefs_set_string(temp_prefs, "lastfm_username", uname);
-    g_free (uname);
-#endif
-}
-
-void
-on_lastfm_password_entry_changed          (GtkEditable     *editable,
-					gpointer         user_data)
-{
-#if 0
-    gchar *upass, *upass_old;
-
-    upass = gtk_editable_get_chars (editable, 0, -1);
-    upass_old = prefs_get_string ("lastfm_password");
-
-    if (!upass_old || (strcmp (upass, upass_old) != 0))
-    {
-	unsigned char sig[16];
-	unsigned char md5[64];
-	gint i;
-
-	md5_buffer((const char *)upass, strlen(upass), sig);
-
-	for (i=0; i<16; ++i)
-	{
-	    snprintf (&md5[i*2], 3, "%02x", sig[i]);
-	}
-
-	temp_prefs_set_string(temp_prefs, "lastfm_password", md5);
-    }
-    g_free (upass);
-    g_free (upass_old);
-#endif
-}
-
-
-/* ------------------------------------------------------------ *\
- *                                                              *
- * Sort-Prefs Window                                            *
- *                                                              *
-\* ------------------------------------------------------------ */
-
-/* the following checkboxes exist */
-static const gint sort_ign_fields[] = {
-    T_TITLE, T_ARTIST,
-    T_ALBUM, T_COMPOSER,
-    -1
-};
-
-
-/* Copy the current ignore fields and ignore strings into scfg */
-static void sort_window_read_sort_ign ()
-{
-    gint i;
-    GtkTextView *tv;
-    GtkTextBuffer *tb;
-    GList *sort_ign_strings;
-    GList *current;
-    gchar *buf;
-
-
-    /* read sort field states */
-    for (i=0; sort_ign_fields[i] != -1; ++i)
-    {
-	buf = g_strdup_printf ("sort_ign_field_%d",
-				      sort_ign_fields[i]);
-	GtkWidget *w = gtkpod_xml_get_widget (sort_window_xml, buf);
-	g_return_if_fail (w);
-	prefs_set_int( buf,
-	     gtk_toggle_button_get_active (
-		GTK_TOGGLE_BUTTON (w)));
-	g_free (buf);
-    }
-    
-    /* Read sort ignore strings */
-    tv = GTK_TEXT_VIEW (gtkpod_xml_get_widget (sort_window_xml,
-					      "sort_ign_strings"));
-    g_return_if_fail (tv);
-    tb = gtk_text_view_get_buffer (tv);
-    g_return_if_fail (tb);
-
-    sort_ign_strings = get_list_from_buffer(tb);
-    current = sort_ign_strings;
-    
-    /* Add a trailing whitespace to strings */
-    while (current)
-    {
-	g_strstrip(current->data);
-	
-        if (strlen(current->data) != 0)
-	{
-	    buf = g_strdup_printf("%s ",(gchar *) current->data);
-	    g_free(current->data);
-	    current->data = buf;
-	}
-
-	current = g_list_next(current);
-    }
-	
-    temp_list_add(sort_temp_lists, "sort_ign_string_", sort_ign_strings);
-}
-
-/**
- * sort_window_create
- * Create, Initialize, and Show the sorting preferences window
- * allocate a static sort struct for temporary variables
- */
-void sort_window_create (void)
-{
-    if (sort_window)
-    {  /* sort options already open --> simply raise to the top */
-	gdk_window_raise(sort_window->window);
-    }
-    else
-    {
-	GList *collist = NULL;
-	GList *sort_ign_strings;
-	GList *current;  /* current sort ignore item */
-	GtkWidget *w;
-	GtkTextView *tv;
-	GtkTextBuffer *tb;
-	gint i;
-	GtkTextIter ti;
-	gchar *str;
-
-	sort_temp_prefs = temp_prefs_create();
-	sort_temp_lists = temp_lists_create();
-
-	sort_window_xml = glade_xml_new (xml_file, "sort_window", NULL);
-	glade_xml_signal_autoconnect (sort_window_xml);
-
-	sort_window = gtkpod_xml_get_widget (sort_window_xml, "sort_window");
-
-	/* label the ignore-field checkbox-labels */
-	for (i=0; sort_ign_fields[i] != -1; ++i)
-	{
-	    gchar *buf = g_strdup_printf ("sort_ign_field_%d",
-					  sort_ign_fields[i]);
-	    GtkWidget *w = gtkpod_xml_get_widget (sort_window_xml, buf);
-	    g_return_if_fail (w);
-	    gtk_button_set_label (
-		GTK_BUTTON (w),
-		gettext (get_t_string (sort_ign_fields[i])));
-	    gtk_toggle_button_set_active (
-		GTK_TOGGLE_BUTTON (w),
-		prefs_get_int (buf));
-	    /* set tooltip if available */
-/* 	    if (tm_col_tooltips[sort_ign_fields[i]]) */
-/* 	    { */
-/* 		gtk_tooltips_set_tip ( */
-/* 		    tt, w, */
-/* 		    gettext (tm_col_tooltips[sort_ign_fields[i]]), */
-/* 		    NULL); */
-/* 	    } */
-	    g_free (buf);
-	}
-	/* set the ignore strings */
-	tv = GTK_TEXT_VIEW (gtkpod_xml_get_widget (sort_window_xml,
-						  "sort_ign_strings"));
-	tb = gtk_text_view_get_buffer (tv);
-	if (!tb)
-	{   /* text buffer doesn't exist yet */
-	    tb = gtk_text_buffer_new (NULL);
-	    gtk_text_view_set_buffer(tv, tb);
-	    gtk_text_view_set_editable(tv, FALSE);
-	    gtk_text_view_set_cursor_visible(tv, FALSE);
-	}
-	
-	sort_ign_strings = prefs_get_list("sort_ign_string_");
-	current = sort_ign_strings;
-	while (current)
-	{
-	    str = (gchar *)current->data;
-	    current = g_list_next(current);
-
-	    /* append new text to the end */
-	    gtk_text_buffer_get_end_iter (tb, &ti);
-	    gtk_text_buffer_insert (tb, &ti, str, -1);
-	    /* append newline */
-	    gtk_text_buffer_get_end_iter (tb, &ti);
-	    gtk_text_buffer_insert (tb, &ti, "\n", -1);
-	}
-	
-	prefs_free_list(sort_ign_strings);
-
-	sort_window_read_sort_ign ();
-
-	/* Set Sort-Column-Combo */
-	/* create the list in the order of the columns displayed */
-	tm_store_col_order ();
-	for (i=0; i<TM_NUM_COLUMNS; ++i)
-	{   /* first the visible columns */
-	    TM_item col = prefs_get_int_index("col_order", i);
-	    if (col != -1)
-	    {
-		if (prefs_get_int_index("col_visible", col))
-		    collist = g_list_append (collist,
-					     gettext (get_tm_string (col)));
-	    }
-	}
-	for (i=0; i<TM_NUM_COLUMNS; ++i)
-	{   /* first the visible columns */
-	    TM_item col = prefs_get_int_index("col_order", i);
-	    if (col != -1)
-	    {
-		if (!prefs_get_int_index("col_visible", col))
-		    collist = g_list_append (collist,
-					     gettext (get_tm_string (col)));
-	    }
-	}
-	w = gtkpod_xml_get_widget (sort_window_xml, "sort_combo");
-	gtk_combo_set_popdown_strings (GTK_COMBO (w), collist);
-	g_list_free (collist);
-	collist = NULL;
-
-	sort_window_update ();
-
-	sort_window_show_hide_tooltips ();
-	gtk_widget_show (sort_window);
-    }
-}
-
-
-
-/* Update sort_window's settings (except for ignore list and ignore
- * fields) */
-void sort_window_update (void)
-{
-    if (sort_window)
-    {
-	gchar *str;
-	GtkWidget *w = NULL;
-
-	switch (prefs_get_int("pm_sort"))
-	{
-	case SORT_ASCENDING:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "pm_ascend");
-	    break;
-	case SORT_DESCENDING:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "pm_descend");
-	    break;
-	case SORT_NONE:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "pm_none");
-	    break;
-	}
-	if (w)
-	    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
-
-	w = NULL;
-	switch (prefs_get_int("st_sort"))
-	{
-	case SORT_ASCENDING:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "st_ascend");
-	    break;
-	case SORT_DESCENDING:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "st_descend");
-	    break;
-	case SORT_NONE:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "st_none");
-	    break;
-	}
-	if (w)
-	    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
-
-	switch (prefs_get_int("tm_sort"))
-	{
-	case SORT_ASCENDING:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "tm_ascend");
-	    break;
-	case SORT_DESCENDING:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "tm_descend");
-	    break;
-	case SORT_NONE:
-	    w = gtkpod_xml_get_widget (sort_window_xml, "tm_none");
-	    break;
-	}
-	if (w)
-	    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
-
-	w = gtkpod_xml_get_widget (sort_window_xml, "tm_autostore");
-	if (w)
-	    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-					 prefs_get_int("tm_autostore"));
-
-	if((w = gtkpod_xml_get_widget (sort_window_xml, "cfg_case_sensitive")))
-	{
-	    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-					 prefs_get_int("case_sensitive"));
-	}
-	/* set standard entry in combo */
-	str = gettext (get_tm_string (prefs_get_int("tm_sortcol")));
-	w = gtkpod_xml_get_widget (sort_window_xml, "sort_combo");
-	gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (w)->entry), str);
-    }
-}
-
-
-/* turn the sort window insensitive (if it's open) */
-void sort_window_block (void)
-{
-    if (sort_window)
-	gtk_widget_set_sensitive (sort_window, FALSE);
-}
-
-/* turn the sort window sensitive (if it's open) */
-void sort_window_release (void)
-{
-    if (sort_window)
-	gtk_widget_set_sensitive (sort_window, TRUE);
-}
-
-
-/* make the tooltips visible or hide it depending on the value set in
- * the prefs (tooltips_prefs) */
-void sort_window_show_hide_tooltips (void)
-{
-    if (sort_window)
-    {
-	GtkTooltips *tt;
-	GtkTooltipsData *tooltips_data;
-	tooltips_data = gtk_tooltips_data_get (gtkpod_xml_get_widget (sort_window_xml, "sort_combo-entry"));
-	tt = tooltips_data->tooltips;
-	if (tt)
-	{
-	    if (prefs_get_int("display_tooltips_prefs")) 
-		gtk_tooltips_enable (tt);
-	    else                                     
-		gtk_tooltips_disable (tt);
-	}
-	else
-	{
-	    g_warning ("***tt is NULL***");
-	}
-    }
-}
-
-
-/* get the sort_column selected in the combo */
-static TM_item sort_window_get_sort_col (void)
-{
-    const gchar *str;
-    GtkWidget *w;
-    gint i = -1;
-
-    w = gtkpod_xml_get_widget (sort_window_xml, "sort_combo");
-    str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (w)->entry));
-    /* Check which string is selected in the combo */
-    if (str)
-	for (i=0; get_tm_string (i); ++i)
-	    if (strcmp (gettext (get_tm_string (i)), str) == 0)  break;
-    if ((i<0) || (i>= TM_NUM_COLUMNS))
-    {
-	fprintf (stderr,
-		 "Programming error: cal_get_category () -- item not found.\n");
-	/* set to something reasonable at least */
-	i = TM_COLUMN_TITLE;
-    }
-
-    return i;
-}
-
-
-/* Prepare keys to be copied to prefs table */
-static void sort_window_set ()
-{
-    gint val; /* A value from temp prefs */
-    TM_item sortcol_new;
-    TM_item sortcol_old;
-
-    sortcol_old = prefs_get_int("tm_sortcol");
-    sortcol_new = sort_window_get_sort_col();
-    prefs_set_int("tm_sortcol", sortcol_new);
-
-    /* update compare string keys */
-    compare_string_fuzzy_generate_keys ();
-
-    /* if sort type has changed, initialize display */
-    if (temp_prefs_get_int_value(sort_temp_prefs, "pm_sort", &val))
-	pm_sort (val);
-    if (temp_prefs_get_int_value(sort_temp_prefs, "st_sort", &val))
-	st_sort (val);
-    if (temp_prefs_get_int_value(sort_temp_prefs, "tm_sort", NULL) ||
-	(sortcol_old != sortcol_new))
-    {
-	tm_sort_counter (-1);
-	tm_sort (prefs_get_int("tm_sortcol"), prefs_get_int("tm_sort"));
-    }
-    /* if auto sort was changed to TRUE, store order */
-    if (!temp_prefs_get_int(sort_temp_prefs, "tm_autostore"))
-	tm_rows_reordered ();
-
-}
-
-
-/* -----------------------------------------------------------------
-
-   Callbacks
-
-   ----------------------------------------------------------------- */
-
-void
-on_st_ascend_toggled                   (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_st_sort (SORT_ASCENDING);
-}
-
-
-void
-on_st_descend_toggled                  (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_st_sort (SORT_DESCENDING);
-}
-
-
-void
-on_st_none_toggled                     (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_st_sort (SORT_NONE);
-}
-
-
-void
-on_pm_ascend_toggled                   (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_pm_sort (SORT_ASCENDING);
-}
-
-
-void
-on_pm_descend_toggled                  (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_pm_sort (SORT_DESCENDING);
-}
-
-
-void
-on_pm_none_toggled                     (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_pm_sort (SORT_NONE);
-}
-
-
-void
-on_tm_ascend_toggled                   (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_tm_sort (SORT_ASCENDING);
-}
-
-
-void
-on_tm_descend_toggled                  (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_tm_sort (SORT_DESCENDING);
-}
-
-
-void
-on_tm_none_toggled                     (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    if (gtk_toggle_button_get_active(togglebutton))
-	sort_window_set_tm_sort (SORT_NONE);
-}
-
-void
-on_tm_autostore_toggled                (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    sort_window_set_tm_autostore (gtk_toggle_button_get_active(togglebutton));
-}
-
-
-void
-on_sort_case_sensitive_toggled         (GtkToggleButton *togglebutton,
-					gpointer         user_data)
-{
-    sort_window_set_case_sensitive(
-	gtk_toggle_button_get_active(togglebutton));
-}
-
-
-void
-on_sort_apply_clicked                  (GtkButton       *button,
-					gpointer         user_data)
-{
-    sort_window_apply ();
-}
-
-
-void
-on_sort_cancel_clicked                 (GtkButton       *button,
-					gpointer         user_data)
-{
-    sort_window_cancel ();
-}
-
-
-void
-on_sort_ok_clicked                     (GtkButton       *button,
-					gpointer         user_data)
-{
-    sort_window_ok ();
-}
-
-
-gboolean
-on_sort_window_delete_event            (GtkWidget       *widget,
-					GdkEvent        *event,
-					gpointer         user_data)
-{
-    sort_window_delete ();
-    return FALSE;
-}
-
-
-
-/**
- * sort_window_cancel
- * UI has requested sort prefs changes be ignored -- write back the
- * original values
- */
-void sort_window_cancel (void)
-{
-    /* close the window */
-    if(sort_window)
-	gtk_widget_destroy(sort_window);
-    sort_window = NULL;
-}
-
-/* when window is deleted, we keep the currently applied prefs */
-void sort_window_delete(void)
-{
-    temp_prefs_destroy(sort_temp_prefs);
-    sort_temp_prefs = NULL;
-    temp_lists_destroy(sort_temp_lists);
-    sort_temp_lists = NULL;
-
-    /* close the window */
-    if(sort_window)
-	gtk_widget_destroy(sort_window);
-    sort_window = NULL;
-}
-
-/* apply the current settings and close the window */
-void sort_window_ok (void)
-{
-    /* update the sort ignore strings */
-    sort_window_read_sort_ign ();
-
-    temp_prefs_apply(sort_temp_prefs);
-    temp_lists_apply(sort_temp_lists);
-
-    /* save current settings */
-    sort_window_set ();
-  
-    /* close the window */
-    if(sort_window)
-	gtk_widget_destroy(sort_window);
-    sort_window = NULL;
-}
-
-
-/* apply the current settings, don't close the window */
-void sort_window_apply (void)
-{
-    /* update the sort ignore strings */
-    sort_window_read_sort_ign ();
-
-    temp_prefs_apply(sort_temp_prefs);
-    temp_lists_apply(sort_temp_lists);
-
-    /* save current settings */
-    sort_window_set ();
-}
-
-void sort_window_set_tm_autostore (gboolean val)
-{
-    temp_prefs_set_int(sort_temp_prefs, "tm_autostore", val);
-}
-
-void sort_window_set_pm_sort (gint val)
-{
-    temp_prefs_set_int(sort_temp_prefs, "pm_sort", val);
-}
-
-void sort_window_set_st_sort (gint val)
-{
-    temp_prefs_set_int(sort_temp_prefs, "st_sort", val);
-}
-
-void sort_window_set_tm_sort (gint val)
-{
-    temp_prefs_set_int(sort_temp_prefs, "tm_sort", val);
-}
-
-void sort_window_set_case_sensitive (gboolean val)
-{
-    temp_prefs_set_int(sort_temp_prefs, "case_sensitive",
-		       val);
-}
-
-void on_exclude_file_mask_entry_changed (GtkEditable	*editable,
-					 gpointer	user_data)
-{
-    gchar *buf = gtk_editable_get_chars(editable, 0, -1);
-
-    temp_prefs_set_string (temp_prefs, "exclude_file_mask", buf);
-    g_free (buf);
-}
-

Deleted: gtkpod/branches/upstream/current/src/prefs_window.h
===================================================================
--- gtkpod/branches/upstream/current/src/prefs_window.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/prefs_window.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,66 +0,0 @@
-/* Time-stamp: <2006-05-21 12:24:56 jcs>
-|
-|  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
-|  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs 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: prefs_window.h 812 2006-06-10 08:29:44Z freethinkerjim $
-*/
-#ifndef _GTKPOD_PREFS_WINDOW_H
-#define _GTKPOD_PREFS_WINDOW_H
-
-#include <gtk/gtk.h>
-#include "prefs.h"
-extern const gchar *path_entry_names[];
-
-void prefs_window_update_default_sizes (void);
-void prefs_window_block (void);
-void prefs_window_release (void);
-void prefs_window_show_hide_tooltips (void);
-void prefs_window_ok (void);
-void prefs_window_apply (void);
-void prefs_window_cancel (void);
-void prefs_window_create (gint page);
-void prefs_window_delete (void);
-
-void sort_window_create (void);
-void sort_window_block (void);
-void sort_window_release (void);
-void sort_window_show_hide_tooltips (void);
-void sort_window_ok (void);
-void sort_window_apply (void);
-void sort_window_cancel (void);
-void sort_window_create (void);
-void sort_window_delete (void);
-void sort_window_set_pm_autostore (gboolean val);
-void sort_window_set_tm_autostore (gboolean val);
-void sort_window_set_pm_sort (gint val);
-void sort_window_set_st_sort (gint val);
-void sort_window_set_tm_sort (gint val);
-void sort_window_set_case_sensitive (gboolean val);
-void sort_window_update (void);
-
-void create_subs_treeview (void);
-#endif
-

Added: gtkpod/branches/upstream/current/src/prefsdlg.c
===================================================================
--- gtkpod/branches/upstream/current/src/prefsdlg.c	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/prefsdlg.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,1296 @@
+/*
+|  Copyright (C) 2007 Matvey Kozhev <sikon 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!
+*/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <string.h>
+#include "charset.h"
+#include "misc.h"
+#include "help.h"
+#include "prefs.h"
+#include "display_coverart.h"
+#include "sort_window.h"
+
+/*
+	Begin types
+*/
+typedef struct _ind_string
+{
+	gint index;
+	const gchar *string;
+} ind_string;
+
+ind_string toolbar_styles[] = {
+	{ -1, N_("Hide") },
+	{ GTK_TOOLBAR_ICONS, N_("Icons only") },
+	{ GTK_TOOLBAR_TEXT, N_("Text only") },
+	{ GTK_TOOLBAR_BOTH, N_("Text under icons") },
+	{ GTK_TOOLBAR_BOTH_HORIZ, N_("Text beside icons") },
+	{ -1, NULL }
+};
+
+#define IND_STRING_END(x, i) ((x)[i].string == NULL)
+#define COUNTOF(x) (sizeof(x) / sizeof((x)[0]))
+
+/*
+	Begin data
+
+	0: checkbox glade ID
+	1: preference
+	2: dependency glade IDs, comma-separated
+*/
+const gchar *checkbox_map[][3] = {
+	/* Display tab */
+	{ "filter_tabs_top", "filter_tabs_top", NULL },
+	{ "horizontal_scrollbar", "horizontal_scrollbar", NULL },
+	{ "group_compilations", "group_compilations", NULL },
+	{ "display_tooltips", "display_tooltips_main", NULL },
+	/* Music tab */
+	{ "background_transfer", "file_convert_background_transfer", NULL },
+	{ "add_subfolders", "add_recursively", NULL },
+	{ "allow_duplicates", "!sha1", NULL },
+	{ "delete_missing", "sync_delete_tracks", NULL },
+	{ "update_existing_track", "update_existing", NULL },
+	{ "include_neverplayed", "not_played_track", NULL },
+	/* Metadata tab */
+	{ "read_tags", "readtags", NULL },
+	{ "parse_filename_tags", "parsetags", "customize_tags" },
+	{ "last_resort_tags", NULL, "tag_title,tag_artist,tag_album,tag_composer,tag_genre" },
+	{ "write_tags", "id3_write", "tag_encoding,write_tags_legacy" },
+	{ "write_tags_legacy", "!id3_write_id3v24", NULL },
+	{ "mass_modify_tags", "multi_edit", NULL },
+	{ "read_coverart", "coverart_apic", NULL },
+	{ "template_coverart", "coverart_file", "customize_coverart" },
+	{ "generate_video_thumbnails", "video_thumbnailer", "customize_video_thumbnailer" },
+	/* Feedback tab */
+	{ "confirm_del_tracks", NULL, "confirm_from_ipod,confirm_from_hdd,confirm_from_db" },
+	{ "confirm_from_ipod", "delete_ipod", NULL },
+	{ "confirm_from_hdd", "delete_local_file", NULL },
+	{ "confirm_from_db", "delete_database", NULL },
+	{ "confirm_del_pl", "delete_file", NULL },
+	{ "confirm_del_sync", "sync_confirm_delete", NULL },
+	{ "msg_startup", "startup_messages", NULL },
+	{ "msg_duplicates", "show_duplicates", NULL },
+	{ "msg_results", "sync_show_summary", NULL },
+	{ "msg_updated", "show_updated", NULL },
+	{ "msg_unupdated", "show_non_updated", NULL },
+};
+
+const gchar *conv_checkbox_map[][3] = {
+	{ "convert_ogg", "convert_ogg", NULL },
+	{ "convert_flac", "convert_flac", NULL },
+	{ "convert_mp3", "convert_mp3", NULL },
+	{ "convert_aac", "convert_m4a", NULL },
+	{ "convert_wav", "convert_wav", NULL },
+	{ "display_conversion_log", "", NULL },
+};
+
+ind_string tag_checkbox_map[] = {
+	{ 0, "tag_title" },
+	{ 1, "tag_artist" },
+	{ 2, "tag_album" },
+	{ 3, "tag_genre" },
+	{ 4, "tag_composer" },
+};
+
+const gchar *conv_scripts[] = {
+	"convert-2mp3.sh",
+	"convert-2m4a.sh",
+};
+
+ind_string conv_paths[] = {
+	{ -1, "path_conv_ogg" },
+    { -1, "path_conv_flac" },
+    { TARGET_FORMAT_AAC, "path_conv_m4a" },
+    { TARGET_FORMAT_MP3, "path_conv_mp3" },
+    { -1, "path_conv_wav" },
+};
+
+static GladeXML *prefs_xml = NULL;
+static GtkWidget *prefs_dialog = NULL;
+static TempPrefs *temp_prefs = NULL;
+
+/*
+	Convenience functions
+*/
+void combo_box_clear (GtkComboBox *combo)
+{
+	GtkListStore *store;
+	GtkTreeModel *model = gtk_combo_box_get_model (combo);
+	g_return_if_fail (GTK_IS_LIST_STORE (model));
+	store = GTK_LIST_STORE (model);
+	gtk_list_store_clear (store);
+}
+
+gint ind_string_find(ind_string *array, gint index)
+{
+	gint i;
+	
+	for(i = 0; !IND_STRING_END(array, i); i++)
+	{
+		if(array[i].index == index)
+			return i;
+	}
+	
+	return -1;
+}
+
+void ind_string_fill_combo (ind_string *array, GtkComboBox *combo)
+{
+	gint i;
+	combo_box_clear(combo);
+
+	for (i = 0; !IND_STRING_END(array, i); i++)
+	{
+		gtk_combo_box_append_text(combo, gettext(array[i].string));
+	}
+}
+
+void update_checkbox_deps (GtkToggleButton *checkbox, const gchar *deps)
+{
+	/* Enable or disable dependent checkboxes */
+	GladeXML *xml = GLADE_XML (g_object_get_data (G_OBJECT (checkbox), "xml"));
+	gboolean active = gtk_toggle_button_get_active (checkbox);
+	gchar **deparray;
+	int i;
+
+	if(!xml || !deps)
+		return;
+
+	deparray = g_strsplit (deps, ",", 0);
+	
+	for(i = 0; deparray[i]; i++)
+	{
+		GtkWidget *dep = gtkpod_xml_get_widget (xml, deparray[i]);
+		gtk_widget_set_sensitive (dep, active);
+	}
+	
+	g_strfreev (deparray);
+}
+
+static void init_checkbox (GtkToggleButton *checkbox, GladeXML *xml, const gchar *pref, const gchar *deps)
+{
+	g_object_set_data(G_OBJECT(checkbox), "pref", (gchar *) pref);
+	g_object_set_data(G_OBJECT(checkbox), "deps", (gchar *) deps);
+	g_object_set_data(G_OBJECT(checkbox), "xml", xml);
+	
+	if(pref)
+	{	
+		if(pref[0] == '!')		/* Checkbox is !preference */
+			gtk_toggle_button_set_active(checkbox, !prefs_get_int(pref + 1));
+		else
+			gtk_toggle_button_set_active(checkbox, prefs_get_int(pref));
+	}
+	
+	update_checkbox_deps (checkbox, deps);
+}
+
+static gint column_tree_sort (GtkTreeModel *model,
+							  GtkTreeIter *a,
+							  GtkTreeIter *b,
+							  gpointer user_data)
+{
+    gchar *str1, *str2;
+    gint result;
+
+    gtk_tree_model_get (model, a, 0, &str1, -1);
+    gtk_tree_model_get (model, b, 0, &str2, -1);
+    result = g_utf8_collate (str1, str2);
+
+    g_free (str1);
+    g_free (str2);
+    return result;
+}
+
+static void setup_column_tree (GtkTreeView *treeview, gboolean list_visible)
+{
+    GtkListStore *store;
+    GtkTreeIter iter;
+    GtkTreeViewColumn *column;
+    GtkCellRenderer *renderer;
+    gint i;
+	
+	/* Delete any existing columns first */
+	while (TRUE)
+	{
+		column = gtk_tree_view_get_column (treeview, 0);
+		
+		if (!column)
+			break;
+		
+		gtk_tree_view_remove_column (treeview, column);
+	}
+
+    store = gtk_list_store_new (2, 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", 0, NULL);
+
+    gtk_tree_view_append_column (treeview, column);
+    gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (store));
+
+    g_object_unref (G_OBJECT (store));
+
+    for (i = 0; i < TM_NUM_COLUMNS; i++)
+    {
+		gint visible = prefs_get_int_index("col_visible", i);
+		
+		if ((!list_visible && visible) || (list_visible && !visible))
+			continue;
+		
+		gtk_list_store_append (store, &iter);
+		gtk_list_store_set(store, &iter,
+				   0, gettext (get_tm_string (i)),
+				   1, i, -1);
+    }
+	
+	if(!list_visible)
+	{
+		/* Sort invisible columns */
+		gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
+							 column_tree_sort,
+							 NULL,
+							 NULL);
+		
+		gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+						  GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+						  GTK_SORT_ASCENDING);
+	}
+}
+
+static gboolean tree_get_current_iter (GtkTreeView *view, GtkTreeIter *iter)
+{
+	GtkTreeModel *model = gtk_tree_view_get_model (view);
+	GtkTreePath *path;
+
+	gtk_tree_view_get_cursor (view, &path, NULL);
+	
+	if (!path)
+		return FALSE;
+	
+	gtk_tree_model_get_iter (model, iter, path);
+	gtk_tree_path_free (path);
+	
+	return TRUE;
+}
+
+/*
+	Disconnects all signals connected to a GtkWidget.
+	The "data" paremeter is ignored.
+*/
+static void disconnect_signals_internal (GtkWidget *widget, gpointer data)
+{
+	GType type;
+	
+	for (type = G_TYPE_FROM_INSTANCE (widget);
+		 type && type != GTK_TYPE_OBJECT && type != GTK_TYPE_WIDGET;
+		 type = g_type_parent (type))
+	{	
+		guint i;
+		guint n_ids;
+		guint *ids;
+		
+		ids = g_signal_list_ids (type, &n_ids);
+		
+		for (i = 0; i < n_ids; i++)
+		{
+			gint handler;
+			
+			while (TRUE)
+			{
+				handler = g_signal_handler_find (widget, G_SIGNAL_MATCH_ID, ids[i], 0, NULL, NULL, NULL);
+				
+				if (!handler)
+					break;
+				
+				g_signal_handler_disconnect (widget, handler);
+			}
+		}
+	}
+}
+
+static void disconnect_all_internal (GtkWidget *widget, gpointer data)
+{
+	disconnect_signals_internal (widget, NULL);
+	
+	if (GTK_IS_CONTAINER (widget))
+	{
+		gtk_container_foreach (GTK_CONTAINER (widget), disconnect_all_internal, NULL);
+	}
+}
+
+/*
+	Recursively disconnects all signals connected to a GtkWidget and its children.
+*/
+static void disconnect_all (GtkWidget *widget)
+{
+	disconnect_all_internal (widget, NULL);
+}
+
+/*
+	Real functions
+*/
+void setup_prefs_dlg (GladeXML *xml, GtkWidget *dlg)
+{
+	gint i;
+	GtkWidget *toolbar_style_combo = gtkpod_xml_get_widget (xml, "toolbar_style");
+	GtkWidget *skip_track_update_radio = gtkpod_xml_get_widget (xml, "skip_track_update");
+	GtkWidget *filter_tabs_bottom_radio = gtkpod_xml_get_widget (xml, "filter_tabs_bottom");
+	GtkWidget *coverart_bgcolorselect_button = gtkpod_xml_get_widget (xml, "coverart_display_bg_button");
+	GtkWidget *coverart_fgcolorselect_button = gtkpod_xml_get_widget (xml, "coverart_display_fg_button");
+	GdkColor *color;
+	
+	/* Display */
+	
+	/* Toolbar */
+	ind_string_fill_combo(toolbar_styles, GTK_COMBO_BOX (toolbar_style_combo));
+	
+	if (!prefs_get_int("display_toolbar"))
+	{
+		gtk_combo_box_set_active(GTK_COMBO_BOX (toolbar_style_combo),
+								 ind_string_find(toolbar_styles, -1));
+	}
+	else
+	{
+		gint style = prefs_get_int("toolbar_style");
+		gint index = ind_string_find(toolbar_styles, style);
+		
+		gtk_combo_box_set_active(GTK_COMBO_BOX (toolbar_style_combo), index);
+	}
+	/* End toolbar */
+	
+	/* Columns */
+	setup_column_tree (GTK_TREE_VIEW (gtkpod_xml_get_widget (xml, "displayed_columns")), TRUE);
+	
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtkpod_xml_get_widget (xml, "filter_tabs_count")),
+							   prefs_get_int("sort_tab_num"));
+
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtkpod_xml_get_widget (xml, "agp_track_count")),
+							   prefs_get_int("misc_track_nr"));
+	
+	/* Check boxes */
+	for (i = 0; i < COUNTOF(checkbox_map); i++)
+	{
+		init_checkbox (GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (xml, checkbox_map[i][0])),
+					   xml, checkbox_map[i][1], checkbox_map[i][2]);
+	}
+	
+	for (i = 0; i < COUNTOF(tag_checkbox_map); i++)
+	{
+		GtkWidget *widget = gtkpod_xml_get_widget (xml, tag_checkbox_map[i].string);
+		g_object_set_data (G_OBJECT (widget), "index", &tag_checkbox_map[i].index);
+
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget),
+									  prefs_get_int_index ("tag_autoset", tag_checkbox_map[i].index));
+	}
+	
+	if(!prefs_get_int("update_existing"))
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (skip_track_update_radio), TRUE);
+	
+	if(!prefs_get_int("filter_tabs_top"))
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (filter_tabs_bottom_radio), TRUE);
+	
+	color = coverart_get_background_display_color();
+	gtk_color_button_set_color (GTK_COLOR_BUTTON(coverart_bgcolorselect_button), color);
+	g_free (color);
+	
+	color = coverart_get_foreground_display_color();
+	gtk_color_button_set_color (GTK_COLOR_BUTTON(coverart_fgcolorselect_button), color);
+	g_free (color);
+	
+	gtk_combo_box_set_active (GTK_COMBO_BOX (gtkpod_xml_get_widget (xml, "target_format")),
+							  prefs_get_int ("conversion_target_format"));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void open_prefs_dlg ()
+{
+	if(prefs_dialog)
+	{
+		gtk_window_present(GTK_WINDOW(prefs_dialog));
+		return;
+	}
+	
+    temp_prefs = temp_prefs_create();
+	temp_prefs_copy_prefs (temp_prefs);
+
+	prefs_xml = gtkpod_xml_new (xml_file, "prefs_dialog");
+	prefs_dialog = gtkpod_xml_get_widget (prefs_xml, "prefs_dialog");
+	
+	setup_prefs_dlg(prefs_xml, prefs_dialog);
+	/*
+		This is after setup because we don't want on_changed signals to fire
+		during setup
+	*/
+	glade_xml_signal_autoconnect (prefs_xml);
+	gtk_widget_show(prefs_dialog);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_prefs_dialog_help ()
+{
+	gtkpod_open_help_context ("gtkpod");
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_prefs_dialog_close ()
+{
+	if (!prefs_dialog)
+		return;
+	
+	gtk_widget_destroy(prefs_dialog);
+	g_object_unref(prefs_xml);
+    temp_prefs_destroy(temp_prefs);
+	
+	prefs_dialog = NULL;
+	prefs_xml = NULL;
+	temp_prefs = NULL;
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_prefs_dialog_revert ()
+{
+	disconnect_all (prefs_dialog);
+    temp_prefs_apply (temp_prefs);
+	setup_prefs_dlg (prefs_xml, prefs_dialog);
+	glade_xml_signal_autoconnect (prefs_xml);
+
+	/* Apply all */
+	tm_store_col_order ();
+
+	tm_show_preferred_columns();
+	st_show_visible();
+	display_show_hide_tooltips();
+	display_show_hide_toolbar();
+
+	file_convert_prefs_changed ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_filter_tabs_count_value_changed (GtkSpinButton *sender, gpointer e)
+{
+    gint num = gtk_spin_button_get_value_as_int (sender);
+
+	/* Update the number of filter tabs */
+    prefs_set_int ("sort_tab_num", num);
+	st_show_visible();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_agp_track_count_value_changed (GtkSpinButton *sender, gpointer e)
+{
+    gint num = gtk_spin_button_get_value_as_int (sender);
+    prefs_set_int ("misc_track_nr", num);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_toolbar_style_changed (GtkComboBox *sender, gpointer e)
+{
+	gint index = toolbar_styles[gtk_combo_box_get_active(sender)].index;
+	
+	if (index == -1)
+	{
+		prefs_set_int ("display_toolbar", 0);
+	}
+	else
+	{
+		prefs_set_int ("display_toolbar", 1);
+		prefs_set_int ("toolbar_style", index);
+	}
+
+	display_show_hide_toolbar ();
+}
+
+/*
+	generic glade callback, used by many checkboxes
+*/
+G_MODULE_EXPORT void on_simple_checkbox_toggled (GtkToggleButton *sender, gpointer e)
+{
+	gboolean active = gtk_toggle_button_get_active (sender);
+	gchar *pref = (gchar *) g_object_get_data (G_OBJECT(sender), "pref");
+	gchar *deps = (gchar *) g_object_get_data (G_OBJECT(sender), "deps");
+	
+	if(pref)
+	{
+		if(pref[0] == '!')		/* Checkbox is !preference */
+			prefs_set_int(pref + 1, !active);
+		else
+			prefs_set_int(pref, active);
+	}
+	
+	update_checkbox_deps (sender, deps);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_tag_checkbox_toggled (GtkToggleButton *sender, gpointer e)
+{
+	gint index = *(gint *) g_object_get_data (G_OBJECT(sender), "index");
+	prefs_set_int_index ("tag_autoset", index, gtk_toggle_button_get_active (sender));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_browse_button_clicked (GtkButton *sender, gpointer e)
+{
+	GtkWidget *dialog;
+	gchar *base, *args, *path;
+	const gchar *space, *current;
+	GtkEntry *entry = GTK_ENTRY (g_object_get_data (G_OBJECT (sender), "entry"));
+
+	g_return_if_fail (entry);
+	
+	dialog = gtk_file_chooser_dialog_new (_("Browse"),
+										  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (sender))),
+										  GTK_FILE_CHOOSER_ACTION_OPEN,
+										  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+										  GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+										  NULL);
+
+	
+	current = gtk_entry_get_text (entry);
+	/* separate filename from command line arguments */
+	space = strchr (current, ' ');
+	if (space)
+	{
+	    base = g_strndup (current, space-current);
+	    args = g_strdup (space);
+	}
+	else
+	{
+	    base = g_strdup (current);
+	    args = NULL;
+	}
+
+	path = g_find_program_in_path (base);
+
+	if (path)
+	{
+	    gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), path);
+	}
+	else
+	{
+	    gchar *dir = g_path_get_dirname (base);
+	    if (dir)
+	    {
+		if (g_file_test (dir, G_FILE_TEST_IS_DIR) && g_path_is_absolute (dir))
+		{
+		    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
+							 dir);
+		}
+	    }
+	    g_free (dir);
+	}
+	
+	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
+	{
+	    gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+	    if (args)
+	    {  /* add args to filename */
+		gchar *new = g_strdup_printf ("%s%s", filename, args);
+		gtk_entry_set_text (entry, new);
+		g_free (new);
+	    }
+	    else
+	    {
+		gtk_entry_set_text (entry, filename);
+	    }
+	    g_free (filename);
+	}
+
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+
+	g_free (base);
+	g_free (path);
+	g_free (args);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_group_compilations_toggled (GtkToggleButton *sender, gpointer e)
+{
+	gboolean active = gtk_toggle_button_get_active (sender);
+	
+	prefs_set_int ("group_compilations", active);
+	st_show_visible();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_display_tooltips_toggled (GtkToggleButton *sender, gpointer e)
+{
+	gboolean active = gtk_toggle_button_get_active (sender);
+	
+	prefs_set_int ("display_tooltips", active);
+	display_show_hide_tooltips ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_filter_tabs_top_toggled (GtkToggleButton *sender, gpointer e)
+{
+	gboolean active = gtk_toggle_button_get_active (sender);
+	
+	prefs_set_int ("filter_tabs_top", active);
+	st_update_paned_position ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_horizontal_scrollbar_toggled (GtkToggleButton *sender, gpointer e)
+{
+	gboolean active = gtk_toggle_button_get_active (sender);
+	
+	prefs_set_int ("horizontal_scrollbar", active);
+	tm_show_preferred_columns ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_column_add_clicked (GtkButton *sender, gpointer e)
+{
+	gint i;
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_columns_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_columns_dialog");
+	GtkTreeView *view = GTK_TREE_VIEW (gtkpod_xml_get_widget (xml, "available_columns"));
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+	setup_column_tree (view, FALSE);
+	
+	/* User pressed Cancel */
+	if(!gtk_dialog_run (GTK_DIALOG (dlg)))
+	{
+		gtk_widget_destroy (dlg);
+		g_object_unref (xml);
+		return;
+	}
+	
+	/* User pressed Add */
+	model = gtk_tree_view_get_model (view);
+	tree_get_current_iter (view, &iter);
+	gtk_tree_model_get (model, &iter, 1, &i, -1);
+	
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+	
+	view = GTK_TREE_VIEW (gtkpod_xml_get_widget (prefs_xml, "displayed_columns"));
+	model = gtk_tree_view_get_model (view);
+	
+	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+	gtk_list_store_set(GTK_LIST_STORE (model), &iter,
+			   0, gettext (get_tm_string (i)),
+			   1, i, -1);
+	
+	prefs_set_int_index ("col_visible", i, TRUE);
+	tm_store_col_order ();
+	tm_show_preferred_columns ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_column_remove_clicked (GtkButton *sender, gpointer e)
+{
+	gint i;
+	GtkTreeView *view = GTK_TREE_VIEW (gtkpod_xml_get_widget (prefs_xml, "displayed_columns"));
+	GtkTreeModel *model = gtk_tree_view_get_model (view);
+	GtkTreeIter iter;
+	
+	if(!tree_get_current_iter (view, &iter) || !gtk_list_store_iter_is_valid (GTK_LIST_STORE (model), &iter))
+		return;
+
+	gtk_tree_model_get (model, &iter, 1, &i, -1);
+	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+	
+	prefs_set_int_index ("col_visible", i, FALSE);
+	tm_store_col_order ();
+	tm_show_preferred_columns ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_unsetdeps_checkbox_toggled (GtkToggleButton *sender, gpointer e)
+{
+	GladeXML *xml = GLADE_XML (g_object_get_data (G_OBJECT(sender), "xml"));
+	
+	if(xml && !gtk_toggle_button_get_active (sender))
+	{
+		int i;
+		const gchar *deps = (gchar *) g_object_get_data (G_OBJECT(sender), "deps");
+		gchar **deparray = g_strsplit (deps, ",", 0);
+		
+		for(i = 0; deparray[i]; i++)
+		{
+			GtkWidget *dep = gtkpod_xml_get_widget (xml, deparray[i]);
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dep), FALSE);
+		}
+		g_strfreev (deparray);
+	}
+
+	/* and then call the default handler */
+	on_simple_checkbox_toggled (sender, e);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_coverart_dialog_bg_color_set (GtkColorButton *widget, gpointer user_data)
+{
+	GdkColor color;
+	gtk_color_button_get_color (widget, &color);
+	gchar *hexstring = g_strdup_printf("#%02X%02X%02X",
+									   color.red >> 8,
+									   color.green >> 8,
+									   color.blue >> 8);
+	
+	prefs_set_string ("coverart_display_bg_color", hexstring);
+	g_free (hexstring);
+	coverart_display_update (FALSE);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_coverart_dialog_fg_color_set (GtkColorButton *widget, gpointer user_data)
+{
+	GdkColor color;
+	gtk_color_button_get_color (widget, &color);
+	gchar *hexstring = g_strdup_printf("#%02X%02X%02X",
+									   color.red >> 8,
+									   color.green >> 8,
+									   color.blue >> 8);
+	
+	prefs_set_string ("coverart_display_fg_color", hexstring);
+	g_free (hexstring);
+	coverart_display_update (FALSE);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void open_encoding_dialog (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_encoding_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_encoding_dialog");
+	GtkWidget *combo = gtkpod_xml_get_widget (xml, "encoding_combo");
+
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+	
+	init_checkbox (GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (xml, "use_encoding_for_update")),
+				   xml, "update_charset", NULL);
+
+	init_checkbox (GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (xml, "use_encoding_for_writing")),
+				   xml, "write_charset", NULL);
+
+	charset_init_combo_box (GTK_COMBO_BOX (combo));
+	glade_xml_signal_autoconnect (xml);
+	gtk_dialog_run (GTK_DIALOG (dlg));
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_encoding_combo_changed (GtkComboBox *sender, gpointer e)
+{
+	gchar *description = gtk_combo_box_get_active_text (sender);
+	gchar *charset = charset_from_description (description);
+	
+	prefs_set_string ("charset", charset);
+	g_free (charset);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_customize_tags_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_tag_parse_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_tag_parse_dialog");
+	gchar *temp = prefs_get_string("parsetags_template");
+	
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+
+	if(temp)
+	{
+		gtk_entry_set_text (GTK_ENTRY (gtkpod_xml_get_widget (xml, "filename_pattern")),
+							temp);
+		
+		g_free (temp);
+	}
+	
+	init_checkbox (GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (xml, "overwrite_tags")),
+				   xml, "parsetags_overwrite", NULL);
+	
+	glade_xml_signal_autoconnect (xml);
+	gtk_dialog_run (GTK_DIALOG (dlg));
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_filename_pattern_changed (GtkEditable *sender, gpointer e)
+{
+	prefs_set_string ("parsetags_template", gtk_entry_get_text (GTK_ENTRY (sender)));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_customize_coverart_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_coverart_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_coverart_dialog");
+	gchar *temp = prefs_get_string("coverart_template");
+	
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+
+	if(temp)
+	{
+		gtk_entry_set_text (GTK_ENTRY (gtkpod_xml_get_widget (xml, "coverart_pattern")),
+							temp);
+		
+		g_free (temp);
+	}
+	
+	glade_xml_signal_autoconnect (xml);
+	gtk_dialog_run (GTK_DIALOG (dlg));
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_customize_video_thumbnailer_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_video_thumbnailer_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_video_thumbnailer_dialog");
+	gchar *temp = prefs_get_string("video_thumbnailer_prog");
+	
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+
+	if(temp)
+	{
+		gtk_entry_set_text (GTK_ENTRY (gtkpod_xml_get_widget (xml, "video_thumbnailer")),
+							temp);
+		
+		g_free (temp);
+	}
+	
+	glade_xml_signal_autoconnect (xml);
+	gtk_dialog_run (GTK_DIALOG (dlg));
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+}
+
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_coverart_pattern_changed (GtkEditable *sender, gpointer e)
+{
+	prefs_set_string ("coverart_template", gtk_entry_get_text (GTK_ENTRY (sender)));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_video_thumbnailer_changed (GtkEditable *sender, gpointer e)
+{
+	prefs_set_string ("video_thumbnailer_prog", gtk_entry_get_text (GTK_ENTRY (sender)));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_exclusions_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_exclusions_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_exclusions_dialog");
+	GtkWidget *tree = gtkpod_xml_get_widget (xml, "exclusion_list");
+	GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
+    GtkTreeViewColumn *column = gtk_tree_view_column_new ();
+    GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+	gchar *temp = prefs_get_string("exclude_file_mask");
+	
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+
+	if (temp)
+	{
+		gint i;
+		gchar **masks = g_strsplit (temp, ";", 0);
+		GtkTreeIter iter;
+		
+		g_free (temp);
+		
+		for (i = 0; masks[i]; i++)
+		{
+			gtk_list_store_append (store, &iter);
+			gtk_list_store_set(store, &iter, 0, masks[i], -1);
+		}
+		
+		g_strfreev (masks);
+	}
+	
+	gtk_tree_view_column_pack_start (column, renderer, TRUE);
+    gtk_tree_view_column_set_attributes (column, renderer, "text", 0, NULL);
+    gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
+	gtk_tree_view_set_model (GTK_TREE_VIEW (tree), GTK_TREE_MODEL (store));
+	g_object_unref (store);
+	
+	g_object_set_data (G_OBJECT (gtkpod_xml_get_widget (xml, "add_exclusion")),
+					   "xml", xml);
+	
+	g_object_set_data (G_OBJECT (gtkpod_xml_get_widget (xml, "remove_exclusion")),
+					   "xml", xml);
+	
+	glade_xml_signal_autoconnect (xml);
+	gtk_dialog_run (GTK_DIALOG (dlg));
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+}
+
+static void update_exclusions (GtkListStore *store)
+{
+	GtkTreeModel *model = GTK_TREE_MODEL (store);
+	gint rows = gtk_tree_model_iter_n_children (model, NULL);
+	gchar **array = g_new (gchar *, rows + 1);
+	gchar *temp;
+	gint i;
+	GtkTreeIter iter;
+	
+	array[rows] = NULL;
+	
+	for (i = 0; i < rows; i++)
+	{
+		gtk_tree_model_iter_nth_child (model, &iter, NULL, i);
+		gtk_tree_model_get (model, &iter, 0, array + i, -1);
+	}
+	
+	temp = g_strjoinv (";", array);
+	prefs_set_string ("exclude_file_mask", temp);
+	g_free (temp);
+	g_strfreev (array);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_add_exclusion_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = GLADE_XML (g_object_get_data (G_OBJECT (sender), "xml"));
+	GtkWidget *tree = gtkpod_xml_get_widget (xml, "exclusion_list");
+	GtkWidget *entry = gtkpod_xml_get_widget (xml, "new_exclusion");
+	const gchar *text = gtk_entry_get_text (GTK_ENTRY (entry));
+	
+	if (text && text[0])
+	{
+		GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (tree)));
+		GtkTreeIter iter;
+		
+		gtk_list_store_append (store, &iter);
+		gtk_list_store_set(store, &iter, 0, text, -1);
+		gtk_entry_set_text (GTK_ENTRY (entry), "");
+		
+		update_exclusions (store);
+	}
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_remove_exclusion_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = GLADE_XML (g_object_get_data (G_OBJECT (sender), "xml"));
+	GtkWidget *tree = gtkpod_xml_get_widget (xml, "exclusion_list");
+	GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (tree)));
+		GtkTreeIter iter;
+	
+	if(!tree_get_current_iter (GTK_TREE_VIEW (tree), &iter) || gtk_list_store_iter_is_valid (store, &iter))
+	{
+		gtk_list_store_remove (store, &iter);
+		update_exclusions (store);
+	}
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_mserv_settings_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_mserv_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_mserv_dialog");
+	gchar *temp = prefs_get_string ("mserv_username");
+	
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+
+	if(temp)
+	{
+		gtk_entry_set_text (GTK_ENTRY (gtkpod_xml_get_widget (xml, "mserv_username")),
+							temp);
+		
+		g_free (temp);
+	}
+	
+	temp = prefs_get_string ("path_mserv_music_root");
+	
+	if(temp)
+	{
+		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (gtkpod_xml_get_widget (xml, "music_root")),
+											 temp);
+		
+		g_free (temp);
+	}
+	
+	temp = prefs_get_string ("path_mserv_trackinfo_root");
+	
+	if(temp)
+	{
+		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (gtkpod_xml_get_widget (xml, "mserv_root")),
+											 temp);
+		
+		g_free (temp);
+	}
+	
+	init_checkbox (GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (xml, "use_mserv")),
+				   xml, "mserv_use", "mserv_settings_frame");
+	
+	init_checkbox (GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (xml, "report_mserv_problems")),
+				   xml, "mserv_report_probs", NULL);
+	
+	glade_xml_signal_autoconnect (xml);
+	gtk_dialog_run (GTK_DIALOG (dlg));
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_mserv_username_changed (GtkEditable *sender, gpointer e)
+{
+	prefs_set_string ("mserv_username", gtk_entry_get_text (GTK_ENTRY (sender)));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_music_root_current_folder_changed (GtkFileChooser *sender, gpointer e)
+{
+	prefs_set_string ("path_mserv_music_root",
+					  gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (sender)));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_mserv_root_current_folder_changed (GtkFileChooser *sender, gpointer e)
+{
+	prefs_set_string ("path_mserv_trackinfo_root",
+					  gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (sender)));
+}
+
+static void cmd_setup_widget (GladeXML *xml, const gchar *entry_name, const gchar *envname, const gchar *browse_name)
+{
+    GtkWidget *entry = gtkpod_xml_get_widget (xml, entry_name);
+    gchar *temp = prefs_get_string (envname);
+    if (!temp)
+    {
+	temp = g_strdup ("");
+    }
+    gtk_entry_set_text (GTK_ENTRY (entry), temp);
+    g_free (temp);
+
+    g_object_set_data (G_OBJECT (entry), "envname", (gpointer)envname);
+    g_object_set_data (G_OBJECT (gtkpod_xml_get_widget (xml, browse_name)),
+		       "entry", entry);
+}
+
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_commands_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_commands_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_commands_dialog");
+
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+
+	cmd_setup_widget (xml, "cmd_playnow", "path_play_now", "browse_playnow");
+	cmd_setup_widget (xml, "cmd_enqueue", "path_play_enqueue", "browse_enqueue");
+	cmd_setup_widget (xml, "cmd_mp3gain", "path_mp3gain", "browse_mp3gain");
+	cmd_setup_widget (xml, "cmd_aacgain", "path_aacgain", "browse_aacgain");
+
+	glade_xml_signal_autoconnect (xml);
+	gtk_dialog_run (GTK_DIALOG (dlg));
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_cmd_entry_changed (GtkEditable *sender, gpointer e)
+{
+    const gchar *envname = g_object_get_data (G_OBJECT (sender), "envname");
+
+    prefs_set_string (envname, gtk_entry_get_text (GTK_ENTRY (sender)));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_conversion_settings_clicked (GtkButton *sender, gpointer e)
+{
+	GladeXML *xml = gtkpod_xml_new (xml_file, "prefs_conversion_dialog");
+	GtkWidget *dlg = gtkpod_xml_get_widget (xml, "prefs_conversion_dialog");
+	gchar *temp = prefs_get_string ("file_convert_cachedir");
+	gint i;
+	
+	gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (prefs_dialog));
+
+	if(temp)
+	{
+		gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (gtkpod_xml_get_widget (xml, "cache_folder")),
+											 temp);
+		
+		g_free (temp);
+	}
+	
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtkpod_xml_get_widget (xml, "bg_threads")),
+							   prefs_get_int("file_convert_max_threads_num"));
+	
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtkpod_xml_get_widget (xml, "cache_size")),
+							   prefs_get_int("file_convert_maxdirsize"));
+
+	for (i = 0; i < COUNTOF(conv_checkbox_map); i++)
+	{
+		init_checkbox (GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (xml, conv_checkbox_map[i][0])),
+					   xml, conv_checkbox_map[i][1], conv_checkbox_map[i][2]);
+	}
+
+	glade_xml_signal_autoconnect (xml);
+	gtk_dialog_run (GTK_DIALOG (dlg));
+	gtk_widget_destroy (dlg);
+	g_object_unref (xml);
+	file_convert_prefs_changed ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_cache_folder_current_folder_changed (GtkFileChooser *sender, gpointer e)
+{
+	prefs_set_string ("file_convert_cachedir",
+					  gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (sender)));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_bg_threads_value_changed (GtkSpinButton *sender, gpointer e)
+{
+    prefs_set_int ("file_convert_max_threads_num", gtk_spin_button_get_value_as_int (sender));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_cache_size_value_changed (GtkSpinButton *sender, gpointer e)
+{
+    prefs_set_int ("file_convert_maxdirsize", gtk_spin_button_get_value_as_int (sender));
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_target_format_changed (GtkComboBox *sender, gpointer e)
+{
+	gint index = gtk_combo_box_get_active (sender);
+	gchar *script = g_build_filename (SCRIPTDIR, conv_scripts[index], NULL);
+	gint i;
+	
+	for (i = 0; i < COUNTOF (conv_paths); i++)
+	{
+		if (conv_paths[i].index == index)
+		{
+			/*
+				The source format is the same as the target format -
+				we set "null conversion" without touching the boolean preference
+			*/
+			prefs_set_string (conv_paths[i].string, "");
+		}
+		else
+			prefs_set_string (conv_paths[i].string, script);
+	}
+	
+	prefs_set_int ("conversion_target_format", index);
+	g_free (script);
+	file_convert_prefs_changed ();
+}
+
+/*
+	glade callback
+*/
+G_MODULE_EXPORT void on_sorting_button_clicked (GtkButton *sender, gpointer e)
+{
+	sort_window_create ();
+}

Added: gtkpod/branches/upstream/current/src/rb_cell_renderer_rating.c
===================================================================
--- gtkpod/branches/upstream/current/src/rb_cell_renderer_rating.c	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/rb_cell_renderer_rating.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,348 @@
+/*
+ *
+ * rb-cell-renderer-rating.c
+ * arch-tag: Implementation of star rating GtkTreeView cell renderer
+ *
+ * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb at redhat.com>
+ * Copyright (C) 2002  Olivier Martin <oleevye at wanadoo.fr>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301  USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <stdlib.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#include "rb_cell_renderer_rating.h"
+#include "rb_rating_helper.h"
+
+static void rb_cell_renderer_rating_get_property (GObject *object,
+						  guint param_id,
+						  GValue *value,
+						  GParamSpec *pspec);
+static void rb_cell_renderer_rating_set_property (GObject *object,
+						  guint param_id,
+						  const GValue *value,
+						  GParamSpec *pspec);
+static void rb_cell_renderer_rating_init (RBCellRendererRating *celltext);
+static void rb_cell_renderer_rating_class_init (RBCellRendererRatingClass *class);
+static void rb_cell_renderer_rating_get_size  (GtkCellRenderer *cell,
+					       GtkWidget *widget,
+					       GdkRectangle *rectangle,
+					       gint *x_offset,
+					       gint *y_offset,
+					       gint *width,
+					       gint *height);
+static void rb_cell_renderer_rating_render (GtkCellRenderer *cell,
+					    GdkWindow *window,
+					    GtkWidget *widget,
+					    GdkRectangle *background_area,
+					    GdkRectangle *cell_area,
+					    GdkRectangle *expose_area,
+					    GtkCellRendererState flags);
+static gboolean rb_cell_renderer_rating_activate (GtkCellRenderer *cell,
+					          GdkEvent *event,
+					          GtkWidget *widget,
+					          const gchar *path,
+					          GdkRectangle *background_area,
+					          GdkRectangle *cell_area,
+					          GtkCellRendererState flags);
+static void rb_cell_renderer_rating_finalize (GObject *object);
+
+struct RBCellRendererRatingPrivate
+{
+	double rating;
+};
+
+struct RBCellRendererRatingClassPrivate
+{
+	RBRatingPixbufs *pixbufs;
+};
+
+G_DEFINE_TYPE (RBCellRendererRating, rb_cell_renderer_rating, GTK_TYPE_CELL_RENDERER)
+#define RB_CELL_RENDERER_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+						RB_TYPE_CELL_RENDERER_RATING, \
+						RBCellRendererRatingPrivate))
+
+enum
+{
+	PROP_0,
+	PROP_RATING
+};
+
+enum
+{
+	RATED,
+	LAST_SIGNAL
+};
+
+static guint rb_cell_renderer_rating_signals[LAST_SIGNAL] = { 0 };
+
+static void
+rb_marshal_VOID__STRING_DOUBLE (GClosure     *closure,
+                                GValue       *return_value,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint,
+                                gpointer      marshal_data)
+{
+	typedef void (*GMarshalFunc_VOID__STRING_DOUBLE) (gpointer     data1,
+													gpointer     arg_1,
+													gdouble      arg_2,
+													gpointer     data2);
+	register GMarshalFunc_VOID__STRING_DOUBLE callback;
+	register GCClosure *cc = (GCClosure*) closure;
+	register gpointer data1, data2;
+
+	g_return_if_fail (n_param_values == 3);
+
+	if (G_CCLOSURE_SWAP_DATA (closure))
+	{
+		data1 = closure->data;
+		data2 = g_value_peek_pointer (param_values + 0);
+	}
+	else
+	{
+		data1 = g_value_peek_pointer (param_values + 0);
+		data2 = closure->data;
+	}
+
+	callback = (GMarshalFunc_VOID__STRING_DOUBLE) (marshal_data ? marshal_data : cc->callback);
+
+	callback (data1,
+			(char *) g_value_get_string (param_values + 1),
+			g_value_get_double (param_values + 2),
+			data2);
+}
+
+static void
+rb_cell_renderer_rating_init (RBCellRendererRating *cellrating)
+{
+
+	cellrating->priv = RB_CELL_RENDERER_RATING_GET_PRIVATE (cellrating);
+
+	/* set the renderer able to be activated */
+	GTK_CELL_RENDERER (cellrating)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
+
+	/* create the needed icons */
+}
+
+static void
+rb_cell_renderer_rating_class_init (RBCellRendererRatingClass *class)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class);
+
+	object_class->finalize = rb_cell_renderer_rating_finalize;
+
+	object_class->get_property = rb_cell_renderer_rating_get_property;
+	object_class->set_property = rb_cell_renderer_rating_set_property;
+
+	cell_class->get_size = rb_cell_renderer_rating_get_size;
+	cell_class->render   = rb_cell_renderer_rating_render;
+	cell_class->activate = rb_cell_renderer_rating_activate;
+
+	class->priv = g_new0 (RBCellRendererRatingClassPrivate, 1);
+	class->priv->pixbufs = rb_rating_pixbufs_new ();
+
+	rb_rating_install_rating_property (object_class, PROP_RATING);
+
+	rb_cell_renderer_rating_signals[RATED] =
+		g_signal_new ("rated",
+			      G_OBJECT_CLASS_TYPE (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (RBCellRendererRatingClass, rated),
+			      NULL, NULL,
+			      rb_marshal_VOID__STRING_DOUBLE,
+			      G_TYPE_NONE,
+			      2,
+			      G_TYPE_STRING,
+			      G_TYPE_DOUBLE);
+
+	g_type_class_add_private (class, sizeof (RBCellRendererRatingPrivate));
+}
+
+static void
+rb_cell_renderer_rating_finalize (GObject *object)
+{
+	RBCellRendererRating *cellrating;
+
+	cellrating = RB_CELL_RENDERER_RATING (object);
+
+	G_OBJECT_CLASS (rb_cell_renderer_rating_parent_class)->finalize (object);
+}
+
+static void
+rb_cell_renderer_rating_get_property (GObject *object,
+				      guint param_id,
+				      GValue *value,
+				      GParamSpec *pspec)
+{
+	RBCellRendererRating *cellrating = RB_CELL_RENDERER_RATING (object);
+
+	switch (param_id) {
+	case PROP_RATING:
+		g_value_set_double (value, cellrating->priv->rating);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+		break;
+	}
+}
+
+static void
+rb_cell_renderer_rating_set_property (GObject *object,
+				      guint param_id,
+				      const GValue *value,
+				      GParamSpec *pspec)
+{
+	RBCellRendererRating *cellrating= RB_CELL_RENDERER_RATING (object);
+
+	switch (param_id) {
+	case PROP_RATING:
+		cellrating->priv->rating = g_value_get_double (value);
+		if (cellrating->priv->rating < 0)
+			cellrating->priv->rating = 0;
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+		break;
+	}
+}
+
+/**
+ * rb_cell_renderer_rating_new: create a cell renderer that will
+ * display some pixbufs for representing the rating of a song.
+ * It is also able to update the rating.
+ *
+ * Return value: the new cell renderer
+ **/
+
+GtkCellRenderer *
+rb_cell_renderer_rating_new ()
+{
+	return GTK_CELL_RENDERER (gtk_type_new (rb_cell_renderer_rating_get_type ()));
+}
+
+static void
+rb_cell_renderer_rating_get_size (GtkCellRenderer *cell,
+				  GtkWidget *widget,
+				  GdkRectangle *cell_area,
+				  gint *x_offset,
+				  gint *y_offset,
+				  gint *width,
+				  gint *height)
+{
+	int icon_width;
+	RBCellRendererRating *cellrating = (RBCellRendererRating *) cell;
+
+	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, NULL);
+
+	if (x_offset)
+		*x_offset = 0;
+
+	if (y_offset)
+		*y_offset = 0;
+
+	if (width)
+		*width = (gint) GTK_CELL_RENDERER (cellrating)->xpad * 2 + icon_width * RB_RATING_MAX_SCORE;
+
+	if (height)
+		*height = (gint) GTK_CELL_RENDERER (cellrating)->ypad * 2 + icon_width;
+}
+
+static void
+rb_cell_renderer_rating_render (GtkCellRenderer  *cell,
+				GdkWindow *window,
+				GtkWidget *widget,
+				GdkRectangle *background_area,
+				GdkRectangle *cell_area,
+				GdkRectangle *expose_area,
+				GtkCellRendererState flags)
+
+{
+	gboolean selected;
+	GdkRectangle pix_rect, draw_rect;
+	RBCellRendererRating *cellrating = (RBCellRendererRating *) cell;
+	RBCellRendererRatingClass *cell_class;
+
+	cellrating = RB_CELL_RENDERER_RATING (cell);
+	cell_class = RB_CELL_RENDERER_RATING_GET_CLASS (cellrating);
+	rb_cell_renderer_rating_get_size (cell, widget, cell_area,
+					  &pix_rect.x,
+					  &pix_rect.y,
+					  &pix_rect.width,
+					  &pix_rect.height);
+
+	pix_rect.x += cell_area->x;
+	pix_rect.y += cell_area->y;
+	pix_rect.width -= cell->xpad * 2;
+	pix_rect.height -= cell->ypad * 2;
+
+	if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) == FALSE)
+		return;
+
+	selected = (flags & GTK_CELL_RENDERER_SELECTED);
+
+	rb_rating_render_stars (widget, window, cell_class->priv->pixbufs,
+				draw_rect.x - pix_rect.x,
+				draw_rect.y - pix_rect.y,
+				draw_rect.x, draw_rect.y,
+				cellrating->priv->rating, selected);
+}
+
+static gboolean
+rb_cell_renderer_rating_activate (GtkCellRenderer *cell,
+				  GdkEvent *event,
+				  GtkWidget *widget,
+				  const gchar *path,
+				  GdkRectangle *background_area,
+				  GdkRectangle *cell_area,
+				  GtkCellRendererState flags)
+{
+	int mouse_x, mouse_y;
+	double rating;
+
+	RBCellRendererRating *cellrating = (RBCellRendererRating *) cell;
+
+	g_return_val_if_fail (RB_IS_CELL_RENDERER_RATING (cellrating), FALSE);
+
+	gtk_widget_get_pointer (widget, &mouse_x, &mouse_y);
+	gtk_tree_view_widget_to_tree_coords (GTK_TREE_VIEW (widget),
+					     mouse_x,
+					     mouse_y,
+					     &mouse_x,
+					     &mouse_y);
+
+	rating = rb_rating_get_rating_from_widget (widget,
+						   mouse_x - cell_area->x,
+						   cell_area->width,
+						   cellrating->priv->rating);
+
+	if (rating != -1.0) {
+		g_signal_emit (G_OBJECT (cellrating),
+			       rb_cell_renderer_rating_signals[RATED],
+			       0, path, rating);
+	}
+
+	return TRUE;
+}

Added: gtkpod/branches/upstream/current/src/rb_cell_renderer_rating.h
===================================================================
--- gtkpod/branches/upstream/current/src/rb_cell_renderer_rating.h	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/rb_cell_renderer_rating.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,64 @@
+/* rbcellrendererrating.h
+ *
+ * arch-tag: Header for star rating GtkTreeView cell renderer
+ *
+ * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb at redhat.com>
+ * Copyright (C) 2002  Jorn Baayen <jorn at nl.linux.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301  USA.
+ */
+
+#ifndef __RB_CELL_RENDERER_RATING_H
+#define __RB_CELL_RENDERER_RATING_H
+
+#include <gtk/gtkcellrenderer.h>
+
+G_BEGIN_DECLS
+
+#define RB_TYPE_CELL_RENDERER_RATING		(rb_cell_renderer_rating_get_type ())
+#define RB_CELL_RENDERER_RATING(obj)		(GTK_CHECK_CAST ((obj), RB_TYPE_CELL_RENDERER_RATING, RBCellRendererRating))
+#define RB_CELL_RENDERER_RATING_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), RB_TYPE_CELL_RENDERER_RATING, RBCellRendererRatingClass))
+#define RB_IS_CELL_RENDERER_RATING(obj)		(GTK_CHECK_TYPE ((obj), RB_TYPE_CELL_RENDERER_RATING))
+#define RB_IS_CELL_RENDERER_RATING_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), RB_TYPE_CELL_RENDERER_RATING))
+#define RB_CELL_RENDERER_RATING_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), RB_TYPE_CELL_RENDERER_RATING, RBCellRendererRatingClass))
+
+typedef struct RBCellRendererRatingPrivate RBCellRendererRatingPrivate;
+typedef struct RBCellRendererRatingClassPrivate RBCellRendererRatingClassPrivate;
+
+typedef struct
+{
+	GtkCellRenderer parent;
+
+	RBCellRendererRatingPrivate *priv;
+} RBCellRendererRating;
+
+typedef struct
+{
+	GtkCellRendererClass parent_class;
+
+	void (*rated) (RBCellRendererRating *renderer, GtkTreePath *path, double rating);
+
+	RBCellRendererRatingClassPrivate *priv;
+
+} RBCellRendererRatingClass;
+
+GtkType          rb_cell_renderer_rating_get_type (void);
+
+GtkCellRenderer *rb_cell_renderer_rating_new      (void);
+
+G_END_DECLS
+
+#endif /* __RB_CELL_RENDERER_RATING_H */

Added: gtkpod/branches/upstream/current/src/rb_rating_helper.c
===================================================================
--- gtkpod/branches/upstream/current/src/rb_rating_helper.c	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/rb_rating_helper.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,218 @@
+/*
+ *
+ *  arch-tag: Implementation of functions shared by the rating widget and cell renderer.
+ *
+ *  Copyright (C) 2004 Christophe Fergeau <teuf at gnome.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include "rb_rating_helper.h"
+
+#define RB_STOCK_SET_STAR	"star-set"
+#define RB_STOCK_UNSET_STAR	"star-unset"
+#define RB_STOCK_NO_STAR	"star-none"
+
+struct _RBRatingPixbufs {
+	GdkPixbuf *pix_star;
+	GdkPixbuf *pix_dot;
+	GdkPixbuf *pix_blank;
+};
+
+void
+rb_rating_pixbufs_free (RBRatingPixbufs *pixbufs)
+{
+	if (pixbufs->pix_star != NULL)
+		g_object_unref (pixbufs->pix_star);
+	if (pixbufs->pix_dot != NULL)
+		g_object_unref (pixbufs->pix_dot);
+	if (pixbufs->pix_blank != NULL)
+		g_object_unref (pixbufs->pix_blank);
+}
+
+void
+rb_rating_install_rating_property (GObjectClass *klass, gulong prop)
+{
+	g_object_class_install_property (klass, prop,
+					 g_param_spec_double ("rating",
+							     ("Rating Value"),
+							     ("Rating Value"),
+							     0.0, (double)RB_RATING_MAX_SCORE,
+							      (double)RB_RATING_MAX_SCORE/2.0,
+							     G_PARAM_READWRITE));
+
+}
+
+RBRatingPixbufs *
+rb_rating_pixbufs_new (void)
+{
+	RBRatingPixbufs *pixbufs;
+	GtkIconTheme *theme;
+	gint width;
+
+	pixbufs = g_new0 (RBRatingPixbufs, 1);
+
+	theme = gtk_icon_theme_get_default ();
+	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, NULL, &width);
+
+	pixbufs->pix_star = gtk_icon_theme_load_icon (theme,
+						      RB_STOCK_SET_STAR,
+						      width,
+						      0,
+						      NULL);
+	pixbufs->pix_dot = gtk_icon_theme_load_icon (theme,
+						     RB_STOCK_UNSET_STAR,
+						     width,
+						     0,
+						     NULL);
+	pixbufs->pix_blank = gtk_icon_theme_load_icon (theme,
+						       RB_STOCK_NO_STAR,
+						       width,
+						       0,
+						       NULL);
+	if (pixbufs->pix_star != NULL &&
+	    pixbufs->pix_dot != NULL &&
+	    pixbufs->pix_blank != NULL) {
+		return pixbufs;
+	}
+	else
+	{
+	    rb_rating_pixbufs_free (pixbufs);
+	    g_free (pixbufs);
+	    g_warning ("Unable to load at least one of the following icons: " RB_STOCK_SET_STAR ", " RB_STOCK_UNSET_STAR " and " RB_STOCK_NO_STAR ". Displaying of the star rating will not work.\n");
+	    return NULL;
+	}
+}
+
+gboolean
+rb_rating_render_stars (GtkWidget *widget,
+			GdkWindow *window,
+			RBRatingPixbufs *pixbufs,
+			gulong x,
+			gulong y,
+			gulong x_offset,
+			gulong y_offset,
+			gdouble rating,
+			gboolean selected)
+{
+	int i, icon_width;
+	gboolean rtl;
+
+	g_return_val_if_fail (widget != NULL, FALSE);
+	g_return_val_if_fail (window != NULL, FALSE);
+	g_return_val_if_fail (pixbufs != NULL, FALSE);
+
+	rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
+	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, NULL);
+
+	for (i = 0; i < RB_RATING_MAX_SCORE; i++) {
+		GdkPixbuf *buf;
+		GtkStateType state;
+		gint star_offset;
+		int offset;
+
+		if (selected == TRUE) {
+			offset = 0;
+			if (GTK_WIDGET_HAS_FOCUS (widget))
+				state = GTK_STATE_SELECTED;
+			else
+				state = GTK_STATE_ACTIVE;
+		} else {
+			offset = 120;
+			if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
+				state = GTK_STATE_INSENSITIVE;
+			else
+				state = GTK_STATE_NORMAL;
+		}
+
+		if (i < rating)
+			buf = pixbufs->pix_star;
+		else if (i >= rating && i < RB_RATING_MAX_SCORE)
+			buf = pixbufs->pix_dot;
+		else
+			buf = pixbufs->pix_blank;
+
+		if (buf == NULL) {
+			return FALSE;
+		}
+
+/*		buf = eel_create_colorized_pixbuf (buf,
+						   (widget->style->text[state].red + offset) >> 8,
+						   (widget->style->text[state].green + offset) >> 8,
+						   (widget->style->text[state].blue + offset) >> 8); */
+		if (buf == NULL) {
+			return FALSE;
+		}
+
+		if (rtl) {
+			star_offset = (RB_RATING_MAX_SCORE - i - 1) * icon_width;
+		} else {
+			star_offset = i * icon_width;
+		}
+
+		gdk_draw_pixbuf (window,
+				 NULL,
+				 buf,
+				 x, y,
+				 x_offset + star_offset, y_offset,
+				 icon_width, icon_width,
+				 GDK_RGB_DITHER_NORMAL, 0, 0);
+/*		g_object_unref (G_OBJECT (buf)); */
+	}
+
+	return TRUE;
+}
+
+double
+rb_rating_get_rating_from_widget (GtkWidget *widget,
+				  gint widget_x,
+				  gint widget_width,
+				  double current_rating)
+{
+	int icon_width;
+	double rating = -1.0;
+
+	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_width, NULL);
+
+	/* ensure the user clicks within the good cell */
+	if (widget_x >= 0 && widget_x <= widget_width) {
+		gboolean rtl;
+
+		rating = (int) (widget_x / icon_width) + 1;
+
+		rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
+		if (rtl) {
+			rating = RB_RATING_MAX_SCORE - rating + 1;
+		}
+
+		if (rating < 0)
+			rating = 0;
+
+		if (rating > RB_RATING_MAX_SCORE)
+			rating = RB_RATING_MAX_SCORE;
+
+		if (rating == current_rating) {
+			/* Make it possible to give a 0 rating to a song */
+			rating--;
+		}
+	}
+
+	return rating;
+}

Added: gtkpod/branches/upstream/current/src/rb_rating_helper.h
===================================================================
--- gtkpod/branches/upstream/current/src/rb_rating_helper.h	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/rb_rating_helper.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,47 @@
+/*
+ *  arch-tag: Header for functions shared by the rating widget and cell renderer.
+ *
+ *  Copyright (C) 2004 Christophe Fergeau <teuf at gnome.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
+ *
+ */
+
+#ifndef RB_RATING_HELPER_H
+#define RB_RATING_HELPER_H 1
+
+#include <gtk/gtk.h>
+
+typedef struct _RBRatingPixbufs RBRatingPixbufs;
+
+/* Number of stars */
+#define RB_RATING_MAX_SCORE 5
+
+gboolean rb_rating_render_stars (GtkWidget *widget, GdkWindow *window,
+				 RBRatingPixbufs *pixbufs,
+				 gulong x, gulong y,
+				 gulong x_offset, gulong y_offset,
+				 gdouble rating, gboolean selected);
+
+double   rb_rating_get_rating_from_widget (GtkWidget *widget,
+					   gint widget_x, gint widget_width,
+					   double current_rating);
+
+RBRatingPixbufs *rb_rating_pixbufs_new (void);
+void             rb_rating_pixbufs_free (RBRatingPixbufs *pixbufs);
+
+void   rb_rating_install_rating_property (GObjectClass *klass, gulong prop);
+
+#endif

Modified: gtkpod/branches/upstream/current/src/repository.c
===================================================================
--- gtkpod/branches/upstream/current/src/repository.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/repository.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-01-16 17:55:41 jcs>
+/* Time-stamp: <2008-10-01 23:36: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: repository.c 954 2007-01-16 09:45:00Z jcsjcs $
+|  $Id: repository.c 2126 2008-10-01 14:40:48Z jcsjcs $
 */
 
 /* This file provides functions for the edit repositories/playlist
@@ -72,6 +72,7 @@
 
 
 /* string constants for window widgets used more than once */
+static const gchar *SYNC_FRAME="sync_frame";
 static const gchar *PLAYLIST_COMBO="playlist_combo";
 static const gchar *REPOSITORY_COMBO="repository_combo";
 static const gchar *MOUNTPOINT_LABEL="mountpoint_label";
@@ -84,7 +85,6 @@
 static const gchar *IPOD_MODEL_COMBO="ipod_model_combo";
 static const gchar *IPOD_MODEL_ENTRY="ipod_model_entry--not-a-glade-name";
 static const gchar *LOCAL_PATH_LABEL="local_path_label";
-static const gchar *LOCAL_PATH_BUTTON="local_path_button";
 static const gchar *LOCAL_PATH_ENTRY="local_path_entry";
 static const gchar *STANDARD_PLAYLIST_VBOX="standard_playlist_vbox";
 static const gchar *SPL_VBOX="spl_vbox";
@@ -94,17 +94,12 @@
 static const gchar *SYNC_PLAYLIST_MODE_MANUAL_RADIO="sync_playlist_mode_manual_radio";
 static const gchar *MANUAL_SYNCDIR_ENTRY="manual_syncdir_entry";
 static const gchar *MANUAL_SYNCDIR_BUTTON="manual_syncdir_button";
-static const gchar *DELETE_REPOSITORY_CHECKBUTTON="delete_repository_checkbutton";
 static const gchar *DELETE_REPOSITORY_BUTTON="delete_repository_button";
 static const gchar *REPOSITORY_VBOX="repository_vbox";
-static const gchar *IPOD_SYNC_LABEL="ipod_sync_label";
-static const gchar *IPOD_SYNC_CONTACTS_LABEL="ipod_sync_contacts_label";
 static const gchar *IPOD_SYNC_CONTACTS_ENTRY="ipod_sync_contacts_entry";
 static const gchar *IPOD_SYNC_CONTACTS_BUTTON="ipod_sync_contacts_button";
-static const gchar *IPOD_SYNC_CALENDAR_LABEL="ipod_sync_calendar_label";
 static const gchar *IPOD_SYNC_CALENDAR_ENTRY="ipod_sync_calendar_entry";
 static const gchar *IPOD_SYNC_CALENDAR_BUTTON="ipod_sync_calendar_button";
-static const gchar *IPOD_SYNC_NOTES_LABEL="ipod_sync_notes_label";
 static const gchar *IPOD_SYNC_NOTES_ENTRY="ipod_sync_notes_entry";
 static const gchar *IPOD_SYNC_NOTES_BUTTON="ipod_sync_notes_button";
 static const gchar *IPOD_CONCAL_AUTOSYNC_TOGGLE="ipod_concal_autosync_toggle";
@@ -140,7 +135,28 @@
 const gchar *KEY_MANUAL_SYNCDIR="manual_syncdir";
 
 
+/* widget names for the "Create New Repository" window */
+static const gchar *CRW_BACKUP_BUTTON="crw_backup_button";
+static const gchar *CRW_BACKUP_ENTRY="crw_backup_entry";
+static const gchar *CRW_BACKUP_LABEL="crw_backup_label";
+static const gchar *CRW_CANCEL_BUTTON="crw_cancel_button";
+static const gchar *CRW_INSERT_BEFORE_AFTER_COMBO="crw_insert_before_after_combo";
+static const gchar *CRW_IPOD_MODEL_COMBO="crw_ipod_model_combo";
+static const gchar *CRW_IPOD_MODEL_ENTRY="crw_ipod_model_entry";
+static const gchar *CRW_IPOD_MODEL_LABEL="crw_ipod_model_label";
+static const gchar *CRW_LOCAL_PATH_BUTTON="crw_local_path_button";
+static const gchar *CRW_LOCAL_PATH_ENTRY="crw_local_path_entry";
+static const gchar *CRW_LOCAL_PATH_LABEL="crw_local_path_label";
+static const gchar *CRW_MOUNTPOINT_BUTTON="crw_mountpoint_button";
+static const gchar *CRW_MOUNTPOINT_ENTRY="crw_mountpoint_entry";
+static const gchar *CRW_MOUNTPOINT_LABEL="crw_mountpoint_label";
+static const gchar *CRW_OK_BUTTON="crw_ok_button";
+static const gchar *CRW_REPOSITORY_COMBO="crw_repository_combo";
+static const gchar *CRW_REPOSITORY_NAME_ENTRY="crw_repository_name_entry";
+static const gchar *CRW_REPOSITORY_TYPE_COMBO="crw_repository_type_combo";
 
+
+
 /* Declarations */
 static void update_buttons (RepWin *repwin);
 static void repwin_free (RepWin *repwin);
@@ -444,6 +460,8 @@
 			    SYNC_PLAYLIST_MODE_AUTOMATIC);
 	update_buttons (repwin);
     }
+
+    g_free (key);
 }
 
 
@@ -495,34 +513,30 @@
     finish_int_storage (repwin, key, active);
 }
 
-
-/* delete_repository_checkbutton was toggled */
-static void delete_repository_checkbutton_toggled (GtkToggleButton *togglebutton,
-						   RepWin *repwin)
-{
-    g_return_if_fail (repwin);
-    g_return_if_fail (repwin->temp_prefs);
-
-    if (!gtk_toggle_button_get_active (togglebutton))
-    {   /* Un-delete if necessary */
-	gchar *key = get_itdb_prefs_key (repwin->itdb_index, "deleted");
-
-	temp_prefs_remove_key (repwin->extra_prefs, key);
-	g_free (key);
-    }
-    update_buttons (repwin);
-}
-
-
-
 /* delete_repository_button was clicked */
 static void delete_repository_button_clicked (GtkButton *button,
 					      RepWin *repwin)
 {
+	Playlist *mpl;
+	gchar *message;
     gchar *key;
+	gint response;
 
     g_return_if_fail (repwin);
+	mpl = itdb_playlist_mpl (repwin->itdb);
+	message = g_strdup_printf (_("Are you sure you want to delete repository \"%s\"? This action cannot be undone!"), mpl->name);
+	
+	response = gtkpod_confirmation_simple (GTK_WINDOW (repwin->window),
+										   GTK_MESSAGE_WARNING,
+										   _("Delete repository?"),
+										   message,
+										   GTK_STOCK_DELETE);
 
+	g_free (message);
+	
+	if (response == GTK_RESPONSE_CANCEL)
+		return;
+
     key = get_itdb_prefs_key (repwin->itdb_index, "deleted");
 
     temp_prefs_set_int (repwin->extra_prefs, key, TRUE);
@@ -1214,7 +1228,8 @@
 	    IPOD_MODEL_LABEL,
 	    IPOD_MODEL_COMBO,
 	    LOCAL_PATH_ENTRY,
-	    IPOD_SYNC_LABEL,
+	    SYNC_FRAME,
+/*	    IPOD_SYNC_LABEL,
 	    IPOD_SYNC_CONTACTS_LABEL,
 	    IPOD_SYNC_CONTACTS_ENTRY,
 	    IPOD_SYNC_CONTACTS_BUTTON,
@@ -1224,7 +1239,7 @@
 	    IPOD_SYNC_NOTES_LABEL,
 	    IPOD_SYNC_NOTES_ENTRY,
 	    IPOD_SYNC_NOTES_BUTTON,
-	    IPOD_CONCAL_AUTOSYNC_TOGGLE,
+	    IPOD_CONCAL_AUTOSYNC_TOGGLE,*/
 	    NULL};
 	const gchar *widgets_hide[] = {
 	    LOCAL_PATH_LABEL,
@@ -1277,7 +1292,8 @@
 	    BACKUP_BUTTON,
 	    IPOD_MODEL_LABEL,
 	    IPOD_MODEL_COMBO,
-	    IPOD_SYNC_LABEL,
+	    SYNC_FRAME,
+/*	    IPOD_SYNC_LABEL,
 	    IPOD_SYNC_CONTACTS_LABEL,
 	    IPOD_SYNC_CONTACTS_ENTRY,
 	    IPOD_SYNC_CONTACTS_BUTTON,
@@ -1287,7 +1303,7 @@
 	    IPOD_SYNC_NOTES_LABEL,
 	    IPOD_SYNC_NOTES_ENTRY,
 	    IPOD_SYNC_NOTES_BUTTON,
-	    IPOD_CONCAL_AUTOSYNC_TOGGLE,
+	    IPOD_CONCAL_AUTOSYNC_TOGGLE,*/
 	    NULL};
 	const gchar **widget;
 
@@ -1306,12 +1322,6 @@
     {
 	g_return_if_reached ();
     }
-
-    key = get_itdb_prefs_key (index, "deleted");
-    gtk_toggle_button_set_active (
-	GTK_TOGGLE_BUTTON (GET_WIDGET (DELETE_REPOSITORY_CHECKBUTTON)),
-	temp_prefs_get_int (repwin->extra_prefs, key));
-    g_free (key);
 }
 
 
@@ -1535,7 +1545,7 @@
 
     gtk_tree_model_get (model, iter, 0, &playlist, -1);
 
-    pm_set_renderer_pix (cell, playlist);
+    pm_set_playlist_renderer_pix (cell, playlist);
 }
 
 
@@ -1554,7 +1564,7 @@
 
     gtk_tree_model_get (model, iter, 0, &playlist, -1);
 
-    pm_set_renderer_text (cell, playlist);
+    pm_set_playlist_renderer_text (cell, playlist);
 }
 
 
@@ -1572,6 +1582,7 @@
 
     if (g_object_get_data (G_OBJECT (cb), "combo_set") == NULL)
     {   /* the combo has not yet been initialized */
+
 	/* Cell for graphic indicator */
 	cell = gtk_cell_renderer_pixbuf_new ();
 	gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cb), cell, FALSE);
@@ -1591,8 +1602,6 @@
     }
 
     store = gtk_list_store_new (1, G_TYPE_POINTER);
-    gtk_combo_box_set_model (cb, GTK_TREE_MODEL (store));
-    g_object_unref (store);
 
     for (gl=itdbs_head->itdbs; gl; gl=gl->next)
     {
@@ -1607,6 +1616,9 @@
 	gtk_list_store_append (store, &iter);
 	gtk_list_store_set (store, &iter, 0, mpl, -1);
     }
+
+    gtk_combo_box_set_model (cb, GTK_TREE_MODEL (store));
+    g_object_unref (store);
 }
 
 
@@ -1679,8 +1691,6 @@
     }
 
     store = gtk_list_store_new (1, G_TYPE_POINTER);
-    gtk_combo_box_set_model (cb, GTK_TREE_MODEL (store));
-    g_object_unref (store);
 
     if (repwin->itdb)
     {
@@ -1695,11 +1705,15 @@
 	}
     }
 
+    gtk_combo_box_set_model (cb, GTK_TREE_MODEL (store));
+    g_object_unref (store);
+
     if (repwin->itdb)
     {
 	select_playlist (repwin, repwin->next_playlist);
 	repwin->next_playlist = NULL;
     }
+
 }
 
 
@@ -1739,11 +1753,12 @@
 	deleted = temp_prefs_get_int (repwin->extra_prefs, key);
 	g_free (key);
 
-	gtk_widget_set_sensitive (GET_WIDGET ("path_table_ipod"), !deleted);
+	gtk_widget_set_sensitive (GET_WIDGET ("general_frame"), !deleted);
+	gtk_widget_set_sensitive (GET_WIDGET (SYNC_FRAME), !deleted);
 	gtk_widget_set_sensitive (GET_WIDGET ("update_all_playlists_button"), !deleted);
-	gtk_widget_set_sensitive (GET_WIDGET ("playlist_frame"), !deleted);
-	gtk_widget_set_sensitive (GET_WIDGET ("delete_repository_button"),
-				  !deleted && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET (DELETE_REPOSITORY_CHECKBUTTON))));
+	gtk_widget_set_sensitive (GET_WIDGET ("playlist_tab_label"), !deleted);
+	gtk_widget_set_sensitive (GET_WIDGET ("playlist_tab_contents"), !deleted);
+	gtk_widget_set_sensitive (GET_WIDGET ("delete_repository_button"), !deleted);
 
 	if (repwin->playlist)
 	{
@@ -1800,6 +1815,8 @@
 	gtk_widget_destroy (repwin->window);
     }
 
+    temp_prefs_destroy (repwin->temp_prefs);
+    temp_prefs_destroy (repwin->extra_prefs);
     g_free (repwin);
 }
 
@@ -1933,7 +1950,7 @@
 
     repwin = g_malloc0 (sizeof (RepWin));
 
-    repwin->xml = glade_xml_new (xml_file, "repository_window", NULL);
+    repwin->xml = gtkpod_xml_new (xml_file, "repository_window");
 /*  no signals to connect -> comment out */
 /*     glade_xml_signal_autoconnect (detail->xml); */
     repwin->window = gtkpod_xml_get_widget (repwin->xml,
@@ -1991,10 +2008,6 @@
 		      G_CALLBACK (sync_playlist_mode_automatic_toggled),
 		      repwin);
 
-    g_signal_connect (GET_WIDGET (DELETE_REPOSITORY_CHECKBUTTON),
-		      "toggled",
-		      G_CALLBACK (delete_repository_checkbutton_toggled),
-		      repwin);
     /* connect standard toggle buttons */
     for (i=0; playlist_widget_names_toggle[i]; ++i)
     {
@@ -2129,14 +2142,7 @@
 };
 
 
-/* somes widget names used several times */
-static const gchar *REPOSITORY_TYPE_COMBO="repository_type_combo";
-static const gchar *INSERT_BEFORE_AFTER_COMBO="insert_before_after_combo";
-static const gchar *REPOSITORY_NAME_ENTRY="repository_name_entry";
 
-
-
-
 /* shortcut to reference widgets when repwin->xml is already set */
 #undef GET_WIDGET
 #define GET_WIDGET(a) repository_xml_get_widget (cr->xml,a)
@@ -2192,32 +2198,32 @@
 
     /* retrieve current settings */
     type = gtk_combo_box_get_active (
-	GTK_COMBO_BOX (GET_WIDGET (REPOSITORY_TYPE_COMBO)));
+	GTK_COMBO_BOX (GET_WIDGET (CRW_REPOSITORY_TYPE_COMBO)));
 
     bef_after = gtk_combo_box_get_active (
-	GTK_COMBO_BOX (GET_WIDGET (INSERT_BEFORE_AFTER_COMBO)));
+	GTK_COMBO_BOX (GET_WIDGET (CRW_INSERT_BEFORE_AFTER_COMBO)));
 
     itdb_index = gtk_combo_box_get_active (
-	GTK_COMBO_BOX (GET_WIDGET (REPOSITORY_COMBO)));
+	GTK_COMBO_BOX (GET_WIDGET (CRW_REPOSITORY_COMBO)));
 
     name = gtk_entry_get_text (
-	GTK_ENTRY (GET_WIDGET (REPOSITORY_NAME_ENTRY)));
+	GTK_ENTRY (GET_WIDGET (CRW_REPOSITORY_NAME_ENTRY)));
 
     mountpoint = gtk_entry_get_text (
-	GTK_ENTRY (GET_WIDGET (MOUNTPOINT_ENTRY)));
+	GTK_ENTRY (GET_WIDGET (CRW_MOUNTPOINT_ENTRY)));
 
     backup = gtk_entry_get_text (
-	GTK_ENTRY (GET_WIDGET (BACKUP_ENTRY)));
+	GTK_ENTRY (GET_WIDGET (CRW_BACKUP_ENTRY)));
 
     ipod_model = gtk_entry_get_text (
-	GTK_ENTRY (GET_WIDGET (IPOD_MODEL_ENTRY)));
+	GTK_ENTRY (GET_WIDGET (CRW_IPOD_MODEL_ENTRY)));
     if (strcmp (ipod_model, gettext(SELECT_OR_ENTER_YOUR_MODEL)) == 0)
     {   /* User didn't choose a model */
 	ipod_model = "";
     }
 
     local_path = gtk_entry_get_text (
-	GTK_ENTRY (GET_WIDGET (LOCAL_PATH_ENTRY)));
+	GTK_ENTRY (GET_WIDGET (CRW_LOCAL_PATH_ENTRY)));
 
     /* adjust position where new itdb is to be inserted */
     if (bef_after == INSERT_AFTER)
@@ -2295,30 +2301,29 @@
  *
  * ------------------------------------------------------------ */
 
-static void repository_type_changed (GtkComboBox *cb,
-				     CreateRep *cr)
+static void cr_repository_type_changed (GtkComboBox *cb,
+					CreateRep *cr)
 {
     gint index, i;
     const gchar **show=NULL;
     /* widgets to show for iPod repositories */
     const gchar *show_ipod[] = {
-	MOUNTPOINT_LABEL, MOUNTPOINT_ENTRY, MOUNTPOINT_BUTTON,
-	BACKUP_LABEL, BACKUP_ENTRY, BACKUP_BUTTON,
-	IPOD_MODEL_LABEL, IPOD_MODEL_COMBO,
+	CRW_MOUNTPOINT_LABEL, CRW_MOUNTPOINT_ENTRY, CRW_MOUNTPOINT_BUTTON,
+	CRW_BACKUP_LABEL, CRW_BACKUP_ENTRY, CRW_BACKUP_BUTTON,
+	CRW_IPOD_MODEL_LABEL, CRW_IPOD_MODEL_COMBO,
 	NULL };
     /* widgets to show for local repositories */
     const gchar *show_local[] = {
-	LOCAL_PATH_LABEL, LOCAL_PATH_ENTRY, LOCAL_PATH_BUTTON,
+	CRW_LOCAL_PATH_LABEL, CRW_LOCAL_PATH_ENTRY, CRW_LOCAL_PATH_BUTTON,
 	NULL };
     /* list of all widgets that get hidden */
     const gchar *hide_all[] = {
-	MOUNTPOINT_LABEL, MOUNTPOINT_ENTRY, MOUNTPOINT_BUTTON,
-	BACKUP_LABEL, BACKUP_ENTRY, BACKUP_BUTTON,
-	IPOD_MODEL_LABEL, IPOD_MODEL_COMBO,
-	LOCAL_PATH_LABEL, LOCAL_PATH_ENTRY, LOCAL_PATH_BUTTON,
+	CRW_MOUNTPOINT_LABEL, CRW_MOUNTPOINT_ENTRY, CRW_MOUNTPOINT_BUTTON,
+	CRW_BACKUP_LABEL, CRW_BACKUP_ENTRY, CRW_BACKUP_BUTTON,
+	CRW_IPOD_MODEL_LABEL, CRW_IPOD_MODEL_COMBO,
+	CRW_LOCAL_PATH_LABEL, CRW_LOCAL_PATH_ENTRY, CRW_LOCAL_PATH_BUTTON,
 	NULL };
 
-
     index = gtk_combo_box_get_active (cb);
 
     switch (index)
@@ -2461,8 +2466,7 @@
     createrep = g_malloc0 (sizeof (CreateRep));
     cr = createrep;
 
-    cr->xml = glade_xml_new (xml_file, "create_repository_window",
-			     NULL);
+    cr->xml = gtkpod_xml_new (xml_file, "create_repository_window");
 /*  no signals to connect -> comment out */
 /*     glade_xml_signal_autoconnect (detail->xml); */
     cr->window = gtkpod_xml_get_widget (cr->xml,
@@ -2471,10 +2475,10 @@
     g_return_if_fail (cr->window);
 
     /* Window control */
-    g_signal_connect (GET_WIDGET ("cancel_button"), "clicked",
+    g_signal_connect (GET_WIDGET (CRW_CANCEL_BUTTON), "clicked",
 		      G_CALLBACK (create_cancel_clicked), cr);
 
-    g_signal_connect (GET_WIDGET ("ok_button"), "clicked",
+    g_signal_connect (GET_WIDGET (CRW_OK_BUTTON), "clicked",
 		      G_CALLBACK (create_ok_clicked), cr);
 
     g_signal_connect (createrep->window, "delete_event",
@@ -2482,48 +2486,48 @@
 
 
     /* Combo callback */
-    g_signal_connect (GET_WIDGET (REPOSITORY_TYPE_COMBO), "changed",
-		      G_CALLBACK (repository_type_changed), cr);
+    g_signal_connect (GET_WIDGET (CRW_REPOSITORY_TYPE_COMBO), "changed",
+		      G_CALLBACK (cr_repository_type_changed), cr);
 
     /* Button callbacks */
-    g_signal_connect (GET_WIDGET (MOUNTPOINT_BUTTON), "clicked",
+    g_signal_connect (GET_WIDGET (CRW_MOUNTPOINT_BUTTON), "clicked",
 		      G_CALLBACK (cr_mountpoint_button_clicked), cr);
 
-    g_signal_connect (GET_WIDGET (BACKUP_BUTTON), "clicked",
+    g_signal_connect (GET_WIDGET (CRW_BACKUP_BUTTON), "clicked",
 		      G_CALLBACK (cr_backup_button_clicked), cr);
 
-    g_signal_connect (GET_WIDGET (LOCAL_PATH_BUTTON), "clicked",
+    g_signal_connect (GET_WIDGET (CRW_LOCAL_PATH_BUTTON), "clicked",
 		      G_CALLBACK (cr_local_path_button_clicked), cr);
 
     /* Setup model number combo */
-    cb = GTK_COMBO_BOX (GET_WIDGET (IPOD_MODEL_COMBO));
+    cb = GTK_COMBO_BOX (GET_WIDGET (CRW_IPOD_MODEL_COMBO));
     gp_init_model_number_combo (cb);
-    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (IPOD_MODEL_ENTRY)),
+    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (CRW_IPOD_MODEL_ENTRY)),
 			gettext (SELECT_OR_ENTER_YOUR_MODEL));
 
     /* Set initial repository type */
     gtk_combo_box_set_active (
-	GTK_COMBO_BOX (GET_WIDGET (REPOSITORY_TYPE_COMBO)),
+	GTK_COMBO_BOX (GET_WIDGET (CRW_REPOSITORY_TYPE_COMBO)),
 	REPOSITORY_TYPE_IPOD);
 
     /* Set before/after combo */
     gtk_combo_box_set_active (
-	GTK_COMBO_BOX (GET_WIDGET (INSERT_BEFORE_AFTER_COMBO)),
+	GTK_COMBO_BOX (GET_WIDGET (CRW_INSERT_BEFORE_AFTER_COMBO)),
 	INSERT_AFTER);
 
     /* Set up repository combo */
-    set_repository_combo (GTK_COMBO_BOX (GET_WIDGET (REPOSITORY_COMBO)));
+    set_repository_combo (GTK_COMBO_BOX (GET_WIDGET (CRW_REPOSITORY_COMBO)));
     gtk_combo_box_set_active (
-	GTK_COMBO_BOX (GET_WIDGET (REPOSITORY_COMBO)),
+	GTK_COMBO_BOX (GET_WIDGET (CRW_REPOSITORY_COMBO)),
 	0);
 
     /* Set default repository name */
-    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (REPOSITORY_NAME_ENTRY)),
+    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (CRW_REPOSITORY_NAME_ENTRY)),
 			_("New Repository"));
 
     /* Set initial mountpoint */
     str = prefs_get_string ("initial_mountpoint");
-    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (MOUNTPOINT_ENTRY)),
+    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (CRW_MOUNTPOINT_ENTRY)),
 			str);
     g_free (str);
 
@@ -2533,7 +2537,7 @@
     buf2 = g_strdup_printf ("backupDB_%d",
 			    g_list_length (itdbs_head->itdbs));
     str = g_build_filename (buf1, buf2, NULL);
-    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (BACKUP_ENTRY)), str);
+    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (CRW_BACKUP_ENTRY)), str);
     g_free (str);
     g_free (buf2);
 
@@ -2541,7 +2545,7 @@
     buf2 = g_strdup_printf ("local_%d.itdb",
 			    g_list_length (itdbs_head->itdbs));
     str = g_build_filename (buf1, buf2, NULL);
-    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (LOCAL_PATH_ENTRY)), str);
+    gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (CRW_LOCAL_PATH_ENTRY)), str);
     g_free (str);
     g_free (buf2);
     g_free (buf1);

Added: gtkpod/branches/upstream/current/src/sort_window.c
===================================================================
--- gtkpod/branches/upstream/current/src/sort_window.c	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/sort_window.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,746 @@
+/*
+|  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
+|  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs 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: sort_window.c 2087 2008-08-04 13:12:23Z jcsjcs $
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include "charset.h"
+#include "display_itdb.h"
+#include "info.h"
+#include "fileselection.h"
+#include "sha1.h"
+/*#include "md5.h"*/
+#include "misc.h"
+#include "misc_track.h"
+#include "prefs.h"
+#include "sort_window.h"
+#include "repository.h"
+#include "display_coverart.h"
+
+GladeXML *prefs_window_xml;
+GladeXML *sort_window_xml;
+
+static GtkWidget *sort_window = NULL;
+
+/* New prefs temp handling */
+static TempPrefs *sort_temp_prefs;
+static TempLists *sort_temp_lists;
+
+static const GtkFileChooserAction path_type[] =
+{
+    GTK_FILE_CHOOSER_ACTION_OPEN,  /* select file */
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, /* select folder */
+    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
+    -1
+};
+
+enum {
+    TRACK_COLUMNS_TEXT,
+    TRACK_COLUMNS_INT,
+    TRACK_N_COLUMNS
+};
+
+typedef enum {
+    HIDE,
+    SHOW
+} TrackColumnsType;
+
+/* ------------------------------------------------------------ *\
+ *                                                              *
+ * Sort-Prefs Window                                            *
+ *                                                              *
+\* ------------------------------------------------------------ */
+
+/* the following checkboxes exist */
+static const gint sort_ign_fields[] = {
+    T_TITLE, T_ARTIST,
+    T_ALBUM, T_COMPOSER,
+    -1
+};
+
+/* Copy the current ignore fields and ignore strings into scfg */
+static void sort_window_read_sort_ign ()
+{
+    gint i;
+    GtkTextView *tv;
+    GtkTextBuffer *tb;
+    GList *sort_ign_strings;
+    GList *current;
+    gchar *buf;
+
+
+    /* read sort field states */
+    for (i=0; sort_ign_fields[i] != -1; ++i)
+    {
+	buf = g_strdup_printf ("sort_ign_field_%d",
+				      sort_ign_fields[i]);
+	GtkWidget *w = gtkpod_xml_get_widget (sort_window_xml, buf);
+	g_return_if_fail (w);
+	prefs_set_int( buf,
+	     gtk_toggle_button_get_active (
+		GTK_TOGGLE_BUTTON (w)));
+	g_free (buf);
+    }
+    
+    /* Read sort ignore strings */
+    tv = GTK_TEXT_VIEW (gtkpod_xml_get_widget (sort_window_xml,
+					      "sort_ign_strings"));
+    g_return_if_fail (tv);
+    tb = gtk_text_view_get_buffer (tv);
+    g_return_if_fail (tb);
+
+    sort_ign_strings = get_list_from_buffer(tb);
+    current = sort_ign_strings;
+    
+    /* Add a trailing whitespace to strings */
+    while (current)
+    {
+	g_strstrip(current->data);
+	
+        if (strlen(current->data) != 0)
+	{
+	    buf = g_strdup_printf("%s ",(gchar *) current->data);
+	    g_free(current->data);
+	    current->data = buf;
+	}
+
+	current = g_list_next(current);
+    }
+	
+    temp_list_add(sort_temp_lists, "sort_ign_string_", sort_ign_strings);
+}
+
+/**
+ * sort_window_create
+ * Create, Initialize, and Show the sorting preferences window
+ * allocate a static sort struct for temporary variables
+ */
+void sort_window_create (void)
+{
+    if (sort_window)
+    {
+		/* sort options already open --> simply raise to the top */
+		gdk_window_raise(sort_window->window);
+    }
+    else
+    {
+		GList *sort_ign_strings;
+		GList *current;  /* current sort ignore item */
+		GtkWidget *w;
+		GtkTextView *tv;
+		GtkTextBuffer *tb;
+		gint i;
+		GtkTextIter ti;
+		gchar *str;
+		GtkTooltips *tooltips;
+		gint *tm_listed_order, tm_list_pos;
+
+		sort_temp_prefs = temp_prefs_create();
+		sort_temp_lists = temp_lists_create();
+
+		sort_window_xml = gtkpod_xml_new (xml_file, "sort_window");
+		glade_xml_signal_autoconnect (sort_window_xml);
+
+		sort_window = gtkpod_xml_get_widget (sort_window_xml, "sort_window");
+
+		/* label the ignore-field checkbox-labels */
+		for (i=0; sort_ign_fields[i] != -1; ++i)
+		{
+			gchar *buf = g_strdup_printf ("sort_ign_field_%d",
+						  sort_ign_fields[i]);
+			GtkWidget *w = gtkpod_xml_get_widget (sort_window_xml, buf);
+			g_return_if_fail (w);
+			gtk_button_set_label (
+			GTK_BUTTON (w),
+			gettext (get_t_string (sort_ign_fields[i])));
+			gtk_toggle_button_set_active (
+			GTK_TOGGLE_BUTTON (w),
+			prefs_get_int (buf));
+			g_free (buf);
+		}
+		/* set the ignore strings */
+		tv = GTK_TEXT_VIEW (gtkpod_xml_get_widget (sort_window_xml,
+							  "sort_ign_strings"));
+		tb = gtk_text_view_get_buffer (tv);
+		if (!tb)
+		{   /* text buffer doesn't exist yet */
+			tb = gtk_text_buffer_new (NULL);
+			gtk_text_view_set_buffer(tv, tb);
+			gtk_text_view_set_editable(tv, FALSE);
+			gtk_text_view_set_cursor_visible(tv, FALSE);
+		}
+		
+		sort_ign_strings = prefs_get_list("sort_ign_string_");
+		current = sort_ign_strings;
+		while (current)
+		{
+			str = (gchar *)current->data;
+			current = g_list_next(current);
+
+			/* append new text to the end */
+			gtk_text_buffer_get_end_iter (tb, &ti);
+			gtk_text_buffer_insert (tb, &ti, str, -1);
+			/* append newline */
+			gtk_text_buffer_get_end_iter (tb, &ti);
+			gtk_text_buffer_insert (tb, &ti, "\n", -1);
+		}
+		
+		prefs_free_list(sort_ign_strings);
+
+		sort_window_read_sort_ign ();
+
+		/* Set Sort-Column-Combo */
+		/* create the list in the order of the columns displayed */
+		tm_store_col_order ();
+
+		/* Here we store the order of TM_Items in the
+		 * GtkComboBox */
+		tm_listed_order = g_new (gint, TM_NUM_COLUMNS);
+		tm_list_pos = 1;
+
+		w = gtkpod_xml_get_widget (sort_window_xml, "sort_combo");
+		gtk_combo_box_remove_text (GTK_COMBO_BOX (w), 0);
+
+		gtk_combo_box_append_text (GTK_COMBO_BOX (w), _("No sorting"));
+
+		for (i = 0; i < TM_NUM_COLUMNS; ++i)
+		{   /* first the visible columns */
+			TM_item col = prefs_get_int_index("col_order", i);
+			if (col != -1)
+			{
+				if (prefs_get_int_index("col_visible", col))
+				{
+					gtk_combo_box_append_text (GTK_COMBO_BOX (w), gettext (get_tm_string (col)));
+					tm_listed_order[col] = tm_list_pos;
+					++tm_list_pos;
+				}
+			}
+		}
+
+		for (i=0; i<TM_NUM_COLUMNS; ++i)
+		{   /* now the hidden colums */
+			TM_item col = prefs_get_int_index("col_order", i);
+			if (col != -1)
+			{
+				if (!prefs_get_int_index("col_visible", col))
+				{
+					gtk_combo_box_append_text (GTK_COMBO_BOX (w), gettext (get_tm_string (col)));
+					tm_listed_order[col] = tm_list_pos;
+					++tm_list_pos;
+				}
+			}
+		}
+
+		/* associate tm_listed_order with sort_window */
+		g_object_set_data (G_OBJECT (sort_window), "tm_listed_order", tm_listed_order);
+			
+		tooltips = gtk_tooltips_new ();
+		gtk_tooltips_set_tip (tooltips, w, _("You can also use the table headers, but this allows you to sort according to a column that is not displayed."), NULL);
+
+		sort_window_update ();
+
+		sort_window_show_hide_tooltips ();
+		gtk_widget_show (sort_window);
+    }
+}
+
+
+
+/* Update sort_window's settings (except for ignore list and ignore
+ * fields) */
+void sort_window_update (void)
+{
+    if (sort_window)
+    {
+	/*	gchar *str; */
+		GtkWidget *w = NULL;
+		gint *tm_listed_order;
+		gint sortorder;
+		TM_item sortcol;
+
+		switch (prefs_get_int("pm_sort"))
+		{
+		case SORT_ASCENDING:
+			w = gtkpod_xml_get_widget (sort_window_xml, "pm_ascend");
+			break;
+		case SORT_DESCENDING:
+			w = gtkpod_xml_get_widget (sort_window_xml, "pm_descend");
+			break;
+		case SORT_NONE:
+			w = gtkpod_xml_get_widget (sort_window_xml, "pm_none");
+			break;
+		}
+		if (w)
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
+
+		w = NULL;
+		switch (prefs_get_int("st_sort"))
+		{
+		case SORT_ASCENDING:
+			w = gtkpod_xml_get_widget (sort_window_xml, "st_ascend");
+			break;
+		case SORT_DESCENDING:
+			w = gtkpod_xml_get_widget (sort_window_xml, "st_descend");
+			break;
+		case SORT_NONE:
+			w = gtkpod_xml_get_widget (sort_window_xml, "st_none");
+			break;
+		}
+		if (w)
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
+
+		switch (prefs_get_int("tm_sort"))
+		{
+		case SORT_ASCENDING:
+			w = gtkpod_xml_get_widget (sort_window_xml, "tm_ascend");
+			break;
+		case SORT_DESCENDING:
+			w = gtkpod_xml_get_widget (sort_window_xml, "tm_descend");
+			break;
+		case SORT_NONE:
+			w = gtkpod_xml_get_widget (sort_window_xml, "tm_none");
+			break;
+		}
+		if (w)
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
+
+		w = gtkpod_xml_get_widget (sort_window_xml, "tm_autostore");
+		if (w)
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
+						 prefs_get_int("tm_autostore"));
+
+		if((w = gtkpod_xml_get_widget (sort_window_xml, "cfg_case_sensitive")))
+		{
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
+						 prefs_get_int("case_sensitive"));
+		}
+		/* set standard entry in combo */
+	/*	str = gettext (get_tm_string (prefs_get_int("tm_sortcol")));
+		w = gtkpod_xml_get_widget (sort_window_xml, "sort_combo");
+		gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (w)->entry), str); */
+		w = gtkpod_xml_get_widget (sort_window_xml, "sort_combo");
+		tm_listed_order = g_object_get_data (G_OBJECT (sort_window), "tm_listed_order");
+		g_return_if_fail (tm_listed_order);
+		sortcol = prefs_get_int ("tm_sortcol");
+		sortorder = prefs_get_int ("tm_sort");
+		if ((sortcol >= 0) && (sortcol < TM_NUM_COLUMNS) && (sortorder != SORT_NONE))
+		{
+		    gtk_combo_box_set_active (GTK_COMBO_BOX(w), tm_listed_order[sortcol]);
+		}
+		else
+		{
+		    gtk_combo_box_set_active (GTK_COMBO_BOX(w), 0);
+		}
+    }
+}
+
+
+/* turn the sort window insensitive (if it's open) */
+void sort_window_block (void)
+{
+    if (sort_window)
+	gtk_widget_set_sensitive (sort_window, FALSE);
+}
+
+/* turn the sort window sensitive (if it's open) */
+void sort_window_release (void)
+{
+    if (sort_window)
+	gtk_widget_set_sensitive (sort_window, TRUE);
+}
+
+
+/* make the tooltips visible or hide it depending on the value set in
+ * the prefs (tooltips_prefs) */
+void sort_window_show_hide_tooltips (void)
+{
+    if (sort_window)
+    {
+		GtkTooltips *tt;
+		GtkTooltipsData *tooltips_data;
+		
+		tooltips_data = gtk_tooltips_data_get (gtkpod_xml_get_widget (sort_window_xml, "sort_combo"));
+		tt = tooltips_data->tooltips;
+
+		if (tt)
+		{
+			if (prefs_get_int("display_tooltips_prefs")) 
+			gtk_tooltips_enable (tt);
+			else                                     
+			gtk_tooltips_disable (tt);
+		}
+		else
+		{
+			g_warning ("***tt is NULL***");
+		}
+    }
+}
+
+
+/* get the sort_column selected in the combo */
+static TM_item sort_window_get_sort_col (void)
+{
+    GtkWidget *w;
+    TM_item sortcol;
+    gint item;
+    gint *tm_listed_order;
+
+    g_return_val_if_fail (sort_window, -1);
+    tm_listed_order = g_object_get_data (G_OBJECT (sort_window), "tm_listed_order");
+
+    w = gtkpod_xml_get_widget (sort_window_xml, "sort_combo");
+    item = gtk_combo_box_get_active (GTK_COMBO_BOX (w));
+
+    if ((item<=0) || (item >TM_NUM_COLUMNS))
+    {   /* either an error or no entry is active or "No sorting" is
+	   selected (0). In all these cases we return -1 ("No
+	   sorting") */
+	sortcol = -1;
+    }
+    else
+    {
+	gint i;
+	sortcol = -1;
+	for (i=0; i<TM_NUM_COLUMNS; ++i)
+	{
+	    if (tm_listed_order[i] == item)
+	    {
+		sortcol = i;
+		break;
+	    }
+	}
+    }
+
+    return sortcol;
+}
+
+
+/* Prepare keys to be copied to prefs table */
+static void sort_window_set ()
+{
+    gint val; /* A value from temp prefs */
+    TM_item sortcol_new;
+    TM_item sortcol_old;
+
+    sortcol_old = prefs_get_int("tm_sortcol");
+    sortcol_new = sort_window_get_sort_col();
+    if (sortcol_new != -1)
+    {
+	prefs_set_int ("tm_sortcol", sortcol_new);
+	if (prefs_get_int ("tm_sort") == SORT_NONE)
+	{
+	    if (temp_prefs_get_int_value (sort_temp_prefs, "tm_sort", &val))
+	    {
+		prefs_set_int ("tm_sort", val);
+	    }
+	    else
+	    {
+		prefs_set_int ("tm_sort", GTK_SORT_ASCENDING);
+	    }
+	}
+    }
+    else
+    {
+	if (prefs_get_int ("tm_sort") == SORT_NONE)
+	{  /* no change */
+	    sortcol_new = sortcol_old;
+	}
+	else
+	{
+	    prefs_set_int ("tm_sort", SORT_NONE);
+	}
+    }
+
+    /* update compare string keys */
+    compare_string_fuzzy_generate_keys ();
+
+    /* if sort type has changed, initialize display */
+    if (temp_prefs_get_int_value(sort_temp_prefs, "pm_sort", &val))
+    {
+	pm_sort (val);
+	temp_prefs_remove_key (sort_temp_prefs, "pm_sort");
+    }
+    if (temp_prefs_get_int_value(sort_temp_prefs, "st_sort", &val))
+    {
+	st_sort (val);
+	temp_prefs_remove_key (sort_temp_prefs, "st_sort");
+    }
+    if (temp_prefs_get_int_value(sort_temp_prefs, "tm_sort", NULL) ||
+	(sortcol_old != sortcol_new))
+    {
+	tm_sort_counter (-1);
+	tm_sort (prefs_get_int("tm_sortcol"), prefs_get_int("tm_sort"));
+	temp_prefs_remove_key (sort_temp_prefs, "tm_sort");
+    }
+    /* if auto sort was changed to TRUE, store order */
+    if (!temp_prefs_get_int(sort_temp_prefs, "tm_autostore"))
+    {
+	tm_rows_reordered ();
+	temp_prefs_remove_key (sort_temp_prefs, "tm_autostore");
+    }
+
+    sort_window_update ();
+}
+
+
+/* -----------------------------------------------------------------
+
+   Callbacks
+
+   ----------------------------------------------------------------- */
+
+G_MODULE_EXPORT void
+on_st_ascend_toggled                   (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_st_sort (SORT_ASCENDING);
+}
+
+
+G_MODULE_EXPORT void
+on_st_descend_toggled                  (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_st_sort (SORT_DESCENDING);
+}
+
+
+G_MODULE_EXPORT void
+on_st_none_toggled                     (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_st_sort (SORT_NONE);
+}
+
+
+G_MODULE_EXPORT void
+on_pm_ascend_toggled                   (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_pm_sort (SORT_ASCENDING);
+}
+
+
+G_MODULE_EXPORT void
+on_pm_descend_toggled                  (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_pm_sort (SORT_DESCENDING);
+}
+
+
+G_MODULE_EXPORT void
+on_pm_none_toggled                     (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_pm_sort (SORT_NONE);
+}
+
+
+G_MODULE_EXPORT void
+on_tm_ascend_toggled                   (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_tm_sort (SORT_ASCENDING);
+}
+
+
+G_MODULE_EXPORT void
+on_tm_descend_toggled                  (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_tm_sort (SORT_DESCENDING);
+}
+
+
+G_MODULE_EXPORT void
+on_tm_none_toggled                     (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    if (gtk_toggle_button_get_active(togglebutton))
+	sort_window_set_tm_sort (SORT_NONE);
+}
+
+G_MODULE_EXPORT void
+on_tm_autostore_toggled                (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    sort_window_set_tm_autostore (gtk_toggle_button_get_active(togglebutton));
+}
+
+
+G_MODULE_EXPORT void
+on_sort_case_sensitive_toggled         (GtkToggleButton *togglebutton,
+					gpointer         user_data)
+{
+    sort_window_set_case_sensitive(
+	gtk_toggle_button_get_active(togglebutton));
+}
+
+
+G_MODULE_EXPORT void
+on_sort_apply_clicked                  (GtkButton       *button,
+					gpointer         user_data)
+{
+    sort_window_apply ();
+}
+
+
+G_MODULE_EXPORT void
+on_sort_cancel_clicked                 (GtkButton       *button,
+					gpointer         user_data)
+{
+    sort_window_cancel ();
+}
+
+
+G_MODULE_EXPORT void
+on_sort_ok_clicked                     (GtkButton       *button,
+					gpointer         user_data)
+{
+    sort_window_ok ();
+}
+
+
+G_MODULE_EXPORT gboolean
+on_sort_window_delete_event            (GtkWidget       *widget,
+					GdkEvent        *event,
+					gpointer         user_data)
+{
+    sort_window_delete ();
+    return FALSE;
+}
+
+
+
+/**
+ * sort_window_cancel
+ * UI has requested sort prefs changes be ignored -- write back the
+ * original values
+ */
+void sort_window_cancel (void)
+{
+    /* close the window */
+    if(sort_window)
+	gtk_widget_destroy(sort_window);
+    sort_window = NULL;
+}
+
+/* when window is deleted, we keep the currently applied prefs */
+void sort_window_delete(void)
+{
+    temp_prefs_destroy(sort_temp_prefs);
+    sort_temp_prefs = NULL;
+    temp_lists_destroy(sort_temp_lists);
+    sort_temp_lists = NULL;
+
+    /* close the window */
+    if(sort_window)
+    {
+	gint *tm_listed_order;
+	tm_listed_order = g_object_get_data (G_OBJECT (sort_window), "tm_listed_order");
+	g_warn_if_fail (tm_listed_order);
+	g_free (tm_listed_order);
+	gtk_widget_destroy(sort_window);
+    }
+    sort_window = NULL;
+}
+
+/* apply the current settings and close the window */
+void sort_window_ok (void)
+{
+    /* update the sort ignore strings */
+    sort_window_read_sort_ign ();
+
+    temp_prefs_apply(sort_temp_prefs);
+    temp_lists_apply(sort_temp_lists);
+
+    /* save current settings */
+    sort_window_set ();
+  
+    /* close the window */
+    if(sort_window)
+	gtk_widget_destroy(sort_window);
+    sort_window = NULL;
+}
+
+
+/* apply the current settings, don't close the window */
+void sort_window_apply (void)
+{
+    /* update the sort ignore strings */
+    sort_window_read_sort_ign ();
+
+    temp_prefs_apply(sort_temp_prefs);
+    temp_lists_apply(sort_temp_lists);
+
+    /* save current settings */
+    sort_window_set ();
+}
+
+void sort_window_set_tm_autostore (gboolean val)
+{
+    temp_prefs_set_int(sort_temp_prefs, "tm_autostore", val);
+}
+
+void sort_window_set_pm_sort (gint val)
+{
+    temp_prefs_set_int(sort_temp_prefs, "pm_sort", val);
+}
+
+void sort_window_set_st_sort (gint val)
+{
+    temp_prefs_set_int(sort_temp_prefs, "st_sort", val);
+}
+
+void sort_window_set_tm_sort (gint val)
+{
+    temp_prefs_set_int(sort_temp_prefs, "tm_sort", val);
+}
+
+void sort_window_set_case_sensitive (gboolean val)
+{
+    temp_prefs_set_int(sort_temp_prefs, "case_sensitive",
+		       val);
+}

Added: gtkpod/branches/upstream/current/src/sort_window.h
===================================================================
--- gtkpod/branches/upstream/current/src/sort_window.h	                        (rev 0)
+++ gtkpod/branches/upstream/current/src/sort_window.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -0,0 +1,56 @@
+/* Time-stamp: <2006-05-21 12:24:56 jcs>
+|
+|  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
+|  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs 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: sort_window.h 1905 2008-01-03 10:04:29Z Sikon $
+*/
+#ifndef _GTKPOD_PREFS_WINDOW_H
+#define _GTKPOD_PREFS_WINDOW_H
+
+#include <gtk/gtk.h>
+#include "prefs.h"
+
+extern const gchar *path_entry_names[];
+
+void sort_window_create (void);
+void sort_window_block (void);
+void sort_window_release (void);
+void sort_window_show_hide_tooltips (void);
+void sort_window_ok (void);
+void sort_window_apply (void);
+void sort_window_cancel (void);
+void sort_window_delete (void);
+void sort_window_set_pm_autostore (gboolean val);
+void sort_window_set_tm_autostore (gboolean val);
+void sort_window_set_pm_sort (gint val);
+void sort_window_set_st_sort (gint val);
+void sort_window_set_tm_sort (gint val);
+void sort_window_set_case_sensitive (gboolean val);
+void sort_window_update (void);
+
+void create_subs_treeview (void);
+#endif
+

Modified: gtkpod/branches/upstream/current/src/stock_icons.c
===================================================================
--- gtkpod/branches/upstream/current/src/stock_icons.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/stock_icons.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -27,8 +27,27 @@
 
 #include "stock_icons.h"
 
-static void register_stock_icon (gchar *path, const gchar *stockid);
+static void register_stock_icon (const gchar *name, const gchar *stockid)
+{
+	GtkIconSet *pl_iconset;
+	GtkIconSource *source;
 
+	g_return_if_fail (name);
+	g_return_if_fail (stockid);
+	
+	pl_iconset = gtk_icon_set_new ();
+	source = gtk_icon_source_new ();
+			
+	gtk_icon_source_set_icon_name (source, name);
+	gtk_icon_set_add_source (pl_iconset, source);
+	gtk_icon_source_free (source); /* _add_source() copies source */
+
+	GtkIconFactory *factory = gtk_icon_factory_new ();
+	gtk_icon_factory_add (factory, stockid, pl_iconset);
+	
+	gtk_icon_factory_add_default (factory);
+}
+
 /**
  * stockid_init
  *
@@ -43,102 +62,54 @@
  */
 void stockid_init (gchar *progpath)
 {
-	gchar *progname;
-	
-	progname = g_find_program_in_path (progpath);
+	gchar *progname = g_find_program_in_path (progpath);
+	static const gchar *SEPsrcSEPgtkpod = G_DIR_SEPARATOR_S "src" G_DIR_SEPARATOR_S "gtkpod";
+	gchar *path;
 
-	if (progname)
-	{
-		static const gchar *SEPsrcSEPgtkpod = G_DIR_SEPARATOR_S "src" G_DIR_SEPARATOR_S "gtkpod";
+	if (!progname)
+		return;
 		
-		if (!g_path_is_absolute (progname))
-		{
-			gchar *cur_dir = g_get_current_dir ();
-			gchar *prog_absolute;
+	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_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);
 		
-		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);
+		g_free (cur_dir);
+		progname = prog_absolute;
+	}
+	
+	if (g_str_has_suffix (progname, SEPsrcSEPgtkpod))
+	{
+		gchar *suffix = g_strrstr (progname, SEPsrcSEPgtkpod);
 		
-		/* Photo playlist icon */
-		if (GPHOTO_PLAYLIST_ICON_PATH && !g_file_test (GPHOTO_PLAYLIST_ICON_PATH, G_FILE_TEST_EXISTS))
+		if (suffix)
 		{
-			g_free (GPHOTO_PLAYLIST_ICON_PATH);
-			GPHOTO_PLAYLIST_ICON_PATH = NULL;
+			*suffix = 0;
 		}
-				
-		if (!GPHOTO_PLAYLIST_ICON_PATH)
-		{
-			GPHOTO_PLAYLIST_ICON_PATH = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "data", "gphoto_playlist_icon-48.png", NULL);
-		}
+	}
+	
+	path = g_build_filename (progname, "data", "icons", NULL);
+	g_free (progname);
 		
-		/* 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);
+	if (path && !g_file_test (path, G_FILE_TEST_EXISTS))
+	{
+		g_free (path);
+		path = NULL;
 	}
-}
+	
+	if (!path)
+		path = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "icons", NULL);
 
-/**
- * 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);
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), path);
+	g_free (path);
+	
+	register_stock_icon ("playlist-photo", GPHOTO_PLAYLIST_ICON_STOCK_ID);
+	register_stock_icon ("playlist", TUNES_PLAYLIST_ICON_STOCK_ID);
+	
 }

Modified: gtkpod/branches/upstream/current/src/stock_icons.h
===================================================================
--- gtkpod/branches/upstream/current/src/stock_icons.h	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/stock_icons.h	2009-01-24 20:05:38 UTC (rev 361)
@@ -38,10 +38,6 @@
 #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/upstream/current/src/syncdir.c
===================================================================
--- gtkpod/branches/upstream/current/src/syncdir.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/syncdir.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-06-17 23:01:18 jcs>
+/* Time-stamp: <2008-07-06 10:38:05 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: syncdir.c 1550 2007-06-17 14:14:38Z jcsjcs $
+|  $Id: syncdir.c 2037 2008-07-06 12:13:44Z jcsjcs $
 */
 
 /* This file provides functions for syncing a directory or directories
@@ -48,9 +48,18 @@
 {
     Playlist *playlist;
     GList    **tracks_updated;
+    GHashTable *filepath_hash;
 };
 
+/* Used in the callback after adding a new track to 
+ * to add to the filehash */
+struct added_file_data
+{
+    GHashTable *filepath_hash;
+    gchar *filepath;
+};
 
+
 /**
  * confirm_sync_dirs:
  *
@@ -299,16 +308,54 @@
  * again if it already exists */
 static void sync_addtrackfunc (Playlist *plitem, Track *track, gpointer data)
 {
+	struct added_file_data *afd = data;
+
     g_return_if_fail (plitem);
     g_return_if_fail (track);
 
-    /* only add if @track isn't already a member of the current
-       playlist */
+    g_return_if_fail (afd->filepath_hash);
+    g_return_if_fail (afd->filepath);
+
+    /* add the new entry to the filepath */
+    g_hash_table_insert (afd->filepath_hash, g_strdup (afd->filepath), track);
+
+    /* only add if @track isn't already a member of the current playlist */
     if (!itdb_playlist_contains_track (plitem, track))
 	gp_playlist_add_track (plitem, track, TRUE);
 }
 
 
+/* Builds a hash of all the tracks in the playlists db,
+ * hashed by the file path */
+static GHashTable *get_itdb_filepath_hash (Playlist *pl)
+{
+    GHashTable* filepath_hash;
+    iTunesDB *itdb = pl->itdb;
+
+    filepath_hash = g_hash_table_new_full (
+	g_str_hash, g_str_equal, g_free, NULL);
+
+    GList *gl;
+    for (gl=itdb->tracks; gl; gl=gl->next)
+    {
+	ExtraTrackData *etr;
+	Track *track = gl->data;
+	g_return_val_if_fail (track, NULL);
+
+	etr = track->userdata;
+	g_return_val_if_fail (etr, NULL);
+
+	/* track has filename info */
+	if (etr->pc_path_locale && *etr->pc_path_locale)
+	{
+	    g_hash_table_insert (filepath_hash, g_strdup (etr->pc_path_locale), track);
+	}
+    }
+	
+    return filepath_hash;
+}
+
+
 /**
  * add_files:
  *
@@ -319,12 +366,15 @@
 {
     struct add_files_data *afd = user_data;
     Playlist *pl;
-    gchar *dirname = key;
+    gchar *dirname;
 
     g_return_if_fail (key);
     g_return_if_fail (afd);
     g_return_if_fail (afd->playlist);
     g_return_if_fail (afd->tracks_updated);
+    g_return_if_fail (afd->filepath_hash);
+
+    dirname = key;
     pl = afd->playlist;
 
     if (g_file_test (dirname, G_FILE_TEST_IS_DIR))
@@ -360,21 +410,14 @@
 		case FILE_TYPE_MPG:
                 case FILE_TYPE_OGG:
                 case FILE_TYPE_FLAC:
-		    tr = gp_track_by_filename (pl->itdb, filename);
+		    tr = g_hash_table_lookup (afd->filepath_hash, filename);
 		    if (tr)
-		    {   /* track is known -> add to playlist if not
-			 * already present and only update if mtime or
-			 * filesize is different */
+		    {   /* track is already present in playlist.
+			   Update if date stamp is different. */
+			struct stat filestat;
 			ExtraTrackData *etr = tr->userdata;
-			struct stat filestat;
 			g_return_if_fail (etr);
 
-			if (!itdb_playlist_contains_track (pl, tr))
-			{
-			    gp_playlist_add_track (pl, tr, TRUE);
-			    updated = TRUE;
-			}
-
 			stat (filename, &filestat);
 /*
 printf ("%ld %ld (%s)\n, %ld %d\n",
@@ -395,10 +438,15 @@
 			 * standard function. Duplicate adding is
 			 * avoided by an addtrack function checking
 			 * for duplication */
+			struct added_file_data data;
+			data.filepath = filename;
+			data.filepath_hash = afd->filepath_hash;
+
 			add_track_by_filename (pl->itdb, filename,
 					       pl, FALSE,
-					       sync_addtrackfunc, NULL);
-			tr = gp_track_by_filename (pl->itdb, filename);
+					       sync_addtrackfunc, &data);
+
+			tr = g_hash_table_lookup (afd->filepath_hash, filename);
 			updated = TRUE;
 		    }
 		    break;
@@ -471,7 +519,7 @@
 		    const gchar *key_sync_show_summary,
 		    gboolean sync_show_summary)
 {
-    GHashTable *dirs_hash;
+    GHashTable *dirs_hash, *filepath_hash;
     gboolean delete_tracks, is_mpl;
     time_t current_time;
     GList *tracks_to_delete_from_ipod = NULL;
@@ -559,10 +607,20 @@
        tracks */
     current_time = time (NULL);
 
-    /* Add all files in all directories entered into dirs_hash */
+    /* craete a hash with all files in the current playlist for faster
+     * comparison with files in the directory */
+    filepath_hash = get_itdb_filepath_hash (playlist);
+
     afd.playlist = playlist;
     afd.tracks_updated = &tracks_updated;
+    afd.filepath_hash = filepath_hash;
+    /* Add all files in all directories present in dirs_hash */
     g_hash_table_foreach (dirs_hash, add_files, &afd);
+
+    /* we won't need this hash any more */
+    g_hash_table_destroy (filepath_hash);
+    filepath_hash = NULL;
+
     /* Remove updated and duplicate list so it won't pop up at a later
        time */
     display_updated ((void *)-1, NULL);

Modified: gtkpod/branches/upstream/current/src/tools.c
===================================================================
--- gtkpod/branches/upstream/current/src/tools.c	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/src/tools.c	2009-01-24 20:05:38 UTC (rev 361)
@@ -23,15 +23,15 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: tools.c 1684 2007-08-18 06:38:49Z jcsjcs $
+|  $Id: tools.c 1894 2008-01-01 19:26:37Z Sikon $
 */
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
-
 #include "info.h"
+#include "infodlg.h"
 #include "misc.h"
 #include "misc_track.h"
 #include "mp3file.h"
@@ -877,19 +877,19 @@
 
    ------------------------------------------------------------ */
 
-gboolean
+G_MODULE_EXPORT gboolean
 on_gtkpod_info_delete_event            (GtkWidget       *widget,
 					GdkEvent        *event,
 					gpointer         user_data)
 {
-    info_close_window ();
+    close_info_dialog ();
     return TRUE; /* don't close again -- info_close_window() already does it */
 }
 
 
-void
+G_MODULE_EXPORT void
 on_info_close_clicked                  (GtkButton       *button,
 					gpointer         user_data)
 {
-    info_close_window ();
+    close_info_dialog ();
 }

Modified: gtkpod/branches/upstream/current/ylwrap
===================================================================
--- gtkpod/branches/upstream/current/ylwrap	2009-01-24 16:20:00 UTC (rev 360)
+++ gtkpod/branches/upstream/current/ylwrap	2009-01-24 20:05:38 UTC (rev 361)
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2005-05-14.22
+scriptversion=2007-11-22.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, 2004, 2005,
+# 2007  Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey at cygnus.com>.
 #
@@ -101,14 +101,14 @@
 # FIXME: add hostname here for parallel makes that run commands on
 # other machines.  But that might take us over the 14-char limit.
 dirname=ylwrap$$
-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
+trap "cd '`pwd`'; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
 mkdir $dirname || exit 1
 
 cd $dirname
 
 case $# in
-  0) $prog "$input" ;;
-  *) $prog "$@" "$input" ;;
+  0) "$prog" "$input" ;;
+  *) "$prog" "$@" "$input" ;;
 esac
 ret=$?
 




More information about the Pkg-gtkpod-devel mailing list